diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
index 5187d3fa..73fd3191 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.2";
+  public const string BaseVersion = "3.3";
   [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/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
index f8dc5d77..46576551 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
index 6a38a1ff..83b47b28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
@@ -14,1306 +14,1774 @@
 
   **********************************************************************************-->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
-    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockAero="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
-    xmlns:avalonDockThemeControls="clr-namespace:Xceed.Wpf.AvalonDock.Themes.Controls"
-    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
-    >
-
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="Brushes.xaml"/>
-   </ResourceDictionary.MergedDictionaries>
-
-   <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-   <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
-   <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
-   <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
-   <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
-   <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
-   <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
-
-   <!--DocumentPaneControlStyle-->
-   <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor8Key}}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-               <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-                  <!--Following border is required to catch mouse events-->
-                  <Border Background="Transparent" Grid.RowSpan="2"/>
-                  <Grid  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                         Panel.ZIndex="1" >
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="4,0,16,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
-                     <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                Focusable="False"
-                                VerticalAlignment="Center"
-                                Grid.Column="1">
-                        <avalonDockControls:DropDownButton.DropDownContextMenu>
-                           <avalonDockControls:ContextMenuEx
-                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
-                              <avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                 <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"  BasedOn="{StaticResource {x:Type MenuItem}}">
-                                    <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
-                                    <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
-                                    <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
-                                    <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
-                                    <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
-                                 </Style>
-                              </avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                           </avalonDockControls:ContextMenuEx>
-                        </avalonDockControls:DropDownButton.DropDownContextMenu>
-                        <Image Source="Images/PinDocMenu_Dark.png"/>
-                     </avalonDockControls:DropDownButton>
-                  </Grid>
-                  <Border x:Name="ContentPanel" 
-                                VerticalAlignment="Stretch" 
-                                HorizontalAlignment="Stretch"  
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                Grid.Row="1" 
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle"
-                                CornerRadius="3">
-                     <Border
-                                BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
-                                BorderThickness="1,1,1,1"
-                                CornerRadius="2"
-                                >
-                        <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}" 
-                                    Background="{TemplateBinding Background}" 
-                                    Margin="2"
-                                    CornerRadius="2"
-                                    >
-                           <ContentPresenter x:Name="PART_SelectedContentHost" 
-                                                  ContentSource="SelectedContent" 
-                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                     </Border>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockAero="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:avalonDockThemeControls="clr-namespace:Xceed.Wpf.AvalonDock.Themes.Controls"
+                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Brushes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+  <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+  <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter" />
+  <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter" />
+  <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter" />
+  <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+
+  <!--DocumentPaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor8Key}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Grid  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
+                   Panel.ZIndex="1">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel"
+                                                       Grid.Column="0"
+                                                       IsItemsHost="true"
+                                                       Margin="4,0,16,0"
+                                                       Grid.Row="0"
+                                                       KeyboardNavigation.TabIndex="1" />
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                 Focusable="False"
+                                                 VerticalAlignment="Center"
+                                                 Grid.Column="1">
+                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                  <avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                    <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                      <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"
+                             BasedOn="{StaticResource {x:Type MenuItem}}">
+                        <Setter Property="HeaderTemplate"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+                        <Setter Property="HeaderTemplateSelector"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+                        <Setter Property="IconTemplate"
+                                Value="{Binding Path=Root.Manager.IconContentTemplate}" />
+                        <Setter Property="IconTemplateSelector"
+                                Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
+                        <Setter Property="Command"
+                                Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}" />
+                      </Style>
+                    </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                  </avalonDockControls:ContextMenuEx>
+                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                <Image Source="Images/PinDocMenu_Dark.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+            </Grid>
+            <Border x:Name="ContentPanel"
+                    VerticalAlignment="Stretch"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="1"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle"
+                    CornerRadius="3">
+              <Border BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
+                      BorderThickness="1,1,1,1"
+                      CornerRadius="2">
+                <Border BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        Margin="2"
+                        CornerRadius="2">
+                  <ContentPresenter x:Name="PART_SelectedContentHost"
+                                    ContentSource="SelectedContent"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </Border>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}"
+                         Value="0">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="MenuDropDownButton" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Foreground"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor10Key}}" />
+          <Setter Property="Background"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}" />
+          <Setter Property="BorderBrush"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Padding"
+                  Value="2,1,2,1" />
+          <Setter Property="Margin"
+                  Value="2,1,-15,0" />
+          <Setter Property="Template">
+            <Setter.Value>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="*" />
+                  </Grid.ColumnDefinitions>
+
+                  <avalonDockThemeControls:SplineBorder x:Name="splineBd"
+                                                        Fill="{TemplateBinding Background}"
+                                                        Stroke="{TemplateBinding BorderBrush}"
+                                                        BottomBorderMargin="0.5" />
+
+                  <Border x:Name="Bd"
+                          Grid.Column="1"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="0,1,1,0"
+                          CornerRadius="0,2,0,0">
+                    <Border x:Name="BdInternal"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}">
+                      <ContentPresenter x:Name="Content"
+                                        ContentSource="Header"
+                                        HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                        RecognizesAccessKey="True"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
                   </Border>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                     <Setter Property="Content" TargetName="MenuDropDownButton">
-                        <Setter.Value>
-                           <Image Source="Images/PinDocMenu_Black.png"/>
-                        </Setter.Value>
-                     </Setter>
-                  </Trigger>
-                  <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                     <Setter Property="Content" TargetName="MenuDropDownButton">
-                        <Setter.Value>
-                           <Image Source="Images/PinDocMenu_Black.png"/>
-                        </Setter.Value>
-                     </Setter>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="-1,0,-16,-1" />
+                    <Setter Property="Margin"
+                            TargetName="BdInternal"
+                            Value="0,0,0,-1" />
+                    <Setter Property="Margin"
+                            TargetName="splineBd"
+                            Value="0,0,0,-1.0" />
+                    <Setter Property="BottomBorderMargin"
+                            TargetName="splineBd"
+                            Value="1.5" />
+                    <Setter Property="FontWeight"
+                            Value="Bold" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
                   </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor17Key}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                   </Trigger>
-                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
-                     <Setter Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
-                  </DataTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="ItemContainerStyle">
-         <Setter.Value>
-            <Style TargetType="{x:Type TabItem}">
-               <Setter Property="Foreground" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor10Key}}"/>
-               <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"/>
-               <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}"/>
-               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-               <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-               <Setter Property="Padding" Value="2,1,2,1"/>
-               <Setter Property="Margin" Value="2,1,-15,0"/>
-               <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Grid SnapsToDevicePixels="true">
-
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="20"/>
-                              <ColumnDefinition Width="*"/>
-                           </Grid.ColumnDefinitions>
-
-                           <avalonDockThemeControls:SplineBorder
-                                        x:Name="splineBd"
-                                        Fill="{TemplateBinding Background}"
-                                        Stroke="{TemplateBinding BorderBrush}"
-                                        BottomBorderMargin="0.5"
-                                        />
-
-                           <Border x:Name="Bd" 
-                                            Grid.Column="1"
-							                BorderBrush="{TemplateBinding BorderBrush}"
-   				                            BorderThickness="0,1,1,0" 
-                                            CornerRadius="0,2,0,0">
-                              <Border
-                                            x:Name="BdInternal"
-							                Background="{TemplateBinding Background}" 
-							                Padding="{TemplateBinding Padding}"
-                                            >
-                                 <ContentPresenter 
-								                x:Name="Content" 
-								                ContentSource="Header" 
-                                                HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                                VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                                RecognizesAccessKey="True" 
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                              </Border>
-                           </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                           <Trigger Property="Selector.IsSelected"
-								            Value="true">
-                              <Setter Property="BorderBrush"
-									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
-                              <Setter Property="Background"
-									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" />
-                              <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                              <Setter Property="Margin" Value="-1,0,-16,-1"/>
-                              <Setter Property="Margin" TargetName="BdInternal" Value="0,0,0,-1"/>
-                              <Setter Property="Margin" TargetName="splineBd" Value="0,0,0,-1.0"/>
-                              <Setter Property="BottomBorderMargin" TargetName="splineBd" Value="1.5"/>
-                              <Setter Property="FontWeight" Value="Bold"/>
-                              <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                           </Trigger>
-                           <MultiTrigger>
-                              <MultiTrigger.Conditions>
-                                 <Condition Property="IsMouseOver" Value="true"/>
-                                 <Condition Property="Selector.IsSelected" Value="false"/>
-                              </MultiTrigger.Conditions>
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}"/>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor17Key}}"/>
-                              <Setter Property="Panel.ZIndex" Value="0" />
-                           </MultiTrigger>
-                           <Trigger Property="IsEnabled" Value="false">
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}"/>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}"/>
-                              <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                           </Trigger>
-                        </ControlTemplate.Triggers>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-            </Style>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="ItemTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="ContentTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--AnchorablePaneControlStyle-->
-   <Style x:Key="AvalonDock_ThemeAero_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-      <Setter Property="TabStripPlacement" Value="Bottom"/>
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
-      <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-               <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="*"/>
-                     <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
-                  <!--Following border is required to catch mouse events-->
-                  <Border Background="Transparent" Grid.RowSpan="2"/>
-                  <Border x:Name="ContentPanel" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}" 
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle">
-                     <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              ContentSource="SelectedContent" 
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--AnchorablePaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeAero_AnchorablePaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+    <Setter Property="TabStripPlacement"
+            Value="Bottom" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="BorderThickness"
+            Value="0" />
+    <Setter Property="Foreground"
+            Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Background"
+            Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Border x:Name="ContentPanel"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel"
+                                                       Margin="0,0,2,2"
+                                                       IsItemsHost="true"
+                                                       Grid.Row="1"
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       Panel.ZIndex="1" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}"
+                         Value="1">
+              <Setter Property="Margin"
+                      Value="0"
+                      TargetName="HeaderPanel" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Background"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}" />
+          <Setter Property="BorderBrush"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+          <Setter Property="Foreground"
+                  Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor12Key}}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Margin"
+                  Value="0,0,-1,0" />
+          <Setter Property="Template">
+            <Setter.Value>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="1,0,1,1"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                   </Border>
-                  <avalonDockControls:AnchorablePaneTabPanel 
-                            x:Name="HeaderPanel" 
-                            Margin="0,0,2,2" 
-                            IsItemsHost="true" 
-                            Grid.Row="1" 
-                            KeyboardNavigation.TabIndex="1"
-                            Panel.ZIndex="1"/>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-                  <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
-                     <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
-                  </DataTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="ItemContainerStyle">
-         <Setter.Value>
-            <Style TargetType="{x:Type TabItem}">
-               <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}"/>
-               <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
-               <Setter Property="Foreground" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor12Key}}"/>
-               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-               <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-               <Setter Property="Margin" Value="0,0,-1,0"/>
-               <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Grid SnapsToDevicePixels="true">
-                           <Border x:Name="Bd" 
-							              BorderBrush="{TemplateBinding BorderBrush}"
-                                          BorderThickness="1,0,1,1"
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                              <ContentPresenter 
-								            x:Name="Content" 
-								            ContentSource="Header" 
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            RecognizesAccessKey="True" 
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                           </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                           <Trigger Property="Selector.IsSelected"
-								        Value="true">
-                              <Setter Property="Background"
-									    Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}" />
-                              <Setter Property="Foreground"
-									    Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor3Key}}" />
-                              <Setter Property="Panel.ZIndex" 
-                                        Value="1" />
-                              <Setter Property="Margin" Value="0,-1,-1,-2"/>
-                           </Trigger>
-                           <MultiTrigger>
-                              <MultiTrigger.Conditions>
-                                 <Condition Property="IsMouseOver" Value="true"/>
-                                 <Condition Property="Selector.IsSelected" Value="false"/>
-                              </MultiTrigger.Conditions>
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor32Key}}"/>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor27Key}}"/>
-                              <Setter Property="Panel.ZIndex" Value="0" />
-                           </MultiTrigger>
-                           <Trigger Property="IsEnabled" Value="false">
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}"/>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}"/>
-                              <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                           </Trigger>
-                        </ControlTemplate.Triggers>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-               <Style.Triggers>
-                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1">
-                     <Setter Property="Visibility" Value="Collapsed"/>
-                  </DataTrigger>
-               </Style.Triggers>
-            </Style>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="ItemTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}"/>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="ContentTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
-                            BorderThickness="0,0,0,1"
-                            Padding="0,2,0,1">
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <avalonDockControls:DropDownControlArea 
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                        <ContentPresenter 
-                                    x:Name="Header"            
-                                    Margin="2,0,0,0"
-                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                     </avalonDockControls:DropDownControlArea>
-
-
-                     <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                VerticalAlignment="Center"
-                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                Focusable="False"
-                                Grid.Column="1"
-                                Padding="-1"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"
-                                >
-                        <Image x:Name="PART_ImgMenuPin" Source="Images/PinMenu_Dark.png"/>
-                     </avalonDockControls:DropDownButton>
-
-                     <Button x:Name="PART_AutoHidePin" 
-                                Grid.Column="2" 
-                                Focusable="False"
-                                Padding="-1"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
-                                >
-                        <Image x:Name="PART_ImgAutoHidePin" Source="Images/PinAutoHide_Dark.png"/>
-                     </Button>
-                     <Button x:Name="PART_HidePin" 
-                                Grid.Column="3" 
-                                Focusable="False"
-                                Padding="-1"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
-                        <Image x:Name="PART_ImgHidePin" Source="Images/PinClose_Dark.png"/>
-                     </Button>
-
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                     <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
-                        <Setter.Value>
-                           <RotateTransform Angle="90"/>
-                        </Setter.Value>
-                     </Setter>
-                  </DataTrigger>
-                  <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                     <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}" />
-                  </DataTrigger>
-
-                  <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="Images/PinAutoHide_Black.png"/>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor3Key}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="0,-1,-1,-2" />
                   </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgHidePin" Value="Images/PinClose_Black.png"/>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor32Key}}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor27Key}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                   </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-      <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel 
-                        MinWidth="4"
-                        MinHeight="4"
-                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-      </ItemsControl>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
-      <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-         <ItemsControl.LayoutTransform>
-            <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
-         </ItemsControl.LayoutTransform>
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-      </ItemsControl>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
-      <Border 
-            x:Name="Bd"
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}"
+                         Value="1">
+              <Setter Property="Visibility"
+                      Value="Collapsed" />
+            </DataTrigger>
+          </Style.Triggers>
+        </Style>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
+                  BorderThickness="0,0,0,1"
+                  Padding="0,2,0,1">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter x:Name="Header"
+                                  Margin="2,0,0,0"
+                                  Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+              </avalonDockControls:DropDownControlArea>
+
+
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 VerticalAlignment="Center"
+                                                 Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                 Focusable="False"
+                                                 Grid.Column="1"
+                                                 Padding="-1"
+                                                 DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                <Image x:Name="PART_ImgMenuPin"
+                       Source="Images/PinMenu_Dark.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+
+              <Button x:Name="PART_AutoHidePin"
+                      Grid.Column="2"
+                      Focusable="False"
+                      Padding="-1"
+                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
+                <Image x:Name="PART_ImgAutoHidePin"
+                       Source="Images/PinAutoHide_Dark.png" >
+                </Image>
+              </Button>
+              <Button x:Name="PART_HidePin"
+                      Grid.Column="3"
+                      Focusable="False"
+                      Padding="-1"
+                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                <Image x:Name="PART_ImgHidePin"
+                       Source="Images/PinClose_Dark.png" >
+                </Image>
+              </Button>
+
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="LayoutTransform"
+                      TargetName="PART_AutoHidePin">
+                <Setter.Value>
+                  <RotateTransform Angle="90" />
+                </Setter.Value>
+              </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_HidePin"
+                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_HidePin"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
+
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}" />
+            </DataTrigger>
+
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_AutoHidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgAutoHidePin"
+                      Value="Images/PinAutoHide_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_HidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgHidePin"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorSideTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel MinWidth="4"
+                      MinHeight="4"
+                      Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorGroupTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.LayoutTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}" />
+      </ItemsControl.LayoutTransform>
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+    <Border x:Name="Bd"
             Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor26Key}}"
             BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
             BorderThickness="1"
             Margin="0,4,0,0"
             Padding="2">
-         <ContentPresenter 
-                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                    ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                    ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-      </Border>
-      <ControlTemplate.Triggers>
-         <Trigger Property="Side" Value="Right">
-            <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
-         </Trigger>
-         <Trigger Property="Side" Value="Bottom">
-            <Setter Property="Margin" Value="0,4,0,0" TargetName="Bd"/>
-         </Trigger>
-         <Trigger Property="Side" Value="Top">
-            <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
-         </Trigger>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="IsMouseOver" Value="true"/>
-               <Condition Property="Selector.IsSelected" Value="false"/>
-            </MultiTrigger.Conditions>
-            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" TargetName="Bd"/>
-            <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" TargetName="Bd"/>
-         </MultiTrigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-               <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-                  <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  <Grid x:Name="PART_DockingManagerDropTargets" >
-                     <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="Images/DockAnchorableLeft.PNG" Stretch="None" />
-                     <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="Images/DockAnchorableRight.PNG" Stretch="None" />
-                     <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="Images/DockAnchorableBottom.PNG" Stretch="None" />
-                     <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="Images/DockAnchorableTop.PNG" Stretch="None"/>
-                  </Grid>
-                  <Grid x:Name="PART_AnchorablePaneDropTargets">
-                     <Grid Width="110" Height="110" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
-                        <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
-                           <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
-                        </Border>
-                        <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                           <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
-                           <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                           <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
-                           <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                        </Border>
-                     </Grid>
-                  </Grid>
-                  <Grid x:Name="PART_DocumentPaneDropTargets">
-                     <Grid Width="110" Height="110" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.PNG"  Stretch="None"/>
-                        <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
-                           <Image Source="Images/DockDocumentTop.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                           <Image Source="Images/DockDocumentRight.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
-                           <Image Source="Images/DockDocumentBottom.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                           <Image Source="Images/DockDocumentLeft.png"  Stretch="None"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
-                           <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                        </Border>
-                     </Grid>
-                  </Grid>
-
-                  <Grid x:Name="PART_DocumentPaneFullDropTargets">
-                     <Grid Width="193" Height="191" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                           <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                           <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
-                        <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
-                           <Image Source="Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
-                           <Image Source="Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
-                           <Image Source="Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
-                           <Image Source="Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
-                           <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                        </Border>
-
-                        <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
-                           <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
-                           <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
-                           <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
-                        </Border>
-                        <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
-                           <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
-                        </Border>
-
-                     </Grid>
-                  </Grid>
-
-               </Canvas>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentHeaderTemplate">
-      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-   </DataTemplate>
-
-   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableHeaderTemplate">
-      <Grid>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition/>
-         </Grid.ColumnDefinitions>
-         <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-         <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
-      </Grid>
-      <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
-            <Setter Property="Margin" Value="0" TargetName="title"/>
-         </DataTrigger>
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentTitleTemplate">
-      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-   </DataTemplate>
-
-   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableTitleTemplate">
-      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-   </DataTemplate>
-
-   <DataTemplate x:Key="AvalonDock_ThemeAero_IconContentTemplate">
-      <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-   </DataTemplate>
-
-   <ContextMenu x:Key="AvalonDock_ThemeAero_AnchorableContextMenu">
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
-                Command="{Binding Path=DockCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
-                Command="{Binding Path=AutoHideCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
-                Command="{Binding Path=HideCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-   </ContextMenu>
-
-   <ContextMenu x:Key="AvalonDock_ThemeAero_DocumentContextMenu">
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
-                  Command="{Binding Path=CloseCommand}"
-                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
-                Command="{Binding Path=CloseAllButThisCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
-                Command="{Binding Path=CloseAllCommand}" />
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
-                Command="{Binding Path=NewHorizontalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-         <MenuItem.Icon>
-            <Image Source="Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
-         </MenuItem.Icon>
-      </MenuItem>
-
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
-                Command="{Binding Path=NewVerticalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-         <MenuItem.Icon>
-            <Image Source="Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
-         </MenuItem.Icon>
-      </MenuItem>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
-                Command="{Binding Path=MoveToNextTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
-                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-
-   </ContextMenu>
-
-   <!--DockingManager-->
-   <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor1Key}}"/>
-      <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeAero_DocumentPaneControlStyle}"/>
-      <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeAero_AnchorablePaneControlStyle}"/>
-      <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorSideTemplate}"/>
-      <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorGroupTemplate}"/>
-      <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorTemplate}"/>
-      <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}"/>
-      <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorableHeaderTemplate}"/>
-      <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentTitleTemplate}"/>
-      <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorableTitleTemplate}"/>
-      <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeAero_AnchorableContextMenu}"/>
-      <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeAero_DocumentContextMenu}"/>
-      <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}"/>
-      <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeAero_IconContentTemplate}"/>
-      <Setter Property="GridSplitterWidth" Value="4"/>
-      <Setter Property="GridSplitterHeight" Value="4"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
-               <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
-                     <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
-                     <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
-                     <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
-                     <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
-                     <ContentPresenter 
-                                x:Name="PART_AutoHideArea"
+      <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+    </Border>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Side"
+               Value="Right">
+        <Setter Property="Margin"
+                Value="0,0,0,4"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Bottom">
+        <Setter Property="Margin"
+                Value="0,4,0,0"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Top">
+        <Setter Property="Margin"
+                Value="0,0,0,4"
+                TargetName="Bd" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver"
+                     Value="true" />
+          <Condition Property="Selector.IsSelected"
+                     Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}"
+                TargetName="Bd" />
+        <Setter Property="Background"
+                Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}"
+                TargetName="Bd" />
+      </MultiTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <Style x:Key="{x:Type avalonDockControls:OverlayWindow}"
+         TargetType="{x:Type avalonDockControls:OverlayWindow}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+          <Canvas x:Name="PART_DropTargetsContainer"
+                  Opacity="0.9">
+            <Path x:Name="PART_PreviewBox"
+                  Fill="AliceBlue"
+                  StrokeThickness="2"
+                  Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            <Grid x:Name="PART_DockingManagerDropTargets">
+              <Image x:Name="PART_DockingManagerDropTargetLeft"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Left"
+                     Source="Images/DockAnchorableLeft.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetRight"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Right"
+                     Source="Images/DockAnchorableRight.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetBottom"
+                     VerticalAlignment="Bottom"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableBottom.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetTop"
+                     VerticalAlignment="Top"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableTop.PNG"
+                     Stretch="None" >
+              </Image>
+            </Grid>
+            <Grid x:Name="PART_AnchorablePaneDropTargets">
+              <Grid Width="110"
+                    Height="110"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.png"
+                       Stretch="None"
+                       Margin="0,0.5,0,-0.5" >
+                </Image>
+                <Border Name="PART_AnchorablePaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="0,3.5,0, 0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="0,-0.5,0,0">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1"
+                        Margin="0,0.5,0,0">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+            <Grid x:Name="PART_DocumentPaneDropTargets">
+              <Grid Width="110"
+                    Height="110"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+
+            <Grid x:Name="PART_DocumentPaneFullDropTargets">
+              <Grid Width="193"
+                    Height="191"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Source="Images/DockPaneLargeEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneFullDropTargetTop"
+                        Grid.Column="2"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetRight"
+                        Grid.Column="3"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetBottom"
+                        Grid.Column="2"
+                        Grid.Row="3">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetLeft"
+                        Grid.Column="1"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetInto"
+                        Grid.Column="2"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+
+                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
+                        Grid.Column="4"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="4">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
+                        Grid.Column="0"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+
+              </Grid>
+            </Grid>
+
+          </Canvas>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentHeaderTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableHeaderTemplate">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Image x:Name="icon"
+             Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+             Stretch="Uniform" >
+      </Image>
+      <TextBlock x:Name="title"
+                 Margin="4,0,0,0"
+                 Text="{Binding Title}"
+                 TextTrimming="CharacterEllipsis"
+                 Grid.Column="1" >
+      </TextBlock>
+    </Grid>
+    <DataTemplate.Triggers>
+      <DataTrigger Binding="{Binding IconSource}"
+                   Value="{x:Null}">
+        <Setter Property="Margin"
+                Value="0"
+                TargetName="title" />
+      </DataTrigger>
+    </DataTemplate.Triggers>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeAero_IconContentTemplate">
+    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+           Stretch="Uniform" >
+    </Image>
+  </DataTemplate>
+
+  <ContextMenu x:Key="AvalonDock_ThemeAero_AnchorableContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}"
+              Command="{Binding Path=DockCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
+              Command="{Binding Path=AutoHideCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
+              Command="{Binding Path=HideCommand}">
+      <MenuItem.Visibility>
+        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
+          <Binding Path="IsEnabled"
+                   RelativeSource="{RelativeSource Self}"
+                   Mode="OneWay"
+                   Converter="{StaticResource BoolToVisibilityConverter}" />
+          <Binding Path="CanClose" />
+        </MultiBinding>
+      </MenuItem.Visibility>
+    </MenuItem>
+  </ContextMenu>
+
+  <ContextMenu x:Key="AvalonDock_ThemeAero_DocumentContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}"
+              Command="{Binding Path=CloseAllButThisCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+              Command="{Binding Path=CloseAllCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
+              Command="{Binding Path=NewHorizontalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/HTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
+              Command="{Binding Path=NewVerticalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/VTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
+              Command="{Binding Path=MoveToNextTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
+              Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+
+  </ContextMenu>
+
+  <!--DockingManager-->
+  <Style x:Key="{x:Type avalonDock:DockingManager}"
+         TargetType="{x:Type avalonDock:DockingManager}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor1Key}}" />
+    <Setter Property="DocumentPaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeAero_DocumentPaneControlStyle}" />
+    <Setter Property="AnchorablePaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorablePaneControlStyle}" />
+    <Setter Property="AnchorSideTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorSideTemplate}" />
+    <Setter Property="AnchorGroupTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorGroupTemplate}" />
+    <Setter Property="AnchorTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorTemplate}" />
+    <Setter Property="DocumentHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}" />
+    <Setter Property="AnchorableHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorableHeaderTemplate}" />
+    <Setter Property="DocumentTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_DocumentTitleTemplate}" />
+    <Setter Property="AnchorableTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorableTitleTemplate}" />
+    <Setter Property="AnchorableContextMenu"
+            Value="{StaticResource AvalonDock_ThemeAero_AnchorableContextMenu}" />
+    <Setter Property="DocumentContextMenu"
+            Value="{StaticResource AvalonDock_ThemeAero_DocumentContextMenu}" />
+    <Setter Property="DocumentPaneMenuItemHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}" />
+    <Setter Property="IconContentTemplate"
+            Value="{StaticResource AvalonDock_ThemeAero_IconContentTemplate}" />
+    <Setter Property="GridSplitterWidth"
+            Value="4" />
+    <Setter Property="GridSplitterHeight"
+            Value="4" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Content="{TemplateBinding LayoutRootPanel}"
+                                Grid.Column="1"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding RightSidePanel}"
+                                Grid.Column="2"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
+                                Grid.Column="0"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding TopSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="0" />
+              <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="2" />
+              <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
                                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                Grid.Column="1" Grid.Row="1"/>
-                  </Grid>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--LayoutGridResizerControl-->
-   <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-               <Border Background="{TemplateBinding Background}"/>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-               <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                  <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-               <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
-                  <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            >
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*"/>
-                           <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" Background="Transparent"/>
-                        <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                        <!-- Close button should be moved out to the container style -->
-                        <Button 
-                                    x:Name="DocumentCloseButton" 
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0" 
-                                    Padding="-1"
-                                    Visibility="Hidden" 
-                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                           <Image x:Name="PART_ImgPinClose" 
-                                           Source="Images/PinClose_Dark.png"/>
-                        </Button>
-                     </Grid>
-                  </Border>
-               </avalonDockControls:DropDownControlArea>
-               <ControlTemplate.Triggers>
-                  <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
-                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                  </DataTrigger>
-                  <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
-                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                  </DataTrigger>
-                  <Trigger Property="IsMouseOver" Value="True">
-                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                  </Trigger>
-                  <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
-                     <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
-                  </DataTrigger>
-
-
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-               <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                  <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                     <Grid>
-                        <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                          ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                          ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                        <avalonDockControls:DropDownControlArea 
-                                Grid.Column="0"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                     </Grid>
-                  </Border>
-               </avalonDockControls:DropDownControlArea>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-               <Border 
-                        x:Name="Bd"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
-                        BorderThickness="1">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-                     <Border x:Name="Header"
-                                Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
-                        <avalonDockControls:AnchorablePaneTitle 
-                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                     </Border>
-                     <ContentPresenter 
-                                Grid.Row="1"
+                                Grid.Column="1"
+                                Grid.Row="1" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--LayoutGridResizerControl-->
+  <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}"
+         TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+          <Border Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Border Grid.ColumnSpan="2"
+                        Background="Transparent" />
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <!-- Close button should be moved out to the container style -->
+                <Button x:Name="DocumentCloseButton"
+                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center"
+                        Grid.Column="1"
+                        Margin="5,0,0,0"
+                        Padding="-1"
+                        Visibility="Hidden"
+                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                  <Image x:Name="PART_ImgPinClose"
+                         Source="Images/PinClose_Dark.png" >
+                  </Image>
+                </Button>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Path=IsSelected}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsActive}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Path=CanClose}"
+                         Value="false">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+
+
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+              <Grid>
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <avalonDockControls:DropDownControlArea Grid.Column="0"
+                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
+                </avalonDockControls:DropDownControlArea>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+          <Border x:Name="Bd"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
+                  BorderThickness="1">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border x:Name="Header"
+                      Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
+                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
+              </Border>
+              <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                     <!--<ContentPresenter 
+              <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
                                 ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 Grid.Row="1"/>-->
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="Header" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome ResizeBorderThickness="10"
+                            CaptionHeight="18"
+                            CornerRadius="3"
+                            GlassFrameThickness="0"
+                            ShowSystemMenu="False" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid Margin="3">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="18" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Border x:Name="Header"
+                        Padding="2,0,2,0">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+
+
+                    <avalonDockControls:DropDownButton x:Name="ContextMenuDropdownButton"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinRestore"
+                             Source="Images/PinRestore_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
                   </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True"/>
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
-                  </MultiDataTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="shell:WindowChrome.WindowChrome">
-         <Setter.Value>
-            <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="18"
-                    CornerRadius="3"
-                    GlassFrameThickness="0"
-                    ShowSystemMenu="False"/>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-               <Grid>
-                  <Border x:Name="WindowBorder" 
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                     <Grid Margin="3">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="18"/>
-                           <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Border x:Name="Header"
-                                        Padding="2,0,2,0">
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-                              <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                  ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                  ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-
-
-                              <avalonDockControls:DropDownButton
-                                            x:Name="ContextMenuDropdownButton"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}"
-                                            >
-                                 <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu_Dark.png" Width="13"/>
-                              </avalonDockControls:DropDownButton>
-
-                              <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                 <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize_Dark.png" Width="13" />
-                              </Button>
-
-                              <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                 <Image x:Name="PART_ImgPinRestore" Source="Images/PinRestore_Dark.png" Width="13" />
-                              </Button>
-
-                              <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                            Grid.Column="3">
-                                 <Image x:Name="PART_ImgPinClose" Source="Images/PinClose_Dark.png" Width="13" />
-                              </Button>
-                           </Grid>
-                        </Border>
-                        <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
-                     </Grid>
-                  </Border>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="WindowState" Value="Maximized">
-                     <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                  </Trigger>
-                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True">
-                     <Setter Property="BorderBrush"
-									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
-                     <Setter Property="Background"
-									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
-                     <Setter Property="Background"
-									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" TargetName="Header" />
-                  </DataTrigger>
-
-                  <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}"/>
-      <Setter Property="BorderThickness" Value="4"/>
-      <Setter Property="shell:WindowChrome.WindowChrome">
-         <Setter.Value>
-            <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="18"
-                    CornerRadius="7"
-                    GlassFrameThickness="0"/>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-               <Grid>
-                  <Border x:Name="WindowBorder" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                     <Grid >
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="18"/>
-                           <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Border x:Name="Header" 
-                                        CornerRadius="1,1,0,0"
-                                        Padding="2,0,2,0"
-                                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-
-                              <Border
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
-                                 <avalonDockControls:DropDownControlArea 
-                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                    <ContentPresenter
-                                                      Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                      ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                 </avalonDockControls:DropDownControlArea>
-                              </Border>
-
-                              <avalonDockControls:DropDownButton
-                                            x:Name="SinglePaneContextMenu"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                 <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu_Dark.png" Width="13"/>
-                              </avalonDockControls:DropDownButton>
-
-                              <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                 <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize_Dark.png" Width="13"/>
-                              </Button>
-
-                              <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                 <Image  x:Name="PART_ImgPinRestore" Source="Images/PinRestore_Dark.png" Width="13"/>
-                              </Button>
-
-                              <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                            Grid.Column="3">
-                                 <Image x:Name="PART_ImgPinClose" Source="Images/PinClose_Dark.png" Width="13"/>
-                              </Button>
-                           </Grid>
-                        </Border>
-                        <ContentPresenter
-                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
-                     </Grid>
-                  </Border>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="WindowState" Value="Maximized">
-                     <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                  </Trigger>
-                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
-                     <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}" TargetName="Header"/>
-                  </DataTrigger>
-                  <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                     <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
-   </Style>
-
-
-   <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual">
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#FFF1FBFF" Offset="0"/>
-      <GradientStop Color="#FFD5F1FE" Offset="1"/>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#FFD9F4FF" Offset="0"/>
-      <GradientStop Color="#FF9BDDFB" Offset="1"/>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#FFEEEDED" Offset="0"/>
-      <GradientStop Color="#FFDDDDDD" Offset="1"/>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#FFEAF9FF" Offset="0"/>
-      <GradientStop Color="#FFC9EDFD" Offset="1"/>
-   </LinearGradientBrush>
-
-   <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual}"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Padding" Value="5,0,5,0"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Cursor" Value="Hand"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="ListBoxItem">
-               <Border BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            CornerRadius="2" SnapsToDevicePixels="true">
-                  <Border x:Name="InnerBorder" BorderThickness="1" CornerRadius="1">
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition MaxHeight="11"/>
-                           <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
-                        <ContentPresenter Grid.RowSpan="2" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                     </Grid>
-                  </Border>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}"/>
-                     <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                     <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                     <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                  </Trigger>
-                  <Trigger Property="IsSelected" Value="true">
-                     <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}"/>
-                     <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                     <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                     <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                  </Trigger>
-                  <!--<MultiTrigger>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}"
+                         Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}"
+                      TargetName="Header" />
+            </DataTrigger>
+
+            <Trigger Property="IsMouseOver"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}" />
+    <Setter Property="BorderThickness"
+            Value="4" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome ResizeBorderThickness="10"
+                            CaptionHeight="18"
+                            CornerRadius="7"
+                            GlassFrameThickness="0" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="18" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Border x:Name="Header"
+                        CornerRadius="1,1,0,0"
+                        Padding="2,0,2,0"
+                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Border Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                      <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                              DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <ContentPresenter Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </avalonDockControls:DropDownControlArea>
+                    </Border>
+
+                    <avalonDockControls:DropDownButton x:Name="SinglePaneContextMenu"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                       Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image  x:Name="PART_ImgPinRestore"
+                              Source="Images/PinRestore_Dark.png"
+                              Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose_Dark.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+                  </Grid>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}"
+                         Value="True">
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}"
+                      TargetName="Header" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_PinClose"
+                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_PinClose"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
+
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+  </Style>
+
+
+  <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle RadiusY="2"
+                     RadiusX="2"
+                     Stroke="#8E6EA6F5"
+                     StrokeThickness="1" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFF1FBFF"
+                  Offset="0" />
+    <GradientStop Color="#FFD5F1FE"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFD9F4FF"
+                  Offset="0" />
+    <GradientStop Color="#FF9BDDFB"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedInactiveFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEEEDED"
+                  Offset="0" />
+    <GradientStop Color="#FFDDDDDD"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEAF9FF"
+                  Offset="0" />
+    <GradientStop Color="#FFC9EDFD"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle"
+         TargetType="ListBoxItem">
+    <Setter Property="FocusVisualStyle"
+            Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual}" />
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Padding"
+            Value="5,0,5,0" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Cursor"
+            Value="Hand" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBoxItem">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="2"
+                  SnapsToDevicePixels="true">
+            <Border x:Name="InnerBorder"
+                    BorderThickness="1"
+                    CornerRadius="1">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition MaxHeight="11" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Rectangle x:Name="UpperHighlight"
+                           Fill="#75FFFFFF"
+                           Visibility="Collapsed" />
+                <ContentPresenter Grid.RowSpan="2"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+              </Grid>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <Trigger Property="IsSelected"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <!--<MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="true"/>
                                 <Condition Property="IsMouseOver" Value="true"/>
@@ -1321,20 +1789,26 @@
                             <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedHoverFill}"/>
                             <Setter Property="BorderBrush" Value="#FF98DDFB"/>
                         </MultiTrigger>-->
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-      <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-      <Setter Property="ResizeMode" Value="NoResize"/>
-      <!--<Setter Property="shell:WindowChrome.WindowChrome">
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}"
+         TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+    <Setter Property="SizeToContent"
+            Value="WidthAndHeight" />
+    <Setter Property="ResizeMode"
+            Value="NoResize" />
+    <!--<Setter Property="shell:WindowChrome.WindowChrome">
          <Setter.Value>
             <shell:WindowChrome
                     ResizeBorderThickness="10"
@@ -1343,124 +1817,155 @@
                     GlassFrameThickness="4"/>
          </Setter.Value>
       </Setter>-->
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-               <Grid>
-                  <Border x:Name="WindowBorder" BorderThickness="1"
-                                CornerRadius="3"
-                                Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="54"/>
-                           <RowDefinition Height="*"/>
-                           <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <Grid Margin="5">
-                           <Grid.RowDefinitions>
-                              <RowDefinition/>
-                              <RowDefinition/>
-                           </Grid.RowDefinitions>
-                           <Grid>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="1"
+                    CornerRadius="3"
+                    Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
+                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="54" />
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid Margin="5">
+                  <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                           Stretch="None"
+                           Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }" >
+                    </Image>
+                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}"
+                               TextTrimming="CharacterEllipsis"
+                               Grid.Column="1"
+                               VerticalAlignment="Center"
+                               FontWeight="Bold"
+                               Margin="4,0,0,0" >
+                    </TextBlock>
+                  </Grid>
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}"
+                             TextTrimming="CharacterEllipsis"
+                             VerticalAlignment="Center" >
+                  </TextBlock>
+                </Grid>
+
+                <Border Grid.Row="1"
+                        BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor11Key}}"
+                        BorderThickness="0,1,0,0"
+                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"
+                        MinHeight="200">
+                  <Grid  Margin="5">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Tool Windows"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4" >
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Anchorables}"
+                               SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
+                            <Grid>
                               <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition/>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
                               </Grid.ColumnDefinitions>
-                              <Image 
-                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-                                            Stretch="None"
-                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
-                              <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
-                           </Grid>
-                           <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-                        </Grid>
-
-                        <Border Grid.Row="1" 
-                                        BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor11Key}}"
-                                        BorderThickness="0,1,0,0"
-                                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"
-                                        MinHeight="200" >
-                           <Grid  Margin="5">
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
+                            </Grid>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                      </ListBox>
+                    </Grid>
+                    <Grid Grid.Column="1"
+                          Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Files"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4" >
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Documents}"
+                               SelectedItem="{Binding SelectedDocument, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
+                            <Grid>
                               <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition/>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
                               </Grid.ColumnDefinitions>
-                              <Grid Margin="5">
-                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition/>
-                                 </Grid.RowDefinitions>
-                                 <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
-                                 <ListBox Grid.Row="1" 
-                                                     ItemsSource="{Binding Anchorables}"
-                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
-                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
-                                                     Background="Transparent" 
-                                                     BorderThickness="0"
-                                                     MaxHeight="400">
-                                    <ListBox.ItemTemplate>
-                                       <DataTemplate>
-                                          <Grid>
-                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="16"/>
-                                                <ColumnDefinition Width="150"/>
-                                             </Grid.ColumnDefinitions>
-                                             <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                             <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                          </Grid>
-                                       </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                 </ListBox>
-                              </Grid>
-                              <Grid Grid.Column="1" Margin="5">
-                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition/>
-                                 </Grid.RowDefinitions>
-                                 <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
-                                 <ListBox 
-                                                Grid.Row="1" 
-                                                ItemsSource="{Binding Documents}" 
-                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
-                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
-                                                Background="Transparent" 
-                                                BorderThickness="0" 
-                                                MaxHeight="400">
-                                    <ListBox.ItemTemplate>
-                                       <DataTemplate>
-                                          <Grid>
-                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="16"/>
-                                                <ColumnDefinition Width="150"/>
-                                             </Grid.ColumnDefinitions>
-                                             <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                             <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                          </Grid>
-                                       </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                    <ListBox.ItemsPanel>
-                                       <ItemsPanelTemplate>
-                                          <WrapPanel Orientation="Vertical"/>
-                                       </ItemsPanelTemplate>
-                                    </ListBox.ItemsPanel>
-                                 </ListBox>
-                              </Grid>
-                           </Grid>
-                        </Border>
-
-                        <Grid Grid.Row="2" Margin="5">
-                           <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
-                        </Grid>
-                     </Grid>
-                  </Border>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-
-   </Style>
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
+                            </Grid>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemsPanel>
+                          <ItemsPanelTemplate>
+                            <WrapPanel Orientation="Vertical" />
+                          </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                      </ListBox>
+                    </Grid>
+                  </Grid>
+                </Border>
+
+                <Grid Grid.Row="2"
+                      Margin="5">
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
+                             VerticalAlignment="Center" >
+                  </TextBlock>
+                </Grid>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Brushes.baml
new file mode 100644
index 00000000..6e1c9b10
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Brushes.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.cs
new file mode 100644
index 00000000..c65238fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,2 @@
+
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Theme.baml
new file mode 100644
index 00000000..6727bc1a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Theme.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..ca7da23f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
@@ -0,0 +1,23 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
new file mode 100644
index 00000000..a2ba5ff5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref
new file mode 100644
index 00000000..161cff3a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref
@@ -0,0 +1,5 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Theme.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
new file mode 100644
index 00000000..b21b8ca9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
@@ -0,0 +1,5 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Theme.xaml;;
+
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
new file mode 100644
index 00000000..16b4ecd6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml 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
new file mode 100644
index 00000000..c65238fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,2 @@
+
+
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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..c40581ec
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml 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
new file mode 100644
index 00000000..a4b763bc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
@@ -0,0 +1,23 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..62d2180e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref
new file mode 100644
index 00000000..6775f037
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.i.lref
@@ -0,0 +1,5 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Theme.xaml;;
+
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
new file mode 100644
index 00000000..0b92f121
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
@@ -0,0 +1,5 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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 5187d3fa..73fd3191 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.2";
+  public const string BaseVersion = "3.3";
   [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/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
index fe8545f1..8491c6ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
index 769140f8..dbe90ad5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
@@ -14,1332 +14,1841 @@
 
   **********************************************************************************-->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
-    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
-    >
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Brushes.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
-    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
-    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
-    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
-    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
-    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
-
-    <Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="AvalonDock_ThemeMetro_ButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--DocumentPaneControlStyle-->
-    <Style x:Key="AvalonDock_ThemeMetro_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-        <Setter Property="BorderBrush" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                  <Grid  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                         Panel.ZIndex="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,0,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
-                                Focusable="False"
-                                VerticalAlignment="Center"
-                                Grid.Column="1">
-                                <avalonDockControls:DropDownButton.DropDownContextMenu>
-                                    <avalonDockControls:ContextMenuEx
-                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
-                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
-                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
-                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
-                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
-                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
-                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
-                                            </Style>
-                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                    </avalonDockControls:ContextMenuEx>
-                                </avalonDockControls:DropDownButton.DropDownContextMenu>
-                                <Image Source="Images/PinDocMenu.png"/>
-                            </avalonDockControls:DropDownButton>
-                        </Grid>
-                        <Border x:Name="ContentPanel" 
-                                VerticalAlignment="Stretch" 
-                                HorizontalAlignment="Stretch"  
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                Grid.Row="1" 
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle"
-                                Padding="0,1,0,2">
-                            <ContentPresenter x:Name="PART_SelectedContentHost" 
-                                              ContentSource="SelectedContent" 
-                                              Margin="0,2,0,2"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Content" TargetName="MenuDropDownButton">
-                                <Setter.Value>
-                                    <Image Source="Images/PinDocMenu_Black.png"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Content" TargetName="MenuDropDownButton">
-                                <Setter.Value>
-                                    <Image Source="Images/PinDocMenu_Black.png"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
-                        </DataTrigger>                        
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="BorderBrush" Value="Transparent"/>
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                    <Setter Property="Padding" Value="4"/>
-                    <Setter Property="Margin" Value="2,0,2,0"/>
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true"
-                                       Margin="0,4,4,4">
-                                    <Border x:Name="Bd" 
-                                          BorderBrush="{TemplateBinding BorderBrush}"
-   				                          BorderThickness="0,3,0,0" 
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                                    </Border>
-                                    <ContentPresenter 
-								            x:Name="Content" 
-                                            Margin="2"
-								            ContentSource="Header" 
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            RecognizesAccessKey="True" 
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected"
-								            Value="true">
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                    </Trigger>
-
-                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                    </DataTrigger>
-
-                                    <MultiTrigger>
-                                        <MultiTrigger.Conditions>
-                                            <Condition Property="IsMouseOver" Value="true"/>
-                                            <Condition Property="Selector.IsSelected" Value="false"/>
-                                        </MultiTrigger.Conditions>
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
-                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-                                        <Setter Property="Panel.ZIndex" Value="0" />
-                                    </MultiTrigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--AnchorablePaneControlStyle-->
-    <Style x:Key="AvalonDock_ThemeMetro_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-        <Setter Property="TabStripPlacement" Value="Bottom"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
-        <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                        <Border x:Name="ContentPanel" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0" 
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                Grid.Row="0" 
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              ContentSource="SelectedContent" 
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="0,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
-                            <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="BorderBrush" Value="Transparent"/>
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true">
-                                    <Border x:Name="Bd" 
-							              BorderBrush="{TemplateBinding BorderBrush}"
-                                          Margin="4"
-   				                          BorderThickness="0,2,0,0" 
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                                        <ContentPresenter 
-								            x:Name="Content" 
-								            ContentSource="Header" 
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            RecognizesAccessKey="True" 
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                    </Border>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected"
-								            Value="true">
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                    </Trigger>
-
-                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                    </DataTrigger>
-                                    <MultiTrigger>
-                                        <MultiTrigger.Conditions>
-                                            <Condition Property="IsMouseOver" Value="true"/>
-                                            <Condition Property="Selector.IsSelected" Value="false"/>
-                                        </MultiTrigger.Conditions>
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
-                                        <Setter Property="Panel.ZIndex" Value="0" />
-                                    </MultiTrigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1">
-                            <Setter Property="Visibility" Value="Collapsed"/>
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemTemplate">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Brushes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+  <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+  <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter" />
+  <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter" />
+  <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter" />
+  <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+
+  <Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle"
+         TargetType="ToggleButton">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="AvalonDock_ThemeMetro_ButtonStyle"
+         TargetType="Button">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--DocumentPaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeMetro_DocumentPaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+    <Setter Property="BorderBrush"
+            Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Grid  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
+                   Panel.ZIndex="1">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel"
+                                                       Grid.Column="0"
+                                                       IsItemsHost="true"
+                                                       Margin="2,0,2,0"
+                                                       Grid.Row="0"
+                                                       KeyboardNavigation.TabIndex="1" />
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                                 Focusable="False"
+                                                 VerticalAlignment="Center"
+                                                 Grid.Column="1">
+                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                  <avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                    <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                      <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"
+                             BasedOn="{StaticResource {x:Type MenuItem}}">
+                        <Setter Property="HeaderTemplate"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+                        <Setter Property="HeaderTemplateSelector"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+                        <Setter Property="IconTemplate"
+                                Value="{Binding Path=Root.Manager.IconContentTemplate}" />
+                        <Setter Property="IconTemplateSelector"
+                                Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
+                        <Setter Property="Command"
+                                Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}" />
+                      </Style>
+                    </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                  </avalonDockControls:ContextMenuEx>
+                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                <Image Source="Images/PinDocMenu.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+            </Grid>
+            <Border x:Name="ContentPanel"
+                    VerticalAlignment="Stretch"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="1"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle"
+                    Padding="0,1,0,2">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="0,2,0,2"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}"
+                         Value="0">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="MenuDropDownButton" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="Background"
+                  Value="Transparent" />
+          <Setter Property="BorderBrush"
+                  Value="Transparent" />
+          <Setter Property="Foreground"
+                  Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Padding"
+                  Value="4" />
+          <Setter Property="Margin"
+                  Value="2,0,2,0" />
+          <Setter Property="Template">
             <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}"/>
-                </DataTemplate>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true"
+                      Margin="0,4,4,4">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="0,3,0,0"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                  </Border>
+                  <ContentPresenter x:Name="Content"
+                                    Margin="2"
+                                    ContentSource="Header"
+                                    HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                    VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </Trigger>
+
+                  <DataTrigger Binding="{Binding IsActive}"
+                               Value="True">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </DataTrigger>
+
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--AnchorablePaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeMetro_AnchorablePaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+    <Setter Property="TabStripPlacement"
+            Value="Bottom" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="BorderThickness"
+            Value="0" />
+    <Setter Property="Foreground"
+            Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Background"
+            Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Border x:Name="ContentPanel"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="0"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel"
+                                                       Margin="0,0,2,2"
+                                                       IsItemsHost="true"
+                                                       Grid.Row="1"
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       Panel.ZIndex="1" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}"
+                         Value="1">
+              <Setter Property="Margin"
+                      Value="0"
+                      TargetName="HeaderPanel" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Background"
+                  Value="Transparent" />
+          <Setter Property="BorderBrush"
+                  Value="Transparent" />
+          <Setter Property="Foreground"
+                  Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Template">
             <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
-                </DataTemplate>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Margin="4"
+                          BorderThickness="0,2,0,0"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Border>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </Trigger>
+
+                  <DataTrigger Binding="{Binding IsActive}"
+                               Value="True">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </DataTrigger>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
-    </Style>
+          </Setter>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}"
+                         Value="1">
+              <Setter Property="Visibility"
+                      Value="Collapsed" />
+            </DataTrigger>
+          </Style.Triggers>
+        </Style>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="0,3,0,0">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter x:Name="Header"
+                                  Margin="2,0,0,0"
+                                  TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                                  Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+              </avalonDockControls:DropDownControlArea>
+
+
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 VerticalAlignment="Center"
+                                                 Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                                 Focusable="False"
+                                                 Grid.Column="1"
+                                                 DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                <Image x:Name="PART_ImgMenuPin"
+                       Source="Images/PinMenu.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+
+              <Button x:Name="PART_AutoHidePin"
+                      Grid.Column="2"
+                      Focusable="False"
+                      Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
+                <Image x:Name="PART_ImgAutoHidePin"
+                       Source="Images/PinAutoHide.png" >
+                </Image>
+              </Button>
+              <Button x:Name="PART_HidePin"
+                      Grid.Column="3"
+                      Focusable="False"
+                      Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                <Image x:Name="PART_ImgHidePin"
+                       Source="Images/PinClose.png" >
+                </Image>
+              </Button>
+
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="LayoutTransform"
+                      TargetName="PART_AutoHidePin">
+                <Setter.Value>
+                  <RotateTransform Angle="90" />
+                </Setter.Value>
+              </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_HidePin"
+                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_HidePin"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="0,3,0,0">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DropDownControlArea 
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                <ContentPresenter 
-                                    x:Name="Header"            
-                                    Margin="2,0,0,0"
-                                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
-                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </avalonDockControls:DropDownControlArea>
-
-
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                VerticalAlignment="Center"
-                                Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
-                                Focusable="False"
-                                Grid.Column="1"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                <Image x:Name="PART_ImgMenuPin" Source="Images/PinMenu.png"/>
-                            </avalonDockControls:DropDownButton>
-
-                            <Button x:Name="PART_AutoHidePin" 
-                                Grid.Column="2" 
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
-                                    >
-                                <Image x:Name="PART_ImgAutoHidePin" Source="Images/PinAutoHide.png"/>
-                            </Button>
-                            <Button x:Name="PART_HidePin" 
-                                Grid.Column="3" 
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                    >
-                                <Image x:Name="PART_ImgHidePin" Source="Images/PinClose.png"/>
-                            </Button>
-
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
-                                <Setter.Value>
-                                    <RotateTransform Angle="90"/>
-                                </Setter.Value>
-                            </Setter>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-                            <Setter Property="BorderThickness" Value="0,3,0,0"/>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="Images/PinAutoHide_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Dark.png"/>
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="Images/PinAutoHide_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel 
-                        MinWidth="4"
-                        MinHeight="4"
-                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.LayoutTransform>
-                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
-            </ItemsControl.LayoutTransform>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
-        <Border 
-            x:Name="Bd"
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+              <Setter Property="BorderThickness"
+                      Value="0,3,0,0" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgAutoHidePin"
+                      Value="Images/PinAutoHide_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgHidePin"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Dark.png" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_AutoHidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgAutoHidePin"
+                      Value="Images/PinAutoHide_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_HidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgHidePin"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorSideTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel MinWidth="4"
+                      MinHeight="4"
+                      Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorGroupTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.LayoutTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}" />
+      </ItemsControl.LayoutTransform>
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+    <Border x:Name="Bd"
             BorderThickness="0,2,0,0"
             BorderBrush="{TemplateBinding BorderBrush}"
             Margin="4"
             Padding="2">
-                <ContentPresenter 
-                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
-                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                    ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                    ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-        </Border>
-        <ControlTemplate.Triggers>
-            <Trigger Property="Side" Value="Right">
-                <Setter Property="BorderThickness" Value="0,0,0,2" TargetName="Bd"/>
-            </Trigger>
-            <Trigger Property="Side" Value="Bottom">
-                <Setter Property="BorderThickness" Value="0,2,0,0" TargetName="Bd"/>
-            </Trigger>
-            <Trigger Property="Side" Value="Top">
-                <Setter Property="BorderThickness" Value="0,0,0,2" TargetName="Bd"/>
-            </Trigger>            
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true"/>
-                    <Condition Property="Selector.IsSelected" Value="false"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
-            </MultiTrigger>
-            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="true">
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}"/>
-            </DataTrigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                        <Grid x:Name="PART_DockingManagerDropTargets" >
-                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="Images/DockAnchorableLeft.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="Images/DockAnchorableRight.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="Images/DockAnchorableBottom.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="Images/DockAnchorableTop.PNG" Stretch="None"/>
-                        </Grid>
-                        <Grid x:Name="PART_AnchorablePaneDropTargets">
-                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
-                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
-                                    <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
-                                    <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-                            </Grid>
-                        </Grid>
-                        <Grid x:Name="PART_DocumentPaneDropTargets">
-                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.PNG"  Stretch="None"/>
-                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
-                                    <Image Source="Images/DockDocumentTop.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
-                                    <Image Source="Images/DockDocumentBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-                            </Grid>
-                        </Grid>
-
-                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
-                            <Grid Width="184" Height="184" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
-                                <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
-                                    <Image Source="Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
-                                    <Image Source="Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-
-                                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
-                                    <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
-                                    <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
-                                </Border>
-
-                            </Grid>
-                        </Grid>
-
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentHeaderTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableHeaderTemplate">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
-                <Setter Property="Margin" Value="0" TargetName="title"/>
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeMetro_IconContentTemplate">
-        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-    </DataTemplate>
-
-    <ContextMenu x:Key="AvalonDock_ThemeMetro_AnchorableContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
-                Command="{Binding Path=DockCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
-                Command="{Binding Path=AutoHideCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
-                Command="{Binding Path=HideCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
-
-    <ContextMenu x:Key="AvalonDock_ThemeMetro_DocumentContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
-                  Command="{Binding Path=CloseCommand}"
-                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
-                Command="{Binding Path=CloseAllButThisCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
-                Command="{Binding Path=CloseAllCommand}" />
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
-                Command="{Binding Path=NewHorizontalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-                <Image Source="Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
-            </MenuItem.Icon>
-        </MenuItem>
-
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
-                Command="{Binding Path=NewVerticalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-                <Image Source="Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
-            </MenuItem.Icon>
-        </MenuItem>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
-                Command="{Binding Path=MoveToNextTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
-                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
-
-    <!--DockingManager-->
-    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
-        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeMetro_DocumentPaneControlStyle}"/>
-        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeMetro_AnchorablePaneControlStyle}"/>
-        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorSideTemplate}"/>
-        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorGroupTemplate}"/>
-        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorTemplate}"/>
-        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}"/>
-        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableHeaderTemplate}"/>
-        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentTitleTemplate}"/>
-        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableTitleTemplate}"/>
-        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableContextMenu}"/>
-        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeMetro_DocumentContextMenu}"/>
-        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}"/>
-        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeMetro_IconContentTemplate}"/>
-        <Setter Property="GridSplitterWidth" Value="5"/>
-        <Setter Property="GridSplitterHeight" Value="5"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
-                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
-                            <ContentPresenter 
-                                x:Name="PART_AutoHideArea"
+      <ContentPresenter TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                        Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+    </Border>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Side"
+               Value="Right">
+        <Setter Property="BorderThickness"
+                Value="0,0,0,2"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Bottom">
+        <Setter Property="BorderThickness"
+                Value="0,2,0,0"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Top">
+        <Setter Property="BorderThickness"
+                Value="0,0,0,2"
+                TargetName="Bd" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver"
+                     Value="true" />
+          <Condition Property="Selector.IsSelected"
+                     Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}" />
+      </MultiTrigger>
+      <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                   Value="true">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+      </DataTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <Style x:Key="{x:Type avalonDockControls:OverlayWindow}"
+         TargetType="{x:Type avalonDockControls:OverlayWindow}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+          <Canvas x:Name="PART_DropTargetsContainer"
+                  Opacity="0.9">
+            <Path x:Name="PART_PreviewBox"
+                  Fill="AliceBlue"
+                  StrokeThickness="2"
+                  Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            <Grid x:Name="PART_DockingManagerDropTargets">
+              <Image x:Name="PART_DockingManagerDropTargetLeft"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Left"
+                     Source="Images/DockAnchorableLeft.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetRight"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Right"
+                     Source="Images/DockAnchorableRight.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetBottom"
+                     VerticalAlignment="Bottom"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableBottom.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetTop"
+                     VerticalAlignment="Top"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableTop.PNG"
+                     Stretch="None" >
+              </Image>
+            </Grid>
+            <Grid x:Name="PART_AnchorablePaneDropTargets">
+              <Grid Width="112"
+                    Height="112"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.png"
+                       Stretch="None"
+                       Margin="0,0.5,0,-0.5" >
+                </Image>
+                <Border Name="PART_AnchorablePaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="0,3.5,0, 0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="0,-0.5,0,0">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1"
+                        Margin="0,0.5,0,0">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+            <Grid x:Name="PART_DocumentPaneDropTargets">
+              <Grid Width="112"
+                    Height="112"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+
+            <Grid x:Name="PART_DocumentPaneFullDropTargets">
+              <Grid Width="184"
+                    Height="184"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Source="Images/DockPaneLargeEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneFullDropTargetTop"
+                        Grid.Column="2"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetRight"
+                        Grid.Column="3"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetBottom"
+                        Grid.Column="2"
+                        Grid.Row="3">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetLeft"
+                        Grid.Column="1"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetInto"
+                        Grid.Column="2"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+
+                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
+                        Grid.Column="4"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="4">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
+                        Grid.Column="0"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+
+              </Grid>
+            </Grid>
+
+          </Canvas>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentHeaderTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableHeaderTemplate">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Image x:Name="icon"
+             Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+             Stretch="Uniform" >
+      </Image>
+      <TextBlock x:Name="title"
+                 Margin="4,0,0,0"
+                 Text="{Binding Title}"
+                 TextTrimming="CharacterEllipsis"
+                 Grid.Column="1" >
+      </TextBlock>
+    </Grid>
+    <DataTemplate.Triggers>
+      <DataTrigger Binding="{Binding IconSource}"
+                   Value="{x:Null}">
+        <Setter Property="Margin"
+                Value="0"
+                TargetName="title" />
+      </DataTrigger>
+    </DataTemplate.Triggers>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis"
+               VerticalAlignment="Center" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis"
+               VerticalAlignment="Center" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeMetro_IconContentTemplate">
+    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+           Stretch="Uniform" >
+    </Image>
+  </DataTemplate>
+
+  <ContextMenu x:Key="AvalonDock_ThemeMetro_AnchorableContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}"
+              Command="{Binding Path=DockCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
+              Command="{Binding Path=AutoHideCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
+              Command="{Binding Path=HideCommand}">
+      <MenuItem.Visibility>
+        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
+          <Binding Path="IsEnabled"
+                   RelativeSource="{RelativeSource Self}"
+                   Mode="OneWay"
+                   Converter="{StaticResource BoolToVisibilityConverter}" />
+          <Binding Path="CanClose" />
+        </MultiBinding>
+      </MenuItem.Visibility>
+    </MenuItem>
+  </ContextMenu>
+
+  <ContextMenu x:Key="AvalonDock_ThemeMetro_DocumentContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}"
+              Command="{Binding Path=CloseAllButThisCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+              Command="{Binding Path=CloseAllCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
+              Command="{Binding Path=NewHorizontalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/HTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
+              Command="{Binding Path=NewVerticalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/VTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
+              Command="{Binding Path=MoveToNextTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
+              Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+  </ContextMenu>
+
+  <!--DockingManager-->
+  <Style x:Key="{x:Type avalonDock:DockingManager}"
+         TargetType="{x:Type avalonDock:DockingManager}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+    <Setter Property="DocumentPaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeMetro_DocumentPaneControlStyle}" />
+    <Setter Property="AnchorablePaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorablePaneControlStyle}" />
+    <Setter Property="AnchorSideTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorSideTemplate}" />
+    <Setter Property="AnchorGroupTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorGroupTemplate}" />
+    <Setter Property="AnchorTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorTemplate}" />
+    <Setter Property="DocumentHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}" />
+    <Setter Property="AnchorableHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorableHeaderTemplate}" />
+    <Setter Property="DocumentTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_DocumentTitleTemplate}" />
+    <Setter Property="AnchorableTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorableTitleTemplate}" />
+    <Setter Property="AnchorableContextMenu"
+            Value="{StaticResource AvalonDock_ThemeMetro_AnchorableContextMenu}" />
+    <Setter Property="DocumentContextMenu"
+            Value="{StaticResource AvalonDock_ThemeMetro_DocumentContextMenu}" />
+    <Setter Property="DocumentPaneMenuItemHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}" />
+    <Setter Property="IconContentTemplate"
+            Value="{StaticResource AvalonDock_ThemeMetro_IconContentTemplate}" />
+    <Setter Property="GridSplitterWidth"
+            Value="5" />
+    <Setter Property="GridSplitterHeight"
+            Value="5" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Content="{TemplateBinding LayoutRootPanel}"
+                                Grid.Column="1"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding RightSidePanel}"
+                                Grid.Column="2"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
+                                Grid.Column="0"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding TopSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="0" />
+              <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="2" />
+              <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
                                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                Grid.Column="1" Grid.Row="1"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--LayoutGridResizerControl-->
-    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-                    <Border Background="{TemplateBinding Background}" Margin="2"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                     <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                       ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                       ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
-                  </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
-                        <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="0,2,0,1">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                                <!-- Close button should be moved out to the container style -->
-                                <Button 
-                                    x:Name="DocumentCloseButton" 
-                                    Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0" 
-                                    Visibility="Hidden" 
-                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                                    <Image x:Name="PART_ImgPinClose" 
-                                           Source="Images/PinClose.png"/>
-                                </Button>
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                            <Setter Property="Source" Value="Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                            <Setter Property="Source" Value="Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="DocumentCloseButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                          ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                          ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                                <avalonDockControls:DropDownControlArea 
-                                Grid.Column="0"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                                Grid.Column="1"
+                                Grid.Row="1" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--LayoutGridResizerControl-->
+  <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}"
+         TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+          <Border Background="{TemplateBinding Background}"
+                  Margin="2" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Padding="0,2,0,1">
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Border Grid.ColumnSpan="2"
+                        Background="Transparent" />
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <!-- Close button should be moved out to the container style -->
+                <Button x:Name="DocumentCloseButton"
+                        Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center"
+                        Grid.Column="1"
+                        Margin="5,0,0,0"
+                        Visibility="Hidden"
+                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                  <Image x:Name="PART_ImgPinClose"
+                         Source="Images/PinClose.png" >
+                  </Image>
+                </Button>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Path=IsSelected}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+              <Setter Property="Source"
+                      Value="Images/PinClose_Dark.png"
+                      TargetName="PART_ImgPinClose" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsActive}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+              <Setter Property="Source"
+                      Value="Images/PinClose_Dark.png"
+                      TargetName="PART_ImgPinClose" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Path=CanClose}"
+                         Value="false">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="DocumentCloseButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                    <Border 
-                        x:Name="Bd"
-                        Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Border x:Name="Header">
-                                <avalonDockControls:AnchorablePaneTitle 
-                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Border>
-                            <ContentPresenter 
-                                Grid.Row="1"
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+              <Grid>
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <avalonDockControls:DropDownControlArea Grid.Column="0"
+                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
+                </avalonDockControls:DropDownControlArea>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+          <Border x:Name="Bd"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border x:Name="Header">
+                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
+              </Border>
+              <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                            <!--<ContentPresenter 
+              <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
                                 ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 Grid.Row="1"/>-->
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
-                        </MultiDataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    CornerRadius="0"
-                    ResizeBorderThickness="10"
-                    CaptionHeight="24"
-                    GlassFrameThickness="0"
-                    ShowSystemMenu="False"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" 
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="24"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-
-                                <Border x:Name="bd" Width="5" VerticalAlignment="Stretch" Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
-
-                                <Border x:Name="Header"
-                                        Padding="2,0,2,0"
-                                        Grid.Column="1">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter
-                                            Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
-                                            ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-
-
-                                        <avalonDockControls:DropDownButton
-                                            x:Name="ContextMenuDropdownButton"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
-                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu.png" Width="13"/>
-                                        </avalonDockControls:DropDownButton>
-
-                                        <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize.png" Width="13" />
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinRestore" Source="Images/PinRestore.png" Width="13" />
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                            Grid.Column="3">
-                                            <Image x:Name="PART_ImgPinClose" Source="Images/PinClose.png" Width="13" />
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1" Grid.ColumnSpan="2"/>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True">
-                            <Setter 
-                                TargetName="bd"
-                                Property="Background"
-								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-                            <Setter 
-                                TargetName="Header"
-                                Property="Background"
-								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
-                            <Setter 
-                                TargetName="Header"
-                                Property="TextElement.Foreground"
-								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
-                        </DataTrigger>
-
-                        <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>                        
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="Header" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome CornerRadius="0"
+                            ResizeBorderThickness="10"
+                            CaptionHeight="24"
+                            GlassFrameThickness="0"
+                            ShowSystemMenu="False" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="24" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Border x:Name="bd"
+                        Width="5"
+                        VerticalAlignment="Stretch"
+                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+
+                <Border x:Name="Header"
+                        Padding="2,0,2,0"
+                        Grid.Column="1">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+
+
+                    <avalonDockControls:DropDownButton x:Name="ContextMenuDropdownButton"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu.png"
+                             Width="13">
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinRestore"
+                             Source="Images/PinRestore.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+                  </Grid>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1"
+                                  Grid.ColumnSpan="2" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}"
+                         Value="True">
+              <Setter TargetName="bd"
+                      Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+              <Setter TargetName="Header"
+                      Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+              <Setter TargetName="Header"
+                      Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+            </DataTrigger>
 
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    CornerRadius="0"
-                    ResizeBorderThickness="10"
-                    CaptionHeight="24"
-                    GlassFrameThickness="0"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                            <Grid >
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="24"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Border x:Name="Header" 
-                                        Padding="2,0,2,0"
-                                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
-                                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-
-                                        <Border
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <avalonDockControls:DropDownControlArea 
-                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                                    <ContentPresenter
-                                                      Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                      ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                            </avalonDockControls:DropDownControlArea>
-                                        </Border>
-
-                                        <avalonDockControls:DropDownButton
-                                            x:Name="SinglePaneContextMenu"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu.png" Width="13"/>
-                                        </avalonDockControls:DropDownButton>
-
-                                        <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize.png" Width="13"/>
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                            <Image  x:Name="PART_ImgPinRestore" Source="Images/PinRestore.png" Width="13"/>
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                            Grid.Column="3">
-                                            <Image x:Name="PART_ImgPinClose" Source="Images/PinClose.png" Width="13"/>
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                                <ContentPresenter
-                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" TargetName="Header"/>
-                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" TargetName="Header"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Dark.png"/>
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+            <Trigger Property="IsMouseOver"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
 
-    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
-    </Style>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome CornerRadius="0"
+                            ResizeBorderThickness="10"
+                            CaptionHeight="24"
+                            GlassFrameThickness="0" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="24" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Border x:Name="Header"
+                        Padding="2,0,2,0"
+                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Border Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                      <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                              DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <ContentPresenter Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </avalonDockControls:DropDownControlArea>
+                    </Border>
 
+                    <avalonDockControls:DropDownButton x:Name="SinglePaneContextMenu"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                       Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu.png"
+                             Width="13" >
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image  x:Name="PART_ImgPinRestore"
+                              Source="Images/PinRestore.png"
+                              Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+                  </Grid>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}"
+                         Value="True">
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}"
+                      TargetName="Header" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"
+                      TargetName="Header" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Dark.png" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_PinClose"
+                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_PinClose"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFF1FBFF" Offset="0"/>
-        <GradientStop Color="#FFD5F1FE" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFD9F4FF" Offset="0"/>
-        <GradientStop Color="#FF9BDDFB" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFEEEDED" Offset="0"/>
-        <GradientStop Color="#FFDDDDDD" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFEAF9FF" Offset="0"/>
-        <GradientStop Color="#FFC9EDFD" Offset="1"/>
-    </LinearGradientBrush>
-
-    <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="5,0,5,0"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            SnapsToDevicePixels="true">
-                        <Border x:Name="InnerBorder" BorderThickness="1" >
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition MaxHeight="11"/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
-                                <ContentPresenter Grid.RowSpan="2" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                            </Grid>
-                        </Border>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}"/>
-                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}"/>
-                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                        </Trigger>
-                        <!--<MultiTrigger>
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+  </Style>
+
+
+  <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle RadiusY="2"
+                     RadiusX="2"
+                     Stroke="#8E6EA6F5"
+                     StrokeThickness="1" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFF1FBFF"
+                  Offset="0" />
+    <GradientStop Color="#FFD5F1FE"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFD9F4FF"
+                  Offset="0" />
+    <GradientStop Color="#FF9BDDFB"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedInactiveFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEEEDED"
+                  Offset="0" />
+    <GradientStop Color="#FFDDDDDD"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEAF9FF"
+                  Offset="0" />
+    <GradientStop Color="#FFC9EDFD"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle"
+         TargetType="ListBoxItem">
+    <Setter Property="FocusVisualStyle"
+            Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual}" />
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Padding"
+            Value="5,0,5,0" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Cursor"
+            Value="Hand" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBoxItem">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Background="{TemplateBinding Background}"
+                  SnapsToDevicePixels="true">
+            <Border x:Name="InnerBorder"
+                    BorderThickness="1">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition MaxHeight="11" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Rectangle x:Name="UpperHighlight"
+                           Fill="#75FFFFFF"
+                           Visibility="Collapsed" />
+                <ContentPresenter Grid.RowSpan="2"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+              </Grid>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <Trigger Property="IsSelected"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <!--<MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="true"/>
                                 <Condition Property="IsMouseOver" Value="true"/>
@@ -1347,20 +1856,26 @@
                             <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedHoverFill}"/>
                             <Setter Property="BorderBrush" Value="#FF98DDFB"/>
                         </MultiTrigger>-->
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <!--<Setter Property="shell:WindowChrome.WindowChrome">
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}"
+         TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+    <Setter Property="SizeToContent"
+            Value="WidthAndHeight" />
+    <Setter Property="ResizeMode"
+            Value="NoResize" />
+    <!--<Setter Property="shell:WindowChrome.WindowChrome">
             <Setter.Value>
                 <shell:WindowChrome
                     ResizeBorderThickness="10"
@@ -1368,122 +1883,153 @@
                     GlassFrameThickness="4"/>
             </Setter.Value>
         </Setter>-->
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" BorderThickness="1"
-                                Background="White"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="1"
+                    Background="White"
+                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="54" />
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid Margin="5">
+                  <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                           Stretch="None"
+                           Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }" >
+                    </Image>
+                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}"
+                               TextTrimming="CharacterEllipsis"
+                               Grid.Column="1"
+                               VerticalAlignment="Center"
+                               FontWeight="Bold"
+                               Margin="4,0,0,0" >
+                    </TextBlock>
+                  </Grid>
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}"
+                             TextTrimming="CharacterEllipsis"
+                             VerticalAlignment="Center" >
+                  </TextBlock>
+                </Grid>
+
+                <Border Grid.Row="1"
+                        BorderThickness="0,1,0,0"
+                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}"
+                        MinHeight="200">
+                  <Grid  Margin="5">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Tool Windows"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4" >
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Anchorables}"
+                               SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
                             <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="54"/>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-
-                                <Grid Margin="5">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition/>
-                                    </Grid.RowDefinitions>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <Image 
-                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-                                            Stretch="None"
-                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
-                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
-                                    </Grid>
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-                                </Grid>
-
-                                <Border Grid.Row="1" 
-                                        BorderThickness="0,1,0,0"
-                                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}"
-                                        MinHeight="200" >
-                                    <Grid  Margin="5">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <Grid Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition/>
-                                            </Grid.RowDefinitions>
-                                            <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
-                                            <ListBox Grid.Row="1" 
-                                                     ItemsSource="{Binding Anchorables}"
-                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
-                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
-                                                     Background="Transparent" 
-                                                     BorderThickness="0"
-                                                     MaxHeight="400">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16"/>
-                                                                <ColumnDefinition Width="150"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                            </ListBox>
-                                        </Grid>
-                                        <Grid Grid.Column="1" Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition/>
-                                            </Grid.RowDefinitions>
-                                            <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
-                                            <ListBox 
-                                                Grid.Row="1" 
-                                                ItemsSource="{Binding Documents}" 
-                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
-                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
-                                                Background="Transparent" 
-                                                BorderThickness="0" 
-                                                MaxHeight="400">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16"/>
-                                                                <ColumnDefinition Width="150"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                                <ListBox.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <WrapPanel Orientation="Vertical"/>
-                                                    </ItemsPanelTemplate>
-                                                </ListBox.ItemsPanel>
-                                            </ListBox>
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-
-                                <Grid Grid.Row="2" Margin="5">
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
-                                </Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
                             </Grid>
-                        </Border>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                      </ListBox>
                     </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
+                    <Grid Grid.Column="1"
+                          Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Files"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4" >
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Documents}"
+                               SelectedItem="{Binding SelectedDocument, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
+                            <Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
+                            </Grid>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemsPanel>
+                          <ItemsPanelTemplate>
+                            <WrapPanel Orientation="Vertical" />
+                          </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                      </ListBox>
+                    </Grid>
+                  </Grid>
+                </Border>
+
+                <Grid Grid.Row="2"
+                      Margin="5">
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
+                             VerticalAlignment="Center">
+                  </TextBlock>
+                </Grid>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Brushes.baml
new file mode 100644
index 00000000..2a3b1522
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Brushes.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Theme.baml
new file mode 100644
index 00000000..e6a5e3c5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Theme.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..180f1b72
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
@@ -0,0 +1,22 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
new file mode 100644
index 00000000..da03029f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref
new file mode 100644
index 00000000..86b39b7f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\Theme.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
new file mode 100644
index 00000000..86b39b7f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Debug/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\Theme.xaml;;
+
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
new file mode 100644
index 00000000..f9a94fe5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml 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
new file mode 100644
index 00000000..f45809ce
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml 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
new file mode 100644
index 00000000..e6591c21
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
@@ -0,0 +1,22 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..62744a87
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref
new file mode 100644
index 00000000..86b39b7f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\Theme.xaml;;
+
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
new file mode 100644
index 00000000..86b39b7f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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 5187d3fa..73fd3191 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.2";
+  public const string BaseVersion = "3.3";
   [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/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
index 39a96798..096508e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
@@ -25,12 +25,12 @@ using System;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle( "Xceed Toolkit for WPF - AvalonDock" )]
+[assembly: AssemblyTitle( "Xceed Toolkit for WPF - AvalonDock VS2010 Theme" )]
 [assembly: AssemblyDescription( "This assembly implements the VS2010 Theme for the AvalonDock layout system." )]
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
index a82fec6d..f06a4ef0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
@@ -14,1417 +14,1978 @@
 
   **********************************************************************************-->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
-    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
-    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
-    >
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Brushes.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
-    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
-    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
-    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
-    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
-    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
-
-    <Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
-                <Setter Property="Background"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Brushes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+  <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+  <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter" />
+  <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter" />
+  <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter" />
+  <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+
+
+  <Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle"
+         TargetType="ToggleButton">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+        <Setter Property="Background"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+      </Trigger>
+      <Trigger Property="IsChecked"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+        <Setter Property="Background"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+
+  <Style x:Key="AvalonDock_ThemeVS2010_ButtonStyle"
+         TargetType="Button">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+        <Setter Property="Background"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+
+  <!--DocumentPaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeVS2010_DocumentPaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
+    <Setter Property="BorderBrush"
+            Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
+                  Panel.ZIndex="1">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel"
+                                                       Grid.Column="0"
+                                                       IsItemsHost="true"
+                                                       Margin="2,0,2,0"
+                                                       Grid.Row="0"
+                                                       KeyboardNavigation.TabIndex="1" />
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                                 Focusable="False"
+                                                 VerticalAlignment="Center"
+                                                 Grid.Column="1">
+                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                  <avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                    <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                      <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"
+                             BasedOn="{StaticResource {x:Type MenuItem}}">
+                        <Setter Property="HeaderTemplate"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+                        <Setter Property="HeaderTemplateSelector"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+                        <Setter Property="IconTemplate"
+                                Value="{Binding Path=Root.Manager.IconContentTemplate}" />
+                        <Setter Property="IconTemplateSelector"
+                                Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
+                        <Setter Property="Command"
+                                Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}" />
+                      </Style>
+                    </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                  </avalonDockControls:ContextMenuEx>
+                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                <Image Source="Images/PinDocMenu.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+            </Grid>
+            <Border x:Name="ContentPanel"
+                    VerticalAlignment="Stretch"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="1"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle"
+                    CornerRadius="3"
+                    Padding="0,1,0,2">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="0,2,0,2"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
             </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
-                <Setter Property="Background"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Content"
+                      TargetName="MenuDropDownButton">
+                <Setter.Value>
+                  <Image Source="/Images/PinDocMenu_Black.png" />
+                </Setter.Value>
+              </Setter>
             </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="AvalonDock_ThemeVS2010_ButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
-                <Setter Property="Background"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}"
+                           Value="False" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+            </MultiDataTrigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
             </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <!--DocumentPaneControlStyle-->
-    <Style x:Key="AvalonDock_ThemeVS2010_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
-        <Setter Property="BorderBrush" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                  <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                        Panel.ZIndex="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,0,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
-                                Focusable="False"
-                                VerticalAlignment="Center"
-                                Grid.Column="1">
-                                <avalonDockControls:DropDownButton.DropDownContextMenu>
-                                    <avalonDockControls:ContextMenuEx
-                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
-                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
-                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
-                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
-                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
-                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
-                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
-                                            </Style>
-                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                    </avalonDockControls:ContextMenuEx>
-                                </avalonDockControls:DropDownButton.DropDownContextMenu>
-                                <Image Source="Images/PinDocMenu.png"/>
-                            </avalonDockControls:DropDownButton>
-                        </Grid>
-                        <Border x:Name="ContentPanel" 
-                                VerticalAlignment="Stretch" 
-                                HorizontalAlignment="Stretch"  
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                Grid.Row="1" 
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle"
-                                CornerRadius="3"
-                                Padding="0,1,0,2">
-                            <ContentPresenter x:Name="PART_SelectedContentHost" 
-                                              ContentSource="SelectedContent" 
-                                              Margin="0,2,0,2"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Content" TargetName="MenuDropDownButton">
-                                <Setter.Value>
-                                    <Image Source="Images/PinDocMenu_Black.png"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Content" TargetName="MenuDropDownButton">
-                                <Setter.Value>
-                                    <Image Source="/Images/PinDocMenu_Black.png"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="True"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="False"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
-                        </MultiDataTrigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
-                        </DataTrigger>                        
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}"/>                
-                    <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                    <Setter Property="Padding" Value="2,0,2,0"/>
-                    <Setter Property="Margin" Value="2,0,2,0"/>
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true">
-                                    <Border x:Name="Bd" 
-							              BorderBrush="{TemplateBinding BorderBrush}"
-   				                          BorderThickness="1,1,1,0" 
-                                          CornerRadius="2,2,0,0"
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                                        <ContentPresenter 
-								            x:Name="Content" 
-								            ContentSource="Header" 
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            RecognizesAccessKey="True" 
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                    </Border>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected"
-								            Value="true">
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
-                                        <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}" />
-                                        <Setter Property="Foreground"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"/>
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                        <Setter Property="Margin" Value="-1,0,-1,-4"/>
-                                        <Setter Property="Margin" TargetName="Content" Value="0,0,0,3"/>
-                                    </Trigger>
-                                    <DataTrigger Binding="{Binding IsActive}"
-                                                 Value="True">
-                                       <Setter Property="BorderBrush"
-                                               Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
-                                       <Setter Property="Background"
-                                               Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}" />
-                                       <Setter Property="Foreground"
-                                               Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" />
-                                       <Setter Property="Panel.ZIndex"
-                                               Value="1" />
-                                    </DataTrigger>
-
-                                    <MultiDataTrigger>
-                                        <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding IsActive}" Value="False"/>
-                                            <Condition Binding="{Binding IsLastFocusedDocument}" Value="True"/>
-                                        </MultiDataTrigger.Conditions>
-                                        <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
-                                        <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}" />
-                                        <Setter Property="Foreground"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"/>
-                                        <Setter Property="Panel.ZIndex" 
-                                            Value="1" />
-                                    </MultiDataTrigger>
-
-                                    <MultiTrigger>
-                                        <MultiTrigger.Conditions>
-                                            <Condition Property="IsMouseOver" Value="true"/>
-                                            <Condition Property="Selector.IsSelected" Value="false"/>
-                                        </MultiTrigger.Conditions>
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}"/>
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}"/>
-                                        <Setter Property="Panel.ZIndex" Value="0" />
-                                    </MultiTrigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}"/>
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}"/>
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--AnchorablePaneControlStyle-->
-    <Style x:Key="AvalonDock_ThemeVS2010_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-        <Setter Property="TabStripPlacement" Value="Bottom"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
-        <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                        <Border x:Name="ContentPanel" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0" 
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                Grid.Row="0" 
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              ContentSource="SelectedContent" 
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="0,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
-                            <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"/>
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true">
-                                    <Border x:Name="Bd" 
-							              BorderBrush="{TemplateBinding BorderBrush}"
-   				                          BorderThickness="1,0,1,1" 
-                                          CornerRadius="0,0,2,2"
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                                        <ContentPresenter 
-								            x:Name="Content" 
-								            ContentSource="Header" 
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            RecognizesAccessKey="True" 
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                    </Border>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected"
-								        Value="true">
-                                            <Setter Property="BorderBrush"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor8}" />
-                                            <Setter Property="Background"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
-                                            <Setter Property="Foreground"
-									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"/>
-                                            <Setter Property="Panel.ZIndex" 
-                                        Value="1" />
-                                        <Setter Property="Margin" Value="0,-2,-1,0"/>
-                                        <Setter Property="Margin" TargetName="Content" Value="0,1,0,0"/>
-                                    </Trigger>
-                                    <MultiTrigger>
-                                        <MultiTrigger.Conditions>
-                                            <Condition Property="IsMouseOver" Value="true"/>
-                                            <Condition Property="Selector.IsSelected" Value="false"/>
-                                        </MultiTrigger.Conditions>
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}"/>
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}"/>
-                                        <Setter Property="Panel.ZIndex" Value="0" />
-                                    </MultiTrigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}"/>
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}"/>
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1">
-                            <Setter Property="Visibility" Value="Collapsed"/>
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemTemplate">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}"
+                         Value="0">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="MenuDropDownButton" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Foreground"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+          <Setter Property="Background"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}" />
+          <Setter Property="BorderBrush"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Padding"
+                  Value="2,0,2,0" />
+          <Setter Property="Margin"
+                  Value="2,0,2,0" />
+          <Setter Property="Template">
             <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}"/>
-                </DataTemplate>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="1,1,1,0"
+                          CornerRadius="2,2,0,0"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Border>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="-1,0,-1,-4" />
+                    <Setter Property="Margin"
+                            TargetName="Content"
+                            Value="0,0,0,3" />
+                  </Trigger>
+                  <DataTrigger Binding="{Binding IsActive}"
+                               Value="True">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </DataTrigger>
+
+                  <MultiDataTrigger>
+                    <MultiDataTrigger.Conditions>
+                      <Condition Binding="{Binding IsActive}"
+                                 Value="False" />
+                      <Condition Binding="{Binding IsLastFocusedDocument}"
+                                 Value="True" />
+                    </MultiDataTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                  </MultiDataTrigger>
+
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--AnchorablePaneControlStyle-->
+  <Style x:Key="AvalonDock_ThemeVS2010_AnchorablePaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+    <Setter Property="TabStripPlacement"
+            Value="Bottom" />
+    <Setter Property="Padding"
+            Value="0" />
+    <Setter Property="BorderThickness"
+            Value="0" />
+    <Setter Property="Foreground"
+            Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Background"
+            Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Border x:Name="ContentPanel"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="0"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel"
+                                                       Margin="0,0,2,2"
+                                                       IsItemsHost="true"
+                                                       Grid.Row="1"
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       Panel.ZIndex="1" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}"
+                         Value="1">
+              <Setter Property="Margin"
+                      Value="0"
+                      TargetName="HeaderPanel" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Background"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}" />
+          <Setter Property="BorderBrush"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}" />
+          <Setter Property="Foreground"
+                  Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Template">
             <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
-                </DataTemplate>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="1,0,1,1"
+                          CornerRadius="0,0,2,2"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Border>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor8}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="0,-2,-1,0" />
+                    <Setter Property="Margin"
+                            TargetName="Content"
+                            Value="0,1,0,0" />
+                  </Trigger>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}" />
+                    <Setter Property="Background"
+                            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
-    </Style>
+          </Setter>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}"
+                         Value="1">
+              <Setter Property="Visibility"
+                      Value="Collapsed" />
+            </DataTrigger>
+          </Style.Triggers>
+        </Style>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="2,2,0,0"
+                  Padding="0,2,0,1">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter x:Name="Header"
+                                  Margin="2,0,0,0"
+                                  TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                                  Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+              </avalonDockControls:DropDownControlArea>
+
+
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 VerticalAlignment="Center"
+                                                 Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                                 Focusable="False"
+                                                 Grid.Column="1"
+                                                 DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                <Image x:Name="PART_ImgMenuPin"
+                       Source="Images/PinMenu.png" >
+                </Image>
+              </avalonDockControls:DropDownButton>
+
+              <Button x:Name="PART_AutoHidePin"
+                      Grid.Column="2"
+                      Focusable="False"
+                      Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
+                <Image x:Name="PART_ImgAutoHidePin"
+                       Source="Images/PinAutoHide.png" >
+                </Image>
+              </Button>
+              <Button x:Name="PART_HidePin"
+                      Grid.Column="3"
+                      Focusable="False"
+                      Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"
+                      Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                <Image x:Name="PART_ImgHidePin"
+                       Source="Images/PinClose.png" >
+                </Image>
+              </Button>
+
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="LayoutTransform"
+                      TargetName="PART_AutoHidePin">
+                <Setter.Value>
+                  <RotateTransform Angle="90" />
+                </Setter.Value>
+              </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"
+                      TargetName="Header" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgAutoHidePin"
+                      Value="Images/PinAutoHide_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgHidePin"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Dark.png" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_HidePin"
+                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_HidePin"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="2,2,0,0"
-                            Padding="0,2,0,1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DropDownControlArea 
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                <ContentPresenter 
-                                    x:Name="Header"            
-                                    Margin="2,0,0,0"
-                                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
-                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </avalonDockControls:DropDownControlArea>
-
-
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                VerticalAlignment="Center"
-                                Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
-                                Focusable="False"
-                                Grid.Column="1"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                <Image x:Name="PART_ImgMenuPin" Source="Images/PinMenu.png"/>
-                            </avalonDockControls:DropDownButton>
-
-                            <Button x:Name="PART_AutoHidePin" 
-                                Grid.Column="2" 
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
-                                    >
-                                <Image x:Name="PART_ImgAutoHidePin" Source="Images/PinAutoHide.png"/>
-                            </Button>
-                            <Button x:Name="PART_HidePin" 
-                                Grid.Column="3" 
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                    >
-                                <Image x:Name="PART_ImgHidePin" Source="Images/PinClose.png"/>
-                            </Button>
-
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
-                                <Setter.Value>
-                                    <RotateTransform Angle="90"/>
-                                </Setter.Value>
-                            </Setter>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}" />
-                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="Images/PinAutoHide_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Dark.png"/>
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="Images/PinAutoHide_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel 
-                        MinWidth="4"
-                        MinHeight="4"
-                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.LayoutTransform>
-                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
-            </ItemsControl.LayoutTransform>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
-        <Border 
-            x:Name="Bd"
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="MenuDropDownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgMenuPin"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_AutoHidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgAutoHidePin"
+                      Value="Images/PinAutoHide_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_HidePin"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgHidePin"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorSideTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel MinWidth="4"
+                      MinHeight="4"
+                      Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorGroupTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.LayoutTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}" />
+      </ItemsControl.LayoutTransform>
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+    <Border x:Name="Bd"
             Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}"
             BorderThickness="1"
             CornerRadius="3,3,0,0"
             Margin="0,4,0,0"
             Padding="2">
-                <ContentPresenter 
-                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
-                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                    ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                    ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-        </Border>
-        <ControlTemplate.Triggers>
-            <Trigger Property="Side" Value="Right">
-                <Setter Property="CornerRadius" Value="0,0,3,3" TargetName="Bd"/>
-                <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
-            </Trigger>
-            <Trigger Property="Side" Value="Bottom">
-                <Setter Property="CornerRadius" Value="3,3,0,0" TargetName="Bd"/>
-                <Setter Property="Margin" Value="0,4,0,0" TargetName="Bd"/>
-            </Trigger>
-            <Trigger Property="Side" Value="Top">
-                <Setter Property="CornerRadius" Value="0,0,3,3" TargetName="Bd"/>
-                <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
-            </Trigger>            
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true"/>
-                    <Condition Property="Selector.IsSelected" Value="false"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}" TargetName="Bd"/>
-                <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}" TargetName="Bd"/>
-            </MultiTrigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                        <Grid x:Name="PART_DockingManagerDropTargets" >
-                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="Images/DockAnchorableLeft.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="Images/DockAnchorableRight.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="Images/DockAnchorableBottom.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="Images/DockAnchorableTop.PNG" Stretch="None"/>
-                        </Grid>
-                        <Grid x:Name="PART_AnchorablePaneDropTargets">
-                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
-                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
-                                    <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
-                                    <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-                            </Grid>
-                        </Grid>
-                        <Grid x:Name="PART_DocumentPaneDropTargets">
-                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="Images/DockPaneEmpty.PNG"  Stretch="None"/>
-                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
-                                    <Image Source="Images/DockDocumentTop.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
-                                    <Image Source="Images/DockDocumentBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
-                                    <Image Source="Images/DockDocumentLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-                            </Grid>
-                        </Grid>
-
-                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
-                            <Grid Width="184" Height="184" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
-                                <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
-                                    <Image Source="Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
-                                    <Image Source="Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentInside.png"  Stretch="None"/>
-                                </Border>
-
-                                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
-                                    <Image Source="Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
-                                    <Image Source="Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
-                                    <Image Source="Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
-                                </Border>
-
-                            </Grid>
-                        </Grid>
-
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentHeaderTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableHeaderTemplate">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
-                <Setter Property="Margin" Value="0" TargetName="title"/>
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_ThemeVS2010_IconContentTemplate">
-        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-    </DataTemplate>
-
-    <ContextMenu x:Key="AvalonDock_ThemeVS2010_AnchorableContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
-                Command="{Binding Path=DockCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
-                Command="{Binding Path=AutoHideCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
-                Command="{Binding Path=HideCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
-
-    <ContextMenu x:Key="AvalonDock_ThemeVS2010_DocumentContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
-                  Command="{Binding Path=CloseCommand}"
-                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
-                Command="{Binding Path=CloseAllButThisCommand}"/>
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
-                Command="{Binding Path=CloseAllCommand}" />
-      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
-                Command="{Binding Path=NewHorizontalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-                <Image Source="Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
-            </MenuItem.Icon>
-        </MenuItem>
-
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
-                Command="{Binding Path=NewVerticalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-            <Image Source="Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
-            </MenuItem.Icon>
-        </MenuItem>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
-                Command="{Binding Path=MoveToNextTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
-                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
-
-    <!--DockingManager-->
-    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor1}"/>
-        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentPaneControlStyle}"/>
-        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorablePaneControlStyle}"/>
-        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorSideTemplate}"/>
-        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorGroupTemplate}"/>
-        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorTemplate}"/>
-        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}"/>
-        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableHeaderTemplate}"/>
-        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentTitleTemplate}"/>
-        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableTitleTemplate}"/>
-        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableContextMenu}"/>
-        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentContextMenu}"/>
-        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}"/>
-        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_IconContentTemplate}"/>
-        <Setter Property="GridSplitterWidth" Value="4"/>
-        <Setter Property="GridSplitterHeight" Value="4"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
-                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
-                            <ContentPresenter 
-                                x:Name="PART_AutoHideArea"
+      <ContentPresenter TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                        Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+    </Border>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Side"
+               Value="Right">
+        <Setter Property="CornerRadius"
+                Value="0,0,3,3"
+                TargetName="Bd" />
+        <Setter Property="Margin"
+                Value="0,0,0,4"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Bottom">
+        <Setter Property="CornerRadius"
+                Value="3,3,0,0"
+                TargetName="Bd" />
+        <Setter Property="Margin"
+                Value="0,4,0,0"
+                TargetName="Bd" />
+      </Trigger>
+      <Trigger Property="Side"
+               Value="Top">
+        <Setter Property="CornerRadius"
+                Value="0,0,3,3"
+                TargetName="Bd" />
+        <Setter Property="Margin"
+                Value="0,0,0,4"
+                TargetName="Bd" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver"
+                     Value="true" />
+          <Condition Property="Selector.IsSelected"
+                     Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}"
+                TargetName="Bd" />
+        <Setter Property="Background"
+                Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}"
+                TargetName="Bd" />
+      </MultiTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <Style x:Key="{x:Type avalonDockControls:OverlayWindow}"
+         TargetType="{x:Type avalonDockControls:OverlayWindow}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+          <Canvas x:Name="PART_DropTargetsContainer"
+                  Opacity="0.9">
+            <Path x:Name="PART_PreviewBox"
+                  Fill="AliceBlue"
+                  StrokeThickness="2"
+                  Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            <Grid x:Name="PART_DockingManagerDropTargets">
+              <Image x:Name="PART_DockingManagerDropTargetLeft"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Left"
+                     Source="Images/DockAnchorableLeft.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetRight"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Right"
+                     Source="Images/DockAnchorableRight.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetBottom"
+                     VerticalAlignment="Bottom"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableBottom.PNG"
+                     Stretch="None" >
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetTop"
+                     VerticalAlignment="Top"
+                     HorizontalAlignment="Center"
+                     Source="Images/DockAnchorableTop.PNG"
+                     Stretch="None" >
+              </Image>
+            </Grid>
+            <Grid x:Name="PART_AnchorablePaneDropTargets">
+              <Grid Width="112"
+                    Height="112"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.png"
+                       Stretch="None"
+                       Margin="0,0.5,0,-0.5" >
+                </Image>
+                <Border Name="PART_AnchorablePaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="0,3.5,0, 0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="0,-0.5,0,0">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1"
+                        Margin="0,0.5,0,0">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+            <Grid x:Name="PART_DocumentPaneDropTargets">
+              <Grid Width="112"
+                    Height="112"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Margin="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+
+            <Grid x:Name="PART_DocumentPaneFullDropTargets">
+              <Grid Width="184"
+                    Height="184"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Source="Images/DockPaneLargeEmpty.PNG"
+                       Stretch="None" >
+                </Image>
+                <Border Name="PART_DocumentPaneFullDropTargetTop"
+                        Grid.Column="2"
+                        Grid.Row="1">
+                  <Image Source="Images/DockDocumentTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetRight"
+                        Grid.Column="3"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetBottom"
+                        Grid.Column="2"
+                        Grid.Row="3">
+                  <Image Source="Images/DockDocumentBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetLeft"
+                        Grid.Column="1"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneFullDropTargetInto"
+                        Grid.Column="2"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentInside.png"
+                         Stretch="None" >
+                  </Image>
+                </Border>
+
+                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="0">
+                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
+                        Grid.Column="4"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
+                        Grid.Column="2"
+                        Grid.Row="4">
+                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
+                        Grid.Column="0"
+                        Grid.Row="2">
+                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
+                         Stretch="None"
+                         Margin="2" >
+                  </Image>
+                </Border>
+
+              </Grid>
+            </Grid>
+
+          </Canvas>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentHeaderTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableHeaderTemplate">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Image x:Name="icon"
+             Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+             Stretch="Uniform" >
+      </Image>
+      <TextBlock x:Name="title"
+                 Margin="4,0,0,0"
+                 Text="{Binding Title}"
+                 TextTrimming="CharacterEllipsis"
+                 Grid.Column="1" >
+      </TextBlock>
+    </Grid>
+    <DataTemplate.Triggers>
+      <DataTrigger Binding="{Binding IconSource}"
+                   Value="{x:Null}">
+        <Setter Property="Margin"
+                Value="0"
+                TargetName="title" />
+      </DataTrigger>
+    </DataTemplate.Triggers>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis" >
+    </TextBlock>
+  </DataTemplate>
+
+  <DataTemplate x:Key="AvalonDock_ThemeVS2010_IconContentTemplate">
+    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+           Stretch="Uniform" >
+    </Image>
+  </DataTemplate>
+
+  <ContextMenu x:Key="AvalonDock_ThemeVS2010_AnchorableContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}"
+              Command="{Binding Path=DockCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
+              Command="{Binding Path=AutoHideCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
+              Command="{Binding Path=HideCommand}">
+      <MenuItem.Visibility>
+        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
+          <Binding Path="IsEnabled"
+                   RelativeSource="{RelativeSource Self}"
+                   Mode="OneWay"
+                   Converter="{StaticResource BoolToVisibilityConverter}" />
+          <Binding Path="CanClose" />
+        </MultiBinding>
+      </MenuItem.Visibility>
+    </MenuItem>
+  </ContextMenu>
+
+  <ContextMenu x:Key="AvalonDock_ThemeVS2010_DocumentContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}"
+              Command="{Binding Path=CloseAllButThisCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+              Command="{Binding Path=CloseAllCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
+              Command="{Binding Path=NewHorizontalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/HTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
+              Command="{Binding Path=NewVerticalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+      <MenuItem.Icon>
+        <Image Source="Images/VTabGroup.png"
+               Stretch="Uniform"
+               Width="14" />
+      </MenuItem.Icon>
+    </MenuItem>
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
+              Command="{Binding Path=MoveToNextTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
+              Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+  </ContextMenu>
+
+  <!--DockingManager-->
+  <Style x:Key="{x:Type avalonDock:DockingManager}"
+         TargetType="{x:Type avalonDock:DockingManager}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor1}" />
+    <Setter Property="DocumentPaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeVS2010_DocumentPaneControlStyle}" />
+    <Setter Property="AnchorablePaneControlStyle"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorablePaneControlStyle}" />
+    <Setter Property="AnchorSideTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorSideTemplate}" />
+    <Setter Property="AnchorGroupTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorGroupTemplate}" />
+    <Setter Property="AnchorTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorTemplate}" />
+    <Setter Property="DocumentHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}" />
+    <Setter Property="AnchorableHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableHeaderTemplate}" />
+    <Setter Property="DocumentTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_DocumentTitleTemplate}" />
+    <Setter Property="AnchorableTitleTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableTitleTemplate}" />
+    <Setter Property="AnchorableContextMenu"
+            Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableContextMenu}" />
+    <Setter Property="DocumentContextMenu"
+            Value="{StaticResource AvalonDock_ThemeVS2010_DocumentContextMenu}" />
+    <Setter Property="DocumentPaneMenuItemHeaderTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}" />
+    <Setter Property="IconContentTemplate"
+            Value="{StaticResource AvalonDock_ThemeVS2010_IconContentTemplate}" />
+    <Setter Property="GridSplitterWidth"
+            Value="4" />
+    <Setter Property="GridSplitterHeight"
+            Value="4" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Content="{TemplateBinding LayoutRootPanel}"
+                                Grid.Column="1"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding RightSidePanel}"
+                                Grid.Column="2"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
+                                Grid.Column="0"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding TopSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="0" />
+              <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="2" />
+              <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
                                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                Grid.Column="1" Grid.Row="1"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--LayoutGridResizerControl-->
-    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-                    <Border Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                  <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
-               </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
-                        <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="0,2,0,1">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                                <!-- Close button should be moved out to the container style -->
-                                <Button 
-                                    x:Name="DocumentCloseButton" 
-                                    Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0" 
-                                    Visibility="Hidden" 
-                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                                    <Image x:Name="PART_ImgPinClose" 
-                                           Source="Images/PinClose.png"/>
-                                </Button>
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                            <Setter Property="Source" Value="Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                            <Setter Property="Source" Value="Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="DocumentCloseButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                          ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                          ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                                <avalonDockControls:DropDownControlArea 
-                                Grid.Column="0"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                                Grid.Column="1"
+                                Grid.Row="1" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--LayoutGridResizerControl-->
+  <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}"
+         TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+          <Border Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Padding="0,2,0,1">
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Border Grid.ColumnSpan="2"
+                        Background="Transparent" />
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <!-- Close button should be moved out to the container style -->
+                <Button x:Name="DocumentCloseButton"
+                        Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center"
+                        Grid.Column="1"
+                        Margin="5,0,0,0"
+                        Visibility="Hidden"
+                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                  <Image x:Name="PART_ImgPinClose"
+                         Source="Images/PinClose.png" >
+                  </Image>
+                </Button>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Path=IsSelected}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+              <Setter Property="Source"
+                      Value="Images/PinClose_Dark.png"
+                      TargetName="PART_ImgPinClose" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsActive}"
+                         Value="true">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+              <Setter Property="Source"
+                      Value="Images/PinClose_Dark.png"
+                      TargetName="PART_ImgPinClose" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Visibility"
+                      Value="Visible"
+                      TargetName="DocumentCloseButton" />
+            </Trigger>
+            <DataTrigger Binding="{Binding Path=CanClose}"
+                         Value="false">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="DocumentCloseButton" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="DocumentCloseButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                    <Border 
-                        x:Name="Bd"
-                        Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Border x:Name="Header"
-                                    CornerRadius="2,2,0,0"
-                                Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
-                                <avalonDockControls:AnchorablePaneTitle 
-                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Border>
-                            <ContentPresenter 
-                                Grid.Row="1"
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+              <Grid>
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                <avalonDockControls:DropDownControlArea Grid.Column="0"
+                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
+                </avalonDockControls:DropDownControlArea>
+              </Grid>
+            </Border>
+          </avalonDockControls:DropDownControlArea>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+          <Border x:Name="Bd"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border x:Name="Header"
+                      CornerRadius="2,2,0,0"
+                      Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
+                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
+              </Border>
+              <ContentPresenter Grid.Row="1"
                                 FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                            <!--<ContentPresenter 
+              <!--<ContentPresenter 
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
                                 ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 Grid.Row="1"/>-->
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
-                        </MultiDataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}"/>
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="18"
-                    CornerRadius="3"
-                    GlassFrameThickness="0"
-                    ShowSystemMenu="False"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" 
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                            <Grid Margin="3">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="18"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Border x:Name="Header"
-                                        Padding="2,0,2,0">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                  ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                  ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-
-
-                                        <avalonDockControls:DropDownButton
-                                            x:Name="ContextMenuDropdownButton"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
-                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu.png" Width="13"/>
-                                        </avalonDockControls:DropDownButton>
-
-                                        <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize.png" Width="13" />
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinRestore" Source="Images/PinRestore.png" Width="13" />
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                            Grid.Column="3">
-                                            <Image x:Name="PART_ImgPinClose" Source="Images/PinClose.png" Width="13" />
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}" TargetName="Header" />
-                            <Setter Property="TextElement.Foreground"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"  TargetName="Header"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Dark.png"/>
-                        </MultiDataTrigger>
-
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="False"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="BorderBrush"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
-                            <Setter Property="Background"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}" TargetName="Header" />
-                            <Setter Property="TextElement.Foreground"
-									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Dark.png"/>
-                        </MultiDataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>                        
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}"/>
-       <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}"/>
-       <Setter Property="BorderThickness" Value="4"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="18"
-                    CornerRadius="7"
-                    GlassFrameThickness="0"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                            <Grid >
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="18"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Border x:Name="Header" 
-                                        CornerRadius="1,1,0,0"
-                                        Padding="2,0,2,0"
-                                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
-                                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-
-                                        <Border
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <avalonDockControls:DropDownControlArea 
-                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                                    <ContentPresenter
-                                                      Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                      ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                            </avalonDockControls:DropDownControlArea>
-                                        </Border>
-
-                                        <avalonDockControls:DropDownButton
-                                            x:Name="SinglePaneContextMenu"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
-                                            Focusable="False"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="Images/PinMenu.png" Width="13"/>
-                                        </avalonDockControls:DropDownButton>
-
-                                        <Button 
-                                            x:Name="PART_PinMaximize"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Grid.Column="2">
-                                            <Image x:Name="PART_ImgPinMaximize" Source="Images/PinMaximize.png" Width="13"/>
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinRestore"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Grid.Column="2">
-                                            <Image  x:Name="PART_ImgPinRestore" Source="Images/PinRestore.png" Width="13"/>
-                                        </Button>
-
-                                        <Button 
-                                            x:Name="PART_PinClose"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                            Grid.Column="3">
-                                            <Image x:Name="PART_ImgPinClose" Source="Images/PinClose.png" Width="13"/>
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                                <ContentPresenter
-                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}" TargetName="Header"/>
-                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Dark.png"/>
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Dark.png"/>
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="Images/PinMenu_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="Images/PinMaximize_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="Images/PinRestore_Black.png"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
-                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="Images/PinClose_Black.png"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="Header" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+    <Setter Property="Foreground"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome ResizeBorderThickness="10"
+                            CaptionHeight="18"
+                            CornerRadius="3"
+                            GlassFrameThickness="0"
+                            ShowSystemMenu="False" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid Margin="3">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="18" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Border x:Name="Header"
+                        Padding="2,0,2,0">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+
+
+                    <avalonDockControls:DropDownButton x:Name="ContextMenuDropdownButton"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu.png"
+                             Width="13" >
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinRestore"
+                             Source="Images/PinRestore.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+                  </Grid>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}"
+                      TargetName="Header" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"
+                      TargetName="Header" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Dark.png" />
+            </MultiDataTrigger>
+
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}"
+                           Value="False" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}"
+                      TargetName="Header" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"
+                      TargetName="Header" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Dark.png" />
+            </MultiDataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="ContextMenuDropdownButton"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
 
-    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}"/>
-    </Style>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}" />
+    <Setter Property="BorderThickness"
+            Value="4" />
+    <Setter Property="shell:WindowChrome.WindowChrome">
+      <Setter.Value>
+        <shell:WindowChrome ResizeBorderThickness="10"
+                            CaptionHeight="18"
+                            CornerRadius="7"
+                            GlassFrameThickness="0" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="18" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Border x:Name="Header"
+                        CornerRadius="1,1,0,0"
+                        Padding="2,0,2,0"
+                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Border Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                      <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                              DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <ContentPresenter Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </avalonDockControls:DropDownControlArea>
+                    </Border>
 
+                    <avalonDockControls:DropDownButton x:Name="SinglePaneContextMenu"
+                                                       shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                       Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                       Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                                       Focusable="False"
+                                                       Grid.Column="1"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalContentAlignment="Center"
+                                                       HorizontalContentAlignment="Center"
+                                                       DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                      <Image x:Name="PART_ImgPinMenu"
+                             Stretch="None"
+                             Source="Images/PinMenu.png"
+                             Width="13" >
+                      </Image>
+                    </avalonDockControls:DropDownButton>
+
+                    <Button x:Name="PART_PinMaximize"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                            Grid.Column="2">
+                      <Image x:Name="PART_ImgPinMaximize"
+                             Source="Images/PinMaximize.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinRestore"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                            Grid.Column="2">
+                      <Image  x:Name="PART_ImgPinRestore"
+                              Source="Images/PinRestore.png"
+                              Width="13" >
+                      </Image>
+                    </Button>
+
+                    <Button x:Name="PART_PinClose"
+                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                            Focusable="False"
+                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                            Grid.Column="3">
+                      <Image x:Name="PART_ImgPinClose"
+                             Source="Images/PinClose.png"
+                             Width="13" >
+                      </Image>
+                    </Button>
+                  </Grid>
+                </Border>
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  Grid.Row="1" />
+              </Grid>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="WindowState"
+                     Value="Maximized">
+              <Setter Property="Padding"
+                      Value="3"
+                      TargetName="WindowBorder" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}"
+                         Value="True">
+              <Setter Property="Background"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}"
+                      TargetName="Header" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"
+                      TargetName="Header" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Dark.png" />
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Dark.png" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_PinClose"
+                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_PinClose"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFF1FBFF" Offset="0"/>
-        <GradientStop Color="#FFD5F1FE" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFD9F4FF" Offset="0"/>
-        <GradientStop Color="#FF9BDDFB" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFEEEDED" Offset="0"/>
-        <GradientStop Color="#FFDDDDDD" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFEAF9FF" Offset="0"/>
-        <GradientStop Color="#FFC9EDFD" Offset="1"/>
-    </LinearGradientBrush>
-
-    <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="5,0,5,0"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            CornerRadius="2" SnapsToDevicePixels="true">
-                        <Border x:Name="InnerBorder" BorderThickness="1" CornerRadius="1">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition MaxHeight="11"/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
-                                <ContentPresenter Grid.RowSpan="2" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                            </Grid>
-                        </Border>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}"/>
-                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}"/>
-                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
-                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
-                        </Trigger>
-                        <!--<MultiTrigger>
+            </DataTrigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     SourceName="SinglePaneContextMenu"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMenu"
+                      Value="Images/PinMenu_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinMaximize"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinMaximize"
+                      Value="Images/PinMaximize_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinRestore"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinRestore"
+                      Value="Images/PinRestore_Black.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     SourceName="PART_PinClose"
+                     Value="True">
+              <Setter Property="Source"
+                      TargetName="PART_ImgPinClose"
+                      Value="Images/PinClose_Black.png" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}"
+         TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+    <Setter Property="Background"
+            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}" />
+  </Style>
+
+
+  <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle RadiusY="2"
+                     RadiusX="2"
+                     Stroke="#8E6EA6F5"
+                     StrokeThickness="1" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFF1FBFF"
+                  Offset="0" />
+    <GradientStop Color="#FFD5F1FE"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFD9F4FF"
+                  Offset="0" />
+    <GradientStop Color="#FF9BDDFB"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedInactiveFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEEEDED"
+                  Offset="0" />
+    <GradientStop Color="#FFDDDDDD"
+                  Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedHoverFill"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#FFEAF9FF"
+                  Offset="0" />
+    <GradientStop Color="#FFC9EDFD"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle"
+         TargetType="ListBoxItem">
+    <Setter Property="FocusVisualStyle"
+            Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual}" />
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Padding"
+            Value="5,0,5,0" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Cursor"
+            Value="Hand" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBoxItem">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="2"
+                  SnapsToDevicePixels="true">
+            <Border x:Name="InnerBorder"
+                    BorderThickness="1"
+                    CornerRadius="1">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition MaxHeight="11" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Rectangle x:Name="UpperHighlight"
+                           Fill="#75FFFFFF"
+                           Visibility="Collapsed" />
+                <ContentPresenter Grid.RowSpan="2"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+              </Grid>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <Trigger Property="IsSelected"
+                     Value="true">
+              <Setter Property="Background"
+                      Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}" />
+              <Setter Property="BorderBrush"
+                      Value="#FF98DDFB" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+              <Setter Property="Visibility"
+                      TargetName="UpperHighlight"
+                      Value="Visible" />
+              <Setter Property="Fill"
+                      TargetName="UpperHighlight"
+                      Value="#40FFFFFF" />
+            </Trigger>
+            <!--<MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="true"/>
                                 <Condition Property="IsMouseOver" Value="true"/>
@@ -1432,20 +1993,26 @@
                             <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedHoverFill}"/>
                             <Setter Property="BorderBrush" Value="#FF98DDFB"/>
                         </MultiTrigger>-->
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <!--<Setter Property="shell:WindowChrome.WindowChrome">
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}"
+         TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+    <Setter Property="SizeToContent"
+            Value="WidthAndHeight" />
+    <Setter Property="ResizeMode"
+            Value="NoResize" />
+    <!--<Setter Property="shell:WindowChrome.WindowChrome">
             <Setter.Value>
                 <shell:WindowChrome
                     ResizeBorderThickness="10"
@@ -1454,124 +2021,155 @@
                     GlassFrameThickness="4"/>
             </Setter.Value>
         </Setter>-->
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" BorderThickness="1"
-                                CornerRadius="3"
-                                Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+          <Grid>
+            <Border x:Name="WindowBorder"
+                    BorderThickness="1"
+                    CornerRadius="3"
+                    Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="54" />
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid Margin="5">
+                  <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                           Stretch="None"
+                           Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }" >
+                    </Image>
+                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}"
+                               TextTrimming="CharacterEllipsis"
+                               Grid.Column="1"
+                               VerticalAlignment="Center"
+                               FontWeight="Bold"
+                               Margin="4,0,0,0" >
+                    </TextBlock>
+                  </Grid>
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}"
+                             TextTrimming="CharacterEllipsis"
+                             VerticalAlignment="Center" >
+                  </TextBlock>
+                </Grid>
+
+                <Border Grid.Row="1"
+                        BorderBrush="{DynamicResource AvalonDock_ThemeVS2010_BaseColor11}"
+                        BorderThickness="0,1,0,0"
+                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor7}"
+                        MinHeight="200">
+                  <Grid  Margin="5">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Tool Windows"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4" >
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Anchorables}"
+                               SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
                             <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="54"/>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-
-                                <Grid Margin="5">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition/>
-                                    </Grid.RowDefinitions>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <Image 
-                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-                                            Stretch="None"
-                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
-                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
-                                    </Grid>
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-                                </Grid>
-
-                                <Border Grid.Row="1" 
-                                        BorderBrush="{DynamicResource AvalonDock_ThemeVS2010_BaseColor11}"
-                                        BorderThickness="0,1,0,0"
-                                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor7}"
-                                        MinHeight="200" >
-                                    <Grid  Margin="5">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <Grid Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition/>
-                                            </Grid.RowDefinitions>
-                                            <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
-                                            <ListBox Grid.Row="1" 
-                                                     ItemsSource="{Binding Anchorables}"
-                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
-                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
-                                                     Background="Transparent" 
-                                                     BorderThickness="0"
-                                                     MaxHeight="400">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16"/>
-                                                                <ColumnDefinition Width="150"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                            </ListBox>
-                                        </Grid>
-                                        <Grid Grid.Column="1" Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition/>
-                                            </Grid.RowDefinitions>
-                                            <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
-                                            <ListBox 
-                                                Grid.Row="1" 
-                                                ItemsSource="{Binding Documents}" 
-                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
-                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
-                                                Background="Transparent" 
-                                                BorderThickness="0" 
-                                                MaxHeight="400">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16"/>
-                                                                <ColumnDefinition Width="150"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                                <ListBox.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <WrapPanel Orientation="Vertical"/>
-                                                    </ItemsPanelTemplate>
-                                                </ListBox.ItemsPanel>
-                                            </ListBox>
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-
-                                <Grid Grid.Row="2" Margin="5">
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
-                                </Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
                             </Grid>
-                        </Border>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                      </ListBox>
                     </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
+                    <Grid Grid.Column="1"
+                          Margin="5">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                      </Grid.RowDefinitions>
+                      <TextBlock Text="Active Files"
+                                 FontWeight="Bold"
+                                 Margin="0,3,0,4">
+                      </TextBlock>
+                      <ListBox Grid.Row="1"
+                               ItemsSource="{Binding Documents}"
+                               SelectedItem="{Binding SelectedDocument, Mode=TwoWay}"
+                               ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
+                               Background="Transparent"
+                               BorderThickness="0"
+                               MaxHeight="400">
+                        <ListBox.ItemTemplate>
+                          <DataTemplate>
+                            <Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="150" />
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                     Stretch="None" >
+                              </Image>
+                              <TextBlock Text="{Binding LayoutElement.Title}"
+                                         TextTrimming="CharacterEllipsis"
+                                         Grid.Column="1"
+                                         Margin="4,0,0,0" >
+                              </TextBlock>
+                            </Grid>
+                          </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemsPanel>
+                          <ItemsPanelTemplate>
+                            <WrapPanel Orientation="Vertical" />
+                          </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                      </ListBox>
+                    </Grid>
+                  </Grid>
+                </Border>
+
+                <Grid Grid.Row="2"
+                      Margin="5">
+                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
+                             VerticalAlignment="Center" >
+                  </TextBlock>
+                </Grid>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Brushes.baml
new file mode 100644
index 00000000..1cda146e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Brushes.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Theme.baml
new file mode 100644
index 00000000..21afb581
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Theme.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..970ae804
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
@@ -0,0 +1,22 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
new file mode 100644
index 00000000..f3507144
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref
new file mode 100644
index 00000000..f4e6c70b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Theme.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
new file mode 100644
index 00000000..f4e6c70b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Debug/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Theme.xaml;;
+
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
new file mode 100644
index 00000000..140e78f6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml 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
new file mode 100644
index 00000000..bc6c6783
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml 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
new file mode 100644
index 00000000..31cc14f3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
@@ -0,0 +1,22 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Theme.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..0962fd37
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref
new file mode 100644
index 00000000..f4e6c70b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Theme.xaml;;
+
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
new file mode 100644
index 00000000..f4e6c70b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
@@ -0,0 +1,4 @@
+
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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 5187d3fa..73fd3191 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.2";
+  public const string BaseVersion = "3.3";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
index 538008f9..d247f9e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
@@ -25,160 +22,165 @@ using System.Windows.Threading;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class LayoutAnchorControl : Control, ILayoutControl
+  public class LayoutAnchorControl : Control, ILayoutControl
+  {
+    static LayoutAnchorControl()
     {
-        static LayoutAnchorControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorControl)));
-            Control.IsHitTestVisibleProperty.AddOwner(typeof(LayoutAnchorControl), new FrameworkPropertyMetadata(true)); 
-        }
-
-
-        internal LayoutAnchorControl(LayoutAnchorable model)
-        {
-            _model = model;
-            _model.IsActiveChanged += new EventHandler(_model_IsActiveChanged);
-            _model.IsSelectedChanged += new EventHandler(_model_IsSelectedChanged);
-
-            SetSide(_model.FindParent<LayoutAnchorSide>().Side);
-        }
-
-        void _model_IsSelectedChanged(object sender, EventArgs e)
-        {
-            if (!_model.IsAutoHidden)
-                _model.IsSelectedChanged -= new EventHandler(_model_IsSelectedChanged);
-            else if (_model.IsSelected)
-            {
-                _model.Root.Manager.ShowAutoHideWindow(this);
-                _model.IsSelected = false;
-            }
-        }
-
-        void _model_IsActiveChanged(object sender, EventArgs e)
-        {
-            if (!_model.IsAutoHidden)
-                _model.IsActiveChanged -= new EventHandler(_model_IsActiveChanged);
-            else if (_model.IsActive)
-                _model.Root.Manager.ShowAutoHideWindow(this);
-        }
-
-        LayoutAnchorable _model;
-
-        public ILayoutElement Model
-        {
-            get { return _model; }
-        }
-
-        //protected override void OnVisualParentChanged(DependencyObject oldParent)
-        //{
-        //    base.OnVisualParentChanged(oldParent);
-
-        //    var contentModel = _model;
-
-        //    if (oldParent != null && contentModel != null && contentModel.Content is UIElement)
-        //    {
-        //        var oldParentPaneControl = oldParent.FindVisualAncestor<LayoutAnchorablePaneControl>();
-        //        if (oldParentPaneControl != null)
-        //        {
-        //            ((ILogicalChildrenContainer)oldParentPaneControl).InternalRemoveLogicalChild(contentModel.Content);
-        //        }
-        //    }
-
-        //    if (contentModel.Content != null && contentModel.Content is UIElement)
-        //    {
-        //        var oldLogicalParentPaneControl = LogicalTreeHelper.GetParent(contentModel.Content as UIElement)
-        //            as ILogicalChildrenContainer;
-        //        if (oldLogicalParentPaneControl != null)
-        //            oldLogicalParentPaneControl.InternalRemoveLogicalChild(contentModel.Content);
-        //    }
-
-        //    if (contentModel != null && contentModel.Content != null && contentModel.Root != null && contentModel.Content is UIElement)
-        //    {
-        //        ((ILogicalChildrenContainer)contentModel.Root.Manager).InternalAddLogicalChild(contentModel.Content);
-        //    }
-        //}
-
-
-        protected override void OnMouseDown(System.Windows.Input.MouseButtonEventArgs e)
-        {
-            base.OnMouseDown(e);
-
-            if (!e.Handled)
-            {
-                _model.Root.Manager.ShowAutoHideWindow(this);
-                _model.IsActive = true;
-            }
-        }
-
-
-        DispatcherTimer _openUpTimer = null;
-
-        protected override void OnMouseEnter(System.Windows.Input.MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-
-            if (!e.Handled)
-            {
-                _openUpTimer = new DispatcherTimer(DispatcherPriority.ApplicationIdle);
-                _openUpTimer.Interval = TimeSpan.FromMilliseconds(400);
-                _openUpTimer.Tick += new EventHandler(_openUpTimer_Tick);
-                _openUpTimer.Start();
-            }
-        }
-
-        void _openUpTimer_Tick(object sender, EventArgs e)
-        {
-            _openUpTimer.Tick -= new EventHandler(_openUpTimer_Tick);
-            _openUpTimer.Stop();
-            _openUpTimer = null;
-            _model.Root.Manager.ShowAutoHideWindow(this);
-        }
-
-        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
-        {
-            if (_openUpTimer != null)
-            {
-                _openUpTimer.Tick -= new EventHandler(_openUpTimer_Tick);
-                _openUpTimer.Stop();
-                _openUpTimer = null;
-            }
-            base.OnMouseLeave(e);
-        }
-
-
-        #region Side
-
-        /// <summary>
-        /// Side Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey SidePropertyKey
-            = DependencyProperty.RegisterReadOnly("Side", typeof(AnchorSide), typeof(LayoutAnchorControl),
-                new FrameworkPropertyMetadata((AnchorSide)AnchorSide.Left));
-
-        public static readonly DependencyProperty SideProperty
-            = SidePropertyKey.DependencyProperty;
-
-        /// <summary>
-        /// Gets the Side property.  This dependency property 
-        /// indicates the anchor side of the control.
-        /// </summary>
-        public AnchorSide Side
-        {
-            get { return (AnchorSide)GetValue(SideProperty); }
-        }
-
-        /// <summary>
-        /// Provides a secure method for setting the Side property.  
-        /// This dependency property indicates the anchor side of the control.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetSide(AnchorSide value)
-        {
-            SetValue(SidePropertyKey, value);
-        }
-
-        #endregion
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorControl ), new FrameworkPropertyMetadata( typeof( LayoutAnchorControl ) ) );
+      Control.IsHitTestVisibleProperty.AddOwner( typeof( LayoutAnchorControl ), new FrameworkPropertyMetadata( true ) );
+    }
+
+
+    internal LayoutAnchorControl( LayoutAnchorable model )
+    {
+      _model = model;
+      _model.IsActiveChanged += new EventHandler( _model_IsActiveChanged );
+      _model.IsSelectedChanged += new EventHandler( _model_IsSelectedChanged );
+
+      SetSide( _model.FindParent<LayoutAnchorSide>().Side );
+    }
+
+    void _model_IsSelectedChanged( object sender, EventArgs e )
+    {
+      if( !_model.IsAutoHidden )
+        _model.IsSelectedChanged -= new EventHandler( _model_IsSelectedChanged );
+      else if( _model.IsSelected )
+      {
+        _model.Root.Manager.ShowAutoHideWindow( this );
+        _model.IsSelected = false;
+      }
+    }
+
+    void _model_IsActiveChanged( object sender, EventArgs e )
+    {
+      if( !_model.IsAutoHidden )
+        _model.IsActiveChanged -= new EventHandler( _model_IsActiveChanged );
+      else if( _model.IsActive )
+        _model.Root.Manager.ShowAutoHideWindow( this );
+    }
+
+    LayoutAnchorable _model;
+
+    public ILayoutElement Model
+    {
+      get
+      {
+        return _model;
+      }
+    }
+
+    //protected override void OnVisualParentChanged(DependencyObject oldParent)
+    //{
+    //    base.OnVisualParentChanged(oldParent);
+
+    //    var contentModel = _model;
+
+    //    if (oldParent != null && contentModel != null && contentModel.Content is UIElement)
+    //    {
+    //        var oldParentPaneControl = oldParent.FindVisualAncestor<LayoutAnchorablePaneControl>();
+    //        if (oldParentPaneControl != null)
+    //        {
+    //            ((ILogicalChildrenContainer)oldParentPaneControl).InternalRemoveLogicalChild(contentModel.Content);
+    //        }
+    //    }
+
+    //    if (contentModel.Content != null && contentModel.Content is UIElement)
+    //    {
+    //        var oldLogicalParentPaneControl = LogicalTreeHelper.GetParent(contentModel.Content as UIElement)
+    //            as ILogicalChildrenContainer;
+    //        if (oldLogicalParentPaneControl != null)
+    //            oldLogicalParentPaneControl.InternalRemoveLogicalChild(contentModel.Content);
+    //    }
+
+    //    if (contentModel != null && contentModel.Content != null && contentModel.Root != null && contentModel.Content is UIElement)
+    //    {
+    //        ((ILogicalChildrenContainer)contentModel.Root.Manager).InternalAddLogicalChild(contentModel.Content);
+    //    }
+    //}
+
+
+    protected override void OnMouseDown( System.Windows.Input.MouseButtonEventArgs e )
+    {
+      base.OnMouseDown( e );
+
+      if( !e.Handled )
+      {
+        _model.Root.Manager.ShowAutoHideWindow( this );
+        _model.IsActive = true;
+      }
+    }
 
 
+    DispatcherTimer _openUpTimer = null;
+
+    protected override void OnMouseEnter( System.Windows.Input.MouseEventArgs e )
+    {
+      base.OnMouseEnter( e );
+
+      if( !e.Handled )
+      {
+        _openUpTimer = new DispatcherTimer( DispatcherPriority.ApplicationIdle );
+        _openUpTimer.Interval = TimeSpan.FromMilliseconds( 400 );
+        _openUpTimer.Tick += new EventHandler( _openUpTimer_Tick );
+        _openUpTimer.Start();
+      }
+    }
+
+    void _openUpTimer_Tick( object sender, EventArgs e )
+    {
+      _openUpTimer.Tick -= new EventHandler( _openUpTimer_Tick );
+      _openUpTimer.Stop();
+      _openUpTimer = null;
+      _model.Root.Manager.ShowAutoHideWindow( this );
+    }
+
+    protected override void OnMouseLeave( System.Windows.Input.MouseEventArgs e )
+    {
+      if( _openUpTimer != null )
+      {
+        _openUpTimer.Tick -= new EventHandler( _openUpTimer_Tick );
+        _openUpTimer.Stop();
+        _openUpTimer = null;
+      }
+      base.OnMouseLeave( e );
+    }
+
+
+    #region Side
+
+    /// <summary>
+    /// Side Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey SidePropertyKey
+        = DependencyProperty.RegisterReadOnly( "Side", typeof( AnchorSide ), typeof( LayoutAnchorControl ),
+            new FrameworkPropertyMetadata( ( AnchorSide )AnchorSide.Left ) );
+
+    public static readonly DependencyProperty SideProperty
+        = SidePropertyKey.DependencyProperty;
+
+    /// <summary>
+    /// Gets the Side property.  This dependency property 
+    /// indicates the anchor side of the control.
+    /// </summary>
+    public AnchorSide Side
+    {
+      get
+      {
+        return ( AnchorSide )GetValue( SideProperty );
+      }
     }
+
+    /// <summary>
+    /// Provides a secure method for setting the Side property.  
+    /// This dependency property indicates the anchor side of the control.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetSide( AnchorSide value )
+    {
+      SetValue( SidePropertyKey, value );
+    }
+
+    #endregion
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
index 3a3b4f2b..5a0c6e8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
@@ -15,9 +15,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using System.Collections.ObjectModel;
@@ -25,228 +23,245 @@ using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class LayoutAnchorSideControl : Control, ILayoutControl
+  public class LayoutAnchorSideControl : Control, ILayoutControl
+  {
+    static LayoutAnchorSideControl()
     {
-        static LayoutAnchorSideControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorSideControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorSideControl)));
-        }
-
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorSideControl ), new FrameworkPropertyMetadata( typeof( LayoutAnchorSideControl ) ) );
+    }
 
-        internal LayoutAnchorSideControl(LayoutAnchorSide model)
-        {
-            if (model == null)
-                throw new ArgumentNullException("model");
 
+    internal LayoutAnchorSideControl( LayoutAnchorSide model )
+    {
+      if( model == null )
+        throw new ArgumentNullException( "model" );
 
-            _model = model;
 
-            CreateChildrenViews();
+      _model = model;
 
-            _model.Children.CollectionChanged += (s, e) => OnModelChildrenCollectionChanged(e);
+      CreateChildrenViews();
 
-            UpdateSide();
-        }
+      _model.Children.CollectionChanged += ( s, e ) => OnModelChildrenCollectionChanged( e );
 
-        private void CreateChildrenViews()
-        {
-            var manager = _model.Root.Manager;
-            foreach (var childModel in _model.Children)
-            {
-                _childViews.Add(manager.CreateUIElementForModel(childModel) as LayoutAnchorGroupControl);
-            }
-        }
+      UpdateSide();
+    }
 
-        private void OnModelChildrenCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (e.OldItems != null && 
-                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove || 
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                foreach (var childModel in e.OldItems)
-                    _childViews.Remove(_childViews.First(cv => cv.Model == childModel));
-            }
-
-            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
-                _childViews.Clear();
-
-            if (e.NewItems != null &&
-                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                var manager = _model.Root.Manager;
-                int insertIndex = e.NewStartingIndex;
-                foreach (LayoutAnchorGroup childModel in e.NewItems)
-                {
-                    _childViews.Insert(insertIndex++, manager.CreateUIElementForModel(childModel) as LayoutAnchorGroupControl);
-                }
-            }
-        }
+    private void CreateChildrenViews()
+    {
+      var manager = _model.Root.Manager;
+      foreach( var childModel in _model.Children )
+      {
+        _childViews.Add( manager.CreateUIElementForModel( childModel ) as LayoutAnchorGroupControl );
+      }
+    }
 
-        LayoutAnchorSide _model = null;
-        public ILayoutElement Model
+    private void OnModelChildrenCollectionChanged( System.Collections.Specialized.NotifyCollectionChangedEventArgs e )
+    {
+      if( e.OldItems != null &&
+          ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        foreach( var childModel in e.OldItems )
+          _childViews.Remove( _childViews.First( cv => cv.Model == childModel ) );
+      }
+
+      if( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Reset )
+        _childViews.Clear();
+
+      if( e.NewItems != null &&
+          ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        var manager = _model.Root.Manager;
+        int insertIndex = e.NewStartingIndex;
+        foreach( LayoutAnchorGroup childModel in e.NewItems )
         {
-            get { return _model; }
+          _childViews.Insert( insertIndex++, manager.CreateUIElementForModel( childModel ) as LayoutAnchorGroupControl );
         }
+      }
+    }
 
-        ObservableCollection<LayoutAnchorGroupControl> _childViews = new ObservableCollection<LayoutAnchorGroupControl>();
+    LayoutAnchorSide _model = null;
+    public ILayoutElement Model
+    {
+      get
+      {
+        return _model;
+      }
+    }
 
-        public ObservableCollection<LayoutAnchorGroupControl> Children
-        {
-            get { return _childViews; }
-        }
+    ObservableCollection<LayoutAnchorGroupControl> _childViews = new ObservableCollection<LayoutAnchorGroupControl>();
 
-        void UpdateSide()
-        {
-            switch (_model.Side)
-            {
-                case AnchorSide.Left:
-                    SetIsLeftSide(true);
-                    break;
-                case AnchorSide.Top:
-                    SetIsTopSide(true);
-                    break;
-                case AnchorSide.Right:
-                    SetIsRightSide(true);
-                    break;
-                case AnchorSide.Bottom:
-                    SetIsBottomSide(true);
-                    break;
-            }
-        }
+    public ObservableCollection<LayoutAnchorGroupControl> Children
+    {
+      get
+      {
+        return _childViews;
+      }
+    }
 
-        #region IsLeftSide
+    void UpdateSide()
+    {
+      switch( _model.Side )
+      {
+        case AnchorSide.Left:
+          SetIsLeftSide( true );
+          break;
+        case AnchorSide.Top:
+          SetIsTopSide( true );
+          break;
+        case AnchorSide.Right:
+          SetIsRightSide( true );
+          break;
+        case AnchorSide.Bottom:
+          SetIsBottomSide( true );
+          break;
+      }
+    }
 
-        /// <summary>
-        /// IsLeftSide Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey IsLeftSidePropertyKey
-            = DependencyProperty.RegisterReadOnly("IsLeftSide", typeof(bool), typeof(LayoutAnchorSideControl),
-                new FrameworkPropertyMetadata((bool)false));
+    #region IsLeftSide
 
-        public static readonly DependencyProperty IsLeftSideProperty
-            = IsLeftSidePropertyKey.DependencyProperty;
+    /// <summary>
+    /// IsLeftSide Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey IsLeftSidePropertyKey
+        = DependencyProperty.RegisterReadOnly( "IsLeftSide", typeof( bool ), typeof( LayoutAnchorSideControl ),
+            new FrameworkPropertyMetadata( ( bool )false ) );
 
-        /// <summary>
-        /// Gets the IsLeftSide property.  This dependency property 
-        /// indicates this control is anchored to left side.
-        /// </summary>
-        public bool IsLeftSide
-        {
-            get { return (bool)GetValue(IsLeftSideProperty); }
-        }
+    public static readonly DependencyProperty IsLeftSideProperty
+        = IsLeftSidePropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Provides a secure method for setting the IsLeftSide property.  
-        /// This dependency property indicates this control is anchored to left side.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetIsLeftSide(bool value)
-        {
-            SetValue(IsLeftSidePropertyKey, value);
-        }
+    /// <summary>
+    /// Gets the IsLeftSide property.  This dependency property 
+    /// indicates this control is anchored to left side.
+    /// </summary>
+    public bool IsLeftSide
+    {
+      get
+      {
+        return ( bool )GetValue( IsLeftSideProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the IsLeftSide property.  
+    /// This dependency property indicates this control is anchored to left side.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetIsLeftSide( bool value )
+    {
+      SetValue( IsLeftSidePropertyKey, value );
+    }
 
-        #region IsTopSide
+    #endregion
 
-        /// <summary>
-        /// IsTopSide Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey IsTopSidePropertyKey
-            = DependencyProperty.RegisterReadOnly("IsTopSide", typeof(bool), typeof(LayoutAnchorSideControl),
-                new FrameworkPropertyMetadata((bool)false));
+    #region IsTopSide
 
-        public static readonly DependencyProperty IsTopSideProperty
-            = IsTopSidePropertyKey.DependencyProperty;
+    /// <summary>
+    /// IsTopSide Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey IsTopSidePropertyKey
+        = DependencyProperty.RegisterReadOnly( "IsTopSide", typeof( bool ), typeof( LayoutAnchorSideControl ),
+            new FrameworkPropertyMetadata( ( bool )false ) );
 
-        /// <summary>
-        /// Gets the IsTopSide property.  This dependency property 
-        /// indicates this control is anchored to top side.
-        /// </summary>
-        public bool IsTopSide
-        {
-            get { return (bool)GetValue(IsTopSideProperty); }
-        }
+    public static readonly DependencyProperty IsTopSideProperty
+        = IsTopSidePropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Provides a secure method for setting the IsTopSide property.  
-        /// This dependency property indicates this control is anchored to top side.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetIsTopSide(bool value)
-        {
-            SetValue(IsTopSidePropertyKey, value);
-        }
+    /// <summary>
+    /// Gets the IsTopSide property.  This dependency property 
+    /// indicates this control is anchored to top side.
+    /// </summary>
+    public bool IsTopSide
+    {
+      get
+      {
+        return ( bool )GetValue( IsTopSideProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the IsTopSide property.  
+    /// This dependency property indicates this control is anchored to top side.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetIsTopSide( bool value )
+    {
+      SetValue( IsTopSidePropertyKey, value );
+    }
 
-        #region IsRightSide
+    #endregion
 
-        /// <summary>
-        /// IsRightSide Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey IsRightSidePropertyKey
-            = DependencyProperty.RegisterReadOnly("IsRightSide", typeof(bool), typeof(LayoutAnchorSideControl),
-                new FrameworkPropertyMetadata((bool)false));
+    #region IsRightSide
 
-        public static readonly DependencyProperty IsRightSideProperty
-            = IsRightSidePropertyKey.DependencyProperty;
+    /// <summary>
+    /// IsRightSide Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey IsRightSidePropertyKey
+        = DependencyProperty.RegisterReadOnly( "IsRightSide", typeof( bool ), typeof( LayoutAnchorSideControl ),
+            new FrameworkPropertyMetadata( ( bool )false ) );
 
-        /// <summary>
-        /// Gets the IsRightSide property.  This dependency property 
-        /// indicates this control is anchored to right side.
-        /// </summary>
-        public bool IsRightSide
-        {
-            get { return (bool)GetValue(IsRightSideProperty); }
-        }
+    public static readonly DependencyProperty IsRightSideProperty
+        = IsRightSidePropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Provides a secure method for setting the IsRightSide property.  
-        /// This dependency property indicates this control is anchored to right side.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetIsRightSide(bool value)
-        {
-            SetValue(IsRightSidePropertyKey, value);
-        }
+    /// <summary>
+    /// Gets the IsRightSide property.  This dependency property 
+    /// indicates this control is anchored to right side.
+    /// </summary>
+    public bool IsRightSide
+    {
+      get
+      {
+        return ( bool )GetValue( IsRightSideProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the IsRightSide property.  
+    /// This dependency property indicates this control is anchored to right side.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetIsRightSide( bool value )
+    {
+      SetValue( IsRightSidePropertyKey, value );
+    }
 
-        #region IsBottomSide
+    #endregion
 
-        /// <summary>
-        /// IsBottomSide Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey IsBottomSidePropertyKey
-            = DependencyProperty.RegisterReadOnly("IsBottomSide", typeof(bool), typeof(LayoutAnchorSideControl),
-                new FrameworkPropertyMetadata((bool)false));
+    #region IsBottomSide
 
-        public static readonly DependencyProperty IsBottomSideProperty
-            = IsBottomSidePropertyKey.DependencyProperty;
+    /// <summary>
+    /// IsBottomSide Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey IsBottomSidePropertyKey
+        = DependencyProperty.RegisterReadOnly( "IsBottomSide", typeof( bool ), typeof( LayoutAnchorSideControl ),
+            new FrameworkPropertyMetadata( ( bool )false ) );
 
-        /// <summary>
-        /// Gets the IsBottomSide property.  This dependency property 
-        /// indicates if this panel is anchored to bottom side.
-        /// </summary>
-        public bool IsBottomSide
-        {
-            get { return (bool)GetValue(IsBottomSideProperty); }
-        }
+    public static readonly DependencyProperty IsBottomSideProperty
+        = IsBottomSidePropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Provides a secure method for setting the IsBottomSide property.  
-        /// This dependency property indicates if this panel is anchored to bottom side.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetIsBottomSide(bool value)
-        {
-            SetValue(IsBottomSidePropertyKey, value);
-        }
+    /// <summary>
+    /// Gets the IsBottomSide property.  This dependency property 
+    /// indicates if this panel is anchored to bottom side.
+    /// </summary>
+    public bool IsBottomSide
+    {
+      get
+      {
+        return ( bool )GetValue( IsBottomSideProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the IsBottomSide property.  
+    /// This dependency property indicates if this panel is anchored to bottom side.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetIsBottomSide( bool value )
+    {
+      SetValue( IsBottomSidePropertyKey, value );
+    }
 
+    #endregion
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
index 4e616266..f4bd9a32 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
@@ -14,147 +14,144 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class LayoutAnchorableControl : Control
+  public class LayoutAnchorableControl : Control
+  {
+    static LayoutAnchorableControl()
     {
-        static LayoutAnchorableControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorableControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorableControl)));
-            FocusableProperty.OverrideMetadata(typeof(LayoutAnchorableControl), new FrameworkPropertyMetadata(false));
-        }
-
-        public LayoutAnchorableControl()
-        {
-            //SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
-        }
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorableControl ), new FrameworkPropertyMetadata( typeof( LayoutAnchorableControl ) ) );
+      FocusableProperty.OverrideMetadata( typeof( LayoutAnchorableControl ), new FrameworkPropertyMetadata( false ) );
+    }
 
+    public LayoutAnchorableControl()
+    {
+      //SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+    }
 
-        #region Model
 
-        /// <summary>
-        /// Model Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ModelProperty =
-            DependencyProperty.Register("Model", typeof(LayoutAnchorable), typeof(LayoutAnchorableControl),
-                new FrameworkPropertyMetadata((LayoutAnchorable)null,
-                    new PropertyChangedCallback(OnModelChanged)));
+    #region Model
 
-        /// <summary>
-        /// Gets or sets the Model property.  This dependency property 
-        /// indicates the model attached to this view.
-        /// </summary>
-        public LayoutAnchorable Model
-        {
-            get { return (LayoutAnchorable)GetValue(ModelProperty); }
-            set { SetValue(ModelProperty, value); }
-        }
+    /// <summary>
+    /// Model Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ModelProperty =
+        DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorable )null,
+                new PropertyChangedCallback( OnModelChanged ) ) );
 
-        /// <summary>
-        /// Handles changes to the Model property.
-        /// </summary>
-        private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutAnchorableControl)d).OnModelChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the Model property.  This dependency property 
+    /// indicates the model attached to this view.
+    /// </summary>
+    public LayoutAnchorable Model
+    {
+      get
+      {
+        return ( LayoutAnchorable )GetValue( ModelProperty );
+      }
+      set
+      {
+        SetValue( ModelProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the Model property.
-        /// </summary>
-        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
-        {
-          if( e.OldValue != null )
-          {
-            ((LayoutContent)e.OldValue).PropertyChanged -= Model_PropertyChanged;
-          }
+    /// <summary>
+    /// Handles changes to the Model property.
+    /// </summary>
+    private static void OnModelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutAnchorableControl )d ).OnModelChanged( e );
+    }
 
-          if( Model != null )
-          {
-            Model.PropertyChanged += Model_PropertyChanged;
-            SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) );
-          }
-          else
-            SetLayoutItem( null );
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the Model property.
+    /// </summary>
+    protected virtual void OnModelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+      {
+        ( ( LayoutContent )e.OldValue ).PropertyChanged -= Model_PropertyChanged;
+      }
+
+      if( Model != null )
+      {
+        Model.PropertyChanged += Model_PropertyChanged;
+        SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) );
+      }
+      else
+        SetLayoutItem( null );
+    }
 
-        private void Model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
+    private void Model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
+    {
+      if( e.PropertyName == "IsEnabled" )
+      {
+        if( Model != null )
         {
-          if( e.PropertyName == "IsEnabled" )
+          IsEnabled = Model.IsEnabled;
+          if( !IsEnabled && Model.IsActive )
           {
-            if( Model != null )
+            if( ( Model.Parent != null ) && ( Model.Parent is LayoutAnchorablePane ) )
             {
-              IsEnabled = Model.IsEnabled;
-              if( !IsEnabled && Model.IsActive )
-              {
-                if( (Model.Parent != null) && (Model.Parent is LayoutAnchorablePane) )
-                {
-                  ((LayoutAnchorablePane)Model.Parent).SetNextSelectedIndex();
-                }
-              }
+              ( ( LayoutAnchorablePane )Model.Parent ).SetNextSelectedIndex();
             }
           }
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region LayoutItem
+    #region LayoutItem
 
-        /// <summary>
-        /// LayoutItem Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey LayoutItemPropertyKey
-            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutAnchorableControl),
-                new FrameworkPropertyMetadata((LayoutItem)null));
+    /// <summary>
+    /// LayoutItem Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey LayoutItemPropertyKey
+        = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( LayoutAnchorableControl ),
+            new FrameworkPropertyMetadata( ( LayoutItem )null ) );
 
-        public static readonly DependencyProperty LayoutItemProperty
-            = LayoutItemPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty LayoutItemProperty
+        = LayoutItemPropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Gets the LayoutItem property.  This dependency property 
-        /// indicates the LayoutItem attached to this tag item.
-        /// </summary>
-        public LayoutItem LayoutItem
-        {
-            get { return (LayoutItem)GetValue(LayoutItemProperty); }
-        }
-
-        /// <summary>
-        /// Provides a secure method for setting the LayoutItem property.  
-        /// This dependency property indicates the LayoutItem attached to this tag item.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetLayoutItem(LayoutItem value)
-        {
-            SetValue(LayoutItemPropertyKey, value);
-        }
+    /// <summary>
+    /// Gets the LayoutItem property.  This dependency property 
+    /// indicates the LayoutItem attached to this tag item.
+    /// </summary>
+    public LayoutItem LayoutItem
+    {
+      get
+      {
+        return ( LayoutItem )GetValue( LayoutItemProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the LayoutItem property.  
+    /// This dependency property indicates the LayoutItem attached to this tag item.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetLayoutItem( LayoutItem value )
+    {
+      SetValue( LayoutItemPropertyKey, value );
+    }
 
+    #endregion
 
-        protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
-        {
-            if (Model != null)
-                Model.IsActive = true;
 
-            base.OnGotKeyboardFocus(e);
-        }
+    protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
+    {
+      if( Model != null )
+        Model.IsActive = true;
 
+      base.OnGotKeyboardFocus( e );
+    }
 
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
index 4dee8d5c..a6746b40 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -47,6 +47,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       _model = model;
       HideWindowCommand = new RelayCommand( ( p ) => OnExecuteHideWindowCommand( p ), ( p ) => CanExecuteHideWindowCommand( p ) );
+      CloseWindowCommand = new RelayCommand( ( p ) => OnExecuteCloseWindowCommand( p ), ( p ) => CanExecuteCloseWindowCommand( p ) );
       UpdateThemeResources();
     }
 
@@ -362,5 +363,60 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
     }
     #endregion
+
+    #region CloseWindowCommand
+    public ICommand CloseWindowCommand
+    {
+      get;
+      private set;
+    }
+
+    private bool CanExecuteCloseWindowCommand( object parameter )
+    {
+      if( Model == null )
+        return false;
+
+      var root = Model.Root;
+      if( root == null )
+        return false;
+
+      var manager = root.Manager;
+      if( manager == null )
+        return false;
+
+      bool canExecute = false;
+      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
+      {
+        if( !anchorable.CanClose )
+        {
+          canExecute = false;
+          break;
+        }
+
+        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
+        if( anchorableLayoutItem == null ||
+            anchorableLayoutItem.CloseCommand == null ||
+            !anchorableLayoutItem.CloseCommand.CanExecute( parameter ) )
+        {
+          canExecute = false;
+          break;
+        }
+
+        canExecute = true;
+      }
+
+      return canExecute;
+    }
+
+    private void OnExecuteCloseWindowCommand( object parameter )
+    {
+      var manager = Model.Root.Manager;
+      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
+      {
+        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
+        anchorableLayoutItem.CloseCommand.Execute( parameter );
+      }
+    }
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
index 048554c0..651a6592 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -15,10 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Data;
@@ -94,5 +90,4 @@ namespace Xceed.Wpf.AvalonDock.Controls
     }
 
   }
-
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
index 5310d66f..f2216a90 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
@@ -15,9 +15,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Interop;
 using System.Windows.Controls;
 using System.Runtime.InteropServices;
@@ -26,527 +24,542 @@ using System.Windows.Input;
 using System.Windows.Data;
 using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
-using System.Diagnostics;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
+  public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
+  {
+    static LayoutAutoHideWindowControl()
     {
-        static LayoutAutoHideWindowControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(typeof(LayoutAutoHideWindowControl)));
-            UIElement.FocusableProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(true));
-            Control.IsTabStopProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(true));
-            VisibilityProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(Visibility.Hidden));
-        }
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAutoHideWindowControl ), new FrameworkPropertyMetadata( typeof( LayoutAutoHideWindowControl ) ) );
+      UIElement.FocusableProperty.OverrideMetadata( typeof( LayoutAutoHideWindowControl ), new FrameworkPropertyMetadata( true ) );
+      Control.IsTabStopProperty.OverrideMetadata( typeof( LayoutAutoHideWindowControl ), new FrameworkPropertyMetadata( true ) );
+      VisibilityProperty.OverrideMetadata( typeof( LayoutAutoHideWindowControl ), new FrameworkPropertyMetadata( Visibility.Hidden ) );
+    }
 
-        internal LayoutAutoHideWindowControl()
-        {
-        }
+    internal LayoutAutoHideWindowControl()
+    {
+    }
 
-        internal void Show(LayoutAnchorControl anchor)
-        {
-            if (_model != null)
-                throw new InvalidOperationException();
+    internal void Show( LayoutAnchorControl anchor )
+    {
+      if( _model != null )
+        throw new InvalidOperationException();
 
-            _anchor = anchor;
-            _model = anchor.Model as LayoutAnchorable;
-            _side = (anchor.Model.Parent.Parent as LayoutAnchorSide).Side;
-            _manager = _model.Root.Manager;
-            CreateInternalGrid();
+      _anchor = anchor;
+      _model = anchor.Model as LayoutAnchorable;
+      _side = ( anchor.Model.Parent.Parent as LayoutAnchorSide ).Side;
+      _manager = _model.Root.Manager;
+      CreateInternalGrid();
 
-            _model.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+      _model.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );
 
-            Visibility = System.Windows.Visibility.Visible;
-            InvalidateMeasure();
-            UpdateWindowPos();
-        }
+      Visibility = System.Windows.Visibility.Visible;
+      InvalidateMeasure();
+      UpdateWindowPos();
+    }
 
-        internal void Hide()
-        {
-            if (_model == null)
-                return;
+    internal void Hide()
+    {
+      if( _model == null )
+        return;
 
-            _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+      _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );
 
-            RemoveInternalGrid();
-            _anchor = null;
-            _model = null;
-            _manager = null;
-            Visibility = System.Windows.Visibility.Hidden;
-        }
+      RemoveInternalGrid();
+      _anchor = null;
+      _model = null;
+      _manager = null;
+      Visibility = System.Windows.Visibility.Hidden;
+    }
 
-        LayoutAnchorControl _anchor;
+    LayoutAnchorControl _anchor;
 
-        LayoutAnchorable _model;
+    LayoutAnchorable _model;
 
-        public ILayoutElement Model
-        {
-            get { return _model; }
-        }
+    public ILayoutElement Model
+    {
+      get
+      {
+        return _model;
+      }
+    }
 
-        HwndSource _internalHwndSource = null;
-        IntPtr parentWindowHandle;
-        protected override System.Runtime.InteropServices.HandleRef BuildWindowCore(System.Runtime.InteropServices.HandleRef hwndParent)
-        {
-            parentWindowHandle = hwndParent.Handle;
-            _internalHwndSource = new HwndSource(new HwndSourceParameters()
-            {
-                ParentWindow = hwndParent.Handle,
-                WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
-                Width = 0,
-                Height = 0,
-            });
-
-            //_internalHost_ContentRendered = false;
-            _internalHwndSource.ContentRendered += _internalHwndSource_ContentRendered;
-            _internalHwndSource.RootVisual = _internalHostPresenter;
-            AddLogicalChild(_internalHostPresenter);
-            Win32Helper.BringWindowToTop(_internalHwndSource.Handle);
-            return new HandleRef(this, _internalHwndSource.Handle);
-        }
+    HwndSource _internalHwndSource = null;
+    IntPtr parentWindowHandle;
+    protected override System.Runtime.InteropServices.HandleRef BuildWindowCore( System.Runtime.InteropServices.HandleRef hwndParent )
+    {
+      parentWindowHandle = hwndParent.Handle;
+      _internalHwndSource = new HwndSource( new HwndSourceParameters()
+      {
+        ParentWindow = hwndParent.Handle,
+        WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
+        Width = 0,
+        Height = 0,
+      } );
+
+      _internalHost_ContentRendered = false;
+      _internalHwndSource.ContentRendered += _internalHwndSource_ContentRendered;
+      _internalHwndSource.RootVisual = _internalHostPresenter;
+      AddLogicalChild( _internalHostPresenter );
+      Win32Helper.BringWindowToTop( _internalHwndSource.Handle );
+      return new HandleRef( this, _internalHwndSource.Handle );
+    }
 
-      //  private bool _internalHost_ContentRendered = false;
+    private bool _internalHost_ContentRendered = false;
 
-        void _internalHwndSource_ContentRendered(object sender, EventArgs e)
-        {
-        //    _internalHost_ContentRendered = true;
-        }
+    void _internalHwndSource_ContentRendered( object sender, EventArgs e )
+    {
+      _internalHost_ContentRendered = true;
+    }
 
 
-        //protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        //{
-        //    if (msg == Win32Helper.WM_WINDOWPOSCHANGING)
-        //    {
-        //        if (_internalHost_ContentRendered)
-        //            Win32Helper.SetWindowPos(_internalHwndSource.Handle, Win32Helper.HWND_TOP, 0, 0, 0, 0, Win32Helper.SetWindowPosFlags.IgnoreMove | Win32Helper.SetWindowPosFlags.IgnoreResize);
-        //    }
-        //    return base.WndProc(hwnd, msg, wParam, lParam, ref handled);
-        //}
+    protected override IntPtr WndProc( IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled )
+    {
+      if( msg == Win32Helper.WM_WINDOWPOSCHANGING )
+      {
+        if( _internalHost_ContentRendered )
+          Win32Helper.SetWindowPos( _internalHwndSource.Handle, Win32Helper.HWND_TOP, 0, 0, 0, 0, Win32Helper.SetWindowPosFlags.IgnoreMove | Win32Helper.SetWindowPosFlags.IgnoreResize );
+      }
+      return base.WndProc( hwnd, msg, wParam, lParam, ref handled );
+    }
 
-        protected override void DestroyWindowCore(System.Runtime.InteropServices.HandleRef hwnd)
-        {
-            if (_internalHwndSource != null)
-            {
-                _internalHwndSource.ContentRendered -= _internalHwndSource_ContentRendered;
-                _internalHwndSource.Dispose();
-                _internalHwndSource = null;
-            }
-        }
+    protected override void DestroyWindowCore( System.Runtime.InteropServices.HandleRef hwnd )
+    {
+      if( _internalHwndSource != null )
+      {
+        _internalHwndSource.ContentRendered -= _internalHwndSource_ContentRendered;
+        _internalHwndSource.Dispose();
+        _internalHwndSource = null;
+      }
+    }
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
 
-        }
+    }
 
-        ContentPresenter _internalHostPresenter = new ContentPresenter();
-        Grid _internalGrid = null;
-        LayoutAnchorableControl _internalHost = null;
-        AnchorSide _side;
-        LayoutGridResizerControl _resizer = null;
-        DockingManager _manager;
+    ContentPresenter _internalHostPresenter = new ContentPresenter();
+    Grid _internalGrid = null;
+    internal LayoutAnchorableControl _internalHost = null;
+    AnchorSide _side;
+    LayoutGridResizerControl _resizer = null;
+    DockingManager _manager;
 
-        void _model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    void _model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
+    {
+      if( e.PropertyName == "IsAutoHidden" )
+      {
+        if( !_model.IsAutoHidden )
         {
-            if (e.PropertyName == "IsAutoHidden")
-            {
-                if (!_model.IsAutoHidden)
-                {
-                    _manager.HideAutoHideWindow(_anchor);
-                }
-            }
+          _manager.HideAutoHideWindow( _anchor );
         }
+      }
+    }
 
-        void CreateInternalGrid()
-        {
-            _internalGrid = new Grid() { FlowDirection = System.Windows.FlowDirection.LeftToRight};
-            _internalGrid.SetBinding(Grid.BackgroundProperty, new Binding("Background") { Source = this });
+    void CreateInternalGrid()
+    {
+      _internalGrid = new Grid() { FlowDirection = System.Windows.FlowDirection.LeftToRight };
+      _internalGrid.SetBinding( Grid.BackgroundProperty, new Binding( "Background" ) { Source = this } );
 
 
-            _internalHost = new LayoutAnchorableControl() { Model = _model, Style = AnchorableStyle };
-            _internalHost.SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+      _internalHost = new LayoutAnchorableControl() { Model = _model, Style = AnchorableStyle };
+      _internalHost.SetBinding( FlowDirectionProperty, new Binding( "Model.Root.Manager.FlowDirection" ) { Source = this } );
 
-            KeyboardNavigation.SetTabNavigation(_internalGrid, KeyboardNavigationMode.Cycle);
+      KeyboardNavigation.SetTabNavigation( _internalGrid, KeyboardNavigationMode.Cycle );
 
-            _resizer = new LayoutGridResizerControl();
+      _resizer = new LayoutGridResizerControl();
 
-            _resizer.DragStarted += new System.Windows.Controls.Primitives.DragStartedEventHandler(OnResizerDragStarted);
-            _resizer.DragDelta += new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnResizerDragDelta);
-            _resizer.DragCompleted += new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnResizerDragCompleted);
+      _resizer.DragStarted += new System.Windows.Controls.Primitives.DragStartedEventHandler( OnResizerDragStarted );
+      _resizer.DragDelta += new System.Windows.Controls.Primitives.DragDeltaEventHandler( OnResizerDragDelta );
+      _resizer.DragCompleted += new System.Windows.Controls.Primitives.DragCompletedEventHandler( OnResizerDragCompleted );
 
-            if (_side == AnchorSide.Right)
-            {
-                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition(){ Width = new GridLength(_manager.GridSplitterWidth)});
-                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition(){
-                    Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel)});
+      if( _side == AnchorSide.Right )
+      {
+        _internalGrid.ColumnDefinitions.Add( new ColumnDefinition() { Width = new GridLength( _manager.GridSplitterWidth ) } );
+        _internalGrid.ColumnDefinitions.Add( new ColumnDefinition()
+        {
+          Width = _model.AutoHideWidth == 0.0 ? new GridLength( _model.AutoHideMinWidth ) : new GridLength( _model.AutoHideWidth, GridUnitType.Pixel )
+        } );
 
-                Grid.SetColumn(_resizer, 0);
-                Grid.SetColumn(_internalHost, 1);
+        Grid.SetColumn( _resizer, 0 );
+        Grid.SetColumn( _internalHost, 1 );
 
-                _resizer.Cursor = Cursors.SizeWE;
+        _resizer.Cursor = Cursors.SizeWE;
 
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Right;
-                VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
-            }
-            else if (_side == AnchorSide.Left)
-            {
-                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition()
-                {
-                    Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel),
-                });
-                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(_manager.GridSplitterWidth) });
+        HorizontalAlignment = System.Windows.HorizontalAlignment.Right;
+        VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
+      }
+      else if( _side == AnchorSide.Left )
+      {
+        _internalGrid.ColumnDefinitions.Add( new ColumnDefinition()
+        {
+          Width = _model.AutoHideWidth == 0.0 ? new GridLength( _model.AutoHideMinWidth ) : new GridLength( _model.AutoHideWidth, GridUnitType.Pixel ),
+        } );
+        _internalGrid.ColumnDefinitions.Add( new ColumnDefinition() { Width = new GridLength( _manager.GridSplitterWidth ) } );
 
-                Grid.SetColumn(_internalHost, 0);
-                Grid.SetColumn(_resizer, 1);
+        Grid.SetColumn( _internalHost, 0 );
+        Grid.SetColumn( _resizer, 1 );
 
-                _resizer.Cursor = Cursors.SizeWE;
+        _resizer.Cursor = Cursors.SizeWE;
 
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Left;
-                VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
-            }
-            else if (_side == AnchorSide.Top)
-            {
-                _internalGrid.RowDefinitions.Add(new RowDefinition()
-                {
-                    Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),
-                });
-                _internalGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(_manager.GridSplitterHeight) });
+        HorizontalAlignment = System.Windows.HorizontalAlignment.Left;
+        VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
+      }
+      else if( _side == AnchorSide.Top )
+      {
+        _internalGrid.RowDefinitions.Add( new RowDefinition()
+        {
+          Height = _model.AutoHideHeight == 0.0 ? new GridLength( _model.AutoHideMinHeight ) : new GridLength( _model.AutoHideHeight, GridUnitType.Pixel ),
+        } );
+        _internalGrid.RowDefinitions.Add( new RowDefinition() { Height = new GridLength( _manager.GridSplitterHeight ) } );
 
-                Grid.SetRow(_internalHost, 0);
-                Grid.SetRow(_resizer, 1);
+        Grid.SetRow( _internalHost, 0 );
+        Grid.SetRow( _resizer, 1 );
 
-                _resizer.Cursor = Cursors.SizeNS;
+        _resizer.Cursor = Cursors.SizeNS;
 
-                VerticalAlignment = System.Windows.VerticalAlignment.Top;
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+        VerticalAlignment = System.Windows.VerticalAlignment.Top;
+        HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
 
-            }
-            else if (_side == AnchorSide.Bottom)
-            {
-                _internalGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(_manager.GridSplitterHeight) });
-                _internalGrid.RowDefinitions.Add(new RowDefinition()
-                {
-                    Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),
-                });
+      }
+      else if( _side == AnchorSide.Bottom )
+      {
+        _internalGrid.RowDefinitions.Add( new RowDefinition() { Height = new GridLength( _manager.GridSplitterHeight ) } );
+        _internalGrid.RowDefinitions.Add( new RowDefinition()
+        {
+          Height = _model.AutoHideHeight == 0.0 ? new GridLength( _model.AutoHideMinHeight ) : new GridLength( _model.AutoHideHeight, GridUnitType.Pixel ),
+        } );
 
-                Grid.SetRow(_resizer, 0);
-                Grid.SetRow(_internalHost, 1);
+        Grid.SetRow( _resizer, 0 );
+        Grid.SetRow( _internalHost, 1 );
 
-                _resizer.Cursor = Cursors.SizeNS;
+        _resizer.Cursor = Cursors.SizeNS;
 
-                VerticalAlignment = System.Windows.VerticalAlignment.Bottom;
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
-            }
+        VerticalAlignment = System.Windows.VerticalAlignment.Bottom;
+        HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+      }
 
 
-            _internalGrid.Children.Add(_resizer);
-            _internalGrid.Children.Add(_internalHost);
-            _internalHostPresenter.Content = _internalGrid;
-        }
+      _internalGrid.Children.Add( _resizer );
+      _internalGrid.Children.Add( _internalHost );
+      _internalHostPresenter.Content = _internalGrid;
+    }
 
-        void RemoveInternalGrid()
-        {
-            _resizer.DragStarted -= new System.Windows.Controls.Primitives.DragStartedEventHandler(OnResizerDragStarted);
-            _resizer.DragDelta -= new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnResizerDragDelta);
-            _resizer.DragCompleted -= new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnResizerDragCompleted);
+    void RemoveInternalGrid()
+    {
+      _resizer.DragStarted -= new System.Windows.Controls.Primitives.DragStartedEventHandler( OnResizerDragStarted );
+      _resizer.DragDelta -= new System.Windows.Controls.Primitives.DragDeltaEventHandler( OnResizerDragDelta );
+      _resizer.DragCompleted -= new System.Windows.Controls.Primitives.DragCompletedEventHandler( OnResizerDragCompleted );
 
-            _internalHostPresenter.Content = null;
-        }
+      _internalHostPresenter.Content = null;
+    }
 
 
-        protected override bool HasFocusWithinCore()
-        {
-            return false;
-        }
+    protected override bool HasFocusWithinCore()
+    {
+      return false;
+    }
 
-        #region Resizer
+    #region Resizer
 
-        Border _resizerGhost = null;
-        Window _resizerWindowHost = null;
-        Vector _initialStartPoint;
+    Border _resizerGhost = null;
+    Window _resizerWindowHost = null;
+    Vector _initialStartPoint;
 
-        void ShowResizerOverlayWindow(LayoutGridResizerControl splitter)
-        {
-            _resizerGhost = new Border()
-            {
-                Background = splitter.BackgroundWhileDragging,
-                Opacity = splitter.OpacityWhileDragging
-            };
-
-            var areaElement = _manager.GetAutoHideAreaElement();
-            var modelControlActualSize = this._internalHost.TransformActualSizeToAncestor();
-
-            Point ptTopLeftScreen = areaElement.PointToScreenDPIWithoutFlowDirection(new Point());
-
-            var managerSize = areaElement.TransformActualSizeToAncestor();
-
-            Size windowSize;
-
-            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
-            {
-                windowSize = new Size(
-                    managerSize.Width - 25.0 + splitter.ActualWidth,
-                    managerSize.Height);
-
-                _resizerGhost.Width = splitter.ActualWidth;
-                _resizerGhost.Height = windowSize.Height;
-                ptTopLeftScreen.Offset(25, 0.0);
-            }
-            else
-            {
-                windowSize = new Size(
-                    managerSize.Width,
-                    managerSize.Height - _model.AutoHideMinHeight - 25.0 + splitter.ActualHeight);
-
-                _resizerGhost.Height = splitter.ActualHeight;
-                _resizerGhost.Width = windowSize.Width;
-                ptTopLeftScreen.Offset(0.0, 25.0);
-            }
-
-            _initialStartPoint = splitter.PointToScreenDPIWithoutFlowDirection(new Point()) - ptTopLeftScreen;
-
-            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
-            {
-                Canvas.SetLeft(_resizerGhost, _initialStartPoint.X);
-            }
-            else
-            {
-                Canvas.SetTop(_resizerGhost, _initialStartPoint.Y);
-            }
-
-            Canvas panelHostResizer = new Canvas()
-            {
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
-                VerticalAlignment = System.Windows.VerticalAlignment.Stretch
-            };
-
-            panelHostResizer.Children.Add(_resizerGhost);
-
-
-            _resizerWindowHost = new Window()
-            {
-                ResizeMode = ResizeMode.NoResize,
-                WindowStyle = System.Windows.WindowStyle.None,
-                ShowInTaskbar = false,
-                AllowsTransparency = true,
-                Background = null,
-                Width = windowSize.Width,
-                Height = windowSize.Height,
-                Left = ptTopLeftScreen.X,
-                Top = ptTopLeftScreen.Y,
-                ShowActivated = false,
-                Owner = Window.GetWindow(this),
-                Content = panelHostResizer
-            };
-
-            _resizerWindowHost.Show();
-        }
+    void ShowResizerOverlayWindow( LayoutGridResizerControl splitter )
+    {
+      _resizerGhost = new Border()
+      {
+        Background = splitter.BackgroundWhileDragging,
+        Opacity = splitter.OpacityWhileDragging
+      };
+
+      var areaElement = _manager.GetAutoHideAreaElement();
+      var modelControlActualSize = this._internalHost.TransformActualSizeToAncestor();
+
+      Point ptTopLeftScreen = areaElement.PointToScreenDPIWithoutFlowDirection( new Point() );
+
+      var managerSize = areaElement.TransformActualSizeToAncestor();
+
+      Size windowSize;
+
+      if( _side == AnchorSide.Right || _side == AnchorSide.Left )
+      {
+        windowSize = new Size(
+            managerSize.Width - 25.0 + splitter.ActualWidth,
+            managerSize.Height );
+
+        _resizerGhost.Width = splitter.ActualWidth;
+        _resizerGhost.Height = windowSize.Height;
+        ptTopLeftScreen.Offset( 25, 0.0 );
+      }
+      else
+      {
+        windowSize = new Size(
+            managerSize.Width,
+            managerSize.Height - _model.AutoHideMinHeight - 25.0 + splitter.ActualHeight );
+
+        _resizerGhost.Height = splitter.ActualHeight;
+        _resizerGhost.Width = windowSize.Width;
+        ptTopLeftScreen.Offset( 0.0, 25.0 );
+      }
+
+      _initialStartPoint = splitter.PointToScreenDPIWithoutFlowDirection( new Point() ) - ptTopLeftScreen;
+
+      if( _side == AnchorSide.Right || _side == AnchorSide.Left )
+      {
+        Canvas.SetLeft( _resizerGhost, _initialStartPoint.X );
+      }
+      else
+      {
+        Canvas.SetTop( _resizerGhost, _initialStartPoint.Y );
+      }
+
+      Canvas panelHostResizer = new Canvas()
+      {
+        HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+        VerticalAlignment = System.Windows.VerticalAlignment.Stretch
+      };
+
+      panelHostResizer.Children.Add( _resizerGhost );
+
+
+      _resizerWindowHost = new Window()
+      {
+        ResizeMode = ResizeMode.NoResize,
+        WindowStyle = System.Windows.WindowStyle.None,
+        ShowInTaskbar = false,
+        AllowsTransparency = true,
+        Background = null,
+        Width = windowSize.Width,
+        Height = windowSize.Height,
+        Left = ptTopLeftScreen.X,
+        Top = ptTopLeftScreen.Y,
+        ShowActivated = false,
+        Owner = Window.GetWindow( this ),
+        Content = panelHostResizer
+      };
+
+      _resizerWindowHost.Show();
+    }
 
-        void HideResizerOverlayWindow()
-        {
-            if (_resizerWindowHost != null)
-            {
-                _resizerWindowHost.Close();
-                _resizerWindowHost = null;
-            }
-        }
+    void HideResizerOverlayWindow()
+    {
+      if( _resizerWindowHost != null )
+      {
+        _resizerWindowHost.Close();
+        _resizerWindowHost = null;
+      }
+    }
 
-        internal bool IsResizing
-        {
-            get;
-            private set;
-        }
+    internal bool IsResizing
+    {
+      get;
+      private set;
+    }
 
-        void OnResizerDragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
-        {
-            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
-            var rootVisual = this.FindVisualTreeRoot() as Visual;
-
-            var trToWnd = TransformToAncestor(rootVisual);
-            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
-                trToWnd.Transform(new Point());
-
-            double delta;
-            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
-                delta = Canvas.GetLeft(_resizerGhost) - _initialStartPoint.X;
-            else
-                delta = Canvas.GetTop(_resizerGhost) - _initialStartPoint.Y;
-
-            if (_side == AnchorSide.Right)
-            {
-                if (_model.AutoHideWidth == 0.0)
-                    _model.AutoHideWidth = _internalHost.ActualWidth - delta;
-                else
-                    _model.AutoHideWidth -= delta;
-
-                _internalGrid.ColumnDefinitions[1].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
-            }
-            else if (_side == AnchorSide.Left)
-            {
-                if (_model.AutoHideWidth == 0.0)
-                    _model.AutoHideWidth = _internalHost.ActualWidth + delta;
-                else
-                    _model.AutoHideWidth += delta;
-
-                _internalGrid.ColumnDefinitions[0].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
-            }
-            else if (_side == AnchorSide.Top)
-            {
-                if (_model.AutoHideHeight == 0.0)
-                    _model.AutoHideHeight = _internalHost.ActualHeight + delta;
-                else
-                    _model.AutoHideHeight += delta;
-
-                _internalGrid.RowDefinitions[0].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
-            }
-            else if (_side == AnchorSide.Bottom)
-            {
-                if (_model.AutoHideHeight == 0.0)
-                    _model.AutoHideHeight = _internalHost.ActualHeight - delta;
-                else
-                    _model.AutoHideHeight -= delta;
-
-                _internalGrid.RowDefinitions[1].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
-            }
-
-            HideResizerOverlayWindow();
-
-            IsResizing = false;
-            InvalidateMeasure();
-        }
+    void OnResizerDragCompleted( object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e )
+    {
+      LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+      var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+      var trToWnd = TransformToAncestor( rootVisual );
+      Vector transformedDelta = trToWnd.Transform( new Point( e.HorizontalChange, e.VerticalChange ) ) -
+          trToWnd.Transform( new Point() );
+
+      double delta;
+      if( _side == AnchorSide.Right || _side == AnchorSide.Left )
+        delta = Canvas.GetLeft( _resizerGhost ) - _initialStartPoint.X;
+      else
+        delta = Canvas.GetTop( _resizerGhost ) - _initialStartPoint.Y;
+
+      if( _side == AnchorSide.Right )
+      {
+        if( _model.AutoHideWidth == 0.0 )
+          _model.AutoHideWidth = _internalHost.ActualWidth - delta;
+        else
+          _model.AutoHideWidth -= delta;
+
+        _internalGrid.ColumnDefinitions[ 1 ].Width = new GridLength( _model.AutoHideWidth, GridUnitType.Pixel );
+      }
+      else if( _side == AnchorSide.Left )
+      {
+        if( _model.AutoHideWidth == 0.0 )
+          _model.AutoHideWidth = _internalHost.ActualWidth + delta;
+        else
+          _model.AutoHideWidth += delta;
+
+        _internalGrid.ColumnDefinitions[ 0 ].Width = new GridLength( _model.AutoHideWidth, GridUnitType.Pixel );
+      }
+      else if( _side == AnchorSide.Top )
+      {
+        if( _model.AutoHideHeight == 0.0 )
+          _model.AutoHideHeight = _internalHost.ActualHeight + delta;
+        else
+          _model.AutoHideHeight += delta;
+
+        _internalGrid.RowDefinitions[ 0 ].Height = new GridLength( _model.AutoHideHeight, GridUnitType.Pixel );
+      }
+      else if( _side == AnchorSide.Bottom )
+      {
+        if( _model.AutoHideHeight == 0.0 )
+          _model.AutoHideHeight = _internalHost.ActualHeight - delta;
+        else
+          _model.AutoHideHeight -= delta;
+
+        _internalGrid.RowDefinitions[ 1 ].Height = new GridLength( _model.AutoHideHeight, GridUnitType.Pixel );
+      }
+
+      HideResizerOverlayWindow();
+
+      IsResizing = false;
+      InvalidateMeasure();
+    }
 
-        void OnResizerDragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
-        {
-            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
-            var rootVisual = this.FindVisualTreeRoot() as Visual;
-
-            var trToWnd = TransformToAncestor(rootVisual);
-            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
-                trToWnd.Transform(new Point());
-
-            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
-            {
-                if (FrameworkElement.GetFlowDirection(_internalHost) == System.Windows.FlowDirection.RightToLeft)
-                    transformedDelta.X = -transformedDelta.X;
-                Canvas.SetLeft(_resizerGhost, MathHelper.MinMax(_initialStartPoint.X + transformedDelta.X, 0.0, _resizerWindowHost.Width - _resizerGhost.Width));
-            }
-            else
-            {
-                Canvas.SetTop(_resizerGhost, MathHelper.MinMax(_initialStartPoint.Y + transformedDelta.Y, 0.0, _resizerWindowHost.Height - _resizerGhost.Height));
-            }
-        }
+    void OnResizerDragDelta( object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e )
+    {
+      LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+      var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+      var trToWnd = TransformToAncestor( rootVisual );
+      Vector transformedDelta = trToWnd.Transform( new Point( e.HorizontalChange, e.VerticalChange ) ) -
+          trToWnd.Transform( new Point() );
+
+      if( _side == AnchorSide.Right || _side == AnchorSide.Left )
+      {
+        if( FrameworkElement.GetFlowDirection( _internalHost ) == System.Windows.FlowDirection.RightToLeft )
+          transformedDelta.X = -transformedDelta.X;
+        Canvas.SetLeft( _resizerGhost, MathHelper.MinMax( _initialStartPoint.X + transformedDelta.X, 0.0, _resizerWindowHost.Width - _resizerGhost.Width ) );
+      }
+      else
+      {
+        Canvas.SetTop( _resizerGhost, MathHelper.MinMax( _initialStartPoint.Y + transformedDelta.Y, 0.0, _resizerWindowHost.Height - _resizerGhost.Height ) );
+      }
+    }
 
-        void OnResizerDragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
-        {
-            var resizer = sender as LayoutGridResizerControl;
-            ShowResizerOverlayWindow(resizer);
-            IsResizing = true;
-        }
-        #endregion
+    void OnResizerDragStarted( object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e )
+    {
+      var resizer = sender as LayoutGridResizerControl;
+      ShowResizerOverlayWindow( resizer );
+      IsResizing = true;
+    }
+    #endregion
 
-        protected override System.Collections.IEnumerator LogicalChildren
-        {
-            get
-            {
-                if (_internalHostPresenter == null)
-                    return new UIElement[] { }.GetEnumerator();
-                return new UIElement[] { _internalHostPresenter }.GetEnumerator();
-            }
-        }
+    protected override System.Collections.IEnumerator LogicalChildren
+    {
+      get
+      {
+        if( _internalHostPresenter == null )
+          return new UIElement[] { }.GetEnumerator();
+        return new UIElement[] { _internalHostPresenter }.GetEnumerator();
+      }
+    }
 
-        protected override Size MeasureOverride(Size constraint)
-        {
-            if (_internalHostPresenter == null)
-                return base.MeasureOverride(constraint);
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _internalHostPresenter == null )
+        return base.MeasureOverride( constraint );
 
-            _internalHostPresenter.Measure(constraint);
-            //return base.MeasureOverride(constraint);
-            return _internalHostPresenter.DesiredSize;
-        }
+      _internalHostPresenter.Measure( constraint );
+      //return base.MeasureOverride(constraint);
+      return _internalHostPresenter.DesiredSize;
+    }
 
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            if (_internalHostPresenter == null)
-                return base.ArrangeOverride(finalSize);
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      if( _internalHostPresenter == null )
+        return base.ArrangeOverride( finalSize );
 
-            _internalHostPresenter.Arrange(new Rect(finalSize));
-            return base.ArrangeOverride(finalSize);// new Size(_internalHostPresenter.ActualWidth, _internalHostPresenter.ActualHeight);
-        }
+      _internalHostPresenter.Arrange( new Rect( finalSize ) );
+      return base.ArrangeOverride( finalSize );// new Size(_internalHostPresenter.ActualWidth, _internalHostPresenter.ActualHeight);
+    }
 
-        #region Background
+    #region Background
 
-        /// <summary>
-        /// Background Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty BackgroundProperty =
-            DependencyProperty.Register("Background", typeof(Brush), typeof(LayoutAutoHideWindowControl),
-                new FrameworkPropertyMetadata((Brush)null));
+    /// <summary>
+    /// Background Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty BackgroundProperty =
+        DependencyProperty.Register( "Background", typeof( Brush ), typeof( LayoutAutoHideWindowControl ),
+            new FrameworkPropertyMetadata( ( Brush )null ) );
 
-        /// <summary>
-        /// Gets or sets the Background property.  This dependency property 
-        /// indicates background of the autohide childwindow.
-        /// </summary>
-        public Brush Background
-        {
-            get { return (Brush)GetValue(BackgroundProperty); }
-            set { SetValue(BackgroundProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the Background property.  This dependency property 
+    /// indicates background of the autohide childwindow.
+    /// </summary>
+    public Brush Background
+    {
+      get
+      {
+        return ( Brush )GetValue( BackgroundProperty );
+      }
+      set
+      {
+        SetValue( BackgroundProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
-        internal bool IsWin32MouseOver
-        {
-            get
-            {
-                var ptMouse = new Win32Helper.Win32Point();
-                if (!Win32Helper.GetCursorPos(ref ptMouse))
-                    return false;
+    internal bool IsWin32MouseOver
+    {
+      get
+      {
+        var ptMouse = new Win32Helper.Win32Point();
+        if( !Win32Helper.GetCursorPos( ref ptMouse ) )
+          return false;
 
-                Point location = this.PointToScreenDPI(new Point());
+        Point location = this.PointToScreenDPI( new Point() );
 
-                Rect rectWindow = this.GetScreenArea();
-                if (rectWindow.Contains(new Point(ptMouse.X, ptMouse.Y)))
-                    return true;
+        Rect rectWindow = this.GetScreenArea();
+        if( rectWindow.Contains( new Point( ptMouse.X, ptMouse.Y ) ) )
+          return true;
 
-                var manager = Model.Root.Manager;
-                var anchor = manager.FindVisualChildren<LayoutAnchorControl>().Where(c => c.Model == Model).FirstOrDefault();
+        var manager = Model.Root.Manager;
+        var anchor = manager.FindVisualChildren<LayoutAnchorControl>().Where( c => c.Model == Model ).FirstOrDefault();
 
-                if (anchor == null)
-                    return false;
+        if( anchor == null )
+          return false;
 
-                location = anchor.PointToScreenDPI(new Point());
+        location = anchor.PointToScreenDPI( new Point() );
 
-                if (anchor.IsMouseOver)
-                    return true;
+        if( anchor.IsMouseOver )
+          return true;
 
-                return false;
-            }
-        }
+        return false;
+      }
+    }
 
-        #region AnchorableStyle
+    #region AnchorableStyle
 
-        /// <summary>
-        /// AnchorableStyle Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableStyleProperty =
-            DependencyProperty.Register("AnchorableStyle", typeof(Style), typeof(LayoutAutoHideWindowControl),
-                new FrameworkPropertyMetadata((Style)null));
+    /// <summary>
+    /// AnchorableStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableStyleProperty =
+        DependencyProperty.Register( "AnchorableStyle", typeof( Style ), typeof( LayoutAutoHideWindowControl ),
+            new FrameworkPropertyMetadata( ( Style )null ) );
 
-        /// <summary>
-        /// Gets or sets the AnchorableStyle property. This dependency property 
-        /// indicates the style to apply to the LayoutAnchorableControl hosted in this auto hide window.
-        /// </summary>
-        public Style AnchorableStyle
-        {
-            get { return (Style)GetValue(AnchorableStyleProperty); }
-            set { SetValue(AnchorableStyleProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the AnchorableStyle property. This dependency property 
+    /// indicates the style to apply to the LayoutAnchorableControl hosted in this auto hide window.
+    /// </summary>
+    public Style AnchorableStyle
+    {
+      get
+      {
+        return ( Style )GetValue( AnchorableStyleProperty );
+      }
+      set
+      {
+        SetValue( AnchorableStyleProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
index d7edb46a..3baf8548 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
@@ -160,6 +160,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       base.OnMouseLeftButtonDown( e );
     }
 
+
     private void SetIsActive()
     {
       if( this.Model != null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
index c9d049fe..d7371e3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
@@ -16,83 +16,84 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Collections.ObjectModel;
 using System.Windows.Controls;
 using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+  public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+  {
+    static LayoutDocumentPaneControl()
     {
-        static LayoutDocumentPaneControl()
-        {
-            FocusableProperty.OverrideMetadata(typeof(LayoutDocumentPaneControl), new FrameworkPropertyMetadata(false));
-        }
+      FocusableProperty.OverrideMetadata( typeof( LayoutDocumentPaneControl ), new FrameworkPropertyMetadata( false ) );
+    }
 
 
-        internal LayoutDocumentPaneControl(LayoutDocumentPane model)
-        {
-            if (model == null)
-                throw new ArgumentNullException("model");
+    internal LayoutDocumentPaneControl( LayoutDocumentPane model )
+    {
+      if( model == null )
+        throw new ArgumentNullException( "model" );
 
-            _model = model;
-            SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this });
-            SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+      _model = model;
+      SetBinding( ItemsSourceProperty, new Binding( "Model.Children" ) { Source = this } );
+      SetBinding( FlowDirectionProperty, new Binding( "Model.Root.Manager.FlowDirection" ) { Source = this } );
 
-            this.LayoutUpdated += new EventHandler(OnLayoutUpdated);
-        }
+      this.LayoutUpdated += new EventHandler( OnLayoutUpdated );
+    }
 
-        void OnLayoutUpdated(object sender, EventArgs e)
-        {
-            var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
-            modelWithAtcualSize.ActualWidth = ActualWidth;
-            modelWithAtcualSize.ActualHeight = ActualHeight;
-        }
+    void OnLayoutUpdated( object sender, EventArgs e )
+    {
+      var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
+      modelWithAtcualSize.ActualWidth = ActualWidth;
+      modelWithAtcualSize.ActualHeight = ActualHeight;
+    }
 
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
-        {
-            base.OnSelectionChanged(e);
+    protected override void OnSelectionChanged( SelectionChangedEventArgs e )
+    {
+      base.OnSelectionChanged( e );
 
-            if (_model.SelectedContent != null)
-                _model.SelectedContent.IsActive = true;
-        }
+      if( _model.SelectedContent != null )
+        _model.SelectedContent.IsActive = true;
+    }
 
-        List<object> _logicalChildren = new List<object>();
+    List<object> _logicalChildren = new List<object>();
 
-        protected override System.Collections.IEnumerator LogicalChildren
-        {
-            get
-            {
-                return _logicalChildren.GetEnumerator();
-            }
-        }
+    protected override System.Collections.IEnumerator LogicalChildren
+    {
+      get
+      {
+        return _logicalChildren.GetEnumerator();
+      }
+    }
 
-        LayoutDocumentPane _model;
+    LayoutDocumentPane _model;
 
-        public ILayoutElement Model
-        {
-            get { return _model; }
-        }
+    public ILayoutElement Model
+    {
+      get
+      {
+        return _model;
+      }
+    }
 
-        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
+    protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
+    {
+      base.OnMouseLeftButtonDown( e );
 
-            if (!e.Handled && _model.SelectedContent != null)
-                _model.SelectedContent.IsActive = true;
-        }
+      if( !e.Handled && _model.SelectedContent != null )
+        _model.SelectedContent.IsActive = true;
+    }
 
-        protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
-        {
-            base.OnMouseRightButtonDown(e);
+    protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )
+    {
+      base.OnMouseRightButtonDown( e );
 
-            if (!e.Handled && _model.SelectedContent != null)
-                _model.SelectedContent.IsActive = true;
+      if( !e.Handled && _model.SelectedContent != null )
+        _model.SelectedContent.IsActive = true;
 
-        }
     }
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
index d2cbe8b3..f8231f19 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
@@ -15,9 +15,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Runtime.InteropServices;
 using System.Windows.Interop;
@@ -26,10 +24,8 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
-using System.Diagnostics;
 using System.Windows.Documents;
 using Xceed.Wpf.AvalonDock.Themes;
-using Microsoft.Windows.Shell;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -50,7 +46,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       return new FloatingWindowContentHost( sender as LayoutFloatingWindowControl ) { Content = content as UIElement };
     }
 
-    protected class FloatingWindowContentHost : HwndHost
+    protected internal class FloatingWindowContentHost : HwndHost
     {
       LayoutFloatingWindowControl _owner;
       public FloatingWindowContentHost( LayoutFloatingWindowControl owner )
@@ -302,6 +298,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       base.OnInitialized( e );
     }
 
+
     public abstract ILayoutElement Model
     {
       get;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
index 683c95af..a57f9c13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
@@ -29,179 +29,180 @@ using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public abstract class LayoutItem : FrameworkElement
+  public abstract class LayoutItem : FrameworkElement
+  {
+    static LayoutItem()
     {
-        static LayoutItem()
-        { 
-            ToolTipProperty.OverrideMetadata(typeof(LayoutItem), new FrameworkPropertyMetadata(null, (s, e) => OnToolTipChanged(s,e)));
-            VisibilityProperty.OverrideMetadata(typeof(LayoutItem), new FrameworkPropertyMetadata(Visibility.Visible, (s,e) => OnVisibilityChanged(s, e)));
-        }
+      ToolTipProperty.OverrideMetadata( typeof( LayoutItem ), new FrameworkPropertyMetadata( null, ( s, e ) => OnToolTipChanged( s, e ) ) );
+      VisibilityProperty.OverrideMetadata( typeof( LayoutItem ), new FrameworkPropertyMetadata( Visibility.Visible, ( s, e ) => OnVisibilityChanged( s, e ) ) );
+    }
 
 
-        internal LayoutItem()
-        {
+    internal LayoutItem()
+    {
 
-        }
+    }
 
-        internal virtual void Attach(LayoutContent model)
-        { 
-            LayoutElement = model;
-            Model = model.Content;
+    internal virtual void Attach( LayoutContent model )
+    {
+      LayoutElement = model;
+      Model = model.Content;
 
-            InitDefaultCommands();
+      InitDefaultCommands();
 
-            LayoutElement.IsSelectedChanged+=new EventHandler(LayoutElement_IsSelectedChanged);
-            LayoutElement.IsActiveChanged+=new EventHandler(LayoutElement_IsActiveChanged);
+      LayoutElement.IsSelectedChanged += new EventHandler( LayoutElement_IsSelectedChanged );
+      LayoutElement.IsActiveChanged += new EventHandler( LayoutElement_IsActiveChanged );
 
-            DataContext = this;
-        }
+      DataContext = this;
+    }
 
 
 
-        void LayoutElement_IsActiveChanged(object sender, EventArgs e)
+    void LayoutElement_IsActiveChanged( object sender, EventArgs e )
+    {
+      if( _isActiveReentrantFlag.CanEnter )
+      {
+        using( _isActiveReentrantFlag.Enter() )
         {
-            if (_isActiveReentrantFlag.CanEnter)
-            {
-                using (_isActiveReentrantFlag.Enter())
-                {
-                    var bnd = BindingOperations.GetBinding(this, IsActiveProperty);
-                    IsActive = LayoutElement.IsActive;
-                    var bnd2 = BindingOperations.GetBinding(this, IsActiveProperty);
-                }
-            }
+          var bnd = BindingOperations.GetBinding( this, IsActiveProperty );
+          IsActive = LayoutElement.IsActive;
+          var bnd2 = BindingOperations.GetBinding( this, IsActiveProperty );
         }
+      }
+    }
 
-        void LayoutElement_IsSelectedChanged(object sender, EventArgs e)
+    void LayoutElement_IsSelectedChanged( object sender, EventArgs e )
+    {
+      if( _isSelectedReentrantFlag.CanEnter )
+      {
+        using( _isSelectedReentrantFlag.Enter() )
         {
-            if (_isSelectedReentrantFlag.CanEnter)
-            {
-                using (_isSelectedReentrantFlag.Enter())
-                {
-                    IsSelected = LayoutElement.IsSelected;
-                }
-            }
+          IsSelected = LayoutElement.IsSelected;
         }
+      }
+    }
 
-        internal virtual void Detach()
-        {
-            LayoutElement.IsSelectedChanged -= new EventHandler(LayoutElement_IsSelectedChanged);
-            LayoutElement.IsActiveChanged -= new EventHandler(LayoutElement_IsActiveChanged);
-            LayoutElement = null;
-            Model = null;
-        }
+    internal virtual void Detach()
+    {
+      LayoutElement.IsSelectedChanged -= new EventHandler( LayoutElement_IsSelectedChanged );
+      LayoutElement.IsActiveChanged -= new EventHandler( LayoutElement_IsActiveChanged );
+      LayoutElement = null;
+      Model = null;
+    }
 
-        public LayoutContent LayoutElement
-        {
-            get;
-            private set;
-        }
+    public LayoutContent LayoutElement
+    {
+      get;
+      private set;
+    }
 
-        public object Model
-        {
-            get;
-            private set;
-        }
+    public object Model
+    {
+      get;
+      private set;
+    }
 
-        ICommand _defaultCloseCommand;
-        ICommand _defaultFloatCommand;
-        ICommand _defaultDockAsDocumentCommand;
-        ICommand _defaultCloseAllButThisCommand;
-        ICommand _defaultCloseAllCommand;
-        ICommand _defaultActivateCommand;
-        ICommand _defaultNewVerticalTabGroupCommand;
-        ICommand _defaultNewHorizontalTabGroupCommand;
-        ICommand _defaultMoveToNextTabGroupCommand;
-        ICommand _defaultMoveToPreviousTabGroupCommand;
-
-        protected virtual void InitDefaultCommands()
-        {
-            _defaultCloseCommand = new RelayCommand((p) => ExecuteCloseCommand(p), (p) => CanExecuteCloseCommand(p));
-            _defaultFloatCommand = new RelayCommand((p) => ExecuteFloatCommand(p), (p) => CanExecuteFloatCommand(p));
-            _defaultDockAsDocumentCommand = new RelayCommand((p) => ExecuteDockAsDocumentCommand(p), (p) => CanExecuteDockAsDocumentCommand(p));
-            _defaultCloseAllButThisCommand = new RelayCommand((p) => ExecuteCloseAllButThisCommand(p), (p) => CanExecuteCloseAllButThisCommand(p));
-            _defaultCloseAllCommand = new RelayCommand( ( p ) => ExecuteCloseAllCommand( p ), ( p ) => CanExecuteCloseAllCommand( p ) );
-            _defaultActivateCommand = new RelayCommand( ( p ) => ExecuteActivateCommand( p ), ( p ) => CanExecuteActivateCommand( p ) );
-            _defaultNewVerticalTabGroupCommand = new RelayCommand((p) => ExecuteNewVerticalTabGroupCommand(p), (p) => CanExecuteNewVerticalTabGroupCommand(p));
-            _defaultNewHorizontalTabGroupCommand = new RelayCommand((p) => ExecuteNewHorizontalTabGroupCommand(p), (p) => CanExecuteNewHorizontalTabGroupCommand(p));
-            _defaultMoveToNextTabGroupCommand = new RelayCommand((p) => ExecuteMoveToNextTabGroupCommand(p), (p) => CanExecuteMoveToNextTabGroupCommand(p));
-            _defaultMoveToPreviousTabGroupCommand = new RelayCommand((p) => ExecuteMoveToPreviousTabGroupCommand(p), (p) => CanExecuteMoveToPreviousTabGroupCommand(p));
-        }
+    ICommand _defaultCloseCommand;
+    ICommand _defaultFloatCommand;
+    ICommand _defaultDockAsDocumentCommand;
+    ICommand _defaultCloseAllButThisCommand;
+    ICommand _defaultCloseAllCommand;
+    ICommand _defaultActivateCommand;
+    ICommand _defaultNewVerticalTabGroupCommand;
+    ICommand _defaultNewHorizontalTabGroupCommand;
+    ICommand _defaultMoveToNextTabGroupCommand;
+    ICommand _defaultMoveToPreviousTabGroupCommand;
+
+    protected virtual void InitDefaultCommands()
+    {
+      _defaultCloseCommand = new RelayCommand( ( p ) => ExecuteCloseCommand( p ), ( p ) => CanExecuteCloseCommand( p ) );
+      _defaultFloatCommand = new RelayCommand( ( p ) => ExecuteFloatCommand( p ), ( p ) => CanExecuteFloatCommand( p ) );
+      _defaultDockAsDocumentCommand = new RelayCommand( ( p ) => ExecuteDockAsDocumentCommand( p ), ( p ) => CanExecuteDockAsDocumentCommand( p ) );
+      _defaultCloseAllButThisCommand = new RelayCommand( ( p ) => ExecuteCloseAllButThisCommand( p ), ( p ) => CanExecuteCloseAllButThisCommand( p ) );
+      _defaultCloseAllCommand = new RelayCommand( ( p ) => ExecuteCloseAllCommand( p ), ( p ) => CanExecuteCloseAllCommand( p ) );
+      _defaultActivateCommand = new RelayCommand( ( p ) => ExecuteActivateCommand( p ), ( p ) => CanExecuteActivateCommand( p ) );
+      _defaultNewVerticalTabGroupCommand = new RelayCommand( ( p ) => ExecuteNewVerticalTabGroupCommand( p ), ( p ) => CanExecuteNewVerticalTabGroupCommand( p ) );
+      _defaultNewHorizontalTabGroupCommand = new RelayCommand( ( p ) => ExecuteNewHorizontalTabGroupCommand( p ), ( p ) => CanExecuteNewHorizontalTabGroupCommand( p ) );
+      _defaultMoveToNextTabGroupCommand = new RelayCommand( ( p ) => ExecuteMoveToNextTabGroupCommand( p ), ( p ) => CanExecuteMoveToNextTabGroupCommand( p ) );
+      _defaultMoveToPreviousTabGroupCommand = new RelayCommand( ( p ) => ExecuteMoveToPreviousTabGroupCommand( p ), ( p ) => CanExecuteMoveToPreviousTabGroupCommand( p ) );
+    }
 
-        protected virtual void ClearDefaultBindings()
-        {
-            if (CloseCommand == _defaultCloseCommand)
-                BindingOperations.ClearBinding(this, CloseCommandProperty);
-            if (FloatCommand == _defaultFloatCommand)
-                BindingOperations.ClearBinding(this, FloatCommandProperty);
-            if (DockAsDocumentCommand == _defaultDockAsDocumentCommand)
-                BindingOperations.ClearBinding(this, DockAsDocumentCommandProperty);
-            if (CloseAllButThisCommand == _defaultCloseAllButThisCommand)
-                BindingOperations.ClearBinding(this, CloseAllButThisCommandProperty);
-            if( CloseAllCommand == _defaultCloseAllCommand )
-              BindingOperations.ClearBinding( this, CloseAllCommandProperty );
-            if (ActivateCommand == _defaultActivateCommand)
-                BindingOperations.ClearBinding(this, ActivateCommandProperty);
-            if (NewVerticalTabGroupCommand == _defaultNewVerticalTabGroupCommand)
-                BindingOperations.ClearBinding(this, NewVerticalTabGroupCommandProperty);
-            if (NewHorizontalTabGroupCommand == _defaultNewHorizontalTabGroupCommand)
-                BindingOperations.ClearBinding(this, NewHorizontalTabGroupCommandProperty);
-            if (MoveToNextTabGroupCommand == _defaultMoveToNextTabGroupCommand)
-                BindingOperations.ClearBinding(this, MoveToNextTabGroupCommandProperty);
-            if (MoveToPreviousTabGroupCommand == _defaultMoveToPreviousTabGroupCommand)
-                BindingOperations.ClearBinding(this, MoveToPreviousTabGroupCommandProperty);
-        }
+    protected virtual void ClearDefaultBindings()
+    {
+      if( CloseCommand == _defaultCloseCommand )
+        BindingOperations.ClearBinding( this, CloseCommandProperty );
+      if( FloatCommand == _defaultFloatCommand )
+        BindingOperations.ClearBinding( this, FloatCommandProperty );
+      if( DockAsDocumentCommand == _defaultDockAsDocumentCommand )
+        BindingOperations.ClearBinding( this, DockAsDocumentCommandProperty );
+      if( CloseAllButThisCommand == _defaultCloseAllButThisCommand )
+        BindingOperations.ClearBinding( this, CloseAllButThisCommandProperty );
+      if( CloseAllCommand == _defaultCloseAllCommand )
+        BindingOperations.ClearBinding( this, CloseAllCommandProperty );
+      if( ActivateCommand == _defaultActivateCommand )
+        BindingOperations.ClearBinding( this, ActivateCommandProperty );
+      if( NewVerticalTabGroupCommand == _defaultNewVerticalTabGroupCommand )
+        BindingOperations.ClearBinding( this, NewVerticalTabGroupCommandProperty );
+      if( NewHorizontalTabGroupCommand == _defaultNewHorizontalTabGroupCommand )
+        BindingOperations.ClearBinding( this, NewHorizontalTabGroupCommandProperty );
+      if( MoveToNextTabGroupCommand == _defaultMoveToNextTabGroupCommand )
+        BindingOperations.ClearBinding( this, MoveToNextTabGroupCommandProperty );
+      if( MoveToPreviousTabGroupCommand == _defaultMoveToPreviousTabGroupCommand )
+        BindingOperations.ClearBinding( this, MoveToPreviousTabGroupCommandProperty );
+    }
 
-        protected virtual void SetDefaultBindings()
-        {
-            if (CloseCommand == null)
-                CloseCommand = _defaultCloseCommand;
-            if (FloatCommand == null)
-                FloatCommand = _defaultFloatCommand;
-            if (DockAsDocumentCommand == null)
-                DockAsDocumentCommand = _defaultDockAsDocumentCommand;
-            if (CloseAllButThisCommand == null)
-                CloseAllButThisCommand = _defaultCloseAllButThisCommand;
-            if( CloseAllCommand == null )
-                CloseAllCommand = _defaultCloseAllCommand;
-            if (ActivateCommand == null)
-                ActivateCommand = _defaultActivateCommand;
-            if (NewVerticalTabGroupCommand == null)
-                NewVerticalTabGroupCommand = _defaultNewVerticalTabGroupCommand;
-            if (NewHorizontalTabGroupCommand == null)
-                NewHorizontalTabGroupCommand = _defaultNewHorizontalTabGroupCommand;
-            if (MoveToNextTabGroupCommand == null)
-                MoveToNextTabGroupCommand = _defaultMoveToNextTabGroupCommand;
-            if (MoveToPreviousTabGroupCommand == null)
-                MoveToPreviousTabGroupCommand = _defaultMoveToPreviousTabGroupCommand;
-
-
-            IsSelected = LayoutElement.IsSelected;
-            IsActive = LayoutElement.IsActive;
-        }
+    protected virtual void SetDefaultBindings()
+    {
+      if( CloseCommand == null )
+        CloseCommand = _defaultCloseCommand;
+      if( FloatCommand == null )
+        FloatCommand = _defaultFloatCommand;
+      if( DockAsDocumentCommand == null )
+        DockAsDocumentCommand = _defaultDockAsDocumentCommand;
+      if( CloseAllButThisCommand == null )
+        CloseAllButThisCommand = _defaultCloseAllButThisCommand;
+      if( CloseAllCommand == null )
+        CloseAllCommand = _defaultCloseAllCommand;
+      if( ActivateCommand == null )
+        ActivateCommand = _defaultActivateCommand;
+      if( NewVerticalTabGroupCommand == null )
+        NewVerticalTabGroupCommand = _defaultNewVerticalTabGroupCommand;
+      if( NewHorizontalTabGroupCommand == null )
+        NewHorizontalTabGroupCommand = _defaultNewHorizontalTabGroupCommand;
+      if( MoveToNextTabGroupCommand == null )
+        MoveToNextTabGroupCommand = _defaultMoveToNextTabGroupCommand;
+      if( MoveToPreviousTabGroupCommand == null )
+        MoveToPreviousTabGroupCommand = _defaultMoveToPreviousTabGroupCommand;
+
+
+      IsSelected = LayoutElement.IsSelected;
+      IsActive = LayoutElement.IsActive;
+      CanClose = LayoutElement.CanClose;
+    }
 
-        internal void _ClearDefaultBindings()
-        {
-            ClearDefaultBindings();
-        }
+    internal void _ClearDefaultBindings()
+    {
+      ClearDefaultBindings();
+    }
 
-        internal void _SetDefaultBindings()
-        {
-            SetDefaultBindings();
-        }
+    internal void _SetDefaultBindings()
+    {
+      SetDefaultBindings();
+    }
 
-        internal bool IsViewExists()
-        {
-          return (_view != null);
-        }
+    internal bool IsViewExists()
+    {
+      return ( _view != null );
+    }
 
-        ContentPresenter _view = null;
-        public ContentPresenter View
+    ContentPresenter _view = null;
+    public ContentPresenter View
+    {
+      get
+      {
+        if( _view == null )
         {
-            get
-            {
-                if (_view == null)
-                {
-                    _view = new ContentPresenter();
+          _view = new ContentPresenter();
 
           _view.SetBinding( ContentPresenter.ContentProperty, new Binding( "Content" ) { Source = LayoutElement } );
           if( ( LayoutElement != null ) && ( LayoutElement.Root != null ) )
@@ -215,960 +216,1056 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
         }
 
-                return _view;
-            }
-        }
+        return _view;
+      }
+    }
 
 
-        #region Title
+    #region Title
 
-        /// <summary>
-        /// Title Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty TitleProperty =
-            DependencyProperty.Register("Title", typeof(string), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((string)null,
-                    new PropertyChangedCallback(OnTitleChanged)));
+    /// <summary>
+    /// Title Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty TitleProperty =
+        DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( string )null,
+                new PropertyChangedCallback( OnTitleChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the Title property.  This dependency property 
-        /// indicates the title of the element.
-        /// </summary>
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the Title property.  This dependency property 
+    /// indicates the title of the element.
+    /// </summary>
+    public string Title
+    {
+      get
+      {
+        return ( string )GetValue( TitleProperty );
+      }
+      set
+      {
+        SetValue( TitleProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the Title property.
-        /// </summary>
-        private static void OnTitleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnTitleChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the Title property.
+    /// </summary>
+    private static void OnTitleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnTitleChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the Title property.
-        /// </summary>
-        protected virtual void OnTitleChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (LayoutElement != null)
-                LayoutElement.Title = (string)e.NewValue;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the Title property.
+    /// </summary>
+    protected virtual void OnTitleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( LayoutElement != null )
+        LayoutElement.Title = ( string )e.NewValue;
+    }
 
-        #endregion
+    #endregion
 
-        #region ToolTip
-        private static void OnToolTipChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)s).OnToolTipChanged();
-        }
+    #region ToolTip
+    private static void OnToolTipChanged( DependencyObject s, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )s ).OnToolTipChanged();
+    }
 
-        private void OnToolTipChanged()
-        {
-            if (LayoutElement != null)
-                LayoutElement.ToolTip = ToolTip;
-        }
-        #endregion
-
-        #region IconSource
-
-        /// <summary>
-        /// IconSource Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty IconSourceProperty =
-            DependencyProperty.Register("IconSource", typeof(ImageSource), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((ImageSource)null,
-                    new PropertyChangedCallback(OnIconSourceChanged)));
-
-        /// <summary>
-        /// Gets or sets the IconSource property.  This dependency property 
-        /// indicates icon associated with the item.
-        /// </summary>
-        public ImageSource IconSource
-        {
-            get { return (ImageSource)GetValue(IconSourceProperty); }
-            set { SetValue(IconSourceProperty, value); }
-        }
+    private void OnToolTipChanged()
+    {
+      if( LayoutElement != null )
+        LayoutElement.ToolTip = ToolTip;
+    }
+    #endregion
+
+    #region IconSource
+
+    /// <summary>
+    /// IconSource Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IconSourceProperty =
+        DependencyProperty.Register( "IconSource", typeof( ImageSource ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( ImageSource )null,
+                new PropertyChangedCallback( OnIconSourceChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the IconSource property.  This dependency property 
+    /// indicates icon associated with the item.
+    /// </summary>
+    public ImageSource IconSource
+    {
+      get
+      {
+        return ( ImageSource )GetValue( IconSourceProperty );
+      }
+      set
+      {
+        SetValue( IconSourceProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the IconSource property.
-        /// </summary>
-        private static void OnIconSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnIconSourceChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the IconSource property.
+    /// </summary>
+    private static void OnIconSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnIconSourceChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the IconSource property.
-        /// </summary>
-        protected virtual void OnIconSourceChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (LayoutElement != null)
-                LayoutElement.IconSource = IconSource;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the IconSource property.
+    /// </summary>
+    protected virtual void OnIconSourceChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( LayoutElement != null )
+        LayoutElement.IconSource = IconSource;
+    }
 
-        #endregion
+    #endregion
 
-        #region Visibility
+    #region Visibility
 
-        private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)s).OnVisibilityChanged();
-        }
+    private static void OnVisibilityChanged( DependencyObject s, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )s ).OnVisibilityChanged();
+    }
 
-        protected virtual void OnVisibilityChanged()
-        {
-            if (LayoutElement != null &&
-                Visibility == System.Windows.Visibility.Collapsed)
-                LayoutElement.Close();
-        }
+    protected virtual void OnVisibilityChanged()
+    {
+      if( LayoutElement != null &&
+          Visibility == System.Windows.Visibility.Collapsed )
+        LayoutElement.Close();
+    }
 
-        #endregion
+    #endregion
 
-        #region ContentId
+    #region ContentId
 
-        /// <summary>
-        /// ContentId Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ContentIdProperty =
-            DependencyProperty.Register("ContentId", typeof(string), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((string)null,
-                    new PropertyChangedCallback(OnContentIdChanged)));
+    /// <summary>
+    /// ContentId Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ContentIdProperty =
+        DependencyProperty.Register( "ContentId", typeof( string ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( string )null,
+                new PropertyChangedCallback( OnContentIdChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the ContentId property.  This dependency property 
-        /// indicates the content id used to retrive content when deserializing layouts.
-        /// </summary>
-        public string ContentId
-        {
-            get { return (string)GetValue(ContentIdProperty); }
-            set { SetValue(ContentIdProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the ContentId property.  This dependency property 
+    /// indicates the content id used to retrive content when deserializing layouts.
+    /// </summary>
+    public string ContentId
+    {
+      get
+      {
+        return ( string )GetValue( ContentIdProperty );
+      }
+      set
+      {
+        SetValue( ContentIdProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the ContentId property.
-        /// </summary>
-        private static void OnContentIdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnContentIdChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the ContentId property.
+    /// </summary>
+    private static void OnContentIdChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnContentIdChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the ContentId property.
-        /// </summary>
-        protected virtual void OnContentIdChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (LayoutElement != null)
-                LayoutElement.ContentId = (string)e.NewValue;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the ContentId property.
+    /// </summary>
+    protected virtual void OnContentIdChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( LayoutElement != null )
+        LayoutElement.ContentId = ( string )e.NewValue;
+    }
 
-        #endregion
+    #endregion
 
-        #region IsSelected
+    #region IsSelected
 
-        ReentrantFlag _isSelectedReentrantFlag = new ReentrantFlag();
+    ReentrantFlag _isSelectedReentrantFlag = new ReentrantFlag();
 
-        /// <summary>
-        /// IsSelected Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty IsSelectedProperty =
-            DependencyProperty.Register("IsSelected", typeof(bool), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((bool)false,
-                    new PropertyChangedCallback(OnIsSelectedChanged)));
+    /// <summary>
+    /// IsSelected Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IsSelectedProperty =
+        DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( bool )false,
+                new PropertyChangedCallback( OnIsSelectedChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the IsSelected property.  This dependency property 
-        /// indicates if the item is selected inside its container.
-        /// </summary>
-        public bool IsSelected
-        {
-            get { return (bool)GetValue(IsSelectedProperty); }
-            set { SetValue(IsSelectedProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the IsSelected property.  This dependency property 
+    /// indicates if the item is selected inside its container.
+    /// </summary>
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the IsSelected property.
-        /// </summary>
-        private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnIsSelectedChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the IsSelected property.
+    /// </summary>
+    private static void OnIsSelectedChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnIsSelectedChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the IsSelected property.
-        /// </summary>
-        protected virtual void OnIsSelectedChanged(DependencyPropertyChangedEventArgs e)
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the IsSelected property.
+    /// </summary>
+    protected virtual void OnIsSelectedChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( _isSelectedReentrantFlag.CanEnter )
+      {
+        using( _isSelectedReentrantFlag.Enter() )
         {
-            if (_isSelectedReentrantFlag.CanEnter)
-            {
-                using (_isSelectedReentrantFlag.Enter())
-                {
-                    if (LayoutElement != null)
-                        LayoutElement.IsSelected = (bool)e.NewValue;
-                }
-            }
+          if( LayoutElement != null )
+            LayoutElement.IsSelected = ( bool )e.NewValue;
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region IsActive
+    #region IsActive
 
-        ReentrantFlag _isActiveReentrantFlag = new ReentrantFlag();
+    ReentrantFlag _isActiveReentrantFlag = new ReentrantFlag();
 
-        /// <summary>
-        /// IsActive Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty IsActiveProperty =
-            DependencyProperty.Register("IsActive", typeof(bool), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((bool)false,
-                    new PropertyChangedCallback(OnIsActiveChanged)));
+    /// <summary>
+    /// IsActive Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IsActiveProperty =
+        DependencyProperty.Register( "IsActive", typeof( bool ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( bool )false,
+                new PropertyChangedCallback( OnIsActiveChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the IsActive property.  This dependency property 
-        /// indicates if the item is active in the UI.
-        /// </summary>
-        public bool IsActive
-        {
-            get { return (bool)GetValue(IsActiveProperty); }
-            set { SetValue(IsActiveProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the IsActive property.  This dependency property 
+    /// indicates if the item is active in the UI.
+    /// </summary>
+    public bool IsActive
+    {
+      get
+      {
+        return ( bool )GetValue( IsActiveProperty );
+      }
+      set
+      {
+        SetValue( IsActiveProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the IsActive property.
-        /// </summary>
-        private static void OnIsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnIsActiveChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the IsActive property.
+    /// </summary>
+    private static void OnIsActiveChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnIsActiveChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the IsActive property.
-        /// </summary>
-        protected virtual void OnIsActiveChanged(DependencyPropertyChangedEventArgs e)
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the IsActive property.
+    /// </summary>
+    protected virtual void OnIsActiveChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( _isActiveReentrantFlag.CanEnter )
+      {
+        using( _isActiveReentrantFlag.Enter() )
         {
-            if (_isActiveReentrantFlag.CanEnter)
-            {
-                using (_isActiveReentrantFlag.Enter())
-                {
-                    if (LayoutElement != null)
-                        LayoutElement.IsActive = (bool)e.NewValue;
-                }
-            }
+          if( LayoutElement != null )
+            LayoutElement.IsActive = ( bool )e.NewValue;
         }
+      }
+    }
 
-        #endregion
-
-        #region CanClose
+    #endregion
 
-        /// <summary>
-        /// CanClose Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CanCloseProperty =
-            DependencyProperty.Register("CanClose", typeof(bool), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((bool)true,
-                    new PropertyChangedCallback(OnCanCloseChanged)));
+    #region CanClose
 
-        /// <summary>
-        /// Gets or sets the CanClose property.  This dependency property 
-        /// indicates if the item can be closed.
-        /// </summary>
-        public bool CanClose
-        {
-            get { return (bool)GetValue(CanCloseProperty); }
-            set { SetValue(CanCloseProperty, value); }
-        }
+    /// <summary>
+    /// CanClose Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty CanCloseProperty =
+        DependencyProperty.Register( "CanClose", typeof( bool ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( bool )true,
+                new PropertyChangedCallback( OnCanCloseChanged ) ) );
 
-        /// <summary>
-        /// Handles changes to the CanClose property.
-        /// </summary>
-        private static void OnCanCloseChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnCanCloseChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the CanClose property.  This dependency property 
+    /// indicates if the item can be closed.
+    /// </summary>
+    public bool CanClose
+    {
+      get
+      {
+        return ( bool )GetValue( CanCloseProperty );
+      }
+      set
+      {
+        SetValue( CanCloseProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CanClose property.
-        /// </summary>
-        protected virtual void OnCanCloseChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (LayoutElement != null)
-                LayoutElement.CanClose = (bool)e.NewValue;
-        }
+    /// <summary>
+    /// Handles changes to the CanClose property.
+    /// </summary>
+    private static void OnCanCloseChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnCanCloseChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the CanClose property.
+    /// </summary>
+    protected virtual void OnCanCloseChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( LayoutElement != null )
+        LayoutElement.CanClose = ( bool )e.NewValue;
+    }
 
-        #region CanFloat
+    #endregion
 
-        /// <summary>
-        /// CanFloat Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CanFloatProperty =
-            DependencyProperty.Register("CanFloat", typeof(bool), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((bool)true,
-                    new PropertyChangedCallback(OnCanFloatChanged)));
+    #region CanFloat
 
-        /// <summary>
-        /// Gets or sets the CanFloat property.  This dependency property 
-        /// indicates if user can move the layout element dragging it to another position.
-        /// </summary>
-        public bool CanFloat
-        {
-            get { return (bool)GetValue(CanFloatProperty); }
-            set { SetValue(CanFloatProperty, value); }
-        }
+    /// <summary>
+    /// CanFloat Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty CanFloatProperty =
+        DependencyProperty.Register( "CanFloat", typeof( bool ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( bool )true,
+                new PropertyChangedCallback( OnCanFloatChanged ) ) );
 
-        /// <summary>
-        /// Handles changes to the CanFloat property.
-        /// </summary>
-        private static void OnCanFloatChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnCanFloatChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the CanFloat property.  This dependency property 
+    /// indicates if user can move the layout element dragging it to another position.
+    /// </summary>
+    public bool CanFloat
+    {
+      get
+      {
+        return ( bool )GetValue( CanFloatProperty );
+      }
+      set
+      {
+        SetValue( CanFloatProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CanFloat property.
-        /// </summary>
-        protected virtual void OnCanFloatChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (LayoutElement != null)
-                LayoutElement.CanFloat = (bool)e.NewValue;
-        }
+    /// <summary>
+    /// Handles changes to the CanFloat property.
+    /// </summary>
+    private static void OnCanFloatChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnCanFloatChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the CanFloat property.
+    /// </summary>
+    protected virtual void OnCanFloatChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( LayoutElement != null )
+        LayoutElement.CanFloat = ( bool )e.NewValue;
+    }
 
-        #region CloseCommand
+    #endregion
 
-        /// <summary>
-        /// CloseCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CloseCommandProperty =
-            DependencyProperty.Register("CloseCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnCloseCommandChanged),
-                    new CoerceValueCallback(CoerceCloseCommandValue)));
+    #region CloseCommand
 
-        /// <summary>
-        /// Gets or sets the CloseCommand property.  This dependency property 
-        /// indicates the command to execute when user click the document close button.
-        /// </summary>
-        public ICommand CloseCommand
-        {
-            get { return (ICommand)GetValue(CloseCommandProperty); }
-            set { SetValue(CloseCommandProperty, value); }
-        }
+    /// <summary>
+    /// CloseCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty CloseCommandProperty =
+        DependencyProperty.Register( "CloseCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnCloseCommandChanged ),
+                new CoerceValueCallback( CoerceCloseCommandValue ) ) );
 
-        /// <summary>
-        /// Handles changes to the CloseCommand property.
-        /// </summary>
-        private static void OnCloseCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnCloseCommandChanged(e);
-        }
-
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CloseCommand property.
-        /// </summary>
-        protected virtual void OnCloseCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Gets or sets the CloseCommand property.  This dependency property 
+    /// indicates the command to execute when user click the document close button.
+    /// </summary>
+    public ICommand CloseCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( CloseCommandProperty );
+      }
+      set
+      {
+        SetValue( CloseCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the CloseCommand value.
-        /// </summary>
-        private static object CoerceCloseCommandValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Handles changes to the CloseCommand property.
+    /// </summary>
+    private static void OnCloseCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnCloseCommandChanged( e );
+    }
 
-        private bool CanExecuteCloseCommand(object parameter)
-        {
-            return LayoutElement != null && LayoutElement.CanClose;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the CloseCommand property.
+    /// </summary>
+    protected virtual void OnCloseCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteCloseCommand(object parameter)
-        {
-            Close();
-        }
+    /// <summary>
+    /// Coerces the CloseCommand value.
+    /// </summary>
+    private static object CoerceCloseCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        protected abstract void Close();
+    private bool CanExecuteCloseCommand( object parameter )
+    {
+      return LayoutElement != null && LayoutElement.CanClose;
+    }
 
+    private void ExecuteCloseCommand( object parameter )
+    {
+      Close();
+    }
 
-        #endregion
+    protected abstract void Close();
 
-        #region FloatCommand
-        /// <summary>
-        /// FloatCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty FloatCommandProperty =
-            DependencyProperty.Register("FloatCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnFloatCommandChanged),
-                    new CoerceValueCallback(CoerceFloatCommandValue)));
 
-        /// <summary>
-        /// Gets or sets the FloatCommand property.  This dependency property 
-        /// indicates the command to execute when user click the float button.
-        /// </summary>
-        /// <remarks>By default this command move the anchorable inside new floating window.</remarks>
-        public ICommand FloatCommand
-        {
-            get { return (ICommand)GetValue(FloatCommandProperty); }
-            set { SetValue(FloatCommandProperty, value); }
-        }
+    #endregion
 
-        /// <summary>
-        /// Handles changes to the FloatCommand property.
-        /// </summary>
-        private static void OnFloatCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnFloatCommandChanged(e);
-        }
+    #region FloatCommand
+    /// <summary>
+    /// FloatCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty FloatCommandProperty =
+        DependencyProperty.Register( "FloatCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnFloatCommandChanged ),
+                new CoerceValueCallback( CoerceFloatCommandValue ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the FloatCommand property.
-        /// </summary>
-        protected virtual void OnFloatCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Gets or sets the FloatCommand property.  This dependency property 
+    /// indicates the command to execute when user click the float button.
+    /// </summary>
+    /// <remarks>By default this command move the anchorable inside new floating window.</remarks>
+    public ICommand FloatCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( FloatCommandProperty );
+      }
+      set
+      {
+        SetValue( FloatCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the FloatCommand value.
-        /// </summary>
-        private static object CoerceFloatCommandValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Handles changes to the FloatCommand property.
+    /// </summary>
+    private static void OnFloatCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnFloatCommandChanged( e );
+    }
 
-        private bool CanExecuteFloatCommand(object anchorable)
-        {
-            return LayoutElement != null && LayoutElement.CanFloat && LayoutElement.FindParent<LayoutFloatingWindow>() == null;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the FloatCommand property.
+    /// </summary>
+    protected virtual void OnFloatCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteFloatCommand(object parameter)
-        {
-            LayoutElement.Root.Manager._ExecuteFloatCommand(LayoutElement);
-        }
+    /// <summary>
+    /// Coerces the FloatCommand value.
+    /// </summary>
+    private static object CoerceFloatCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        protected virtual void Float()
-        { 
+    private bool CanExecuteFloatCommand( object anchorable )
+    {
+      return LayoutElement != null && LayoutElement.CanFloat && LayoutElement.FindParent<LayoutFloatingWindow>() == null;
+    }
 
-        }
+    private void ExecuteFloatCommand( object parameter )
+    {
+      LayoutElement.Root.Manager._ExecuteFloatCommand( LayoutElement );
+    }
 
-        #endregion
-
-        #region DockAsDocumentCommand
-
-        /// <summary>
-        /// DockAsDocumentCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DockAsDocumentCommandProperty =
-            DependencyProperty.Register("DockAsDocumentCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnDockAsDocumentCommandChanged),
-                    new CoerceValueCallback(CoerceDockAsDocumentCommandValue)));
-
-        /// <summary>
-        /// Gets or sets the DockAsDocumentCommand property.  This dependency property 
-        /// indicates the command to execute when user click the DockAsDocument button.
-        /// </summary>
-        /// <remarks>By default this command move the anchorable inside the last focused document pane.</remarks>
-        public ICommand DockAsDocumentCommand
-        {
-            get { return (ICommand)GetValue(DockAsDocumentCommandProperty); }
-            set { SetValue(DockAsDocumentCommandProperty, value); }
-        }
+    protected virtual void Float()
+    {
 
-        /// <summary>
-        /// Handles changes to the DockAsDocumentCommand property.
-        /// </summary>
-        private static void OnDockAsDocumentCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnDockAsDocumentCommandChanged(e);
-        }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DockAsDocumentCommand property.
-        /// </summary>
-        protected virtual void OnDockAsDocumentCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    #endregion
+
+    #region DockAsDocumentCommand
+
+    /// <summary>
+    /// DockAsDocumentCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DockAsDocumentCommandProperty =
+        DependencyProperty.Register( "DockAsDocumentCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnDockAsDocumentCommandChanged ),
+                new CoerceValueCallback( CoerceDockAsDocumentCommandValue ) ) );
+
+    /// <summary>
+    /// Gets or sets the DockAsDocumentCommand property.  This dependency property 
+    /// indicates the command to execute when user click the DockAsDocument button.
+    /// </summary>
+    /// <remarks>By default this command move the anchorable inside the last focused document pane.</remarks>
+    public ICommand DockAsDocumentCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( DockAsDocumentCommandProperty );
+      }
+      set
+      {
+        SetValue( DockAsDocumentCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the DockAsDocumentCommand value.
-        /// </summary>
-        private static object CoerceDockAsDocumentCommandValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Handles changes to the DockAsDocumentCommand property.
+    /// </summary>
+    private static void OnDockAsDocumentCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnDockAsDocumentCommandChanged( e );
+    }
 
-        private bool CanExecuteDockAsDocumentCommand(object parameter)
-        {
-            return LayoutElement != null && LayoutElement.FindParent<LayoutDocumentPane>() == null;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DockAsDocumentCommand property.
+    /// </summary>
+    protected virtual void OnDockAsDocumentCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteDockAsDocumentCommand(object parameter)
-        {
-            LayoutElement.Root.Manager._ExecuteDockAsDocumentCommand(LayoutElement);
-        }
+    /// <summary>
+    /// Coerces the DockAsDocumentCommand value.
+    /// </summary>
+    private static object CoerceDockAsDocumentCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #endregion
+    private bool CanExecuteDockAsDocumentCommand( object parameter )
+    {
+      return LayoutElement != null && LayoutElement.FindParent<LayoutDocumentPane>() == null;
+    }
 
-        #region CloseAllButThisCommand
+    private void ExecuteDockAsDocumentCommand( object parameter )
+    {
+      LayoutElement.Root.Manager._ExecuteDockAsDocumentCommand( LayoutElement );
+    }
 
-        /// <summary>
-        /// CloseAllButThisCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CloseAllButThisCommandProperty =
-            DependencyProperty.Register("CloseAllButThisCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnCloseAllButThisCommandChanged),
-                    new CoerceValueCallback(CoerceCloseAllButThisCommandValue)));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the CloseAllButThisCommand property.  This dependency property 
-        /// indicates the 'Close All But This' command.
-        /// </summary>
-        public ICommand CloseAllButThisCommand
-        {
-            get { return (ICommand)GetValue(CloseAllButThisCommandProperty); }
-            set { SetValue(CloseAllButThisCommandProperty, value); }
-        }
+    #region CloseAllButThisCommand
 
-        /// <summary>
-        /// Handles changes to the CloseAllButThisCommand property.
-        /// </summary>
-        private static void OnCloseAllButThisCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnCloseAllButThisCommandChanged(e);
-        }
+    /// <summary>
+    /// CloseAllButThisCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty CloseAllButThisCommandProperty =
+        DependencyProperty.Register( "CloseAllButThisCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnCloseAllButThisCommandChanged ),
+                new CoerceValueCallback( CoerceCloseAllButThisCommandValue ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CloseAllButThisCommand property.
-        /// </summary>
-        protected virtual void OnCloseAllButThisCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Gets or sets the CloseAllButThisCommand property.  This dependency property 
+    /// indicates the 'Close All But This' command.
+    /// </summary>
+    public ICommand CloseAllButThisCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( CloseAllButThisCommandProperty );
+      }
+      set
+      {
+        SetValue( CloseAllButThisCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the CloseAllButThisCommand value.
-        /// </summary>
-        private static object CoerceCloseAllButThisCommandValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Handles changes to the CloseAllButThisCommand property.
+    /// </summary>
+    private static void OnCloseAllButThisCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnCloseAllButThisCommandChanged( e );
+    }
 
-        private bool CanExecuteCloseAllButThisCommand(object parameter)
-        {
-            if (LayoutElement == null)
-                return false;
-            var root = LayoutElement.Root;
-            if (root == null)
-                return false;
-
-            return LayoutElement.Root.Manager.Layout.
-                Descendents().OfType<LayoutContent>().Where(d => d != LayoutElement && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).Any();
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the CloseAllButThisCommand property.
+    /// </summary>
+    protected virtual void OnCloseAllButThisCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteCloseAllButThisCommand(object parameter)
-        {
-            LayoutElement.Root.Manager._ExecuteCloseAllButThisCommand(LayoutElement);
-        }
+    /// <summary>
+    /// Coerces the CloseAllButThisCommand value.
+    /// </summary>
+    private static object CoerceCloseAllButThisCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #endregion
+    private bool CanExecuteCloseAllButThisCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+      var root = LayoutElement.Root;
+      if( root == null )
+        return false;
+
+      return LayoutElement.Root.Manager.Layout.
+          Descendents().OfType<LayoutContent>().Where( d => d != LayoutElement && ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).Any();
+    }
 
-        #region CloseAllCommand
+    private void ExecuteCloseAllButThisCommand( object parameter )
+    {
+      LayoutElement.Root.Manager._ExecuteCloseAllButThisCommand( LayoutElement );
+    }
 
-        /// <summary>
-        /// CloseAllCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CloseAllCommandProperty =
-            DependencyProperty.Register( "CloseAllCommand", typeof( ICommand ), typeof( LayoutItem ),
-                new FrameworkPropertyMetadata( null,
-                    new PropertyChangedCallback( OnCloseAllCommandChanged ),
-                    new CoerceValueCallback( CoerceCloseAllCommandValue ) ) );
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the CloseAllCommand property.  This dependency property 
-        /// indicates the 'Close All' command.
-        /// </summary>
-        public ICommand CloseAllCommand
-        {
-          get
-          {
-            return ( ICommand )GetValue( CloseAllCommandProperty );
-          }
-          set
-          {
-            SetValue( CloseAllCommandProperty, value );
-          }
-        }
+    #region CloseAllCommand
 
-        /// <summary>
-        /// Handles changes to the CloseAllCommand property.
-        /// </summary>
-        private static void OnCloseAllCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-        {
-          ( ( LayoutItem )d ).OnCloseAllCommandChanged( e );
-        }
+    /// <summary>
+    /// CloseAllCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty CloseAllCommandProperty =
+        DependencyProperty.Register( "CloseAllCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnCloseAllCommandChanged ),
+                new CoerceValueCallback( CoerceCloseAllCommandValue ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CloseAllCommand property.
-        /// </summary>
-        protected virtual void OnCloseAllCommandChanged( DependencyPropertyChangedEventArgs e )
-        {
-        }
+    /// <summary>
+    /// Gets or sets the CloseAllCommand property.  This dependency property 
+    /// indicates the 'Close All' command.
+    /// </summary>
+    public ICommand CloseAllCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( CloseAllCommandProperty );
+      }
+      set
+      {
+        SetValue( CloseAllCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the CloseAllCommand value.
-        /// </summary>
-        private static object CoerceCloseAllCommandValue( DependencyObject d, object value )
-        {
-          return value;
-        }
+    /// <summary>
+    /// Handles changes to the CloseAllCommand property.
+    /// </summary>
+    private static void OnCloseAllCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnCloseAllCommandChanged( e );
+    }
 
-        private bool CanExecuteCloseAllCommand( object parameter )
-        {
-          if( LayoutElement == null )
-            return false;
-          var root = LayoutElement.Root;
-          if( root == null )
-            return false;
-
-          return LayoutElement.Root.Manager.Layout.
-              Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).Any();
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the CloseAllCommand property.
+    /// </summary>
+    protected virtual void OnCloseAllCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteCloseAllCommand( object parameter )
-        {
-          LayoutElement.Root.Manager._ExecuteCloseAllCommand( LayoutElement );
-        }
+    /// <summary>
+    /// Coerces the CloseAllCommand value.
+    /// </summary>
+    private static object CoerceCloseAllCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #endregion
+    private bool CanExecuteCloseAllCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+      var root = LayoutElement.Root;
+      if( root == null )
+        return false;
+
+      return LayoutElement.Root.Manager.Layout.
+          Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).Any();
+    }
 
-        #region ActivateCommand
+    private void ExecuteCloseAllCommand( object parameter )
+    {
+      LayoutElement.Root.Manager._ExecuteCloseAllCommand( LayoutElement );
+    }
 
-        /// <summary>
-        /// ActivateCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ActivateCommandProperty =
-            DependencyProperty.Register("ActivateCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnActivateCommandChanged),
-                    new CoerceValueCallback(CoerceActivateCommandValue)));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the ActivateCommand property.  This dependency property 
-        /// indicates the command to execute when user wants to activate a content (either a Document or an Anchorable).
-        /// </summary>
-        public ICommand ActivateCommand
-        {
-            get { return (ICommand)GetValue(ActivateCommandProperty); }
-            set { SetValue(ActivateCommandProperty, value); }
-        }
+    #region ActivateCommand
 
-        /// <summary>
-        /// Handles changes to the ActivateCommand property.
-        /// </summary>
-        private static void OnActivateCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnActivateCommandChanged(e);
-        }
+    /// <summary>
+    /// ActivateCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ActivateCommandProperty =
+        DependencyProperty.Register( "ActivateCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnActivateCommandChanged ),
+                new CoerceValueCallback( CoerceActivateCommandValue ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the ActivateCommand property.
-        /// </summary>
-        protected virtual void OnActivateCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Gets or sets the ActivateCommand property.  This dependency property 
+    /// indicates the command to execute when user wants to activate a content (either a Document or an Anchorable).
+    /// </summary>
+    public ICommand ActivateCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( ActivateCommandProperty );
+      }
+      set
+      {
+        SetValue( ActivateCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Coerces the ActivateCommand value.
-        /// </summary>
-        private static object CoerceActivateCommandValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Handles changes to the ActivateCommand property.
+    /// </summary>
+    private static void OnActivateCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnActivateCommandChanged( e );
+    }
 
-        private bool CanExecuteActivateCommand(object parameter)
-        {
-            return LayoutElement != null;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the ActivateCommand property.
+    /// </summary>
+    protected virtual void OnActivateCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private void ExecuteActivateCommand(object parameter)
-        {
-            LayoutElement.Root.Manager._ExecuteContentActivateCommand(LayoutElement);
-        }
+    /// <summary>
+    /// Coerces the ActivateCommand value.
+    /// </summary>
+    private static object CoerceActivateCommandValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #endregion
+    private bool CanExecuteActivateCommand( object parameter )
+    {
+      return LayoutElement != null;
+    }
 
-        #region NewVerticalTabGroupCommand
+    private void ExecuteActivateCommand( object parameter )
+    {
+      LayoutElement.Root.Manager._ExecuteContentActivateCommand( LayoutElement );
+    }
 
-        /// <summary>
-        /// NewVerticalTabGroupCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty NewVerticalTabGroupCommandProperty =
-            DependencyProperty.Register("NewVerticalTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((ICommand)null,
-                    new PropertyChangedCallback(OnNewVerticalTabGroupCommandChanged)));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the NewVerticalTabGroupCommand property.  This dependency property 
-        /// indicates the new vertical tab group command.
-        /// </summary>
-        public ICommand NewVerticalTabGroupCommand
-        {
-            get { return (ICommand)GetValue(NewVerticalTabGroupCommandProperty); }
-            set { SetValue(NewVerticalTabGroupCommandProperty, value); }
-        }
+    #region NewVerticalTabGroupCommand
 
-        /// <summary>
-        /// Handles changes to the NewVerticalTabGroupCommand property.
-        /// </summary>
-        private static void OnNewVerticalTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnNewVerticalTabGroupCommandChanged(e);
-        }
+    /// <summary>
+    /// NewVerticalTabGroupCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty NewVerticalTabGroupCommandProperty =
+        DependencyProperty.Register( "NewVerticalTabGroupCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( ICommand )null,
+                new PropertyChangedCallback( OnNewVerticalTabGroupCommandChanged ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the NewVerticalTabGroupCommand property.
-        /// </summary>
-        protected virtual void OnNewVerticalTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Gets or sets the NewVerticalTabGroupCommand property.  This dependency property 
+    /// indicates the new vertical tab group command.
+    /// </summary>
+    public ICommand NewVerticalTabGroupCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( NewVerticalTabGroupCommandProperty );
+      }
+      set
+      {
+        SetValue( NewVerticalTabGroupCommandProperty, value );
+      }
+    }
 
-        private bool CanExecuteNewVerticalTabGroupCommand(object parameter)
-        {
-            if (LayoutElement == null)
-                return false;
-            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
-            return ((parentDocumentGroup == null ||
-                parentDocumentGroup.ChildrenCount == 1 ||
-                parentDocumentGroup.Root.Manager.AllowMixedOrientation || 
-                parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Horizontal) &&
-                parentDocumentPane != null &&
-                parentDocumentPane.ChildrenCount > 1);
-        }
+    /// <summary>
+    /// Handles changes to the NewVerticalTabGroupCommand property.
+    /// </summary>
+    private static void OnNewVerticalTabGroupCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnNewVerticalTabGroupCommandChanged( e );
+    }
 
-        private void ExecuteNewVerticalTabGroupCommand(object parameter)
-        {
-            var layoutElement = LayoutElement;
-            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the NewVerticalTabGroupCommand property.
+    /// </summary>
+    protected virtual void OnNewVerticalTabGroupCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-            if (parentDocumentGroup == null)
-            {
-                var grandParent = parentDocumentPane.Parent as ILayoutContainer;
-                parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
-                grandParent.ReplaceChild(parentDocumentPane, parentDocumentGroup);
-                parentDocumentGroup.Children.Add(parentDocumentPane);
-            }
-            parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Horizontal; 
-            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
-            parentDocumentGroup.InsertChildAt(indexOfParentPane + 1, new LayoutDocumentPane(layoutElement));
-            layoutElement.IsActive = true;
-            layoutElement.Root.CollectGarbage();
-        }
-        #endregion
-
-        #region NewHorizontalTabGroupCommand
-
-        /// <summary>
-        /// NewHorizontalTabGroupCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty NewHorizontalTabGroupCommandProperty =
-            DependencyProperty.Register("NewHorizontalTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((ICommand)null,
-                    new PropertyChangedCallback(OnNewHorizontalTabGroupCommandChanged)));
-
-        /// <summary>
-        /// Gets or sets the NewHorizontalTabGroupCommand property.  This dependency property 
-        /// indicates the new horizontal tab group command.
-        /// </summary>
-        public ICommand NewHorizontalTabGroupCommand
-        {
-            get { return (ICommand)GetValue(NewHorizontalTabGroupCommandProperty); }
-            set { SetValue(NewHorizontalTabGroupCommandProperty, value); }
-        }
+    private bool CanExecuteNewVerticalTabGroupCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+      var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+      return ( ( parentDocumentGroup == null ||
+          parentDocumentGroup.ChildrenCount == 1 ||
+          parentDocumentGroup.Root.Manager.AllowMixedOrientation ||
+          parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Horizontal ) &&
+          parentDocumentPane != null &&
+          parentDocumentPane.ChildrenCount > 1 );
+    }
 
-        /// <summary>
-        /// Handles changes to the NewHorizontalTabGroupCommand property.
-        /// </summary>
-        private static void OnNewHorizontalTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnNewHorizontalTabGroupCommandChanged(e);
-        }
+    private void ExecuteNewVerticalTabGroupCommand( object parameter )
+    {
+      var layoutElement = LayoutElement;
+      var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+
+      if( parentDocumentGroup == null )
+      {
+        var grandParent = parentDocumentPane.Parent as ILayoutContainer;
+        parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+        grandParent.ReplaceChild( parentDocumentPane, parentDocumentGroup );
+        parentDocumentGroup.Children.Add( parentDocumentPane );
+      }
+      parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+      int indexOfParentPane = parentDocumentGroup.IndexOfChild( parentDocumentPane );
+      parentDocumentGroup.InsertChildAt( indexOfParentPane + 1, new LayoutDocumentPane( layoutElement ) );
+      layoutElement.IsActive = true;
+      layoutElement.Root.CollectGarbage();
+    }
+    #endregion
+
+    #region NewHorizontalTabGroupCommand
+
+    /// <summary>
+    /// NewHorizontalTabGroupCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty NewHorizontalTabGroupCommandProperty =
+        DependencyProperty.Register( "NewHorizontalTabGroupCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( ICommand )null,
+                new PropertyChangedCallback( OnNewHorizontalTabGroupCommandChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the NewHorizontalTabGroupCommand property.  This dependency property 
+    /// indicates the new horizontal tab group command.
+    /// </summary>
+    public ICommand NewHorizontalTabGroupCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( NewHorizontalTabGroupCommandProperty );
+      }
+      set
+      {
+        SetValue( NewHorizontalTabGroupCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the NewHorizontalTabGroupCommand property.
-        /// </summary>
-        protected virtual void OnNewHorizontalTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Handles changes to the NewHorizontalTabGroupCommand property.
+    /// </summary>
+    private static void OnNewHorizontalTabGroupCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnNewHorizontalTabGroupCommandChanged( e );
+    }
 
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the NewHorizontalTabGroupCommand property.
+    /// </summary>
+    protected virtual void OnNewHorizontalTabGroupCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private bool CanExecuteNewHorizontalTabGroupCommand(object parameter)
-        {
-            if (LayoutElement == null)
-                return false;
-            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
-            return ((parentDocumentGroup == null ||
-                parentDocumentGroup.ChildrenCount == 1 ||
-                parentDocumentGroup.Root.Manager.AllowMixedOrientation ||
-                parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Vertical) &&
-                parentDocumentPane != null &&
-                parentDocumentPane.ChildrenCount > 1);
-        }
 
-        private void ExecuteNewHorizontalTabGroupCommand(object parameter)
-        {
-            var layoutElement = LayoutElement;
-            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+    private bool CanExecuteNewHorizontalTabGroupCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+      var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+      return ( ( parentDocumentGroup == null ||
+          parentDocumentGroup.ChildrenCount == 1 ||
+          parentDocumentGroup.Root.Manager.AllowMixedOrientation ||
+          parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Vertical ) &&
+          parentDocumentPane != null &&
+          parentDocumentPane.ChildrenCount > 1 );
+    }
 
-            if (parentDocumentGroup == null)
-            {
-                var grandParent = parentDocumentPane.Parent as ILayoutContainer;
-                parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
-                grandParent.ReplaceChild(parentDocumentPane, parentDocumentGroup);
-                parentDocumentGroup.Children.Add(parentDocumentPane);
-            }
-            parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
-            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
-            parentDocumentGroup.InsertChildAt(indexOfParentPane + 1, new LayoutDocumentPane(layoutElement));
-            layoutElement.IsActive = true;
-            layoutElement.Root.CollectGarbage();
-        }       
-        #endregion
-
-        #region MoveToNextTabGroupCommand
-
-        /// <summary>
-        /// MoveToNextTabGroupCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty MoveToNextTabGroupCommandProperty =
-            DependencyProperty.Register("MoveToNextTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((ICommand)null,
-                    new PropertyChangedCallback(OnMoveToNextTabGroupCommandChanged)));
-
-        /// <summary>
-        /// Gets or sets the MoveToNextTabGroupCommand property.  This dependency property 
-        /// indicates move to next tab group command.
-        /// </summary>
-        public ICommand MoveToNextTabGroupCommand
-        {
-            get { return (ICommand)GetValue(MoveToNextTabGroupCommandProperty); }
-            set { SetValue(MoveToNextTabGroupCommandProperty, value); }
-        }
+    private void ExecuteNewHorizontalTabGroupCommand( object parameter )
+    {
+      var layoutElement = LayoutElement;
+      var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+
+      if( parentDocumentGroup == null )
+      {
+        var grandParent = parentDocumentPane.Parent as ILayoutContainer;
+        parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+        grandParent.ReplaceChild( parentDocumentPane, parentDocumentGroup );
+        parentDocumentGroup.Children.Add( parentDocumentPane );
+      }
+      parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+      int indexOfParentPane = parentDocumentGroup.IndexOfChild( parentDocumentPane );
+      parentDocumentGroup.InsertChildAt( indexOfParentPane + 1, new LayoutDocumentPane( layoutElement ) );
+      layoutElement.IsActive = true;
+      layoutElement.Root.CollectGarbage();
+    }
+    #endregion
+
+    #region MoveToNextTabGroupCommand
+
+    /// <summary>
+    /// MoveToNextTabGroupCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty MoveToNextTabGroupCommandProperty =
+        DependencyProperty.Register( "MoveToNextTabGroupCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( ICommand )null,
+                new PropertyChangedCallback( OnMoveToNextTabGroupCommandChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the MoveToNextTabGroupCommand property.  This dependency property 
+    /// indicates move to next tab group command.
+    /// </summary>
+    public ICommand MoveToNextTabGroupCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( MoveToNextTabGroupCommandProperty );
+      }
+      set
+      {
+        SetValue( MoveToNextTabGroupCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the MoveToNextTabGroupCommand property.
-        /// </summary>
-        private static void OnMoveToNextTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnMoveToNextTabGroupCommandChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the MoveToNextTabGroupCommand property.
+    /// </summary>
+    private static void OnMoveToNextTabGroupCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnMoveToNextTabGroupCommandChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the MoveToNextTabGroupCommand property.
-        /// </summary>
-        protected virtual void OnMoveToNextTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the MoveToNextTabGroupCommand property.
+    /// </summary>
+    protected virtual void OnMoveToNextTabGroupCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private bool CanExecuteMoveToNextTabGroupCommand(object parameter)
-        {
-            if (LayoutElement == null)
-                return false;
-
-            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
-            return (parentDocumentGroup != null &&
-                parentDocumentPane != null &&
-                parentDocumentGroup.ChildrenCount > 1 &&
-                parentDocumentGroup.IndexOfChild(parentDocumentPane) < parentDocumentGroup.ChildrenCount - 1 &&
-                parentDocumentGroup.Children[parentDocumentGroup.IndexOfChild(parentDocumentPane) + 1] is LayoutDocumentPane);
-        }
+    private bool CanExecuteMoveToNextTabGroupCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+
+      var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+      return ( parentDocumentGroup != null &&
+          parentDocumentPane != null &&
+          parentDocumentGroup.ChildrenCount > 1 &&
+          parentDocumentGroup.IndexOfChild( parentDocumentPane ) < parentDocumentGroup.ChildrenCount - 1 &&
+          parentDocumentGroup.Children[ parentDocumentGroup.IndexOfChild( parentDocumentPane ) + 1 ] is LayoutDocumentPane );
+    }
 
-        private void ExecuteMoveToNextTabGroupCommand(object parameter)
-        {
-            var layoutElement = LayoutElement;
-            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
-            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
-            var nextDocumentPane = parentDocumentGroup.Children[indexOfParentPane + 1] as LayoutDocumentPane;
-            nextDocumentPane.InsertChildAt(0, layoutElement);
-            layoutElement.IsActive = true;
-            layoutElement.Root.CollectGarbage();
-        }
+    private void ExecuteMoveToNextTabGroupCommand( object parameter )
+    {
+      var layoutElement = LayoutElement;
+      var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+      int indexOfParentPane = parentDocumentGroup.IndexOfChild( parentDocumentPane );
+      var nextDocumentPane = parentDocumentGroup.Children[ indexOfParentPane + 1 ] as LayoutDocumentPane;
+      nextDocumentPane.InsertChildAt( 0, layoutElement );
+      layoutElement.IsActive = true;
+      layoutElement.Root.CollectGarbage();
+    }
 
-        #endregion
+    #endregion
 
-        #region MoveToPreviousTabGroupCommand
+    #region MoveToPreviousTabGroupCommand
 
-        /// <summary>
-        /// MoveToPreviousTabGroupCommand Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty MoveToPreviousTabGroupCommandProperty =
-            DependencyProperty.Register("MoveToPreviousTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
-                new FrameworkPropertyMetadata((ICommand)null,
-                    new PropertyChangedCallback(OnMoveToPreviousTabGroupCommandChanged)));
+    /// <summary>
+    /// MoveToPreviousTabGroupCommand Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty MoveToPreviousTabGroupCommandProperty =
+        DependencyProperty.Register( "MoveToPreviousTabGroupCommand", typeof( ICommand ), typeof( LayoutItem ),
+            new FrameworkPropertyMetadata( ( ICommand )null,
+                new PropertyChangedCallback( OnMoveToPreviousTabGroupCommandChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the MoveToPreviousTabGroupCommand property.  This dependency property 
-        /// indicates move to rpevious tab group command.
-        /// </summary>
-        public ICommand MoveToPreviousTabGroupCommand
-        {
-            get { return (ICommand)GetValue(MoveToPreviousTabGroupCommandProperty); }
-            set { SetValue(MoveToPreviousTabGroupCommandProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the MoveToPreviousTabGroupCommand property.  This dependency property 
+    /// indicates move to rpevious tab group command.
+    /// </summary>
+    public ICommand MoveToPreviousTabGroupCommand
+    {
+      get
+      {
+        return ( ICommand )GetValue( MoveToPreviousTabGroupCommandProperty );
+      }
+      set
+      {
+        SetValue( MoveToPreviousTabGroupCommandProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the MoveToPreviousTabGroupCommand property.
-        /// </summary>
-        private static void OnMoveToPreviousTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((LayoutItem)d).OnMoveToPreviousTabGroupCommandChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the MoveToPreviousTabGroupCommand property.
+    /// </summary>
+    private static void OnMoveToPreviousTabGroupCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( LayoutItem )d ).OnMoveToPreviousTabGroupCommandChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the MoveToPreviousTabGroupCommand property.
-        /// </summary>
-        protected virtual void OnMoveToPreviousTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the MoveToPreviousTabGroupCommand property.
+    /// </summary>
+    protected virtual void OnMoveToPreviousTabGroupCommandChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        private bool CanExecuteMoveToPreviousTabGroupCommand(object parameter)
-        {
-            if (LayoutElement == null)
-                return false;
-            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
-            return (parentDocumentGroup != null &&
-                parentDocumentPane != null &&
-                parentDocumentGroup.ChildrenCount > 1 &&
-                parentDocumentGroup.IndexOfChild(parentDocumentPane) > 0 &&
-                parentDocumentGroup.Children[parentDocumentGroup.IndexOfChild(parentDocumentPane) - 1] is LayoutDocumentPane);
-        }
+    private bool CanExecuteMoveToPreviousTabGroupCommand( object parameter )
+    {
+      if( LayoutElement == null )
+        return false;
+      var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+      return ( parentDocumentGroup != null &&
+          parentDocumentPane != null &&
+          parentDocumentGroup.ChildrenCount > 1 &&
+          parentDocumentGroup.IndexOfChild( parentDocumentPane ) > 0 &&
+          parentDocumentGroup.Children[ parentDocumentGroup.IndexOfChild( parentDocumentPane ) - 1 ] is LayoutDocumentPane );
+    }
 
-        private void ExecuteMoveToPreviousTabGroupCommand(object parameter)
-        {
-            var layoutElement = LayoutElement;
-            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
-            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
-            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
-            var nextDocumentPane = parentDocumentGroup.Children[indexOfParentPane - 1] as LayoutDocumentPane;
-            nextDocumentPane.InsertChildAt(0, layoutElement);
-            layoutElement.IsActive = true;
-            layoutElement.Root.CollectGarbage();
-        }
-        #endregion
+    private void ExecuteMoveToPreviousTabGroupCommand( object parameter )
+    {
+      var layoutElement = LayoutElement;
+      var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+      var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+      int indexOfParentPane = parentDocumentGroup.IndexOfChild( parentDocumentPane );
+      var nextDocumentPane = parentDocumentGroup.Children[ indexOfParentPane - 1 ] as LayoutDocumentPane;
+      nextDocumentPane.InsertChildAt( 0, layoutElement );
+      layoutElement.IsActive = true;
+      layoutElement.Root.CollectGarbage();
+    }
+    #endregion
 
 
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
index 4f12a840..daf27ceb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
@@ -14,351 +14,366 @@
 
   ***********************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Interop;
-using System.Windows.Threading;
 using Xceed.Wpf.AvalonDock.Themes;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-    public class NavigatorWindow : Window
-    {
-        private ResourceDictionary currentThemeResourceDictionary; // = null
+  public class NavigatorWindow : Window
+  {
+    private ResourceDictionary currentThemeResourceDictionary; // = null
 
-        static NavigatorWindow()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(typeof(NavigatorWindow)));
-            ShowActivatedProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(false));
-            ShowInTaskbarProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(false));
-        }
+    static NavigatorWindow()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( typeof( NavigatorWindow ) ) );
+      ShowActivatedProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( false ) );
+      ShowInTaskbarProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( false ) );
+    }
 
-        DockingManager _manager;
-        internal NavigatorWindow(DockingManager manager)
-        {
-            _manager = manager;
+    DockingManager _manager;
+    internal NavigatorWindow( DockingManager manager )
+    {
+      _manager = manager;
 
-            _internalSetSelectedDocument = true;
-            SetAnchorables(_manager.Layout.Descendents().OfType<LayoutAnchorable>().Where(a => a.IsVisible).Select(d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel(d)).ToArray());
-            SetDocuments(_manager.Layout.Descendents().OfType<LayoutDocument>().OrderByDescending(d => d.LastActivationTimeStamp.GetValueOrDefault()).Select(d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel(d)).ToArray());
-            _internalSetSelectedDocument = false;
+      _internalSetSelectedDocument = true;
+      SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible ).Select( d => ( LayoutAnchorableItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => ( LayoutDocumentItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      _internalSetSelectedDocument = false;
 
-            if (Documents.Length > 1)
-                InternalSetSelectedDocument(Documents[1]);
+      if( Documents.Length > 1 )
+        InternalSetSelectedDocument( Documents[ 1 ] );
 
-            this.DataContext = this;
+      this.DataContext = this;
 
-            this.Loaded += new RoutedEventHandler(OnLoaded);
-            this.Unloaded += new RoutedEventHandler(OnUnloaded);
+      this.Loaded += new RoutedEventHandler( OnLoaded );
+      this.Unloaded += new RoutedEventHandler( OnUnloaded );
 
-            UpdateThemeResources();
-        }
+      UpdateThemeResources();
+    }
 
 
-        internal void UpdateThemeResources(Theme oldTheme = null)
+    internal void UpdateThemeResources( Theme oldTheme = null )
+    {
+      if( oldTheme != null )
+      {
+        if( oldTheme is DictionaryTheme )
         {
-            if (oldTheme != null)
-            {
-              if( oldTheme is DictionaryTheme )
-              {
-                if( currentThemeResourceDictionary != null )
-                {
-                  Resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-                  currentThemeResourceDictionary = null;
-                }
-              }
-              else
-              {
-                var resourceDictionaryToRemove =
-                    Resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-                if( resourceDictionaryToRemove != null )
-                  Resources.MergedDictionaries.Remove(
-                      resourceDictionaryToRemove );
-              }
-            }
-
-            if (_manager.Theme != null)
-            {
-              if( _manager.Theme is DictionaryTheme )
-              {
-                currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary;
-                Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-              }
-              else
-              {
-                Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _manager.Theme.GetResourceUri() });
-              }
-            }
+          if( currentThemeResourceDictionary != null )
+          {
+            Resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
+            currentThemeResourceDictionary = null;
+          }
         }
-
-
-        void OnLoaded(object sender, RoutedEventArgs e)
+        else
         {
-            this.Loaded -= new RoutedEventHandler(OnLoaded);
-
-            this.Focus();
-
-            //this.SetParentToMainWindowOf(_manager);
-            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+          var resourceDictionaryToRemove =
+              Resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
+          if( resourceDictionaryToRemove != null )
+            Resources.MergedDictionaries.Remove(
+                resourceDictionaryToRemove );
         }
+      }
 
-        void OnUnloaded(object sender, RoutedEventArgs e)
+      if( _manager.Theme != null )
+      {
+        if( _manager.Theme is DictionaryTheme )
         {
-            this.Unloaded -= new RoutedEventHandler(OnUnloaded);
-
-            //_hwndSrc.RemoveHook(_hwndSrcHook);
-            //_hwndSrc.Dispose();
-            //_hwndSrc = null;
+          currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary;
+          Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
         }
-
-        //protected virtual IntPtr FilterMessage(
-        //    IntPtr hwnd,
-        //    int msg,
-        //    IntPtr wParam,
-        //    IntPtr lParam,
-        //    ref bool handled
-        //    )
-        //{
-        //    handled = false;
-
-        //    switch (msg)
-        //    {
-        //        case Win32Helper.WM_ACTIVATE:
-        //            if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
-        //            {
-        //                if (lParam == new WindowInteropHelper(this.Owner).Handle)
-        //                {
-        //                    Win32Helper.SetActiveWindow(_hwndSrc.Handle);
-        //                    handled = true;
-        //                }
-
-        //            }
-        //            break;
-        //    }
-
-        //    return IntPtr.Zero;
-        //}
-
-
-        #region Documents
-
-        /// <summary>
-        /// Documents Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey DocumentsPropertyKey
-            = DependencyProperty.RegisterReadOnly("Documents", typeof(IEnumerable<LayoutDocumentItem>), typeof(NavigatorWindow),
-                new FrameworkPropertyMetadata(null));
-
-        public static readonly DependencyProperty DocumentsProperty
-            = DocumentsPropertyKey.DependencyProperty;
-
-        /// <summary>
-        /// Gets the Documents property.  This dependency property 
-        /// indicates the list of documents.
-        /// </summary>
-        public LayoutDocumentItem[] Documents
+        else
         {
-            get { return (LayoutDocumentItem[])GetValue(DocumentsProperty); }
+          Resources.MergedDictionaries.Add( new ResourceDictionary() { Source = _manager.Theme.GetResourceUri() } );
         }
+      }
+    }
 
-        /// <summary>
-        /// Provides a secure method for setting the Documents property.  
-        /// This dependency property indicates the list of documents.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetDocuments(LayoutDocumentItem[] value)
-        {
-            SetValue(DocumentsPropertyKey, value);
-        }
 
-        #endregion
+    void OnLoaded( object sender, RoutedEventArgs e )
+    {
+      this.Loaded -= new RoutedEventHandler( OnLoaded );
 
-        #region Anchorables
+      this.Focus();
 
-        /// <summary>
-        /// Anchorables Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey AnchorablesPropertyKey
-            = DependencyProperty.RegisterReadOnly("Anchorables", typeof(IEnumerable<LayoutAnchorableItem>), typeof(NavigatorWindow),
-                new FrameworkPropertyMetadata((IEnumerable<LayoutAnchorableItem>)null));
+      //this.SetParentToMainWindowOf(_manager);
+      WindowStartupLocation = WindowStartupLocation.CenterOwner;
+    }
 
-        public static readonly DependencyProperty AnchorablesProperty
-            = AnchorablesPropertyKey.DependencyProperty;
+    void OnUnloaded( object sender, RoutedEventArgs e )
+    {
+      this.Unloaded -= new RoutedEventHandler( OnUnloaded );
 
-        /// <summary>
-        /// Gets the Anchorables property.  This dependency property 
-        /// indicates the list of anchorables.
-        /// </summary>
-        public IEnumerable<LayoutAnchorableItem> Anchorables
-        {
-            get { return (IEnumerable<LayoutAnchorableItem>)GetValue(AnchorablesProperty); }
-        }
+      //_hwndSrc.RemoveHook(_hwndSrcHook);
+      //_hwndSrc.Dispose();
+      //_hwndSrc = null;
+    }
 
-        /// <summary>
-        /// Provides a secure method for setting the Anchorables property.  
-        /// This dependency property indicates the list of anchorables.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetAnchorables(IEnumerable<LayoutAnchorableItem> value)
-        {
-            SetValue(AnchorablesPropertyKey, value);
-        }
+    //protected virtual IntPtr FilterMessage(
+    //    IntPtr hwnd,
+    //    int msg,
+    //    IntPtr wParam,
+    //    IntPtr lParam,
+    //    ref bool handled
+    //    )
+    //{
+    //    handled = false;
+
+    //    switch (msg)
+    //    {
+    //        case Win32Helper.WM_ACTIVATE:
+    //            if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
+    //            {
+    //                if (lParam == new WindowInteropHelper(this.Owner).Handle)
+    //                {
+    //                    Win32Helper.SetActiveWindow(_hwndSrc.Handle);
+    //                    handled = true;
+    //                }
+
+    //            }
+    //            break;
+    //    }
+
+    //    return IntPtr.Zero;
+    //}
+
+
+    #region Documents
+
+    /// <summary>
+    /// Documents Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey DocumentsPropertyKey
+        = DependencyProperty.RegisterReadOnly( "Documents", typeof( IEnumerable<LayoutDocumentItem> ), typeof( NavigatorWindow ),
+            new FrameworkPropertyMetadata( null ) );
+
+    public static readonly DependencyProperty DocumentsProperty
+        = DocumentsPropertyKey.DependencyProperty;
+
+    /// <summary>
+    /// Gets the Documents property.  This dependency property 
+    /// indicates the list of documents.
+    /// </summary>
+    public LayoutDocumentItem[] Documents
+    {
+      get
+      {
+        return ( LayoutDocumentItem[] )GetValue( DocumentsProperty );
+      }
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides a secure method for setting the Documents property.  
+    /// This dependency property indicates the list of documents.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetDocuments( LayoutDocumentItem[] value )
+    {
+      SetValue( DocumentsPropertyKey, value );
+    }
 
-        #region SelectedDocument
+    #endregion
 
-        /// <summary>
-        /// SelectedDocument Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty SelectedDocumentProperty =
-            DependencyProperty.Register("SelectedDocument", typeof(LayoutDocumentItem), typeof(NavigatorWindow),
-                new FrameworkPropertyMetadata((LayoutDocumentItem)null,
-                    new PropertyChangedCallback(OnSelectedDocumentChanged)));
+    #region Anchorables
 
-        /// <summary>
-        /// Gets or sets the SelectedDocument property.  This dependency property 
-        /// indicates the selected document.
-        /// </summary>
-        public LayoutDocumentItem SelectedDocument
-        {
-            get { return (LayoutDocumentItem)GetValue(SelectedDocumentProperty); }
-            set { SetValue(SelectedDocumentProperty, value); }
-        }
+    /// <summary>
+    /// Anchorables Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey AnchorablesPropertyKey
+        = DependencyProperty.RegisterReadOnly( "Anchorables", typeof( IEnumerable<LayoutAnchorableItem> ), typeof( NavigatorWindow ),
+            new FrameworkPropertyMetadata( ( IEnumerable<LayoutAnchorableItem> )null ) );
 
-        /// <summary>
-        /// Handles changes to the SelectedDocument property.
-        /// </summary>
-        private static void OnSelectedDocumentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((NavigatorWindow)d).OnSelectedDocumentChanged(e);
-        }
+    public static readonly DependencyProperty AnchorablesProperty
+        = AnchorablesPropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the SelectedDocument property.
-        /// </summary>
-        protected virtual void OnSelectedDocumentChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (_internalSetSelectedDocument)
-                return;
+    /// <summary>
+    /// Gets the Anchorables property.  This dependency property 
+    /// indicates the list of anchorables.
+    /// </summary>
+    public IEnumerable<LayoutAnchorableItem> Anchorables
+    {
+      get
+      {
+        return ( IEnumerable<LayoutAnchorableItem> )GetValue( AnchorablesProperty );
+      }
+    }
 
-            if (SelectedDocument != null &&
-                SelectedDocument.ActivateCommand.CanExecute(null))
-            {
-                SelectedDocument.ActivateCommand.Execute(null);
-                Hide();
-            }
+    /// <summary>
+    /// Provides a secure method for setting the Anchorables property.  
+    /// This dependency property indicates the list of anchorables.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetAnchorables( IEnumerable<LayoutAnchorableItem> value )
+    {
+      SetValue( AnchorablesPropertyKey, value );
+    }
 
-        }
+    #endregion
 
-        bool _internalSetSelectedDocument = false;
-        void InternalSetSelectedDocument(LayoutDocumentItem documentToSelect)
-        {
-            _internalSetSelectedDocument = true;
-            SelectedDocument = documentToSelect;
-            _internalSetSelectedDocument = false;
-        }
+    #region SelectedDocument
 
-        #endregion
+    /// <summary>
+    /// SelectedDocument Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty SelectedDocumentProperty =
+        DependencyProperty.Register( "SelectedDocument", typeof( LayoutDocumentItem ), typeof( NavigatorWindow ),
+            new FrameworkPropertyMetadata( ( LayoutDocumentItem )null,
+                new PropertyChangedCallback( OnSelectedDocumentChanged ) ) );
 
-        #region SelectedAnchorable
+    /// <summary>
+    /// Gets or sets the SelectedDocument property.  This dependency property 
+    /// indicates the selected document.
+    /// </summary>
+    public LayoutDocumentItem SelectedDocument
+    {
+      get
+      {
+        return ( LayoutDocumentItem )GetValue( SelectedDocumentProperty );
+      }
+      set
+      {
+        SetValue( SelectedDocumentProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// SelectedAnchorable Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty SelectedAnchorableProperty =
-            DependencyProperty.Register("SelectedAnchorable", typeof(LayoutAnchorableItem), typeof(NavigatorWindow),
-                new FrameworkPropertyMetadata((LayoutAnchorableItem)null,
-                    new PropertyChangedCallback(OnSelectedAnchorableChanged)));
+    /// <summary>
+    /// Handles changes to the SelectedDocument property.
+    /// </summary>
+    private static void OnSelectedDocumentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( NavigatorWindow )d ).OnSelectedDocumentChanged( e );
+    }
 
-        /// <summary>
-        /// Gets or sets the SelectedAnchorable property.  This dependency property 
-        /// indicates the selected anchorable.
-        /// </summary>
-        public LayoutAnchorableItem SelectedAnchorable
-        {
-            get { return (LayoutAnchorableItem)GetValue(SelectedAnchorableProperty); }
-            set { SetValue(SelectedAnchorableProperty, value); }
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the SelectedDocument property.
+    /// </summary>
+    protected virtual void OnSelectedDocumentChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( _internalSetSelectedDocument )
+        return;
 
-        /// <summary>
-        /// Handles changes to the SelectedAnchorable property.
-        /// </summary>
-        private static void OnSelectedAnchorableChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((NavigatorWindow)d).OnSelectedAnchorableChanged(e);
-        }
+      if( SelectedDocument != null &&
+          SelectedDocument.ActivateCommand.CanExecute( null ) )
+      {
+        SelectedDocument.ActivateCommand.Execute( null );
+        Hide();
+      }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the SelectedAnchorable property.
-        /// </summary>
-        protected virtual void OnSelectedAnchorableChanged(DependencyPropertyChangedEventArgs e)
-        {
-            var selectedAnchorable = e.NewValue as LayoutAnchorableItem;
-            if (SelectedAnchorable != null &&
-                SelectedAnchorable.ActivateCommand.CanExecute(null))
-            {
-                SelectedAnchorable.ActivateCommand.Execute(null);
-                Close();
-            }
-        }
+    }
 
-        #endregion
+    bool _internalSetSelectedDocument = false;
+    void InternalSetSelectedDocument( LayoutDocumentItem documentToSelect )
+    {
+      _internalSetSelectedDocument = true;
+      SelectedDocument = documentToSelect;
+      _internalSetSelectedDocument = false;
+    }
 
+    #endregion
 
-        internal void SelectNextDocument()
-        {
-            if (SelectedDocument != null)
-            {
-                int docIndex = Documents.IndexOf<LayoutDocumentItem>(SelectedDocument);
-                docIndex++;
-                if (docIndex == Documents.Length)
-                    docIndex = 0;
-                InternalSetSelectedDocument(Documents[docIndex]);
-            }
+    #region SelectedAnchorable
 
-        }
+    /// <summary>
+    /// SelectedAnchorable Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty SelectedAnchorableProperty =
+        DependencyProperty.Register( "SelectedAnchorable", typeof( LayoutAnchorableItem ), typeof( NavigatorWindow ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorableItem )null,
+                new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) );
 
-        protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-        }
+    /// <summary>
+    /// Gets or sets the SelectedAnchorable property.  This dependency property 
+    /// indicates the selected anchorable.
+    /// </summary>
+    public LayoutAnchorableItem SelectedAnchorable
+    {
+      get
+      {
+        return ( LayoutAnchorableItem )GetValue( SelectedAnchorableProperty );
+      }
+      set
+      {
+        SetValue( SelectedAnchorableProperty, value );
+      }
+    }
 
-        protected override void OnPreviewKeyDown(System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.Tab)
-            {
-                SelectNextDocument();
-                e.Handled = true;
-            }
+    /// <summary>
+    /// Handles changes to the SelectedAnchorable property.
+    /// </summary>
+    private static void OnSelectedAnchorableChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( NavigatorWindow )d ).OnSelectedAnchorableChanged( e );
+    }
 
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the SelectedAnchorable property.
+    /// </summary>
+    protected virtual void OnSelectedAnchorableChanged( DependencyPropertyChangedEventArgs e )
+    {
+      var selectedAnchorable = e.NewValue as LayoutAnchorableItem;
+      if( SelectedAnchorable != null &&
+          SelectedAnchorable.ActivateCommand.CanExecute( null ) )
+      {
+        SelectedAnchorable.ActivateCommand.Execute( null );
+        Close();
+      }
+    }
 
-            base.OnPreviewKeyDown(e);
-        }
+    #endregion
 
-        protected override void OnPreviewKeyUp(System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key != System.Windows.Input.Key.Tab)
-            {
-                if (SelectedAnchorable != null &&
-                    SelectedAnchorable.ActivateCommand.CanExecute(null))
-                    SelectedAnchorable.ActivateCommand.Execute(null);
-
-                if (SelectedAnchorable == null &&
-                    SelectedDocument != null &&
-                    SelectedDocument.ActivateCommand.CanExecute(null))
-                    SelectedDocument.ActivateCommand.Execute(null);
-                Close();
-                e.Handled = true;
-            }       
-
-
-            base.OnPreviewKeyUp(e);
-        }
 
+    internal void SelectNextDocument()
+    {
+      if( SelectedDocument != null )
+      {
+        int docIndex = Documents.IndexOf<LayoutDocumentItem>( SelectedDocument );
+        docIndex++;
+        if( docIndex == Documents.Length )
+          docIndex = 0;
+        InternalSetSelectedDocument( Documents[ docIndex ] );
+      }
+
+    }
+
+    protected override void OnKeyDown( System.Windows.Input.KeyEventArgs e )
+    {
+      base.OnKeyDown( e );
     }
+
+    protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e )
+    {
+      if( e.Key == System.Windows.Input.Key.Tab )
+      {
+        SelectNextDocument();
+        e.Handled = true;
+      }
+
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnPreviewKeyUp( System.Windows.Input.KeyEventArgs e )
+    {
+      if( e.Key != System.Windows.Input.Key.Tab )
+      {
+        if( SelectedAnchorable != null &&
+            SelectedAnchorable.ActivateCommand.CanExecute( null ) )
+          SelectedAnchorable.ActivateCommand.Execute( null );
+
+        if( SelectedAnchorable == null &&
+            SelectedDocument != null &&
+            SelectedDocument.ActivateCommand.CanExecute( null ) )
+          SelectedDocument.ActivateCommand.Execute( null );
+        Close();
+        e.Handled = true;
+      }
+
+
+      base.OnPreviewKeyUp( e );
+    }
+
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
new file mode 100644
index 00000000..7c881eba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
@@ -0,0 +1,49 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+  public class AnchorableContextMenuHideVisibilityConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( ( values.Count() == 2 )
+        && ( values[ 0 ] != DependencyProperty.UnsetValue )
+        && ( values[ 1 ] != DependencyProperty.UnsetValue ) 
+        && ( values[ 1 ] is bool ))
+      {
+        var canClose = ( bool )values[ 1 ];
+
+        return canClose ? Visibility.Collapsed : values[ 0 ];
+      }
+      else
+      {
+        return values[ 0 ];
+      }
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
index 2ed4f6c1..2456e496 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
@@ -17,14 +17,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Markup;
 using System.ComponentModel;
 using System.Windows.Interop;
-using System.Diagnostics;
-
 using Xceed.Wpf.AvalonDock.Layout;
 using Xceed.Wpf.AvalonDock.Controls;
 using System.Windows.Input;
@@ -32,3219 +29,3479 @@ using System.Collections;
 using System.Collections.Specialized;
 using System.Windows.Data;
 using System.Windows.Threading;
-using Xceed.Wpf.AvalonDock.Commands;
 using Xceed.Wpf.AvalonDock.Themes;
 
 namespace Xceed.Wpf.AvalonDock
 {
-    [ContentProperty("Layout")]
-    [TemplatePart(Name="PART_AutoHideArea")]
-    public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
-    {
-        private ResourceDictionary currentThemeResourceDictionary; // = null
+  [ContentProperty( "Layout" )]
+  [TemplatePart( Name = "PART_AutoHideArea" )]
+  public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
+  {
+    private ResourceDictionary currentThemeResourceDictionary; // = null
 
-        static DockingManager()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(typeof(DockingManager)));
-            FocusableProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(false));
-            HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
-        }
+    static DockingManager()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DockingManager ), new FrameworkPropertyMetadata( typeof( DockingManager ) ) );
+      FocusableProperty.OverrideMetadata( typeof( DockingManager ), new FrameworkPropertyMetadata( false ) );
+      HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
+    }
 
 
-        public DockingManager()
-        {
+    public DockingManager()
+    {
 #if !VS2008
-          Layout = new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+      Layout = new LayoutRoot() { RootPanel = new LayoutPanel( new LayoutDocumentPaneGroup( new LayoutDocumentPane() ) ) };
 #else
           this.SetCurrentValue( DockingManager.LayoutProperty, new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) } );
 #endif
-          this.Loaded += new RoutedEventHandler(DockingManager_Loaded);
-          this.Unloaded += new RoutedEventHandler(DockingManager_Unloaded);
-        }
-
-        #region Layout
-
-        /// <summary>
-        /// Layout Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutProperty =
-            DependencyProperty.Register("Layout", typeof(LayoutRoot), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnLayoutChanged),
-                    new CoerceValueCallback(CoerceLayoutValue)));
-
-        /// <summary>
-        /// Gets or sets the Layout property.  This dependency property 
-        /// indicates layout tree.
-        /// </summary>
-        public LayoutRoot Layout
-        {
-            get { return (LayoutRoot)GetValue(LayoutProperty); }
-            set { SetValue(LayoutProperty, value); }
-        }
-
-        /// <summary>
-        /// Handles changes to the Layout property.
-        /// </summary>
-        private static void OnLayoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLayoutChanged(e.OldValue as LayoutRoot, e.NewValue as LayoutRoot);
-        }
-
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the <see cref="DockingManager.Layout"/> property.
-        /// </summary>
-        protected virtual void OnLayoutChanged(LayoutRoot oldLayout, LayoutRoot newLayout)
-        {
-            if (oldLayout != null)
-            {
-                oldLayout.PropertyChanged -= new PropertyChangedEventHandler(OnLayoutRootPropertyChanged);
-                oldLayout.Updated -= new EventHandler(OnLayoutRootUpdated);
-            }
-
-            foreach (var fwc in _fwList.ToArray())
-            {
-                fwc.KeepContentVisibleOnClose = true;
-                fwc.InternalClose();
-            }
-
-            _fwList.Clear();
-
-            DetachDocumentsSource(oldLayout, DocumentsSource);
-            DetachAnchorablesSource(oldLayout, AnchorablesSource);
-
-            if (oldLayout != null &&
-                oldLayout.Manager == this)
-                oldLayout.Manager = null;
-
-            ClearLogicalChildrenList();
-            DetachLayoutItems();
+      this.Loaded += new RoutedEventHandler( DockingManager_Loaded );
+      this.Unloaded += new RoutedEventHandler( DockingManager_Unloaded );
+    }
 
-            Layout.Manager = this;
+    #region Layout
+
+    /// <summary>
+    /// Layout Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutProperty =
+        DependencyProperty.Register( "Layout", typeof( LayoutRoot ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnLayoutChanged ),
+                new CoerceValueCallback( CoerceLayoutValue ) ) );
+
+    /// <summary>
+    /// Gets or sets the Layout property.  This dependency property 
+    /// indicates layout tree.
+    /// </summary>
+    public LayoutRoot Layout
+    {
+      get
+      {
+        return ( LayoutRoot )GetValue( LayoutProperty );
+      }
+      set
+      {
+        SetValue( LayoutProperty, value );
+      }
+    }
 
-            AttachLayoutItems();
-            AttachDocumentsSource(newLayout, DocumentsSource);
-            AttachAnchorablesSource(newLayout, AnchorablesSource);
+    /// <summary>
+    /// Handles changes to the Layout property.
+    /// </summary>
+    private static void OnLayoutChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutChanged( e.OldValue as LayoutRoot, e.NewValue as LayoutRoot );
+    }
 
-            if (IsLoaded)
-            {
-                LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
-                LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
-                TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
-                RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
-                BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the <see cref="DockingManager.Layout"/> property.
+    /// </summary>
+    protected virtual void OnLayoutChanged( LayoutRoot oldLayout, LayoutRoot newLayout )
+    {
+      if( oldLayout != null )
+      {
+        oldLayout.PropertyChanged -= new PropertyChangedEventHandler( OnLayoutRootPropertyChanged );
+        oldLayout.Updated -= new EventHandler( OnLayoutRootUpdated );
+      }
 
-                foreach (var fw in Layout.FloatingWindows.ToArray())
-                {
-                    if (fw.IsValid)
-                       _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
-                }
+      foreach( var fwc in _fwList.ToArray() )
+      {
+        fwc.KeepContentVisibleOnClose = true;
+        fwc.InternalClose();
+      }
 
-                foreach (var fw in _fwList)
-                {
-                    //fw.Owner = Window.GetWindow(this);
-                    //fw.SetParentToMainWindowOf(this);
-                }
-            }
+      _fwList.Clear();
 
+      DetachDocumentsSource( oldLayout, DocumentsSource );
+      DetachAnchorablesSource( oldLayout, AnchorablesSource );
 
-            if (newLayout != null)
-            {
-                newLayout.PropertyChanged += new PropertyChangedEventHandler(OnLayoutRootPropertyChanged);
-                newLayout.Updated += new EventHandler(OnLayoutRootUpdated);
-            }
+      if( oldLayout != null &&
+          oldLayout.Manager == this )
+        oldLayout.Manager = null;
 
-            if (LayoutChanged != null)
-                LayoutChanged(this, EventArgs.Empty);
+      ClearLogicalChildrenList();
+      DetachLayoutItems();
 
-            //if (Layout != null)
-            //    Layout.CollectGarbage();
+      Layout.Manager = this;
 
-            CommandManager.InvalidateRequerySuggested();
-        }
+      AttachLayoutItems();
+      AttachDocumentsSource( newLayout, DocumentsSource );
+      AttachAnchorablesSource( newLayout, AnchorablesSource );
 
-      //  DispatcherOperation _setFocusAsyncOperation = null;
+      if( IsLoaded )
+      {
+        LayoutRootPanel = CreateUIElementForModel( Layout.RootPanel ) as LayoutPanelControl;
+        LeftSidePanel = CreateUIElementForModel( Layout.LeftSide ) as LayoutAnchorSideControl;
+        TopSidePanel = CreateUIElementForModel( Layout.TopSide ) as LayoutAnchorSideControl;
+        RightSidePanel = CreateUIElementForModel( Layout.RightSide ) as LayoutAnchorSideControl;
+        BottomSidePanel = CreateUIElementForModel( Layout.BottomSide ) as LayoutAnchorSideControl;
 
-        void OnLayoutRootPropertyChanged(object sender, PropertyChangedEventArgs e)
+        foreach( var fw in Layout.FloatingWindows.ToArray() )
         {
-            if (e.PropertyName == "RootPanel")
-            {
-                if (IsInitialized)
-                {
-                    var layoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
-                    LayoutRootPanel = layoutRootPanel;
-                }
-            }
-            else if (e.PropertyName == "ActiveContent")
-            {
-                if (Layout.ActiveContent != null)
-                {
-                    //Debug.WriteLine(new StackTrace().ToString());
-
-                    //set focus on active element only after a layout pass is completed
-                    //it's possible that it is not yet visible in the visual tree
-                    //if (_setFocusAsyncOperation == null)
-                    //{
-                    //    _setFocusAsyncOperation = Dispatcher.BeginInvoke(new Action(() =>
-                           // {
-                                if (Layout.ActiveContent != null)
-                                    FocusElementManager.SetFocusOnLastElement(Layout.ActiveContent);
-                                //_setFocusAsyncOperation = null;
-                          //  } ), DispatcherPriority.Input );
-                    //}
-                }
-
-            //if (!_insideInternalSetActiveContent)
-            //    ActiveContent = Layout.ActiveContent != null ?
-            //        Layout.ActiveContent.Content : null;
-            if( !_insideInternalSetActiveContent && (Layout.ActiveContent != null) )
-            {
-              this.ActiveContent = Layout.ActiveContent.Content;
-            }
-          }
+          if( fw.IsValid )
+            _fwList.Add( CreateUIElementForModel( fw ) as LayoutFloatingWindowControl );
         }
 
-        void OnLayoutRootUpdated(object sender, EventArgs e)
+        foreach( var fw in _fwList )
         {
-            CommandManager.InvalidateRequerySuggested();
+          //fw.Owner = Window.GetWindow(this);
+          //fw.SetParentToMainWindowOf(this);
         }
+      }
 
 
-        /// <summary>
-        /// Event fired when <see cref="DockingManager.Layout"/> property changes
-        /// </summary>
-        public event EventHandler LayoutChanged;
-
-        /// <summary>
-        /// Coerces the <see cref="DockingManager.Layout"/> value.
-        /// </summary>
-        private static object CoerceLayoutValue(DependencyObject d, object value)
-        {
-            if (value == null)
-                return new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
-
-            ((DockingManager)d).OnLayoutChanging(value as LayoutRoot);
-
-            return value;
-        }
-
-        /// <summary>
-        /// Event fired when <see cref="DockingManager.Layout"/> property is about to be changed
-        /// </summary>
-        public event EventHandler LayoutChanging;
+      if( newLayout != null )
+      {
+        newLayout.PropertyChanged += new PropertyChangedEventHandler( OnLayoutRootPropertyChanged );
+        newLayout.Updated += new EventHandler( OnLayoutRootUpdated );
+      }
 
-        void OnLayoutChanging(LayoutRoot newLayout)
-        {
-            if (LayoutChanging != null)
-                LayoutChanging(this, EventArgs.Empty);
-        }
+      if( LayoutChanged != null )
+        LayoutChanged( this, EventArgs.Empty );
 
+      //if (Layout != null)
+      //    Layout.CollectGarbage();
 
-        #region LayoutUpdateStrategy
+      CommandManager.InvalidateRequerySuggested();
+    }
 
-        /// <summary>
-        /// LayoutUpdateStrategy Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutUpdateStrategyProperty =
-            DependencyProperty.Register("LayoutUpdateStrategy", typeof(ILayoutUpdateStrategy), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ILayoutUpdateStrategy)null));
+    //  DispatcherOperation _setFocusAsyncOperation = null;
 
-        /// <summary>
-        /// Gets or sets the LayoutUpdateStrategy property.  This dependency property 
-        /// indicates the strategy class to call when AvalonDock needs to positionate a LayoutAnchorable inside an existing layout.
-        /// </summary>
-        /// <remarks>Sometimes it's impossible to automatically insert an anchorable in the layout without specifing the target parent pane.
-        /// Set this property to an object that will be asked to insert the anchorable to the desidered position.</remarks>
-        public ILayoutUpdateStrategy LayoutUpdateStrategy
+    void OnLayoutRootPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      if( e.PropertyName == "RootPanel" )
+      {
+        if( IsInitialized )
         {
-            get { return (ILayoutUpdateStrategy)GetValue(LayoutUpdateStrategyProperty); }
-            set { SetValue(LayoutUpdateStrategyProperty, value); }
+          var layoutRootPanel = CreateUIElementForModel( Layout.RootPanel ) as LayoutPanelControl;
+          LayoutRootPanel = layoutRootPanel;
         }
-
-        #endregion
-
-
-
-        #endregion
-
-        public override void OnApplyTemplate()
+      }
+      else if( e.PropertyName == "ActiveContent" )
+      {
+        if( Layout.ActiveContent != null )
         {
-            base.OnApplyTemplate();
+          //Debug.WriteLine(new StackTrace().ToString());
 
-          //  SetupAutoHideWindow();
+          //set focus on active element only after a layout pass is completed
+          //it's possible that it is not yet visible in the visual tree
+          //if (_setFocusAsyncOperation == null)
+          //{
+          //    _setFocusAsyncOperation = Dispatcher.BeginInvoke(new Action(() =>
+          // {
+          if( Layout.ActiveContent != null )
+            FocusElementManager.SetFocusOnLastElement( Layout.ActiveContent );
+          //_setFocusAsyncOperation = null;
+          //  } ), DispatcherPriority.Input );
+          //}
         }
 
-        protected override void OnInitialized( EventArgs e )
+        //if (!_insideInternalSetActiveContent)
+        //    ActiveContent = Layout.ActiveContent != null ?
+        //        Layout.ActiveContent.Content : null;
+        if( !_insideInternalSetActiveContent && ( Layout.ActiveContent != null ) )
         {
-            base.OnInitialized(e);
+          this.ActiveContent = Layout.ActiveContent.Content;
         }
+      }
+    }
 
-        void DockingManager_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (!DesignerProperties.GetIsInDesignMode(this))
-            {
-                if( Layout.Manager == this )
-                {
-                  LayoutRootPanel = CreateUIElementForModel( Layout.RootPanel ) as LayoutPanelControl;
-                  LeftSidePanel = CreateUIElementForModel( Layout.LeftSide ) as LayoutAnchorSideControl;
-                  TopSidePanel = CreateUIElementForModel( Layout.TopSide ) as LayoutAnchorSideControl;
-                  RightSidePanel = CreateUIElementForModel( Layout.RightSide ) as LayoutAnchorSideControl;
-                  BottomSidePanel = CreateUIElementForModel( Layout.BottomSide ) as LayoutAnchorSideControl;
-                }
+    void OnLayoutRootUpdated( object sender, EventArgs e )
+    {
+      CommandManager.InvalidateRequerySuggested();
+    }
 
-                SetupAutoHideWindow();
 
-                //load windows not already loaded!
-                foreach (var fw in Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)))
-                    _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
+    /// <summary>
+    /// Event fired when <see cref="DockingManager.Layout"/> property changes
+    /// </summary>
+    public event EventHandler LayoutChanged;
 
-                //create the overlaywindow if it's possible
-                if (IsVisible)
-                    CreateOverlayWindow();
-                FocusElementManager.SetupFocusManagement(this);
-            }
-        }
+    /// <summary>
+    /// Coerces the <see cref="DockingManager.Layout"/> value.
+    /// </summary>
+    private static object CoerceLayoutValue( DependencyObject d, object value )
+    {
+      if( value == null )
+        return new LayoutRoot() { RootPanel = new LayoutPanel( new LayoutDocumentPaneGroup( new LayoutDocumentPane() ) ) };
 
-        void DockingManager_Unloaded(object sender, RoutedEventArgs e)
-        {
+      ( ( DockingManager )d ).OnLayoutChanging( value as LayoutRoot );
 
-            if (!DesignerProperties.GetIsInDesignMode(this))
-            {
-              if( _autoHideWindowManager != null )
-              {
-                _autoHideWindowManager.HideAutoWindow();
-              }
+      return value;
+    }
 
-              if( AutoHideWindow != null )
-                AutoHideWindow.Dispose();
+    /// <summary>
+    /// Event fired when <see cref="DockingManager.Layout"/> property is about to be changed
+    /// </summary>
+    public event EventHandler LayoutChanging;
 
-              foreach (var fw in _fwList.ToArray())
-              {
-                  //fw.Owner = null;
-                  fw.SetParentWindowToNull();
-                  fw.KeepContentVisibleOnClose = true;
-                  fw.Close();
-              }
+    void OnLayoutChanging( LayoutRoot newLayout )
+    {
+      if( LayoutChanging != null )
+        LayoutChanging( this, EventArgs.Empty );
+    }
 
-              DestroyOverlayWindow();
-              FocusElementManager.FinalizeFocusManagement(this);
-            }
-        }
 
-        internal UIElement CreateUIElementForModel(ILayoutElement model)
-        {
-            if (model is LayoutPanel)
-                return new LayoutPanelControl(model as LayoutPanel);
-            if (model is LayoutAnchorablePaneGroup)
-                return new LayoutAnchorablePaneGroupControl(model as LayoutAnchorablePaneGroup);
-            if (model is LayoutDocumentPaneGroup)
-                return new LayoutDocumentPaneGroupControl(model as LayoutDocumentPaneGroup);
-
-            if (model is LayoutAnchorSide)
-            {
-                var templateModelView = new LayoutAnchorSideControl(model as LayoutAnchorSide);
-                templateModelView.SetBinding(LayoutAnchorSideControl.TemplateProperty, new Binding("AnchorSideTemplate") { Source = this });
-                return templateModelView;
-            }
-            if (model is LayoutAnchorGroup)
-            {
-                var templateModelView = new LayoutAnchorGroupControl(model as LayoutAnchorGroup);
-                templateModelView.SetBinding(LayoutAnchorGroupControl.TemplateProperty, new Binding("AnchorGroupTemplate") { Source = this });
-                return templateModelView;
-            }
+    #region LayoutUpdateStrategy
 
-            if (model is LayoutDocumentPane)
-            {
-                var templateModelView = new LayoutDocumentPaneControl(model as LayoutDocumentPane);
-                templateModelView.SetBinding(LayoutDocumentPaneControl.StyleProperty, new Binding("DocumentPaneControlStyle") { Source = this });
-                return templateModelView;
-            }
-            if (model is LayoutAnchorablePane)
-            {
-                var templateModelView = new LayoutAnchorablePaneControl(model as LayoutAnchorablePane);
-                templateModelView.SetBinding(LayoutAnchorablePaneControl.StyleProperty, new Binding("AnchorablePaneControlStyle") { Source = this });
-                return templateModelView;
-            }
+    /// <summary>
+    /// LayoutUpdateStrategy Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutUpdateStrategyProperty =
+        DependencyProperty.Register( "LayoutUpdateStrategy", typeof( ILayoutUpdateStrategy ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ILayoutUpdateStrategy )null ) );
 
-            if (model is LayoutAnchorableFloatingWindow)
-            {
-                if (DesignerProperties.GetIsInDesignMode(this))
-                    return null;
-                var modelFW = model as LayoutAnchorableFloatingWindow;
-                var newFW = new LayoutAnchorableFloatingWindowControl(modelFW)
-                {
-                    //Owner = Window.GetWindow(this) 
-                };
-                newFW.SetParentToMainWindowOf(this);
+    /// <summary>
+    /// Gets or sets the LayoutUpdateStrategy property.  This dependency property 
+    /// indicates the strategy class to call when AvalonDock needs to positionate a LayoutAnchorable inside an existing layout.
+    /// </summary>
+    /// <remarks>Sometimes it's impossible to automatically insert an anchorable in the layout without specifing the target parent pane.
+    /// Set this property to an object that will be asked to insert the anchorable to the desidered position.</remarks>
+    public ILayoutUpdateStrategy LayoutUpdateStrategy
+    {
+      get
+      {
+        return ( ILayoutUpdateStrategy )GetValue( LayoutUpdateStrategyProperty );
+      }
+      set
+      {
+        SetValue( LayoutUpdateStrategyProperty, value );
+      }
+    }
 
-                var paneForExtensions = modelFW.RootPanel.Children.OfType<LayoutAnchorablePane>().FirstOrDefault();
-                if (paneForExtensions != null)
-                {
-                    //ensure that floating window position is inside current (or nearest) monitor
-                    paneForExtensions.KeepInsideNearestMonitor();
+    #endregion
 
-                    newFW.Left = paneForExtensions.FloatingLeft;
-                    newFW.Top = paneForExtensions.FloatingTop;
-                    newFW.Width = paneForExtensions.FloatingWidth;
-                    newFW.Height = paneForExtensions.FloatingHeight;
-                }
 
-                newFW.ShowInTaskbar = false;
-                newFW.Show();
-                // Do not set the WindowState before showing or it will be lost
-                if( paneForExtensions != null && paneForExtensions.IsMaximized )
-                {
-                  newFW.WindowState = WindowState.Maximized;
-                }
-                return newFW;
-            }
 
-            if (model is LayoutDocumentFloatingWindow)
-            {
-                if (DesignerProperties.GetIsInDesignMode(this))
-                    return null;
-                var modelFW = model as LayoutDocumentFloatingWindow;
-                var newFW = new LayoutDocumentFloatingWindowControl(modelFW)
-                {
-                    //Owner = Window.GetWindow(this) 
-                };
-                newFW.SetParentToMainWindowOf(this);
+    #endregion
 
-                var paneForExtensions = modelFW.RootDocument;
-                if (paneForExtensions != null)
-                {
-                    //ensure that floating window position is inside current (or nearest) monitor
-                    paneForExtensions.KeepInsideNearestMonitor();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-                    newFW.Left = paneForExtensions.FloatingLeft;
-                    newFW.Top = paneForExtensions.FloatingTop;
-                    newFW.Width = paneForExtensions.FloatingWidth;
-                    newFW.Height = paneForExtensions.FloatingHeight;
-                }
 
-                newFW.ShowInTaskbar = false;
-                newFW.Show();
-                // Do not set the WindowState before showing or it will be lost
-                if( paneForExtensions != null && paneForExtensions.IsMaximized )
-                {
-                  newFW.WindowState = WindowState.Maximized;
-                }
-                return newFW;
-            }
+      _autohideArea = GetTemplateChild( "PART_AutoHideArea" ) as FrameworkElement;
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+    }
 
-            if (model is LayoutDocument)
-            {
-                var templateModelView = new LayoutDocumentControl() { Model = model as LayoutDocument };
-                return templateModelView;
-            }
 
-            return null;
+    void DockingManager_Loaded( object sender, RoutedEventArgs e )
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( Layout.Manager == this )
+        {
+          LayoutRootPanel = CreateUIElementForModel( Layout.RootPanel ) as LayoutPanelControl;
+          LeftSidePanel = CreateUIElementForModel( Layout.LeftSide ) as LayoutAnchorSideControl;
+          TopSidePanel = CreateUIElementForModel( Layout.TopSide ) as LayoutAnchorSideControl;
+          RightSidePanel = CreateUIElementForModel( Layout.RightSide ) as LayoutAnchorSideControl;
+          BottomSidePanel = CreateUIElementForModel( Layout.BottomSide ) as LayoutAnchorSideControl;
         }
 
+        SetupAutoHideWindow();
 
+        //load windows not already loaded!
+        foreach( var fw in Layout.FloatingWindows.Where( fw => !_fwList.Any( fwc => fwc.Model == fw ) ) )
+          _fwList.Add( CreateUIElementForModel( fw ) as LayoutFloatingWindowControl );
 
-        #region DocumentPaneTemplate
+        //create the overlaywindow if it's possible
+        if( IsVisible )
+          CreateOverlayWindow();
+        FocusElementManager.SetupFocusManagement( this );
+      }
+    }
 
-        /// <summary>
-        /// DocumentPaneTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentPaneTemplateProperty =
-            DependencyProperty.Register("DocumentPaneTemplate", typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null,
-                    new PropertyChangedCallback(OnDocumentPaneTemplateChanged)));
+    void DockingManager_Unloaded( object sender, RoutedEventArgs e )
+    {
 
-        /// <summary>
-        /// Gets or sets the DocumentPaneDataTemplate property.  This dependency property 
-        /// indicates .
-        /// </summary>
-        public ControlTemplate DocumentPaneTemplate
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( _autoHideWindowManager != null )
         {
-            get { return (ControlTemplate)GetValue(DocumentPaneTemplateProperty); }
-            set { SetValue(DocumentPaneTemplateProperty, value); }
+          _autoHideWindowManager.HideAutoWindow();
         }
 
-        /// <summary>
-        /// Handles changes to the DocumentPaneTemplate property.
-        /// </summary>
-        private static void OnDocumentPaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentPaneTemplateChanged(e);
-        }
+        if( AutoHideWindow != null )
+          AutoHideWindow.Dispose();
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentPaneTemplate property.
-        /// </summary>
-        protected virtual void OnDocumentPaneTemplateChanged(DependencyPropertyChangedEventArgs e)
+        foreach( var fw in _fwList.ToArray() )
         {
+          //fw.Owner = null;
+          fw.SetParentWindowToNull();
+          fw.KeepContentVisibleOnClose = true;
+          fw.Close();
         }
 
-        #endregion
+        DestroyOverlayWindow();
+        FocusElementManager.FinalizeFocusManagement( this );
+      }
+    }
 
-        #region AnchorablePaneTemplate
+    internal UIElement CreateUIElementForModel( ILayoutElement model )
+    {
+      if( model is LayoutPanel )
+        return new LayoutPanelControl( model as LayoutPanel );
+      if( model is LayoutAnchorablePaneGroup )
+        return new LayoutAnchorablePaneGroupControl( model as LayoutAnchorablePaneGroup );
+      if( model is LayoutDocumentPaneGroup )
+        return new LayoutDocumentPaneGroupControl( model as LayoutDocumentPaneGroup );
+
+      if( model is LayoutAnchorSide )
+      {
+        var templateModelView = new LayoutAnchorSideControl( model as LayoutAnchorSide );
+        templateModelView.SetBinding( LayoutAnchorSideControl.TemplateProperty, new Binding( "AnchorSideTemplate" ) { Source = this } );
+        return templateModelView;
+      }
+      if( model is LayoutAnchorGroup )
+      {
+        var templateModelView = new LayoutAnchorGroupControl( model as LayoutAnchorGroup );
+        templateModelView.SetBinding( LayoutAnchorGroupControl.TemplateProperty, new Binding( "AnchorGroupTemplate" ) { Source = this } );
+        return templateModelView;
+      }
 
-        /// <summary>
-        /// AnchorablePaneTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorablePaneTemplateProperty =
-            DependencyProperty.Register("AnchorablePaneTemplate", typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null,
-                    new PropertyChangedCallback(OnAnchorablePaneTemplateChanged)));
+      if( model is LayoutDocumentPane )
+      {
+        var templateModelView = new LayoutDocumentPaneControl( model as LayoutDocumentPane );
+        templateModelView.SetBinding( LayoutDocumentPaneControl.StyleProperty, new Binding( "DocumentPaneControlStyle" ) { Source = this } );
+        return templateModelView;
+      }
+      if( model is LayoutAnchorablePane )
+      {
+        var templateModelView = new LayoutAnchorablePaneControl( model as LayoutAnchorablePane );
+        templateModelView.SetBinding( LayoutAnchorablePaneControl.StyleProperty, new Binding( "AnchorablePaneControlStyle" ) { Source = this } );
+        return templateModelView;
+      }
 
-        /// <summary>
-        /// Gets or sets the AnchorablePaneTemplate property.  This dependency property 
-        /// indicates ....
-        /// </summary>
-        public ControlTemplate AnchorablePaneTemplate
+      if( model is LayoutAnchorableFloatingWindow )
+      {
+        if( DesignerProperties.GetIsInDesignMode( this ) )
+          return null;
+        var modelFW = model as LayoutAnchorableFloatingWindow;
+        var newFW = new LayoutAnchorableFloatingWindowControl( modelFW )
         {
-            get { return (ControlTemplate)GetValue(AnchorablePaneTemplateProperty); }
-            set { SetValue(AnchorablePaneTemplateProperty, value); }
-        }
+          //Owner = Window.GetWindow(this) 
+        };
+        newFW.SetParentToMainWindowOf( this );
 
-        /// <summary>
-        /// Handles changes to the AnchorablePaneDataTemplate property.
-        /// </summary>
-        private static void OnAnchorablePaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        var paneForExtensions = modelFW.RootPanel.Children.OfType<LayoutAnchorablePane>().FirstOrDefault();
+        if( paneForExtensions != null )
         {
-            ((DockingManager)d).OnAnchorablePaneTemplateChanged(e);
-        }
+          //ensure that floating window position is inside current (or nearest) monitor
+          paneForExtensions.KeepInsideNearestMonitor();
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorablePaneDataTemplate property.
-        /// </summary>
-        protected virtual void OnAnchorablePaneTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
+          newFW.Left = paneForExtensions.FloatingLeft;
+          newFW.Top = paneForExtensions.FloatingTop;
+          newFW.Width = paneForExtensions.FloatingWidth;
+          newFW.Height = paneForExtensions.FloatingHeight;
         }
 
-        #endregion
-
-        #region AnchorSideTemplate
-
-        /// <summary>
-        /// AnchorSideTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorSideTemplateProperty =
-            DependencyProperty.Register("AnchorSideTemplate", typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
-
-        /// <summary>
-        /// Gets or sets the AnchorSideTemplate property.  This dependency property 
-        /// indicates ....
-        /// </summary>
-        public ControlTemplate AnchorSideTemplate
+        newFW.ShowInTaskbar = false;
+        newFW.Show();
+        // Do not set the WindowState before showing or it will be lost
+        if( paneForExtensions != null && paneForExtensions.IsMaximized )
         {
-            get { return (ControlTemplate)GetValue(AnchorSideTemplateProperty); }
-            set { SetValue(AnchorSideTemplateProperty, value); }
+          newFW.WindowState = WindowState.Maximized;
         }
+        return newFW;
+      }
 
-        #endregion
-
-        #region AnchorGroupTemplate
-
-        /// <summary>
-        /// AnchorGroupTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorGroupTemplateProperty =
-            DependencyProperty.Register("AnchorGroupTemplate", typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
-
-        /// <summary>
-        /// Gets or sets the AnchorGroupTemplate property.  This dependency property 
-        /// indicates the template used to render the AnchorGroup control.
-        /// </summary>
-        public ControlTemplate AnchorGroupTemplate
+      if( model is LayoutDocumentFloatingWindow )
+      {
+        if( DesignerProperties.GetIsInDesignMode( this ) )
+          return null;
+        var modelFW = model as LayoutDocumentFloatingWindow;
+        var newFW = new LayoutDocumentFloatingWindowControl( modelFW )
         {
-            get { return (ControlTemplate)GetValue(AnchorGroupTemplateProperty); }
-            set { SetValue(AnchorGroupTemplateProperty, value); }
-        }
-
-        #endregion
+          //Owner = Window.GetWindow(this) 
+        };
+        newFW.SetParentToMainWindowOf( this );
 
-        #region AnchorTemplate
+        var paneForExtensions = modelFW.RootDocument;
+        if( paneForExtensions != null )
+        {
+          //ensure that floating window position is inside current (or nearest) monitor
+          paneForExtensions.KeepInsideNearestMonitor();
 
-        /// <summary>
-        /// AnchorTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorTemplateProperty =
-            DependencyProperty.Register("AnchorTemplate", typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
+          newFW.Left = paneForExtensions.FloatingLeft;
+          newFW.Top = paneForExtensions.FloatingTop;
+          newFW.Width = paneForExtensions.FloatingWidth;
+          newFW.Height = paneForExtensions.FloatingHeight;
+        }
 
-        /// <summary>
-        /// Gets or sets the AnchorTemplate property.  This dependency property 
-        /// indicates ....
-        /// </summary>
-        public ControlTemplate AnchorTemplate
+        newFW.ShowInTaskbar = false;
+        newFW.Show();
+        // Do not set the WindowState before showing or it will be lost
+        if( paneForExtensions != null && paneForExtensions.IsMaximized )
         {
-            get { return (ControlTemplate)GetValue(AnchorTemplateProperty); }
-            set { SetValue(AnchorTemplateProperty, value); }
+          newFW.WindowState = WindowState.Maximized;
         }
+        return newFW;
+      }
 
-        #endregion
-
-        #region DocumentPaneControlStyle
+      if( model is LayoutDocument )
+      {
+        var templateModelView = new LayoutDocumentControl() { Model = model as LayoutDocument };
+        return templateModelView;
+      }
 
-        /// <summary>
-        /// DocumentPaneControlStyle Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentPaneControlStyleProperty =
-            DependencyProperty.Register("DocumentPaneControlStyle", typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata((Style)null,
-                    new PropertyChangedCallback(OnDocumentPaneControlStyleChanged)));
+      return null;
+    }
 
-        /// <summary>
-        /// Gets or sets the DocumentPaneControlStyle property.  This dependency property 
-        /// indicates ....
-        /// </summary>
-        public Style DocumentPaneControlStyle
-        {
-            get { return (Style)GetValue(DocumentPaneControlStyleProperty); }
-            set { SetValue(DocumentPaneControlStyleProperty, value); }
-        }
 
-        /// <summary>
-        /// Handles changes to the DocumentPaneControlStyle property.
-        /// </summary>
-        private static void OnDocumentPaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentPaneControlStyleChanged(e);
-        }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentPaneControlStyle property.
-        /// </summary>
-        protected virtual void OnDocumentPaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    #region DocumentPaneTemplate
 
-        #endregion
+    /// <summary>
+    /// DocumentPaneTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentPaneTemplateProperty =
+        DependencyProperty.Register( "DocumentPaneTemplate", typeof( ControlTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ControlTemplate )null,
+                new PropertyChangedCallback( OnDocumentPaneTemplateChanged ) ) );
 
-        #region AnchorablePaneControlStyle
+    /// <summary>
+    /// Gets or sets the DocumentPaneDataTemplate property.  This dependency property 
+    /// indicates .
+    /// </summary>
+    public ControlTemplate DocumentPaneTemplate
+    {
+      get
+      {
+        return ( ControlTemplate )GetValue( DocumentPaneTemplateProperty );
+      }
+      set
+      {
+        SetValue( DocumentPaneTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// AnchorablePaneControlStyle Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorablePaneControlStyleProperty =
-            DependencyProperty.Register("AnchorablePaneControlStyle", typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata((Style)null,
-                    new PropertyChangedCallback(OnAnchorablePaneControlStyleChanged)));
+    /// <summary>
+    /// Handles changes to the DocumentPaneTemplate property.
+    /// </summary>
+    private static void OnDocumentPaneTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentPaneTemplateChanged( e );
+    }
 
-        /// <summary>
-        /// Gets or sets the AnchorablePaneControlStyle property.  This dependency property 
-        /// indicates the style to apply to AnchorablePaneControl.
-        /// </summary>
-        public Style AnchorablePaneControlStyle
-        {
-            get { return (Style)GetValue(AnchorablePaneControlStyleProperty); }
-            set { SetValue(AnchorablePaneControlStyleProperty, value); }
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentPaneTemplate property.
+    /// </summary>
+    protected virtual void OnDocumentPaneTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Handles changes to the AnchorablePaneControlStyle property.
-        /// </summary>
-        private static void OnAnchorablePaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorablePaneControlStyleChanged(e);
-        }
+    #endregion
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorablePaneControlStyle property.
-        /// </summary>
-        protected virtual void OnAnchorablePaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    #region AnchorablePaneTemplate
 
-        #endregion
+    /// <summary>
+    /// AnchorablePaneTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorablePaneTemplateProperty =
+        DependencyProperty.Register( "AnchorablePaneTemplate", typeof( ControlTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ControlTemplate )null,
+                new PropertyChangedCallback( OnAnchorablePaneTemplateChanged ) ) );
 
-        #region DocumentHeaderTemplate
+    /// <summary>
+    /// Gets or sets the AnchorablePaneTemplate property.  This dependency property 
+    /// indicates ....
+    /// </summary>
+    public ControlTemplate AnchorablePaneTemplate
+    {
+      get
+      {
+        return ( ControlTemplate )GetValue( AnchorablePaneTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorablePaneTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// DocumentHeaderTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentHeaderTemplateProperty =
-            DependencyProperty.Register("DocumentHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnDocumentHeaderTemplateChanged),
-                    new CoerceValueCallback(CoerceDocumentHeaderTemplateValue)));
+    /// <summary>
+    /// Handles changes to the AnchorablePaneDataTemplate property.
+    /// </summary>
+    private static void OnAnchorablePaneTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorablePaneTemplateChanged( e );
+    }
 
-        /// <summary>
-        /// Gets or sets the DocumentHeaderTemplate property.  This dependency property 
-        /// indicates data template to use for document header.
-        /// </summary>
-        public DataTemplate DocumentHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(DocumentHeaderTemplateProperty); }
-            set { SetValue(DocumentHeaderTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorablePaneDataTemplate property.
+    /// </summary>
+    protected virtual void OnAnchorablePaneTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Handles changes to the DocumentHeaderTemplate property.
-        /// </summary>
-        private static void OnDocumentHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentHeaderTemplateChanged(e);
-        }
+    #endregion
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplate property.
-        /// </summary>
-        protected virtual void OnDocumentHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    #region AnchorSideTemplate
 
-        /// <summary>
-        /// Coerces the DocumentHeaderTemplate value.
-        /// </summary>
-        private static object CoerceDocumentHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null &&
-                d.GetValue(DocumentHeaderTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
+    /// <summary>
+    /// AnchorSideTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorSideTemplateProperty =
+        DependencyProperty.Register( "AnchorSideTemplate", typeof( ControlTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ControlTemplate )null ) );
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the AnchorSideTemplate property.  This dependency property 
+    /// indicates ....
+    /// </summary>
+    public ControlTemplate AnchorSideTemplate
+    {
+      get
+      {
+        return ( ControlTemplate )GetValue( AnchorSideTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorSideTemplateProperty, value );
+      }
+    }
 
-        #region DocumentHeaderTemplateSelector
+    #endregion
 
-        /// <summary>
-        /// DocumentHeaderTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentHeaderTemplateSelectorProperty =
-            DependencyProperty.Register("DocumentHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnDocumentHeaderTemplateSelectorChanged),
-                    new CoerceValueCallback(CoerceDocumentHeaderTemplateSelectorValue)));
+    #region AnchorGroupTemplate
 
-        /// <summary>
-        /// Gets or sets the DocumentHeaderTemplateSelector property.  This dependency property 
-        /// indicates the template selector that is used when selcting the data template for the header.
-        /// </summary>
-        public DataTemplateSelector DocumentHeaderTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(DocumentHeaderTemplateSelectorProperty); }
-            set { SetValue(DocumentHeaderTemplateSelectorProperty, value); }
-        }
+    /// <summary>
+    /// AnchorGroupTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorGroupTemplateProperty =
+        DependencyProperty.Register( "AnchorGroupTemplate", typeof( ControlTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ControlTemplate )null ) );
 
-        /// <summary>
-        /// Handles changes to the DocumentHeaderTemplateSelector property.
-        /// </summary>
-        private static void OnDocumentHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentHeaderTemplateSelectorChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the AnchorGroupTemplate property.  This dependency property 
+    /// indicates the template used to render the AnchorGroup control.
+    /// </summary>
+    public ControlTemplate AnchorGroupTemplate
+    {
+      get
+      {
+        return ( ControlTemplate )GetValue( AnchorGroupTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorGroupTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplateSelector property.
-        /// </summary>
-        protected virtual void OnDocumentHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null &&
-                DocumentHeaderTemplate != null)
-                DocumentHeaderTemplate = null;
+    #endregion
 
-            if (DocumentPaneMenuItemHeaderTemplateSelector == null)
-                DocumentPaneMenuItemHeaderTemplateSelector = DocumentHeaderTemplateSelector;
+    #region AnchorTemplate
 
-        }
+    /// <summary>
+    /// AnchorTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorTemplateProperty =
+        DependencyProperty.Register( "AnchorTemplate", typeof( ControlTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ControlTemplate )null ) );
 
-        /// <summary>
-        /// Coerces the DocumentHeaderTemplateSelector value.
-        /// </summary>
-        private static object CoerceDocumentHeaderTemplateSelectorValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Gets or sets the AnchorTemplate property.  This dependency property 
+    /// indicates ....
+    /// </summary>
+    public ControlTemplate AnchorTemplate
+    {
+      get
+      {
+        return ( ControlTemplate )GetValue( AnchorTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorTemplateProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region DocumentTitleTemplate
+    #region DocumentPaneControlStyle
 
-        /// <summary>
-        /// DocumentTitleTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentTitleTemplateProperty =
-            DependencyProperty.Register("DocumentTitleTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnDocumentTitleTemplateChanged),
-                    new CoerceValueCallback(CoerceDocumentTitleTemplateValue)));
+    /// <summary>
+    /// DocumentPaneControlStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentPaneControlStyleProperty =
+        DependencyProperty.Register( "DocumentPaneControlStyle", typeof( Style ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( Style )null,
+                new PropertyChangedCallback( OnDocumentPaneControlStyleChanged ) ) );
 
-        /// <summary>
-        /// Gets or sets the DocumentTitleTemplate property.  This dependency property 
-        /// indicates the datatemplate to use when creating the title for a document.
-        /// </summary>
-        public DataTemplate DocumentTitleTemplate
-        {
-            get { return (DataTemplate)GetValue(DocumentTitleTemplateProperty); }
-            set { SetValue(DocumentTitleTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the DocumentPaneControlStyle property.  This dependency property 
+    /// indicates ....
+    /// </summary>
+    public Style DocumentPaneControlStyle
+    {
+      get
+      {
+        return ( Style )GetValue( DocumentPaneControlStyleProperty );
+      }
+      set
+      {
+        SetValue( DocumentPaneControlStyleProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the DocumentTitleTemplate property.
-        /// </summary>
-        private static void OnDocumentTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentTitleTemplateChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the DocumentPaneControlStyle property.
+    /// </summary>
+    private static void OnDocumentPaneControlStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentPaneControlStyleChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplate property.
-        /// </summary>
-        protected virtual void OnDocumentTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentPaneControlStyle property.
+    /// </summary>
+    protected virtual void OnDocumentPaneControlStyleChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Coerces the DocumentTitleTemplate value.
-        /// </summary>
-        private static object CoerceDocumentTitleTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null &&
-                d.GetValue(DocumentTitleTemplateSelectorProperty) != null)
-                return null;
+    #endregion
 
-            return value;
-        }
+    #region AnchorablePaneControlStyle
 
-        #endregion
+    /// <summary>
+    /// AnchorablePaneControlStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorablePaneControlStyleProperty =
+        DependencyProperty.Register( "AnchorablePaneControlStyle", typeof( Style ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( Style )null,
+                new PropertyChangedCallback( OnAnchorablePaneControlStyleChanged ) ) );
 
-        #region DocumentTitleTemplateSelector
+    /// <summary>
+    /// Gets or sets the AnchorablePaneControlStyle property.  This dependency property 
+    /// indicates the style to apply to AnchorablePaneControl.
+    /// </summary>
+    public Style AnchorablePaneControlStyle
+    {
+      get
+      {
+        return ( Style )GetValue( AnchorablePaneControlStyleProperty );
+      }
+      set
+      {
+        SetValue( AnchorablePaneControlStyleProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// DocumentTitleTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentTitleTemplateSelectorProperty =
-            DependencyProperty.Register("DocumentTitleTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnDocumentTitleTemplateSelectorChanged),
-                    new CoerceValueCallback(CoerceDocumentTitleTemplateSelectorValue)));
+    /// <summary>
+    /// Handles changes to the AnchorablePaneControlStyle property.
+    /// </summary>
+    private static void OnAnchorablePaneControlStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorablePaneControlStyleChanged( e );
+    }
 
-        /// <summary>
-        /// Gets or sets the DocumentTitleTemplateSelector property.  This dependency property 
-        /// indicates the data template selector to use when creating the data template for the title.
-        /// </summary>
-        public DataTemplateSelector DocumentTitleTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(DocumentTitleTemplateSelectorProperty); }
-            set { SetValue(DocumentTitleTemplateSelectorProperty, value); }
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorablePaneControlStyle property.
+    /// </summary>
+    protected virtual void OnAnchorablePaneControlStyleChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Handles changes to the DocumentTitleTemplateSelector property.
-        /// </summary>
-        private static void OnDocumentTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentTitleTemplateSelectorChanged(e);
-        }
+    #endregion
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplateSelector property.
-        /// </summary>
-        protected virtual void OnDocumentTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null)
-                DocumentTitleTemplate = null;                
-        }
+    #region DocumentHeaderTemplate
 
-        /// <summary>
-        /// Coerces the DocumentTitleTemplateSelector value.
-        /// </summary>
-        private static object CoerceDocumentTitleTemplateSelectorValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// DocumentHeaderTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentHeaderTemplateProperty =
+        DependencyProperty.Register( "DocumentHeaderTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnDocumentHeaderTemplateChanged ),
+                new CoerceValueCallback( CoerceDocumentHeaderTemplateValue ) ) );
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the DocumentHeaderTemplate property.  This dependency property 
+    /// indicates data template to use for document header.
+    /// </summary>
+    public DataTemplate DocumentHeaderTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( DocumentHeaderTemplateProperty );
+      }
+      set
+      {
+        SetValue( DocumentHeaderTemplateProperty, value );
+      }
+    }
 
-        #region AnchorableTitleTemplate
+    /// <summary>
+    /// Handles changes to the DocumentHeaderTemplate property.
+    /// </summary>
+    private static void OnDocumentHeaderTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentHeaderTemplateChanged( e );
+    }
 
-        /// <summary>
-        /// AnchorableTitleTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableTitleTemplateProperty =
-            DependencyProperty.Register("AnchorableTitleTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnAnchorableTitleTemplateChanged),
-                    new CoerceValueCallback(CoerceAnchorableTitleTemplateValue)));
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplate property.
+    /// </summary>
+    protected virtual void OnDocumentHeaderTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Gets or sets the AnchorableTitleTemplate property.  This dependency property 
-        /// indicates the data template to use for anchorables title.
-        /// </summary>
-        public DataTemplate AnchorableTitleTemplate
-        {
-            get { return (DataTemplate)GetValue(AnchorableTitleTemplateProperty); }
-            set { SetValue(AnchorableTitleTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Coerces the DocumentHeaderTemplate value.
+    /// </summary>
+    private static object CoerceDocumentHeaderTemplateValue( DependencyObject d, object value )
+    {
+      if( value != null &&
+          d.GetValue( DocumentHeaderTemplateSelectorProperty ) != null )
+        return null;
+      return value;
+    }
 
-        /// <summary>
-        /// Handles changes to the AnchorableTitleTemplate property.
-        /// </summary>
-        private static void OnAnchorableTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorableTitleTemplateChanged(e);
-        }
+    #endregion
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplate property.
-        /// </summary>
-        protected virtual void OnAnchorableTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    #region DocumentHeaderTemplateSelector
 
-        /// <summary>
-        /// Coerces the AnchorableTitleTemplate value.
-        /// </summary>
-        private static object CoerceAnchorableTitleTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null &&
-                d.GetValue(AnchorableTitleTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
+    /// <summary>
+    /// DocumentHeaderTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentHeaderTemplateSelectorProperty =
+        DependencyProperty.Register( "DocumentHeaderTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnDocumentHeaderTemplateSelectorChanged ),
+                new CoerceValueCallback( CoerceDocumentHeaderTemplateSelectorValue ) ) );
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the DocumentHeaderTemplateSelector property.  This dependency property 
+    /// indicates the template selector that is used when selcting the data template for the header.
+    /// </summary>
+    public DataTemplateSelector DocumentHeaderTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( DocumentHeaderTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( DocumentHeaderTemplateSelectorProperty, value );
+      }
+    }
 
-        #region AnchorableTitleTemplateSelector
+    /// <summary>
+    /// Handles changes to the DocumentHeaderTemplateSelector property.
+    /// </summary>
+    private static void OnDocumentHeaderTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentHeaderTemplateSelectorChanged( e );
+    }
 
-        /// <summary>
-        /// AnchorableTitleTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableTitleTemplateSelectorProperty =
-            DependencyProperty.Register("AnchorableTitleTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnAnchorableTitleTemplateSelectorChanged)));
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplateSelector property.
+    /// </summary>
+    protected virtual void OnDocumentHeaderTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.NewValue != null &&
+          DocumentHeaderTemplate != null )
+        DocumentHeaderTemplate = null;
 
-        /// <summary>
-        /// Gets or sets the AnchorableTitleTemplateSelector property.  This dependency property 
-        /// indicates selctor to use when selecting data template for the title of anchorables.
-        /// </summary>
-        public DataTemplateSelector AnchorableTitleTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(AnchorableTitleTemplateSelectorProperty); }
-            set { SetValue(AnchorableTitleTemplateSelectorProperty, value); }
-        }
+      if( DocumentPaneMenuItemHeaderTemplateSelector == null )
+        DocumentPaneMenuItemHeaderTemplateSelector = DocumentHeaderTemplateSelector;
 
-        /// <summary>
-        /// Handles changes to the AnchorableTitleTemplateSelector property.
-        /// </summary>
-        private static void OnAnchorableTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorableTitleTemplateSelectorChanged(e);
-        }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplateSelector property.
-        /// </summary>
-        protected virtual void OnAnchorableTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null &&
-                AnchorableTitleTemplate != null)
-                AnchorableTitleTemplate = null;
-        }
+    /// <summary>
+    /// Coerces the DocumentHeaderTemplateSelector value.
+    /// </summary>
+    private static object CoerceDocumentHeaderTemplateSelectorValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #endregion
+    #endregion
 
-        #region AnchorableHeaderTemplate
+    #region DocumentTitleTemplate
 
-        /// <summary>
-        /// AnchorableHeaderTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableHeaderTemplateProperty =
-            DependencyProperty.Register("AnchorableHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnAnchorableHeaderTemplateChanged),
-                    new CoerceValueCallback(CoerceAnchorableHeaderTemplateValue)));
+    /// <summary>
+    /// DocumentTitleTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentTitleTemplateProperty =
+        DependencyProperty.Register( "DocumentTitleTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnDocumentTitleTemplateChanged ),
+                new CoerceValueCallback( CoerceDocumentTitleTemplateValue ) ) );
 
-        /// <summary>
-        /// Gets or sets the AnchorableHeaderTemplate property.  This dependency property 
-        /// indicates the data template to use for anchorable templates.
-        /// </summary>
-        public DataTemplate AnchorableHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(AnchorableHeaderTemplateProperty); }
-            set { SetValue(AnchorableHeaderTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the DocumentTitleTemplate property.  This dependency property 
+    /// indicates the datatemplate to use when creating the title for a document.
+    /// </summary>
+    public DataTemplate DocumentTitleTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( DocumentTitleTemplateProperty );
+      }
+      set
+      {
+        SetValue( DocumentTitleTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the AnchorableHeaderTemplate property.
-        /// </summary>
-        private static void OnAnchorableHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorableHeaderTemplateChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the DocumentTitleTemplate property.
+    /// </summary>
+    private static void OnDocumentTitleTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentTitleTemplateChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplate property.
-        /// </summary>
-        protected virtual void OnAnchorableHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplate property.
+    /// </summary>
+    protected virtual void OnDocumentTitleTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        /// <summary>
-        /// Coerces the AnchorableHeaderTemplate value.
-        /// </summary>
-        private static object CoerceAnchorableHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null &&
-                d.GetValue(AnchorableHeaderTemplateSelectorProperty) != null)
-                return null;
+    /// <summary>
+    /// Coerces the DocumentTitleTemplate value.
+    /// </summary>
+    private static object CoerceDocumentTitleTemplateValue( DependencyObject d, object value )
+    {
+      if( value != null &&
+          d.GetValue( DocumentTitleTemplateSelectorProperty ) != null )
+        return null;
 
-            return value;
-        }
+      return value;
+    }
 
-        #endregion
+    #endregion
 
-        #region AnchorableHeaderTemplateSelector
+    #region DocumentTitleTemplateSelector
 
-        /// <summary>
-        /// AnchorableHeaderTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableHeaderTemplateSelectorProperty =
-            DependencyProperty.Register("AnchorableHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnAnchorableHeaderTemplateSelectorChanged)));
+    /// <summary>
+    /// DocumentTitleTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentTitleTemplateSelectorProperty =
+        DependencyProperty.Register( "DocumentTitleTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnDocumentTitleTemplateSelectorChanged ),
+                new CoerceValueCallback( CoerceDocumentTitleTemplateSelectorValue ) ) );
 
-        /// <summary>
-        /// Gets or sets the AnchorableHeaderTemplateSelector property.  This dependency property 
-        /// indicates the selector to use when selecting the data template for anchorable headers.
-        /// </summary>
-        public DataTemplateSelector AnchorableHeaderTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(AnchorableHeaderTemplateSelectorProperty); }
-            set { SetValue(AnchorableHeaderTemplateSelectorProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the DocumentTitleTemplateSelector property.  This dependency property 
+    /// indicates the data template selector to use when creating the data template for the title.
+    /// </summary>
+    public DataTemplateSelector DocumentTitleTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( DocumentTitleTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( DocumentTitleTemplateSelectorProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the AnchorableHeaderTemplateSelector property.
-        /// </summary>
-        private static void OnAnchorableHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorableHeaderTemplateSelectorChanged(e);
-        }
+    /// <summary>
+    /// Handles changes to the DocumentTitleTemplateSelector property.
+    /// </summary>
+    private static void OnDocumentTitleTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentTitleTemplateSelectorChanged( e );
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplateSelector property.
-        /// </summary>
-        protected virtual void OnAnchorableHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null)
-                AnchorableHeaderTemplate = null;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplateSelector property.
+    /// </summary>
+    protected virtual void OnDocumentTitleTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.NewValue != null )
+        DocumentTitleTemplate = null;
+    }
 
-        #endregion
+    /// <summary>
+    /// Coerces the DocumentTitleTemplateSelector value.
+    /// </summary>
+    private static object CoerceDocumentTitleTemplateSelectorValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        #region LayoutRootPanel
+    #endregion
 
-        /// <summary>
-        /// LayoutRootPanel Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutRootPanelProperty =
-            DependencyProperty.Register("LayoutRootPanel", typeof(LayoutPanelControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutPanelControl)null,
-                    new PropertyChangedCallback(OnLayoutRootPanelChanged)));
+    #region AnchorableTitleTemplate
 
-        /// <summary>
-        /// Gets or sets the LayoutRootPanel property.  This dependency property 
-        /// indicates the layout panel control which is attached to the Layout.Root property.
-        /// </summary>
-        public LayoutPanelControl LayoutRootPanel
-        {
-            get { return (LayoutPanelControl)GetValue(LayoutRootPanelProperty); }
-            set { SetValue(LayoutRootPanelProperty, value); }
-        }
+    /// <summary>
+    /// AnchorableTitleTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableTitleTemplateProperty =
+        DependencyProperty.Register( "AnchorableTitleTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnAnchorableTitleTemplateChanged ),
+                new CoerceValueCallback( CoerceAnchorableTitleTemplateValue ) ) );
 
-        /// <summary>
-        /// Handles changes to the LayoutRootPanel property.
-        /// </summary>
-        private static void OnLayoutRootPanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLayoutRootPanelChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the AnchorableTitleTemplate property.  This dependency property 
+    /// indicates the data template to use for anchorables title.
+    /// </summary>
+    public DataTemplate AnchorableTitleTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( AnchorableTitleTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorableTitleTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the LayoutRootPanel property.
-        /// </summary>
-        protected virtual void OnLayoutRootPanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
+    /// <summary>
+    /// Handles changes to the AnchorableTitleTemplate property.
+    /// </summary>
+    private static void OnAnchorableTitleTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorableTitleTemplateChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplate property.
+    /// </summary>
+    protected virtual void OnAnchorableTitleTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        #region RightSidePanel
+    /// <summary>
+    /// Coerces the AnchorableTitleTemplate value.
+    /// </summary>
+    private static object CoerceAnchorableTitleTemplateValue( DependencyObject d, object value )
+    {
+      if( value != null &&
+          d.GetValue( AnchorableTitleTemplateSelectorProperty ) != null )
+        return null;
+      return value;
+    }
 
-        /// <summary>
-        /// RightSidePanel Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty RightSidePanelProperty =
-            DependencyProperty.Register("RightSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
-                    new PropertyChangedCallback(OnRightSidePanelChanged)));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the RightSidePanel property.  This dependency property 
-        /// indicates right side anchor panel.
-        /// </summary>
-        public LayoutAnchorSideControl RightSidePanel
-        {
-            get { return (LayoutAnchorSideControl)GetValue(RightSidePanelProperty); }
-            set { SetValue(RightSidePanelProperty, value); }
-        }
+    #region AnchorableTitleTemplateSelector
 
-        /// <summary>
-        /// Handles changes to the RightSidePanel property.
-        /// </summary>
-        private static void OnRightSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnRightSidePanelChanged(e);
-        }
+    /// <summary>
+    /// AnchorableTitleTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableTitleTemplateSelectorProperty =
+        DependencyProperty.Register( "AnchorableTitleTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnAnchorableTitleTemplateSelectorChanged ) ) );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the RightSidePanel property.
-        /// </summary>
-        protected virtual void OnRightSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
+    /// <summary>
+    /// Gets or sets the AnchorableTitleTemplateSelector property.  This dependency property 
+    /// indicates selctor to use when selecting data template for the title of anchorables.
+    /// </summary>
+    public DataTemplateSelector AnchorableTitleTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( AnchorableTitleTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( AnchorableTitleTemplateSelectorProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// Handles changes to the AnchorableTitleTemplateSelector property.
+    /// </summary>
+    private static void OnAnchorableTitleTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorableTitleTemplateSelectorChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplateSelector property.
+    /// </summary>
+    protected virtual void OnAnchorableTitleTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.NewValue != null &&
+          AnchorableTitleTemplate != null )
+        AnchorableTitleTemplate = null;
+    }
 
-        #region LeftSidePanel
+    #endregion
 
-        /// <summary>
-        /// LeftSidePanel Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LeftSidePanelProperty =
-            DependencyProperty.Register("LeftSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
-                    new PropertyChangedCallback(OnLeftSidePanelChanged)));
+    #region AnchorableHeaderTemplate
 
-        /// <summary>
-        /// Gets or sets the LeftSidePanel property.  This dependency property 
-        /// indicates the left side panel control.
-        /// </summary>
-        public LayoutAnchorSideControl LeftSidePanel
-        {
-            get { return (LayoutAnchorSideControl)GetValue(LeftSidePanelProperty); }
-            set { SetValue(LeftSidePanelProperty, value); }
-        }
+    /// <summary>
+    /// AnchorableHeaderTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableHeaderTemplateProperty =
+        DependencyProperty.Register( "AnchorableHeaderTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnAnchorableHeaderTemplateChanged ),
+                new CoerceValueCallback( CoerceAnchorableHeaderTemplateValue ) ) );
 
-        /// <summary>
-        /// Handles changes to the LeftSidePanel property.
-        /// </summary>
-        private static void OnLeftSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLeftSidePanelChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the AnchorableHeaderTemplate property.  This dependency property 
+    /// indicates the data template to use for anchorable templates.
+    /// </summary>
+    public DataTemplate AnchorableHeaderTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( AnchorableHeaderTemplateProperty );
+      }
+      set
+      {
+        SetValue( AnchorableHeaderTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the LeftSidePanel property.
-        /// </summary>
-        protected virtual void OnLeftSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
+    /// <summary>
+    /// Handles changes to the AnchorableHeaderTemplate property.
+    /// </summary>
+    private static void OnAnchorableHeaderTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorableHeaderTemplateChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplate property.
+    /// </summary>
+    protected virtual void OnAnchorableHeaderTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        #region TopSidePanel
+    /// <summary>
+    /// Coerces the AnchorableHeaderTemplate value.
+    /// </summary>
+    private static object CoerceAnchorableHeaderTemplateValue( DependencyObject d, object value )
+    {
+      if( value != null &&
+          d.GetValue( AnchorableHeaderTemplateSelectorProperty ) != null )
+        return null;
 
-        /// <summary>
-        /// TopSidePanel Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty TopSidePanelProperty =
-            DependencyProperty.Register("TopSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
-                    new PropertyChangedCallback(OnTopSidePanelChanged)));
+      return value;
+    }
 
-        /// <summary>
-        /// Gets or sets the TopSidePanel property.  This dependency property 
-        /// indicates top side control panel.
-        /// </summary>
-        public LayoutAnchorSideControl TopSidePanel
-        {
-            get { return (LayoutAnchorSideControl)GetValue(TopSidePanelProperty); }
-            set { SetValue(TopSidePanelProperty, value); }
-        }
+    #endregion
 
-        /// <summary>
-        /// Handles changes to the TopSidePanel property.
-        /// </summary>
-        private static void OnTopSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnTopSidePanelChanged(e);
-        }
+    #region AnchorableHeaderTemplateSelector
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the TopSidePanel property.
-        /// </summary>
-        protected virtual void OnTopSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
+    /// <summary>
+    /// AnchorableHeaderTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableHeaderTemplateSelectorProperty =
+        DependencyProperty.Register( "AnchorableHeaderTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnAnchorableHeaderTemplateSelectorChanged ) ) );
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the AnchorableHeaderTemplateSelector property.  This dependency property 
+    /// indicates the selector to use when selecting the data template for anchorable headers.
+    /// </summary>
+    public DataTemplateSelector AnchorableHeaderTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( AnchorableHeaderTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( AnchorableHeaderTemplateSelectorProperty, value );
+      }
+    }
 
-        #region BottomSidePanel
+    /// <summary>
+    /// Handles changes to the AnchorableHeaderTemplateSelector property.
+    /// </summary>
+    private static void OnAnchorableHeaderTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorableHeaderTemplateSelectorChanged( e );
+    }
 
-        /// <summary>
-        /// BottomSidePanel Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty BottomSidePanelProperty =
-            DependencyProperty.Register("BottomSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
-                    new PropertyChangedCallback(OnBottomSidePanelChanged)));
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplateSelector property.
+    /// </summary>
+    protected virtual void OnAnchorableHeaderTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.NewValue != null )
+        AnchorableHeaderTemplate = null;
+    }
 
-        /// <summary>
-        /// Gets or sets the BottomSidePanel property.  This dependency property 
-        /// indicates bottom side panel control.
-        /// </summary>
-        public LayoutAnchorSideControl BottomSidePanel
-        {
-            get { return (LayoutAnchorSideControl)GetValue(BottomSidePanelProperty); }
-            set { SetValue(BottomSidePanelProperty, value); }
-        }
+    #endregion
 
-        /// <summary>
-        /// Handles changes to the BottomSidePanel property.
-        /// </summary>
-        private static void OnBottomSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnBottomSidePanelChanged(e);
-        }
+    #region LayoutRootPanel
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the BottomSidePanel property.
-        /// </summary>
-        protected virtual void OnBottomSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
+    /// <summary>
+    /// LayoutRootPanel Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutRootPanelProperty =
+        DependencyProperty.Register( "LayoutRootPanel", typeof( LayoutPanelControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutPanelControl )null,
+                new PropertyChangedCallback( OnLayoutRootPanelChanged ) ) );
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the LayoutRootPanel property.  This dependency property 
+    /// indicates the layout panel control which is attached to the Layout.Root property.
+    /// </summary>
+    public LayoutPanelControl LayoutRootPanel
+    {
+      get
+      {
+        return ( LayoutPanelControl )GetValue( LayoutRootPanelProperty );
+      }
+      set
+      {
+        SetValue( LayoutRootPanelProperty, value );
+      }
+    }
 
-        #region LogicalChildren
+    /// <summary>
+    /// Handles changes to the LayoutRootPanel property.
+    /// </summary>
+    private static void OnLayoutRootPanelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutRootPanelChanged( e );
+    }
 
-        List<WeakReference> _logicalChildren = new List<WeakReference>();
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the LayoutRootPanel property.
+    /// </summary>
+    protected virtual void OnLayoutRootPanelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
+    }
 
-        protected override System.Collections.IEnumerator LogicalChildren
-        {
-            get
-            {
-                return _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).GetEnumerator();
-            }
-        }
+    #endregion
 
-    public System.Collections.IEnumerator LogicalChildrenPublic
+    #region RightSidePanel
+
+    /// <summary>
+    /// RightSidePanel Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty RightSidePanelProperty =
+        DependencyProperty.Register( "RightSidePanel", typeof( LayoutAnchorSideControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorSideControl )null,
+                new PropertyChangedCallback( OnRightSidePanelChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the RightSidePanel property.  This dependency property 
+    /// indicates right side anchor panel.
+    /// </summary>
+    public LayoutAnchorSideControl RightSidePanel
     {
       get
       {
-        return this.LogicalChildren;
+        return ( LayoutAnchorSideControl )GetValue( RightSidePanelProperty );
+      }
+      set
+      {
+        SetValue( RightSidePanelProperty, value );
       }
     }
 
+    /// <summary>
+    /// Handles changes to the RightSidePanel property.
+    /// </summary>
+    private static void OnRightSidePanelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnRightSidePanelChanged( e );
+    }
 
-        internal void InternalAddLogicalChild(object element)
-        {
-#if DEBUG
-            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
-                new InvalidOperationException();
-#endif
-            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
-                return;
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the RightSidePanel property.
+    /// </summary>
+    protected virtual void OnRightSidePanelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
+    }
 
-            _logicalChildren.Add(new WeakReference(element));
-            AddLogicalChild(element);
-        }
+    #endregion
 
-        internal void InternalRemoveLogicalChild(object element)
-        {
-            var wrToRemove = _logicalChildren.FirstOrDefault(ch => ch.GetValueOrDefault<object>() == element);
-            if (wrToRemove != null)
-                _logicalChildren.Remove(wrToRemove);
-            RemoveLogicalChild(element);
-        }
+    #region LeftSidePanel
 
-        void ClearLogicalChildrenList()
-        {
-            foreach (var child in _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).ToArray())
-                RemoveLogicalChild(child);
-            _logicalChildren.Clear();
-        }
+    /// <summary>
+    /// LeftSidePanel Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LeftSidePanelProperty =
+        DependencyProperty.Register( "LeftSidePanel", typeof( LayoutAnchorSideControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorSideControl )null,
+                new PropertyChangedCallback( OnLeftSidePanelChanged ) ) );
 
-        #endregion  
+    /// <summary>
+    /// Gets or sets the LeftSidePanel property.  This dependency property 
+    /// indicates the left side panel control.
+    /// </summary>
+    public LayoutAnchorSideControl LeftSidePanel
+    {
+      get
+      {
+        return ( LayoutAnchorSideControl )GetValue( LeftSidePanelProperty );
+      }
+      set
+      {
+        SetValue( LeftSidePanelProperty, value );
+      }
+    }
 
-        #region AutoHide window
-        internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
-        {
-            _autoHideWindowManager.ShowAutoHideWindow(anchor);
-            //if (_autohideArea == null)
-            //    return;
+    /// <summary>
+    /// Handles changes to the LeftSidePanel property.
+    /// </summary>
+    private static void OnLeftSidePanelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLeftSidePanelChanged( e );
+    }
 
-            //if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
-            //    return;
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the LeftSidePanel property.
+    /// </summary>
+    protected virtual void OnLeftSidePanelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
+    }
 
-          //Trace.WriteLine("ShowAutoHideWindow()");
+    #endregion
 
-            //_currentAutohiddenAnchor = new WeakReference(anchor);
+    #region TopSidePanel
 
-            //HideAutoHideWindow(anchor);
+    /// <summary>
+    /// TopSidePanel Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty TopSidePanelProperty =
+        DependencyProperty.Register( "TopSidePanel", typeof( LayoutAnchorSideControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorSideControl )null,
+                new PropertyChangedCallback( OnTopSidePanelChanged ) ) );
 
-            //SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
-            //AutoHideWindow.Show();
-        }
+    /// <summary>
+    /// Gets or sets the TopSidePanel property.  This dependency property 
+    /// indicates top side control panel.
+    /// </summary>
+    public LayoutAnchorSideControl TopSidePanel
+    {
+      get
+      {
+        return ( LayoutAnchorSideControl )GetValue( TopSidePanelProperty );
+      }
+      set
+      {
+        SetValue( TopSidePanelProperty, value );
+      }
+    }
 
-        internal void HideAutoHideWindow(LayoutAnchorControl anchor)
-        {
-            _autoHideWindowManager.HideAutoWindow(anchor);
-        }
+    /// <summary>
+    /// Handles changes to the TopSidePanel property.
+    /// </summary>
+    private static void OnTopSidePanelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnTopSidePanelChanged( e );
+    }
 
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the TopSidePanel property.
+    /// </summary>
+    protected virtual void OnTopSidePanelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
+    }
 
-        void SetupAutoHideWindow()
-        {
-            _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
+    #endregion
 
-            if (_autoHideWindowManager != null)
-                _autoHideWindowManager.HideAutoWindow();
-            else
-                _autoHideWindowManager = new AutoHideWindowManager(this);
+    #region BottomSidePanel
 
-            if (AutoHideWindow != null)
-                AutoHideWindow.Dispose();
+    /// <summary>
+    /// BottomSidePanel Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty BottomSidePanelProperty =
+        DependencyProperty.Register( "BottomSidePanel", typeof( LayoutAnchorSideControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutAnchorSideControl )null,
+                new PropertyChangedCallback( OnBottomSidePanelChanged ) ) );
 
-            SetAutoHideWindow(new LayoutAutoHideWindowControl());
-        }
+    /// <summary>
+    /// Gets or sets the BottomSidePanel property.  This dependency property 
+    /// indicates bottom side panel control.
+    /// </summary>
+    public LayoutAnchorSideControl BottomSidePanel
+    {
+      get
+      {
+        return ( LayoutAnchorSideControl )GetValue( BottomSidePanelProperty );
+      }
+      set
+      {
+        SetValue( BottomSidePanelProperty, value );
+      }
+    }
 
-        AutoHideWindowManager _autoHideWindowManager;
+    /// <summary>
+    /// Handles changes to the BottomSidePanel property.
+    /// </summary>
+    private static void OnBottomSidePanelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnBottomSidePanelChanged( e );
+    }
 
-        FrameworkElement _autohideArea;
-        internal FrameworkElement GetAutoHideAreaElement()
-        {
-            return _autohideArea;
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the BottomSidePanel property.
+    /// </summary>
+    protected virtual void OnBottomSidePanelChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
+    }
 
-        #region AutoHideWindow
+    #endregion
 
-        /// <summary>
-        /// AutoHideWindow Read-Only Dependency Property
-        /// </summary>
-        private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
-            = DependencyProperty.RegisterReadOnly("AutoHideWindow", typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata((LayoutAutoHideWindowControl)null,
-                    new PropertyChangedCallback(OnAutoHideWindowChanged)));
+    #region LogicalChildren
 
-        public static readonly DependencyProperty AutoHideWindowProperty
-            = AutoHideWindowPropertyKey.DependencyProperty;
+    List<WeakReference> _logicalChildren = new List<WeakReference>();
 
-        /// <summary>
-        /// Gets the AutoHideWindow property.  This dependency property 
-        /// indicates the currently shown autohide window.
-        /// </summary>
-        public LayoutAutoHideWindowControl AutoHideWindow
-        {
-            get { return (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty); }
-        }
+    protected override System.Collections.IEnumerator LogicalChildren
+    {
+      get
+      {
+        return _logicalChildren.Select( ch => ch.GetValueOrDefault<object>() ).GetEnumerator();
+      }
+    }
 
-        /// <summary>
-        /// Provides a secure method for setting the AutoHideWindow property.  
-        /// This dependency property indicates the currently shown autohide window.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetAutoHideWindow(LayoutAutoHideWindowControl value)
-        {
-            SetValue(AutoHideWindowPropertyKey, value);
-        }
+    public System.Collections.IEnumerator LogicalChildrenPublic
+    {
+      get
+      {
+        return this.LogicalChildren;
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the AutoHideWindow property.
-        /// </summary>
-        private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAutoHideWindowChanged(e);
-        }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
-        /// </summary>
-        protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
+    internal void InternalAddLogicalChild( object element )
+    {
+#if DEBUG
+      if( _logicalChildren.Select( ch => ch.GetValueOrDefault<object>() ).Contains( element ) )
+        new InvalidOperationException();
+#endif
+      if( _logicalChildren.Select( ch => ch.GetValueOrDefault<object>() ).Contains( element ) )
+        return;
 
-        }
+      _logicalChildren.Add( new WeakReference( element ) );
+      AddLogicalChild( element );
+    }
+
+    internal void InternalRemoveLogicalChild( object element )
+    {
+      var wrToRemove = _logicalChildren.FirstOrDefault( ch => ch.GetValueOrDefault<object>() == element );
+      if( wrToRemove != null )
+        _logicalChildren.Remove( wrToRemove );
+      RemoveLogicalChild( element );
+    }
+
+    void ClearLogicalChildrenList()
+    {
+      foreach( var child in _logicalChildren.Select( ch => ch.GetValueOrDefault<object>() ).ToArray() )
+        RemoveLogicalChild( child );
+      _logicalChildren.Clear();
+    }
 
-        #endregion
-
-
-
-        #endregion
-        // #region AutoHide window
-        //WeakReference _currentAutohiddenAnchor = null;
-        //internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
-        //{
-        //    if (_autohideArea == null)
-        //        return;
-
-        //    if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
-        //        return;
-
-        //    Trace.WriteLine("ShowAutoHideWindow()");
-
-        //    _currentAutohiddenAnchor = new WeakReference(anchor);
-
-        //    HideAutoHideWindow(anchor);
-
-        //    SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
-        //}
-
-        //internal void HideAutoHideWindow(LayoutAnchorControl anchor)
-        //{
-        //    if (AutoHideWindow != null)
-        //    {
-        //        if (anchor == _currentAutohiddenAnchor.GetValueOrDefault<LayoutAnchorControl>())
-        //        {
-        //            Trace.WriteLine("AutoHideWindow()");
-        //            AutoHideWindow.Dispose();
-        //            SetAutoHideWindow(null);
-        //        }
-        //    }
-        //}
-
-        //FrameworkElement _autohideArea;
-        //internal FrameworkElement GetAutoHideAreaElement()
-        //{
-        //    return _autohideArea;
-        //}
-
-        //void SetupAutoHideArea()
-        //{
-        //    _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
-        //}
-
-        // #region AutoHideWindow
-
-        ///// <summary>
-        ///// AutoHideWindow Read-Only Dependency Property
-        ///// </summary>
-        //private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
-        //    = DependencyProperty.RegisterReadOnly("AutoHideWindow", typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
-        //        new FrameworkPropertyMetadata((LayoutAutoHideWindowControl)null,
-        //            new PropertyChangedCallback(OnAutoHideWindowChanged)));
-
-        //public static readonly DependencyProperty AutoHideWindowProperty
-        //    = AutoHideWindowPropertyKey.DependencyProperty;
-
-        ///// <summary>
-        ///// Gets the AutoHideWindow property.  This dependency property 
-        ///// indicates the currently shown autohide window.
-        ///// </summary>
-        //public LayoutAutoHideWindowControl AutoHideWindow
-        //{
-        //    get { return (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty); }
-        //}
-
-        ///// <summary>
-        ///// Provides a secure method for setting the AutoHideWindow property.  
-        ///// This dependency property indicates the currently shown autohide window.
-        ///// </summary>
-        ///// <param name="value">The new value for the property.</param>
-        //protected void SetAutoHideWindow(LayoutAutoHideWindowControl value)
-        //{
-        //    SetValue(AutoHideWindowPropertyKey, value);
-        //}
-
-        ///// <summary>
-        ///// Handles changes to the AutoHideWindow property.
-        ///// </summary>
-        //private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        //{
-        //    ((DockingManager)d).OnAutoHideWindowChanged(e);
-        //}
-
-        ///// <summary>
-        ///// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
-        ///// </summary>
-        //protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
-        //{
-        //    if (e.OldValue != null)
-        //        ((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(e.OldValue);
-        //    if (e.NewValue != null)
-        //        ((ILogicalChildrenContainer)this).InternalAddLogicalChild(e.NewValue);
-        //}
-
-        // #endregion
-
-
-
-        // #endregion
-
-        #region Floating Windows
-        List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
-
-        internal void StartDraggingFloatingWindowForContent(LayoutContent contentModel, bool startDrag = true)
-        {
-            if (!contentModel.CanFloat)
-                return;
-            var contentModelAsAnchorable = contentModel as LayoutAnchorable;
-            if (contentModelAsAnchorable != null &&
-                contentModelAsAnchorable.IsAutoHidden)
-                contentModelAsAnchorable.ToggleAutoHide();
-
-            var parentPane = contentModel.Parent as ILayoutPane;
-            var parentPaneAsPositionableElement = contentModel.Parent as ILayoutPositionableElement;
-            var parentPaneAsWithActualSize = contentModel.Parent as ILayoutPositionableElementWithActualSize;
-            var contentModelParentChildrenIndex = parentPane.Children.ToList().IndexOf(contentModel);
-
-            if (contentModel.FindParent<LayoutFloatingWindow>() == null)
-            {
-                ((ILayoutPreviousContainer)contentModel).PreviousContainer = parentPane;
-                contentModel.PreviousContainerIndex = contentModelParentChildrenIndex;
-            }
+    #endregion
 
-            parentPane.RemoveChildAt(contentModelParentChildrenIndex);
+    #region AutoHide window
+    internal void ShowAutoHideWindow( LayoutAnchorControl anchor )
+    {
+      _autoHideWindowManager.ShowAutoHideWindow( anchor );
+      //if (_autohideArea == null)
+      //    return;
 
-            double fwWidth = contentModel.FloatingWidth; 
-            double fwHeight = contentModel.FloatingHeight; 
+      //if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
+      //    return;
 
-            if (fwWidth == 0.0)
-                fwWidth = parentPaneAsPositionableElement.FloatingWidth;
-            if (fwHeight == 0.0)
-                fwHeight = parentPaneAsPositionableElement.FloatingHeight;
+      //Trace.WriteLine("ShowAutoHideWindow()");
 
-            if (fwWidth == 0.0)
-                fwWidth = parentPaneAsWithActualSize.ActualWidth;
-            if (fwHeight == 0.0)
-                fwHeight = parentPaneAsWithActualSize.ActualHeight;
+      //_currentAutohiddenAnchor = new WeakReference(anchor);
 
-            LayoutFloatingWindow fw;
-            LayoutFloatingWindowControl fwc;
-            if (contentModel is LayoutAnchorable)
-            {
-                var anchorableContent = contentModel as LayoutAnchorable;
-                fw = new LayoutAnchorableFloatingWindow()
-                {
-                    RootPanel = new LayoutAnchorablePaneGroup(
-                        new LayoutAnchorablePane(anchorableContent)
-                        {
-                            DockWidth = parentPaneAsPositionableElement.DockWidth,
-                            DockHeight = parentPaneAsPositionableElement.DockHeight,
-                            DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
-                            DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
-                            FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
-                            FloatingTop = parentPaneAsPositionableElement.FloatingTop,
-                            FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
-                            FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
-                        })
-                };
-
-                Layout.FloatingWindows.Add(fw);
-
-                fwc = new LayoutAnchorableFloatingWindowControl(
-                    fw as LayoutAnchorableFloatingWindow)
-                    {
-                        Width = fwWidth,
-                        Height = fwHeight,
-                        Left = contentModel.FloatingLeft,
-                        Top = contentModel.FloatingTop
-                    };
-            }
-            else
-            {
-                var anchorableDocument = contentModel as LayoutDocument;
-                fw = new LayoutDocumentFloatingWindow()
-                {
-                    RootDocument = anchorableDocument
-                };
+      //HideAutoHideWindow(anchor);
 
-                Layout.FloatingWindows.Add(fw);
+      //SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
+      //AutoHideWindow.Show();
+    }
 
-                fwc = new LayoutDocumentFloatingWindowControl(
-                    fw as LayoutDocumentFloatingWindow)
-                {
-                    Width = fwWidth,
-                    Height = fwHeight,
-                    Left = contentModel.FloatingLeft,
-                    Top = contentModel.FloatingTop
-                };
-            }
+    internal void HideAutoHideWindow( LayoutAnchorControl anchor )
+    {
+      _autoHideWindowManager.HideAutoWindow( anchor );
+    }
 
 
-            //fwc.Owner = Window.GetWindow(this);
-            //fwc.SetParentToMainWindowOf(this);
+    void SetupAutoHideWindow()
+    {
+      if( _autoHideWindowManager != null )
+        _autoHideWindowManager.HideAutoWindow();
+      else
+        _autoHideWindowManager = new AutoHideWindowManager( this );
 
+      if( AutoHideWindow != null )
+        AutoHideWindow.Dispose();
 
-            _fwList.Add(fwc);
+      SetAutoHideWindow( new LayoutAutoHideWindowControl() );
+    }
 
-            Layout.CollectGarbage();
+    AutoHideWindowManager _autoHideWindowManager;
 
-            UpdateLayout();
+    FrameworkElement _autohideArea;
+    internal FrameworkElement GetAutoHideAreaElement()
+    {
+      return _autohideArea;
+    }
 
-            Dispatcher.BeginInvoke(new Action(() =>
-            {
-                if (startDrag)
-                    fwc.AttachDrag();
-                fwc.Show();
-            }), DispatcherPriority.Send);
-        }
+    #region AutoHideWindow
 
-        internal void StartDraggingFloatingWindowForPane(LayoutAnchorablePane paneModel)
-        {
-            if (paneModel.Children.Any(c => !c.CanFloat))
-                return;
-            var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
-            var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
+    /// <summary>
+    /// AutoHideWindow Read-Only Dependency Property
+    /// </summary>
+    private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
+        = DependencyProperty.RegisterReadOnly( "AutoHideWindow", typeof( LayoutAutoHideWindowControl ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( LayoutAutoHideWindowControl )null,
+                new PropertyChangedCallback( OnAutoHideWindowChanged ) ) );
 
-            double fwWidth = paneAsPositionableElement.FloatingWidth;
-            double fwHeight = paneAsPositionableElement.FloatingHeight;
-            double fwLeft = paneAsPositionableElement.FloatingLeft;
-            double fwTop = paneAsPositionableElement.FloatingTop;
+    public static readonly DependencyProperty AutoHideWindowProperty
+        = AutoHideWindowPropertyKey.DependencyProperty;
 
+    /// <summary>
+    /// Gets the AutoHideWindow property.  This dependency property 
+    /// indicates the currently shown autohide window.
+    /// </summary>
+    public LayoutAutoHideWindowControl AutoHideWindow
+    {
+      get
+      {
+        return ( LayoutAutoHideWindowControl )GetValue( AutoHideWindowProperty );
+      }
+    }
 
+    /// <summary>
+    /// Provides a secure method for setting the AutoHideWindow property.  
+    /// This dependency property indicates the currently shown autohide window.
+    /// </summary>
+    /// <param name="value">The new value for the property.</param>
+    protected void SetAutoHideWindow( LayoutAutoHideWindowControl value )
+    {
+      SetValue( AutoHideWindowPropertyKey, value );
+    }
 
-            if (fwWidth == 0.0)
-                fwWidth = paneAsWithActualSize.ActualWidth;
-            if (fwHeight == 0.0)
-                fwHeight = paneAsWithActualSize.ActualHeight;
+    /// <summary>
+    /// Handles changes to the AutoHideWindow property.
+    /// </summary>
+    private static void OnAutoHideWindowChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAutoHideWindowChanged( e );
+    }
 
-            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,
-            };
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
+    /// </summary>
+    protected virtual void OnAutoHideWindowChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.OldValue != null )
+        InternalRemoveLogicalChild( e.OldValue );
+      if( e.NewValue != null )
+        InternalAddLogicalChild( e.NewValue );
 
-            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;
-                }
+    #endregion
+
+
+
+    #endregion
+    // #region AutoHide window
+    //WeakReference _currentAutohiddenAnchor = null;
+    //internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
+    //{
+    //    if (_autohideArea == null)
+    //        return;
+
+    //    if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
+    //        return;
+
+    //    Trace.WriteLine("ShowAutoHideWindow()");
+
+    //    _currentAutohiddenAnchor = new WeakReference(anchor);
+
+    //    HideAutoHideWindow(anchor);
+
+    //    SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
+    //}
+
+    //internal void HideAutoHideWindow(LayoutAnchorControl anchor)
+    //{
+    //    if (AutoHideWindow != null)
+    //    {
+    //        if (anchor == _currentAutohiddenAnchor.GetValueOrDefault<LayoutAnchorControl>())
+    //        {
+    //            Trace.WriteLine("AutoHideWindow()");
+    //            AutoHideWindow.Dispose();
+    //            SetAutoHideWindow(null);
+    //        }
+    //    }
+    //}
+
+    //FrameworkElement _autohideArea;
+    //internal FrameworkElement GetAutoHideAreaElement()
+    //{
+    //    return _autohideArea;
+    //}
+
+    //void SetupAutoHideArea()
+    //{
+    //    _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
+    //}
+
+    // #region AutoHideWindow
+
+    ///// <summary>
+    ///// AutoHideWindow Read-Only Dependency Property
+    ///// </summary>
+    //private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
+    //    = DependencyProperty.RegisterReadOnly("AutoHideWindow", typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
+    //        new FrameworkPropertyMetadata((LayoutAutoHideWindowControl)null,
+    //            new PropertyChangedCallback(OnAutoHideWindowChanged)));
+
+    //public static readonly DependencyProperty AutoHideWindowProperty
+    //    = AutoHideWindowPropertyKey.DependencyProperty;
+
+    ///// <summary>
+    ///// Gets the AutoHideWindow property.  This dependency property 
+    ///// indicates the currently shown autohide window.
+    ///// </summary>
+    //public LayoutAutoHideWindowControl AutoHideWindow
+    //{
+    //    get { return (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty); }
+    //}
+
+    ///// <summary>
+    ///// Provides a secure method for setting the AutoHideWindow property.  
+    ///// This dependency property indicates the currently shown autohide window.
+    ///// </summary>
+    ///// <param name="value">The new value for the property.</param>
+    //protected void SetAutoHideWindow(LayoutAutoHideWindowControl value)
+    //{
+    //    SetValue(AutoHideWindowPropertyKey, value);
+    //}
+
+    ///// <summary>
+    ///// Handles changes to the AutoHideWindow property.
+    ///// </summary>
+    //private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    //{
+    //    ((DockingManager)d).OnAutoHideWindowChanged(e);
+    //}
+
+    ///// <summary>
+    ///// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
+    ///// </summary>
+    //protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
+    //{
+    //    if (e.OldValue != null)
+    //        ((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(e.OldValue);
+    //    if (e.NewValue != null)
+    //        ((ILogicalChildrenContainer)this).InternalAddLogicalChild(e.NewValue);
+    //}
+
+    // #endregion
+
+
+
+    // #endregion
+
+    #region Floating Windows
+    List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
+
+    internal void StartDraggingFloatingWindowForContent( LayoutContent contentModel, bool startDrag = true )
+    {
+      if( !contentModel.CanFloat )
+        return;
+      var contentModelAsAnchorable = contentModel as LayoutAnchorable;
+      if( contentModelAsAnchorable != null &&
+          contentModelAsAnchorable.IsAutoHidden )
+        contentModelAsAnchorable.ToggleAutoHide();
+
+      var parentPane = contentModel.Parent as ILayoutPane;
+      var parentPaneAsPositionableElement = contentModel.Parent as ILayoutPositionableElement;
+      var parentPaneAsWithActualSize = contentModel.Parent as ILayoutPositionableElementWithActualSize;
+      var contentModelParentChildrenIndex = parentPane.Children.ToList().IndexOf( contentModel );
+
+      if( contentModel.FindParent<LayoutFloatingWindow>() == null )
+      {
+        ( ( ILayoutPreviousContainer )contentModel ).PreviousContainer = parentPane;
+        contentModel.PreviousContainerIndex = contentModelParentChildrenIndex;
+      }
 
-                paneModel.RemoveChildAt(paneModel.Children.Count - 1);
-                destPane.Children.Insert(0, contentModel);
-            }
+      parentPane.RemoveChildAt( contentModelParentChildrenIndex );
 
-            if (destPane.Children.Count > 0)
-            {
-                destPane.SelectedContentIndex = currentSelectedContentIndex;
-            }
+      double fwWidth = contentModel.FloatingWidth;
+      double fwHeight = contentModel.FloatingHeight;
 
+      if( fwWidth == 0.0 )
+        fwWidth = parentPaneAsPositionableElement.FloatingWidth;
+      if( fwHeight == 0.0 )
+        fwHeight = parentPaneAsPositionableElement.FloatingHeight;
 
-            LayoutFloatingWindow fw;
-            LayoutFloatingWindowControl fwc;
-            fw = new LayoutAnchorableFloatingWindow()
-            {
-                RootPanel = new LayoutAnchorablePaneGroup(
-                    destPane) 
-                    {
-                        DockHeight = destPane.DockHeight,
-                        DockWidth = destPane.DockWidth,
-                        DockMinHeight = destPane.DockMinHeight,
-                        DockMinWidth = destPane.DockMinWidth,
-                    }
-            };
+      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.
 
-            Layout.FloatingWindows.Add(fw);
+      LayoutFloatingWindow fw;
+      LayoutFloatingWindowControl fwc;
+      if( contentModel is LayoutAnchorable )
+      {
+        var anchorableContent = contentModel as LayoutAnchorable;
+        fw = new LayoutAnchorableFloatingWindow()
+        {
+          RootPanel = new LayoutAnchorablePaneGroup(
+                new LayoutAnchorablePane( anchorableContent )
+                {
+                  DockWidth = parentPaneAsPositionableElement.DockWidth,
+                  DockHeight = parentPaneAsPositionableElement.DockHeight,
+                  DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
+                  DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
+                  FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
+                  FloatingTop = parentPaneAsPositionableElement.FloatingTop,
+                  FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
+                  FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
+                } )
+        };
+
+        Layout.FloatingWindows.Add( fw );
+
+        fwc = new LayoutAnchorableFloatingWindowControl(
+            fw as LayoutAnchorableFloatingWindow )
+        {
+          Width = fwWidth,
+          Height = fwHeight,
+          Left = contentModel.FloatingLeft,
+          Top = contentModel.FloatingTop
+        };
+      }
+      else
+      {
+        var anchorableDocument = contentModel as LayoutDocument;
+        fw = new LayoutDocumentFloatingWindow()
+        {
+          RootDocument = anchorableDocument
+        };
 
-            fwc = new LayoutAnchorableFloatingWindowControl(
-                fw as LayoutAnchorableFloatingWindow)
-            {
-                Width = fwWidth,
-                Height = fwHeight
-            };
+        Layout.FloatingWindows.Add( fw );
 
+        fwc = new LayoutDocumentFloatingWindowControl(
+            fw as LayoutDocumentFloatingWindow )
+        {
+          Width = fwWidth,
+          Height = fwHeight,
+          Left = contentModel.FloatingLeft,
+          Top = contentModel.FloatingTop
+        };
+      }
 
 
-            //fwc.Owner = Window.GetWindow(this);
-            //fwc.SetParentToMainWindowOf(this);
+      //fwc.Owner = Window.GetWindow(this);
+      //fwc.SetParentToMainWindowOf(this);
 
 
-            _fwList.Add(fwc);
+      _fwList.Add( fwc );
 
-            Layout.CollectGarbage();
+      Layout.CollectGarbage();
 
-            InvalidateArrange();
+      UpdateLayout();
 
+      Dispatcher.BeginInvoke( new Action( () =>
+        {
+          if( startDrag )
             fwc.AttachDrag();
-            fwc.Show(); 
+          fwc.Show();
+        } ), DispatcherPriority.Send );
+    }
 
-        }
+    internal void StartDraggingFloatingWindowForPane( LayoutAnchorablePane paneModel )
+    {
+      if( paneModel.Children.Any( c => !c.CanFloat ) )
+        return;
+      var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
+      var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
+
+      double fwWidth = paneAsPositionableElement.FloatingWidth;
+      double fwHeight = paneAsPositionableElement.FloatingHeight;
+      double fwLeft = paneAsPositionableElement.FloatingLeft;
+      double fwTop = paneAsPositionableElement.FloatingTop;
+
+      if( fwWidth == 0.0 )
+        fwWidth = paneAsWithActualSize.ActualWidth + 10;       //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
+      if( fwHeight == 0.0 )
+        fwHeight = paneAsWithActualSize.ActualHeight + 10;   //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
+
+      var destPane = new LayoutAnchorablePane()
+      {
+        DockWidth = paneAsPositionableElement.DockWidth,
+        DockHeight = paneAsPositionableElement.DockHeight,
+        DockMinHeight = paneAsPositionableElement.DockMinHeight,
+        DockMinWidth = paneAsPositionableElement.DockMinWidth,
+        FloatingLeft = paneAsPositionableElement.FloatingLeft,
+        FloatingTop = paneAsPositionableElement.FloatingTop,
+        FloatingWidth = paneAsPositionableElement.FloatingWidth,
+        FloatingHeight = paneAsPositionableElement.FloatingHeight,
+      };
+
+      bool savePreviousContainer = paneModel.FindParent<LayoutFloatingWindow>() == null;
+      int currentSelectedContentIndex = paneModel.SelectedContentIndex;
+      while( paneModel.Children.Count > 0 )
+      {
+        var contentModel = paneModel.Children[ paneModel.Children.Count - 1 ] as LayoutAnchorable;
 
-        internal IEnumerable<LayoutFloatingWindowControl> GetFloatingWindowsByZOrder()
+        if( savePreviousContainer )
         {
-            var parentWindow = Window.GetWindow(this);
-
-            if (parentWindow == null)
-                yield break;
+          var contentModelAsPreviousContainer = contentModel as ILayoutPreviousContainer;
+          contentModelAsPreviousContainer.PreviousContainer = paneModel;
+          contentModel.PreviousContainerIndex = paneModel.Children.Count - 1;
+        }
 
-            IntPtr windowParentHanlde = new WindowInteropHelper(parentWindow).Handle;
+        paneModel.RemoveChildAt( paneModel.Children.Count - 1 );
+        destPane.Children.Insert( 0, contentModel );
+      }
 
-            IntPtr currentHandle = Win32Helper.GetWindow(windowParentHanlde, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDFIRST);
-            while (currentHandle != IntPtr.Zero)
-            {
-                LayoutFloatingWindowControl ctrl = _fwList.FirstOrDefault(fw => new WindowInteropHelper(fw).Handle == currentHandle);
-                if (ctrl != null && ctrl.Model.Root.Manager == this)
-                    yield return ctrl;
+      if( destPane.Children.Count > 0 )
+      {
+        destPane.SelectedContentIndex = currentSelectedContentIndex;
+      }
 
-                currentHandle = Win32Helper.GetWindow(currentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDNEXT);
-            }
-        }
 
-        internal void RemoveFloatingWindow(LayoutFloatingWindowControl floatingWindow)
+      LayoutFloatingWindow fw;
+      LayoutFloatingWindowControl fwc;
+      fw = new LayoutAnchorableFloatingWindow()
+      {
+        RootPanel = new LayoutAnchorablePaneGroup(
+              destPane )
         {
-            _fwList.Remove(floatingWindow);
+          DockHeight = destPane.DockHeight,
+          DockWidth = destPane.DockWidth,
+          DockMinHeight = destPane.DockMinHeight,
+          DockMinWidth = destPane.DockMinWidth,
         }
+      };
 
-        public IEnumerable<LayoutFloatingWindowControl> FloatingWindows
-        {
-            get { return _fwList; }
-        }
-        #endregion
+      Layout.FloatingWindows.Add( fw );
 
-        #region OverlayWindow
+      fwc = new LayoutAnchorableFloatingWindowControl(
+          fw as LayoutAnchorableFloatingWindow )
+      {
+        Width = fwWidth,
+        Height = fwHeight
+      };
 
-        bool IOverlayWindowHost.HitTest(Point dragPoint)
-        {
-            Rect detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
-            return detectionRect.Contains(dragPoint);
-        }
 
-        DockingManager IOverlayWindowHost.Manager
-        {
-            get { return this; }
-        }
 
-        OverlayWindow _overlayWindow = null;
-        void CreateOverlayWindow()
-        {
-            if (_overlayWindow == null)
-            {
-                _overlayWindow = new OverlayWindow(this);
-            }
-            Rect rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
-            _overlayWindow.Left = rectWindow.Left;
-            _overlayWindow.Top = rectWindow.Top;
-            _overlayWindow.Width = rectWindow.Width;
-            _overlayWindow.Height = rectWindow.Height;
-        }
+      //fwc.Owner = Window.GetWindow(this);
+      //fwc.SetParentToMainWindowOf(this);
 
-        void DestroyOverlayWindow()
-        {
-            if (_overlayWindow != null)
-            {
-                _overlayWindow.Close();
-                _overlayWindow = null;
-            }
-        }
 
-        IOverlayWindow IOverlayWindowHost.ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow)
-        {
-            CreateOverlayWindow();
-            _overlayWindow.Owner = draggingWindow;
-            _overlayWindow.EnableDropTargets();
-            _overlayWindow.Show();
-            return _overlayWindow;
-        }
+      _fwList.Add( fwc );
 
-        void IOverlayWindowHost.HideOverlayWindow()
-        {
-            _areas = null;
-            _overlayWindow.Owner = null;
-            _overlayWindow.HideDropTargets();
-        }
+      Layout.CollectGarbage();
 
-        List<IDropArea> _areas = null;
+      InvalidateArrange();
 
-        IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowControl draggingWindow)
-        {
-            if (_areas != null)
-                return _areas;
+      fwc.AttachDrag();
+      fwc.Show();
 
-            bool isDraggingDocuments = draggingWindow.Model is LayoutDocumentFloatingWindow;
+    }
 
-            _areas = new List<IDropArea>();
+    internal IEnumerable<LayoutFloatingWindowControl> GetFloatingWindowsByZOrder()
+    {
+      var parentWindow = Window.GetWindow( this );
 
-            if (!isDraggingDocuments)
-            {
-                _areas.Add(new DropArea<DockingManager>(
-                    this,
-                    DropAreaType.DockingManager));
+      if( parentWindow == null )
+        yield break;
 
-                foreach (var areaHost in this.FindVisualChildren<LayoutAnchorablePaneControl>())
-                {
-                    if (areaHost.Model.Descendents().Any())
-                    {
-                        _areas.Add(new DropArea<LayoutAnchorablePaneControl>(
-                            areaHost,
-                            DropAreaType.AnchorablePane));
-                    }
-                }
-            }
+      IntPtr windowParentHanlde = new WindowInteropHelper( parentWindow ).Handle;
 
-            foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneControl>())
-            {
-                _areas.Add(new DropArea<LayoutDocumentPaneControl>(
-                    areaHost,
-                    DropAreaType.DocumentPane));
-            }
+      IntPtr currentHandle = Win32Helper.GetWindow( windowParentHanlde, ( uint )Win32Helper.GetWindow_Cmd.GW_HWNDFIRST );
+      while( currentHandle != IntPtr.Zero )
+      {
+        LayoutFloatingWindowControl ctrl = _fwList.FirstOrDefault( fw => new WindowInteropHelper( fw ).Handle == currentHandle );
+        if( ctrl != null && ctrl.Model.Root.Manager == this )
+          yield return ctrl;
 
-            foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneGroupControl>())
-            {
-                var documentGroupModel = areaHost.Model as LayoutDocumentPaneGroup;
-                if (documentGroupModel.Children.Where(c => c.IsVisible).Count() == 0)
-                {
-                    _areas.Add(new DropArea<LayoutDocumentPaneGroupControl>(
-                        areaHost,
-                        DropAreaType.DocumentPaneGroup));
-                }
-            }
+        currentHandle = Win32Helper.GetWindow( currentHandle, ( uint )Win32Helper.GetWindow_Cmd.GW_HWNDNEXT );
+      }
+    }
 
-            return _areas;
-        }
+    internal void RemoveFloatingWindow( LayoutFloatingWindowControl floatingWindow )
+    {
+      _fwList.Remove( floatingWindow );
+    }
 
-        protected override Size ArrangeOverride(Size arrangeBounds)
-        {
-            _areas = null;
-            return base.ArrangeOverride(arrangeBounds);
-        }
+    public IEnumerable<LayoutFloatingWindowControl> FloatingWindows
+    {
+      get
+      {
+        return _fwList;
+      }
+    }
+    #endregion
+
+    #region OverlayWindow
+
+    bool IOverlayWindowHost.HitTest( Point dragPoint )
+    {
+      Rect detectionRect = new Rect( this.PointToScreenDPIWithoutFlowDirection( new Point() ), this.TransformActualSizeToAncestor() );
+      return detectionRect.Contains( dragPoint );
+    }
 
-        #endregion
+    DockingManager IOverlayWindowHost.Manager
+    {
+      get
+      {
+        return this;
+      }
+    }
 
-        #region LayoutDocument & LayoutAnchorable Templates
+    OverlayWindow _overlayWindow = null;
+    void CreateOverlayWindow()
+    {
+      if( _overlayWindow == null )
+      {
+        _overlayWindow = new OverlayWindow( this );
+      }
+      Rect rectWindow = new Rect( this.PointToScreenDPIWithoutFlowDirection( new Point() ), this.TransformActualSizeToAncestor() );
+      _overlayWindow.Left = rectWindow.Left;
+      _overlayWindow.Top = rectWindow.Top;
+      _overlayWindow.Width = rectWindow.Width;
+      _overlayWindow.Height = rectWindow.Height;
+    }
 
-        #region LayoutItemTemplate
+    void DestroyOverlayWindow()
+    {
+      if( _overlayWindow != null )
+      {
+        _overlayWindow.Close();
+        _overlayWindow = null;
+      }
+    }
 
-        /// <summary>
-        /// LayoutItemTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutItemTemplateProperty =
-            DependencyProperty.Register("LayoutItemTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnLayoutItemTemplateChanged)));
+    IOverlayWindow IOverlayWindowHost.ShowOverlayWindow( LayoutFloatingWindowControl draggingWindow )
+    {
+      CreateOverlayWindow();
+      _overlayWindow.Owner = draggingWindow;
+      _overlayWindow.EnableDropTargets();
+      _overlayWindow.Show();
+      return _overlayWindow;
+    }
 
-        /// <summary>
-        /// Gets or sets the AnchorableTemplate property.  This dependency property 
-        /// indicates the template to use to render anchorable and document contents.
-        /// </summary>
-        public DataTemplate LayoutItemTemplate
-        {
-            get { return (DataTemplate)GetValue(LayoutItemTemplateProperty); }
-            set { SetValue(LayoutItemTemplateProperty, value); }
-        }
+    void IOverlayWindowHost.HideOverlayWindow()
+    {
+      _areas = null;
+      _overlayWindow.Owner = null;
+      _overlayWindow.HideDropTargets();
+    }
 
-        /// <summary>
-        /// Handles changes to the AnchorableTemplate property.
-        /// </summary>
-        private static void OnLayoutItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLayoutItemTemplateChanged(e);
-        }
+    List<IDropArea> _areas = null;
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorableTemplate property.
-        /// </summary>
-        protected virtual void OnLayoutItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
+    IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas( LayoutFloatingWindowControl draggingWindow )
+    {
+      if( _areas != null )
+        return _areas;
 
-        #endregion
+      bool isDraggingDocuments = draggingWindow.Model is LayoutDocumentFloatingWindow;
 
-        #region LayoutItemTemplateSelector
+      _areas = new List<IDropArea>();
 
-        /// <summary>
-        /// LayoutItemTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutItemTemplateSelectorProperty =
-            DependencyProperty.Register("LayoutItemTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnLayoutItemTemplateSelectorChanged)));
+      if( !isDraggingDocuments )
+      {
+        _areas.Add( new DropArea<DockingManager>(
+            this,
+            DropAreaType.DockingManager ) );
 
-        /// <summary>
-        /// Gets or sets the LayoutItemTemplateSelector property.  This dependency property 
-        /// indicates selector object to use for anchorable templates.
-        /// </summary>
-        public DataTemplateSelector LayoutItemTemplateSelector
+        foreach( var areaHost in this.FindVisualChildren<LayoutAnchorablePaneControl>() )
         {
-            get { return (DataTemplateSelector)GetValue(LayoutItemTemplateSelectorProperty); }
-            set { SetValue(LayoutItemTemplateSelectorProperty, value); }
+          if( areaHost.Model.Descendents().Any() )
+          {
+            _areas.Add( new DropArea<LayoutAnchorablePaneControl>(
+                areaHost,
+                DropAreaType.AnchorablePane ) );
+          }
         }
+      }
 
-        /// <summary>
-        /// Handles changes to the LayoutItemTemplateSelector property.
-        /// </summary>
-        private static void OnLayoutItemTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLayoutItemTemplateSelectorChanged(e);
-        }
+      foreach( var areaHost in this.FindVisualChildren<LayoutDocumentPaneControl>() )
+      {
+        _areas.Add( new DropArea<LayoutDocumentPaneControl>(
+            areaHost,
+            DropAreaType.DocumentPane ) );
+      }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the LayoutItemTemplateSelector property.
-        /// </summary>
-        protected virtual void OnLayoutItemTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+      foreach( var areaHost in this.FindVisualChildren<LayoutDocumentPaneGroupControl>() )
+      {
+        var documentGroupModel = areaHost.Model as LayoutDocumentPaneGroup;
+        if( documentGroupModel.Children.Where( c => c.IsVisible ).Count() == 0 )
         {
+          _areas.Add( new DropArea<LayoutDocumentPaneGroupControl>(
+              areaHost,
+              DropAreaType.DocumentPaneGroup ) );
         }
+      }
 
-        #endregion
+      return _areas;
+    }
 
+    protected override Size ArrangeOverride( Size arrangeBounds )
+    {
+      _areas = null;
+      return base.ArrangeOverride( arrangeBounds );
+    }
 
-        #endregion
+    #endregion
 
-        #region DocumentsSource
+    #region LayoutDocument & LayoutAnchorable Templates
 
-        /// <summary>
-        /// DocumentsSource Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentsSourceProperty =
-            DependencyProperty.Register("DocumentsSource", typeof(IEnumerable), typeof(DockingManager),
-                new FrameworkPropertyMetadata((IEnumerable)null,
-                    new PropertyChangedCallback(OnDocumentsSourceChanged)));
+    #region LayoutItemTemplate
 
-        /// <summary>
-        /// Gets or sets the DocumentsSource property.  This dependency property 
-        /// indicates the source collection of documents.
-        /// </summary>
-        public IEnumerable DocumentsSource
-        {
-            get { return (IEnumerable)GetValue(DocumentsSourceProperty); }
-            set { SetValue(DocumentsSourceProperty, value); }
-        }
+    /// <summary>
+    /// LayoutItemTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutItemTemplateProperty =
+        DependencyProperty.Register( "LayoutItemTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnLayoutItemTemplateChanged ) ) );
 
-        /// <summary>
-        /// Handles changes to the DocumentsSource property.
-        /// </summary>
-        private static void OnDocumentsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentsSourceChanged(e);
-        }
+    /// <summary>
+    /// Gets or sets the AnchorableTemplate property.  This dependency property 
+    /// indicates the template to use to render anchorable and document contents.
+    /// </summary>
+    public DataTemplate LayoutItemTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( LayoutItemTemplateProperty );
+      }
+      set
+      {
+        SetValue( LayoutItemTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentsSource property.
-        /// </summary>
-        protected virtual void OnDocumentsSourceChanged(DependencyPropertyChangedEventArgs e)
-        {
-            DetachDocumentsSource(Layout, e.OldValue as IEnumerable);
-            AttachDocumentsSource(Layout, e.NewValue as IEnumerable);
-        }
+    /// <summary>
+    /// Handles changes to the AnchorableTemplate property.
+    /// </summary>
+    private static void OnLayoutItemTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutItemTemplateChanged( e );
+    }
 
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorableTemplate property.
+    /// </summary>
+    protected virtual void OnLayoutItemTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        void AttachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
-        {
-            if (documentsSource == null)
-                return;
+    #endregion
 
-            if (layout == null)
-                return;
+    #region LayoutItemTemplateSelector
 
-            //if (layout.Descendents().OfType<LayoutDocument>().Any())
-            //    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
-            var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select(d => d.Content).ToArray();
-            var documents = documentsSource as IEnumerable;
-            var listOfDocumentsToImport = new List<object>(documents.OfType<object>());
+    /// <summary>
+    /// LayoutItemTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutItemTemplateSelectorProperty =
+        DependencyProperty.Register( "LayoutItemTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnLayoutItemTemplateSelectorChanged ) ) );
 
-            foreach (var document in listOfDocumentsToImport.ToArray())
-            {
-                if (documentsImported.Contains(document))
-                    listOfDocumentsToImport.Remove(document);
-            }
+    /// <summary>
+    /// Gets or sets the LayoutItemTemplateSelector property.  This dependency property 
+    /// indicates selector object to use for anchorable templates.
+    /// </summary>
+    public DataTemplateSelector LayoutItemTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( LayoutItemTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( LayoutItemTemplateSelectorProperty, value );
+      }
+    }
 
+    /// <summary>
+    /// Handles changes to the LayoutItemTemplateSelector property.
+    /// </summary>
+    private static void OnLayoutItemTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutItemTemplateSelectorChanged( e );
+    }
 
-            LayoutDocumentPane documentPane = null;
-            if (layout.LastFocusedDocument != null)
-            {
-                documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
-            }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the LayoutItemTemplateSelector property.
+    /// </summary>
+    protected virtual void OnLayoutItemTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-            if (documentPane == null)
-            {
-                documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
-            }
+    #endregion
 
-            //if (documentPane == null)
-            //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
 
-            _suspendLayoutItemCreation = true;
-            foreach (var documentContentToImport in listOfDocumentsToImport)
-            {
+    #endregion
 
-                //documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
+    #region DocumentsSource
 
-                var documentToImport = new LayoutDocument()
-                {
-                    Content = documentContentToImport
-                };
+    /// <summary>
+    /// DocumentsSource Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentsSourceProperty =
+        DependencyProperty.Register( "DocumentsSource", typeof( IEnumerable ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( IEnumerable )null,
+                new PropertyChangedCallback( OnDocumentsSourceChanged ) ) );
 
-                bool added = false;
-                if (LayoutUpdateStrategy != null)
-                {
-                    added = LayoutUpdateStrategy.BeforeInsertDocument(layout, documentToImport, documentPane);
-                }
+    /// <summary>
+    /// Gets or sets the DocumentsSource property.  This dependency property 
+    /// indicates the source collection of documents.
+    /// </summary>
+    public IEnumerable DocumentsSource
+    {
+      get
+      {
+        return ( IEnumerable )GetValue( DocumentsSourceProperty );
+      }
+      set
+      {
+        SetValue( DocumentsSourceProperty, value );
+      }
+    }
 
-                if (!added)
-                {
-                    if (documentPane == null)
-                        throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+    /// <summary>
+    /// Handles changes to the DocumentsSource property.
+    /// </summary>
+    private static void OnDocumentsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentsSourceChanged( e );
+    }
 
-                    documentPane.Children.Add(documentToImport);
-                    added = true;
-                }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentsSource property.
+    /// </summary>
+    protected virtual void OnDocumentsSourceChanged( DependencyPropertyChangedEventArgs e )
+    {
+      DetachDocumentsSource( Layout, e.OldValue as IEnumerable );
+      AttachDocumentsSource( Layout, e.NewValue as IEnumerable );
+    }
 
-                if (LayoutUpdateStrategy != null)
-                    LayoutUpdateStrategy.AfterInsertDocument(layout, documentToImport);
 
+    void AttachDocumentsSource( LayoutRoot layout, IEnumerable documentsSource )
+    {
+      if( documentsSource == null )
+        return;
 
-                CreateDocumentLayoutItem(documentToImport);
+      if( layout == null )
+        return;
 
-            }
-            _suspendLayoutItemCreation = false;
+      //if (layout.Descendents().OfType<LayoutDocument>().Any())
+      //    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
+      var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select( d => d.Content ).ToArray();
+      var documents = documentsSource as IEnumerable;
+      var listOfDocumentsToImport = new List<object>( documents.OfType<object>() );
 
+      foreach( var document in listOfDocumentsToImport.ToArray() )
+      {
+        if( documentsImported.Contains( document ) )
+          listOfDocumentsToImport.Remove( document );
+      }
 
-            var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
-            if (documentsSourceAsNotifier != null)
-                documentsSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler(documentsSourceElementsChanged);
-        }
 
-        internal bool SuspendDocumentsSourceBinding = false;
+      LayoutDocumentPane documentPane = null;
+      if( layout.LastFocusedDocument != null )
+      {
+        documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+      }
 
-        void documentsSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (Layout == null)
-                return;
+      if( documentPane == null )
+      {
+        documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+      }
 
-            //When deserializing documents are created automatically by the deserializer
-            if (SuspendDocumentsSourceBinding)
-                return;
+      //if (documentPane == null)
+      //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
 
-            //handle remove
-            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
-            {
-                if (e.OldItems != null)
-                {
-                    var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
-                    foreach (var documentToRemove in documentsToRemove)
-                    {
-                        (documentToRemove.Parent as ILayoutContainer).RemoveChild(
-                            documentToRemove);
-                        this.RemoveViewFromLogicalChild( documentToRemove );
-                    }
-                }
-            }
+      _suspendLayoutItemCreation = true;
+      foreach( var documentContentToImport in listOfDocumentsToImport )
+      {
 
-            //handle add
-            if (e.NewItems != null &&
-                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                if (e.NewItems != null)
-                {
-                    LayoutDocumentPane documentPane = null;
-                    if (Layout.LastFocusedDocument != null)
-                    {
-                        documentPane = Layout.LastFocusedDocument.Parent as LayoutDocumentPane;
-                    }
+        //documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
 
-                    if (documentPane == null)
-                    {
-                        documentPane = Layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
-                    }
+        var documentToImport = new LayoutDocument()
+        {
+          Content = documentContentToImport
+        };
 
-                    //if (documentPane == null)
-                    //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+        bool added = false;
+        if( LayoutUpdateStrategy != null )
+        {
+          added = LayoutUpdateStrategy.BeforeInsertDocument( layout, documentToImport, documentPane );
+        }
 
-                    _suspendLayoutItemCreation = true;
+        if( !added )
+        {
+          if( documentPane == null )
+            throw new InvalidOperationException( "Layout must contains at least one LayoutDocumentPane in order to host documents" );
 
-                    foreach (var documentContentToImport in e.NewItems)
-                    {
-                        var documentToImport = new LayoutDocument()
-                        {
-                            Content = documentContentToImport
-                        };
+          documentPane.Children.Add( documentToImport );
+          added = true;
+        }
 
-                        bool added = false;
-                        if (LayoutUpdateStrategy != null)
-                        {
-                            added = LayoutUpdateStrategy.BeforeInsertDocument(Layout, documentToImport, documentPane);
-                        }
+        if( LayoutUpdateStrategy != null )
+          LayoutUpdateStrategy.AfterInsertDocument( layout, documentToImport );
 
-                        if (!added)
-                        {
-                            if (documentPane == null)
-                                throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
 
-                            documentPane.Children.Add(documentToImport);
-                            added = true;
-                        }
+        CreateDocumentLayoutItem( documentToImport );
 
-                        if (LayoutUpdateStrategy != null)
-                        {
-                            LayoutUpdateStrategy.AfterInsertDocument(Layout, documentToImport);
-                        }
+      }
+      _suspendLayoutItemCreation = false;
 
 
-                        var root = documentToImport.Root;
+      var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
+      if( documentsSourceAsNotifier != null )
+        documentsSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler( documentsSourceElementsChanged );
+    }
 
-                        if (root != null && root.Manager == this)
-                        {
-                            CreateDocumentLayoutItem(documentToImport);
-                        }
-                    }
-                    _suspendLayoutItemCreation = false;
-                }
-            }
+    internal bool SuspendDocumentsSourceBinding = false;
 
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                //NOTE: I'm going to clear every document present in layout but
-                //some documents may have been added directly to the layout, for now I clear them too
-                var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().ToArray();
-                foreach (var documentToRemove in documentsToRemove)
-                {
-                    (documentToRemove.Parent as ILayoutContainer).RemoveChild(
-                        documentToRemove);
-                    this.RemoveViewFromLogicalChild( documentToRemove );
-                }
-            }
+    void documentsSourceElementsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      if( Layout == null )
+        return;
 
-            if (Layout != null)
-            {
-                Layout.CollectGarbage();
-            }
-        }
+      //When deserializing documents are created automatically by the deserializer
+      if( SuspendDocumentsSourceBinding )
+        return;
 
-        void DetachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
+      //handle remove
+      if( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace )
+      {
+        if( e.OldItems != null )
         {
-            if (documentsSource == null)
-                return;
-
-            if (layout == null)
-                return;
-
-            var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
-                .Where(d => documentsSource.Contains(d.Content)).ToArray();
+          var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().Where( d => e.OldItems.Contains( d.Content ) ).ToArray();
+          foreach( var documentToRemove in documentsToRemove )
+          {
+            ( documentToRemove.Parent as ILayoutContainer ).RemoveChild(
+                documentToRemove );
+            this.RemoveViewFromLogicalChild( documentToRemove );
+          }
+        }
+      }
 
-            foreach (var documentToRemove in documentsToRemove)
-            {
-                (documentToRemove.Parent as ILayoutContainer).RemoveChild(
-                    documentToRemove);
-                this.RemoveViewFromLogicalChild( documentToRemove );
-            }
+      //handle add
+      if( e.NewItems != null &&
+          ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        if( e.NewItems != null )
+        {
+          LayoutDocumentPane documentPane = null;
+          if( Layout.LastFocusedDocument != null )
+          {
+            documentPane = Layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+          }
 
-            var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
-            if (documentsSourceAsNotifier != null)
-                documentsSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler(documentsSourceElementsChanged);
-        }
+          if( documentPane == null )
+          {
+            documentPane = Layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+          }
 
+          //if (documentPane == null)
+          //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
 
-        #endregion
+          _suspendLayoutItemCreation = true;
 
-        #region DocumentCloseCommand
+          foreach( var documentContentToImport in e.NewItems )
+          {
+            var documentToImport = new LayoutDocument()
+            {
+              Content = documentContentToImport
+            };
 
-        internal void _ExecuteCloseCommand(LayoutDocument document)
-        {
-            if (DocumentClosing != null)
+            bool added = false;
+            if( LayoutUpdateStrategy != null )
             {
-                var evargs = new DocumentClosingEventArgs(document);
-                DocumentClosing(this, evargs);
-                if (evargs.Cancel)
-                    return;
+              added = LayoutUpdateStrategy.BeforeInsertDocument( Layout, documentToImport, documentPane );
             }
 
-            if( document.CloseDocument() )
+            if( !added )
             {
-              this.RemoveViewFromLogicalChild( document );
+              if( documentPane == null )
+                throw new InvalidOperationException( "Layout must contains at least one LayoutDocumentPane in order to host documents" );
 
-              if( DocumentClosed != null )
-              {
-                var evargs = new DocumentClosedEventArgs( document );
-                DocumentClosed( this, evargs );
-              }
+              documentPane.Children.Add( documentToImport );
+              added = true;
             }
-        }
-
-        /// <summary>
-        /// Event fired when a document is about to be closed
-        /// </summary>
-        /// <remarks>Subscribers have the opportuniy to cancel the operation.</remarks>
-        public event EventHandler<DocumentClosingEventArgs> DocumentClosing;
-
-        /// <summary>
-        /// Event fired after a document is closed
-        /// </summary>
-        public event EventHandler<DocumentClosedEventArgs> DocumentClosed;
 
+            if( LayoutUpdateStrategy != null )
+            {
+              LayoutUpdateStrategy.AfterInsertDocument( Layout, documentToImport );
+            }
 
 
-        #endregion
+            var root = documentToImport.Root;
 
-        internal void _ExecuteCloseAllButThisCommand(LayoutContent contentSelected)
-        {
-            foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => d != contentSelected && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
+            if( root != null && root.Manager == this )
             {
-              this.Close( contentToClose );              
+              CreateDocumentLayoutItem( documentToImport );
             }
+          }
+          _suspendLayoutItemCreation = false;
         }
+      }
 
-        internal void _ExecuteCloseAllCommand( LayoutContent contentSelected )
+      if( e.Action == NotifyCollectionChangedAction.Reset )
+      {
+        //NOTE: I'm going to clear every document present in layout but
+        //some documents may have been added directly to the layout, for now I clear them too
+        var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().ToArray();
+        foreach( var documentToRemove in documentsToRemove )
         {
-          foreach( var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).ToArray() )
-          {
-            this.Close( contentToClose );
-          }
+          ( documentToRemove.Parent as ILayoutContainer ).RemoveChild(
+              documentToRemove );
+          this.RemoveViewFromLogicalChild( documentToRemove );
         }
+      }
 
-        private void Close( LayoutContent contentToClose )
-        {
-          if( !contentToClose.CanClose )
-            return;
+      if( Layout != null )
+      {
+        Layout.CollectGarbage();
+      }
+    }
 
-          var layoutItem = GetLayoutItemFromModel( contentToClose );
-          if( layoutItem.CloseCommand != null )
-          {
-            if( layoutItem.CloseCommand.CanExecute( null ) )
-              layoutItem.CloseCommand.Execute( null );
-          }
-          else
-          {
-            if( contentToClose is LayoutDocument )
-              _ExecuteCloseCommand( contentToClose as LayoutDocument );
-            else if( contentToClose is LayoutAnchorable )
-              _ExecuteCloseCommand( contentToClose as LayoutAnchorable );
-          }
-        }
+    void DetachDocumentsSource( LayoutRoot layout, IEnumerable documentsSource )
+    {
+      if( documentsSource == null )
+        return;
 
-        #region DocumentContextMenu
+      if( layout == null )
+        return;
 
-        /// <summary>
-        /// DocumentContextMenu Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentContextMenuProperty =
-            DependencyProperty.Register("DocumentContextMenu", typeof(ContextMenu), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ContextMenu)null));
+      var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
+          .Where( d => documentsSource.Contains( d.Content ) ).ToArray();
 
-        /// <summary>
-        /// Gets or sets the DocumentContextMenu property.  This dependency property 
-        /// indicates context menu to show for documents.
-        /// </summary>
-        public ContextMenu DocumentContextMenu
-        {
-            get { return (ContextMenu)GetValue(DocumentContextMenuProperty); }
-            set { SetValue(DocumentContextMenuProperty, value); }
-        }
+      foreach( var documentToRemove in documentsToRemove )
+      {
+        ( documentToRemove.Parent as ILayoutContainer ).RemoveChild(
+            documentToRemove );
+        this.RemoveViewFromLogicalChild( documentToRemove );
+      }
 
-        #endregion
+      var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
+      if( documentsSourceAsNotifier != null )
+        documentsSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler( documentsSourceElementsChanged );
+    }
 
-        #region AnchorablesSource
 
-        /// <summary>
-        /// AnchorablesSource Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorablesSourceProperty =
-            DependencyProperty.Register("AnchorablesSource", typeof(IEnumerable), typeof(DockingManager),
-                new FrameworkPropertyMetadata((IEnumerable)null,
-                    new PropertyChangedCallback(OnAnchorablesSourceChanged)));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the AnchorablesSource property.  This dependency property 
-        /// indicates source collection of anchorables.
-        /// </summary>
-        public IEnumerable AnchorablesSource
-        {
-            get { return (IEnumerable)GetValue(AnchorablesSourceProperty); }
-            set { SetValue(AnchorablesSourceProperty, value); }
-        }
+    #region DocumentCloseCommand
 
-        /// <summary>
-        /// Handles changes to the AnchorablesSource property.
-        /// </summary>
-        private static void OnAnchorablesSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnAnchorablesSourceChanged(e);
-        }
+    internal void _ExecuteCloseCommand( LayoutDocument document )
+    {
+      if( DocumentClosing != null )
+      {
+        var evargs = new DocumentClosingEventArgs( document );
+        DocumentClosing( this, evargs );
+        if( evargs.Cancel )
+          return;
+      }
+
+      if( document.CloseDocument() )
+      {
+        this.RemoveViewFromLogicalChild( document );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the AnchorablesSource property.
-        /// </summary>
-        protected virtual void OnAnchorablesSourceChanged(DependencyPropertyChangedEventArgs e)
+        if( DocumentClosed != null )
         {
-            DetachAnchorablesSource(Layout, e.OldValue as IEnumerable);
-            AttachAnchorablesSource(Layout, e.NewValue as IEnumerable);
+          var evargs = new DocumentClosedEventArgs( document );
+          DocumentClosed( this, evargs );
         }
+      }
+    }
 
-        void AttachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
-        {
-            if (anchorablesSource == null)
-                return;
+    /// <summary>
+    /// Event fired when a document is about to be closed
+    /// </summary>
+    /// <remarks>Subscribers have the opportuniy to cancel the operation.</remarks>
+    public event EventHandler<DocumentClosingEventArgs> DocumentClosing;
 
-            if (layout == null)
-                return;
+    /// <summary>
+    /// Event fired after a document is closed
+    /// </summary>
+    public event EventHandler<DocumentClosedEventArgs> DocumentClosed;
 
-            //if (layout.Descendents().OfType<LayoutAnchorable>().Any())
-            //    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
-            var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select(d => d.Content).ToArray();
-            var anchorables = anchorablesSource as IEnumerable;
-            var listOfAnchorablesToImport = new List<object>(anchorables.OfType<object>());
 
-            foreach (var document in listOfAnchorablesToImport.ToArray())
-            {
-                if (anchorablesImported.Contains(document))
-                    listOfAnchorablesToImport.Remove(document);
-            }
 
-            LayoutAnchorablePane anchorablePane = null;
-            if (layout.ActiveContent != null)
-            {
-                //look for active content parent pane
-                anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
-            }
+    #endregion
 
-            if (anchorablePane == null)
-            {
-                //look for a pane on the right side
-                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
-            }
+    internal void _ExecuteCloseAllButThisCommand( LayoutContent contentSelected )
+    {
+      foreach( var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where( d => d != contentSelected && ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).ToArray() )
+      {
+        this.Close( contentToClose );
+      }
+    }
 
-            if (anchorablePane == null)
-            {
-                //look for an available pane
-                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
-            }
+    internal void _ExecuteCloseAllCommand( LayoutContent contentSelected )
+    {
+      foreach( var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).ToArray() )
+      {
+        this.Close( contentToClose );
+      }
+    }
 
-            _suspendLayoutItemCreation = true;
-            foreach (var anchorableContentToImport in listOfAnchorablesToImport)
-            {
-                var anchorableToImport = new LayoutAnchorable()
-                {
-                    Content = anchorableContentToImport
-                };
+    private void Close( LayoutContent contentToClose )
+    {
+      if( !contentToClose.CanClose )
+        return;
 
-                bool added = false;
-                if (LayoutUpdateStrategy != null)
-                {
-                    added = LayoutUpdateStrategy.BeforeInsertAnchorable(layout, anchorableToImport, anchorablePane);
-                }
+      var layoutItem = GetLayoutItemFromModel( contentToClose );
+      if( layoutItem.CloseCommand != null )
+      {
+        if( layoutItem.CloseCommand.CanExecute( null ) )
+          layoutItem.CloseCommand.Execute( null );
+      }
+      else
+      {
+        if( contentToClose is LayoutDocument )
+          _ExecuteCloseCommand( contentToClose as LayoutDocument );
+        else if( contentToClose is LayoutAnchorable )
+          _ExecuteCloseCommand( contentToClose as LayoutAnchorable );
+      }
+    }
 
-                if (!added)
-                {
-                    if (anchorablePane == null)
-                    {
-                        var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
-                        if (layout.RootPanel != null)
-                        {
-                            mainLayoutPanel.Children.Add(layout.RootPanel);
-                        }
-
-                        layout.RootPanel = mainLayoutPanel;
-                        anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
-                        mainLayoutPanel.Children.Add(anchorablePane);
-                    }
+    #region DocumentContextMenu
 
-                    anchorablePane.Children.Add(anchorableToImport);
-                    added = true;
-                }
+    /// <summary>
+    /// DocumentContextMenu Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentContextMenuProperty =
+        DependencyProperty.Register( "DocumentContextMenu", typeof( ContextMenu ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ContextMenu )null ) );
 
-                if (LayoutUpdateStrategy != null)
-                    LayoutUpdateStrategy.AfterInsertAnchorable(layout, anchorableToImport);
+    /// <summary>
+    /// Gets or sets the DocumentContextMenu property.  This dependency property 
+    /// indicates context menu to show for documents.
+    /// </summary>
+    public ContextMenu DocumentContextMenu
+    {
+      get
+      {
+        return ( ContextMenu )GetValue( DocumentContextMenuProperty );
+      }
+      set
+      {
+        SetValue( DocumentContextMenuProperty, value );
+      }
+    }
 
+    #endregion
 
-                CreateAnchorableLayoutItem(anchorableToImport);
+    #region AnchorablesSource
 
-            }
+    /// <summary>
+    /// AnchorablesSource Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorablesSourceProperty =
+        DependencyProperty.Register( "AnchorablesSource", typeof( IEnumerable ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( IEnumerable )null,
+                new PropertyChangedCallback( OnAnchorablesSourceChanged ) ) );
 
-            _suspendLayoutItemCreation = false;
+    /// <summary>
+    /// Gets or sets the AnchorablesSource property.  This dependency property 
+    /// indicates source collection of anchorables.
+    /// </summary>
+    public IEnumerable AnchorablesSource
+    {
+      get
+      {
+        return ( IEnumerable )GetValue( AnchorablesSourceProperty );
+      }
+      set
+      {
+        SetValue( AnchorablesSourceProperty, value );
+      }
+    }
 
-            var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
-            if (anchorablesSourceAsNotifier != null)
-                anchorablesSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler(anchorablesSourceElementsChanged);
-        }
+    /// <summary>
+    /// Handles changes to the AnchorablesSource property.
+    /// </summary>
+    private static void OnAnchorablesSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnAnchorablesSourceChanged( e );
+    }
 
-        internal bool SuspendAnchorablesSourceBinding = false;
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the AnchorablesSource property.
+    /// </summary>
+    protected virtual void OnAnchorablesSourceChanged( DependencyPropertyChangedEventArgs e )
+    {
+      DetachAnchorablesSource( Layout, e.OldValue as IEnumerable );
+      AttachAnchorablesSource( Layout, e.NewValue as IEnumerable );
+    }
 
-        void anchorablesSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (Layout == null)
-                return;
+    void AttachAnchorablesSource( LayoutRoot layout, IEnumerable anchorablesSource )
+    {
+      if( anchorablesSource == null )
+        return;
 
-            //When deserializing documents are created automatically by the deserializer
-            if (SuspendAnchorablesSourceBinding)
-                return;
+      if( layout == null )
+        return;
 
-            //handle remove
-            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
-            {
-                if (e.OldItems != null)
-                {
-                    var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
-                    foreach (var anchorableToRemove in anchorablesToRemove)
-                    {
-                        anchorableToRemove.Content = null;
-                        (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
-                            anchorableToRemove);
-                        this.RemoveViewFromLogicalChild( anchorableToRemove );
-                    }
-                }
-            }
+      //if (layout.Descendents().OfType<LayoutAnchorable>().Any())
+      //    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
+      var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select( d => d.Content ).ToArray();
+      var anchorables = anchorablesSource as IEnumerable;
+      var listOfAnchorablesToImport = new List<object>( anchorables.OfType<object>() );
 
-            //handle add
-            if (e.NewItems != null &&
-                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                if (e.NewItems != null)
-                {
-                    LayoutAnchorablePane anchorablePane = null;
+      foreach( var document in listOfAnchorablesToImport.ToArray() )
+      {
+        if( anchorablesImported.Contains( document ) )
+          listOfAnchorablesToImport.Remove( document );
+      }
 
-                    if (Layout.ActiveContent != null)
-                    {
-                        //look for active content parent pane
-                        anchorablePane = Layout.ActiveContent.Parent as LayoutAnchorablePane;
-                    }
+      LayoutAnchorablePane anchorablePane = null;
+      if( layout.ActiveContent != null )
+      {
+        //look for active content parent pane
+        anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
+      }
 
-                    if (anchorablePane == null)
-                    {
-                        //look for a pane on the right side
-                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
-                    }
+      if( anchorablePane == null )
+      {
+        //look for a pane on the right side
+        anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().Where( pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right ).FirstOrDefault();
+      }
 
-                    if (anchorablePane == null)
-                    {
-                        //look for an available pane
-                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
-                    }
+      if( anchorablePane == null )
+      {
+        //look for an available pane
+        anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+      }
 
-                    _suspendLayoutItemCreation = true;
-                    foreach (var anchorableContentToImport in e.NewItems)
-                    {
-                        var anchorableToImport = new LayoutAnchorable()
-                        {
-                            Content = anchorableContentToImport
-                        };
-
-                        bool added = false;
-                        if (LayoutUpdateStrategy != null)
-                        {
-                            added = LayoutUpdateStrategy.BeforeInsertAnchorable(Layout, anchorableToImport, anchorablePane);
-                        }
-
-                        if (!added)
-                        {
-                            if (anchorablePane == null)
-                            {
-                                var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
-                                if (Layout.RootPanel != null)
-                                {
-                                    mainLayoutPanel.Children.Add(Layout.RootPanel);
-                                }
-
-                                Layout.RootPanel = mainLayoutPanel;
-                                anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
-                                mainLayoutPanel.Children.Add(anchorablePane);
-                            }
-
-                            anchorablePane.Children.Add(anchorableToImport);
-                            added = true;
-                        }
-
-                        if (LayoutUpdateStrategy != null)
-                        {
-                            LayoutUpdateStrategy.AfterInsertAnchorable(Layout, anchorableToImport);
-                        }
-
-                        var root = anchorableToImport.Root;
-
-                        if (root != null && root.Manager == this)
-                        {
-                            CreateAnchorableLayoutItem(anchorableToImport);
-                        }
+      _suspendLayoutItemCreation = true;
+      foreach( var anchorableContentToImport in listOfAnchorablesToImport )
+      {
+        var anchorableToImport = new LayoutAnchorable()
+        {
+          Content = anchorableContentToImport
+        };
 
-                    }
-                    _suspendLayoutItemCreation = false;
-                }
-            }
+        bool added = false;
+        if( LayoutUpdateStrategy != null )
+        {
+          added = LayoutUpdateStrategy.BeforeInsertAnchorable( layout, anchorableToImport, anchorablePane );
+        }
 
-            if (e.Action == NotifyCollectionChangedAction.Reset)
+        if( !added )
+        {
+          if( anchorablePane == null )
+          {
+            var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+            if( layout.RootPanel != null )
             {
-                //NOTE: I'm going to clear every anchorable present in layout but
-                //some anchorable may have been added directly to the layout, for now I clear them too
-                var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
-                foreach (var anchorableToRemove in anchorablesToRemove)
-                {
-                    (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
-                        anchorableToRemove);
-                    this.RemoveViewFromLogicalChild( anchorableToRemove );
-                }
+              mainLayoutPanel.Children.Add( layout.RootPanel );
             }
 
-            if (Layout != null)
-                Layout.CollectGarbage();
+            layout.RootPanel = mainLayoutPanel;
+            anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength( 200.0, GridUnitType.Pixel ) };
+            mainLayoutPanel.Children.Add( anchorablePane );
+          }
+
+          anchorablePane.Children.Add( anchorableToImport );
+          added = true;
         }
 
-        void DetachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
-        {
-            if (anchorablesSource == null)
-                return;
+        if( LayoutUpdateStrategy != null )
+          LayoutUpdateStrategy.AfterInsertAnchorable( layout, anchorableToImport );
 
-            if (layout == null)
-                return;
 
-            var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
-                .Where(d => anchorablesSource.Contains(d.Content)).ToArray();
+        CreateAnchorableLayoutItem( anchorableToImport );
 
-            foreach (var anchorableToRemove in anchorablesToRemove)
-            {
-                (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
-                    anchorableToRemove);
-                this.RemoveViewFromLogicalChild( anchorableToRemove );
-            }
+      }
 
-            var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
-            if (anchorablesSourceAsNotifier != null)
-                anchorablesSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler(anchorablesSourceElementsChanged);
-        }
+      _suspendLayoutItemCreation = false;
+
+      var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
+      if( anchorablesSourceAsNotifier != null )
+        anchorablesSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler( anchorablesSourceElementsChanged );
+    }
+
+    internal bool SuspendAnchorablesSourceBinding = false;
 
-        #endregion
+    void anchorablesSourceElementsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      if( Layout == null )
+        return;
+
+      //When deserializing documents are created automatically by the deserializer
+      if( SuspendAnchorablesSourceBinding )
+        return;
 
-        internal void _ExecuteCloseCommand(LayoutAnchorable anchorable)
+      //handle remove
+      if( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace )
+      {
+        if( e.OldItems != null )
         {
-            var model = anchorable as LayoutAnchorable;
-            if (model != null )
-            {
-              model.CloseAnchorable();
-              this.RemoveViewFromLogicalChild( anchorable );
-            }
+          var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().Where( d => e.OldItems.Contains( d.Content ) ).ToArray();
+          foreach( var anchorableToRemove in anchorablesToRemove )
+          {
+            anchorableToRemove.Content = null;
+            ( anchorableToRemove.Parent as ILayoutContainer ).RemoveChild(
+                anchorableToRemove );
+            this.RemoveViewFromLogicalChild( anchorableToRemove );
+          }
         }
+      }
 
-        internal void _ExecuteHideCommand(LayoutAnchorable anchorable)
+      //handle add
+      if( e.NewItems != null &&
+          ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        if( e.NewItems != null )
         {
-            var model = anchorable as LayoutAnchorable;
-            if (model != null)
+          LayoutAnchorablePane anchorablePane = null;
+
+          if( Layout.ActiveContent != null )
+          {
+            //look for active content parent pane
+            anchorablePane = Layout.ActiveContent.Parent as LayoutAnchorablePane;
+          }
+
+          if( anchorablePane == null )
+          {
+            //look for a pane on the right side
+            anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().Where( pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right ).FirstOrDefault();
+          }
+
+          if( anchorablePane == null )
+          {
+            //look for an available pane
+            anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+          }
+
+          _suspendLayoutItemCreation = true;
+          foreach( var anchorableContentToImport in e.NewItems )
+          {
+            var anchorableToImport = new LayoutAnchorable()
             {
-                //by default hide the anchorable
-                model.Hide();
+              Content = anchorableContentToImport
+            };
+
+            bool added = false;
+            if( LayoutUpdateStrategy != null )
+            {
+              added = LayoutUpdateStrategy.BeforeInsertAnchorable( Layout, anchorableToImport, anchorablePane );
             }
-        }
 
-        internal void _ExecuteAutoHideCommand(LayoutAnchorable _anchorable)
-        {
-            _anchorable.ToggleAutoHide();
-        }
+            if( !added )
+            {
+              if( anchorablePane == null )
+              {
+                var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                if( Layout.RootPanel != null )
+                {
+                  mainLayoutPanel.Children.Add( Layout.RootPanel );
+                }
 
-        internal void _ExecuteFloatCommand(LayoutContent contentToFloat)
-        {
-            contentToFloat.Float();
-        }
+                Layout.RootPanel = mainLayoutPanel;
+                anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength( 200.0, GridUnitType.Pixel ) };
+                mainLayoutPanel.Children.Add( anchorablePane );
+              }
 
-        internal void _ExecuteDockCommand(LayoutAnchorable anchorable)
-        {
-            anchorable.Dock();
-        }
+              anchorablePane.Children.Add( anchorableToImport );
+              added = true;
+            }
 
-        internal void _ExecuteDockAsDocumentCommand(LayoutContent content)
-        {
-            content.DockAsDocument();
-        }
+            if( LayoutUpdateStrategy != null )
+            {
+              LayoutUpdateStrategy.AfterInsertAnchorable( Layout, anchorableToImport );
+            }
 
-        private void RemoveViewFromLogicalChild( LayoutContent layoutContent )
-        {
-          if( layoutContent == null )
-            return;
+            var root = anchorableToImport.Root;
 
-          var layoutItem = this.GetLayoutItemFromModel( layoutContent );
-          if( layoutItem != null )
-          {
-            if( layoutItem.IsViewExists() )
+            if( root != null && root.Manager == this )
             {
-              this.InternalRemoveLogicalChild( layoutItem.View );
+              CreateAnchorableLayoutItem( anchorableToImport );
             }
+
           }
+          _suspendLayoutItemCreation = false;
         }
+      }
 
-        #region ActiveContent
-
-        /// <summary>
-        /// ActiveContent Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ActiveContentProperty =
-            DependencyProperty.Register("ActiveContent", typeof(object), typeof(DockingManager),
-                new FrameworkPropertyMetadata((object)null,
-                    new PropertyChangedCallback(OnActiveContentChanged)));
-
-        /// <summary>
-        /// Gets or sets the ActiveContent property.  This dependency property 
-        /// indicates the content currently active.
-        /// </summary>
-        public object ActiveContent
+      if( e.Action == NotifyCollectionChangedAction.Reset )
+      {
+        //NOTE: I'm going to clear every anchorable present in layout but
+        //some anchorable may have been added directly to the layout, for now I clear them too
+        var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
+        foreach( var anchorableToRemove in anchorablesToRemove )
         {
-            get { return (object)GetValue(ActiveContentProperty); }
-            set { SetValue(ActiveContentProperty, value); }
+          ( anchorableToRemove.Parent as ILayoutContainer ).RemoveChild(
+              anchorableToRemove );
+          this.RemoveViewFromLogicalChild( anchorableToRemove );
         }
+      }
 
-        /// <summary>
-        /// Handles changes to the ActiveContent property.
-        /// </summary>
-        private static void OnActiveContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).InternalSetActiveContent(e.NewValue);
-            ((DockingManager)d).OnActiveContentChanged(e);
-        }
+      if( Layout != null )
+        Layout.CollectGarbage();
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the ActiveContent property.
-        /// </summary>
-        protected virtual void OnActiveContentChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (ActiveContentChanged != null)
-                ActiveContentChanged(this, EventArgs.Empty);
-        }
+    void DetachAnchorablesSource( LayoutRoot layout, IEnumerable anchorablesSource )
+    {
+      if( anchorablesSource == null )
+        return;
 
+      if( layout == null )
+        return;
 
-        bool _insideInternalSetActiveContent = false;
-        void InternalSetActiveContent(object contentObject)
-        {
-            var layoutContent = Layout.Descendents().OfType<LayoutContent>().FirstOrDefault(lc => lc == contentObject || lc.Content == contentObject);
-            _insideInternalSetActiveContent = true;
-            Layout.ActiveContent = layoutContent;
-            _insideInternalSetActiveContent = false;
-        }
+      var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
+          .Where( d => anchorablesSource.Contains( d.Content ) ).ToArray();
 
-        public event EventHandler ActiveContentChanged;
+      foreach( var anchorableToRemove in anchorablesToRemove )
+      {
+        ( anchorableToRemove.Parent as ILayoutContainer ).RemoveChild(
+            anchorableToRemove );
+        this.RemoveViewFromLogicalChild( anchorableToRemove );
+      }
 
-        #endregion
+      var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
+      if( anchorablesSourceAsNotifier != null )
+        anchorablesSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler( anchorablesSourceElementsChanged );
+    }
 
-        #region AnchorableContextMenu
+    #endregion
 
-        /// <summary>
-        /// AnchorableContextMenu Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AnchorableContextMenuProperty =
-            DependencyProperty.Register("AnchorableContextMenu", typeof(ContextMenu), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ContextMenu)null));
+    internal void _ExecuteCloseCommand( LayoutAnchorable anchorable )
+    {
+      var model = anchorable as LayoutAnchorable;
+      if( model != null )
+      {
+        model.CloseAnchorable();
+        this.RemoveViewFromLogicalChild( anchorable );
+      }
+    }
 
-        /// <summary>
-        /// Gets or sets the AnchorableContextMenu property.  This dependency property 
-        /// indicates the context menu to show up for anchorables.
-        /// </summary>
-        public ContextMenu AnchorableContextMenu
-        {
-            get { return (ContextMenu)GetValue(AnchorableContextMenuProperty); }
-            set { SetValue(AnchorableContextMenuProperty, value); }
-        }
+    internal void _ExecuteHideCommand( LayoutAnchorable anchorable )
+    {
+      var model = anchorable as LayoutAnchorable;
+      if( model != null )
+      {
+        model.Hide();
+      }
+    }
+
+    internal void _ExecuteAutoHideCommand( LayoutAnchorable _anchorable )
+    {
+      _anchorable.ToggleAutoHide();
+    }
 
-        #endregion
+    internal void _ExecuteFloatCommand( LayoutContent contentToFloat )
+    {
+      contentToFloat.Float();
+    }
 
-        #region Theme
+    internal void _ExecuteDockCommand( LayoutAnchorable anchorable )
+    {
+      anchorable.Dock();
+    }
 
-        /// <summary>
-        /// Theme Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ThemeProperty =
-            DependencyProperty.Register("Theme", typeof(Theme), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null,
-                    new PropertyChangedCallback(OnThemeChanged)));
+    internal void _ExecuteDockAsDocumentCommand( LayoutContent content )
+    {
+      content.DockAsDocument();
+    }
 
-        /// <summary>
-        /// Gets or sets the Theme property.  This dependency property 
-        /// indicates the theme to use for AvalonDock controls.
-        /// </summary>
-        public Theme Theme
-        {
-            get { return (Theme)GetValue(ThemeProperty); }
-            set { SetValue(ThemeProperty, value); }
-        }
+    private void RemoveViewFromLogicalChild( LayoutContent layoutContent )
+    {
+      if( layoutContent == null )
+        return;
 
-        /// <summary>
-        /// Handles changes to the Theme property.
-        /// </summary>
-        private static void OnThemeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+      var layoutItem = this.GetLayoutItemFromModel( layoutContent );
+      if( layoutItem != null )
+      {
+        if( layoutItem.IsViewExists() )
         {
-            ((DockingManager)d).OnThemeChanged(e);
+          this.InternalRemoveLogicalChild( layoutItem.View );
         }
+      }
+    }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the Theme property.
-        /// </summary>
-        protected virtual void OnThemeChanged(DependencyPropertyChangedEventArgs e)
-        {
-            var oldTheme = e.OldValue as Theme;
-            var newTheme = e.NewValue as Theme;
-            var resources = this.Resources;
-            if (oldTheme != null)
-            {
-              if( oldTheme is DictionaryTheme )
-              {
-                if( currentThemeResourceDictionary != null )
-                {
-                  resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-                  currentThemeResourceDictionary = null;
-                }
-              }
-              else
-              {
-                var resourceDictionaryToRemove =
-                   resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-                if( resourceDictionaryToRemove != null )
-                  resources.MergedDictionaries.Remove(
-                      resourceDictionaryToRemove );
-              }
-            }
+    #region ActiveContent
+
+    /// <summary>
+    /// ActiveContent Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ActiveContentProperty =
+        DependencyProperty.Register( "ActiveContent", typeof( object ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( object )null,
+                new PropertyChangedCallback( OnActiveContentChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the ActiveContent property.  This dependency property 
+    /// indicates the content currently active.
+    /// </summary>
+    public object ActiveContent
+    {
+      get
+      {
+        return ( object )GetValue( ActiveContentProperty );
+      }
+      set
+      {
+        SetValue( ActiveContentProperty, value );
+      }
+    }
 
-            if (newTheme != null)
-            {
-              if( newTheme is DictionaryTheme )
-              {
-                currentThemeResourceDictionary = ( ( DictionaryTheme )newTheme ).ThemeResourceDictionary;
-                resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-              }
-              else
-              {
-                resources.MergedDictionaries.Add(new ResourceDictionary() { Source = newTheme.GetResourceUri() });
-              }
-            }
+    /// <summary>
+    /// Handles changes to the ActiveContent property.
+    /// </summary>
+    private static void OnActiveContentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).InternalSetActiveContent( e.NewValue );
+      ( ( DockingManager )d ).OnActiveContentChanged( e );
+    }
+
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the ActiveContent property.
+    /// </summary>
+    protected virtual void OnActiveContentChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( ActiveContentChanged != null )
+        ActiveContentChanged( this, EventArgs.Empty );
+    }
+
+
+    bool _insideInternalSetActiveContent = false;
+    void InternalSetActiveContent( object contentObject )
+    {
+      var layoutContent = Layout.Descendents().OfType<LayoutContent>().FirstOrDefault( lc => lc == contentObject || lc.Content == contentObject );
+      _insideInternalSetActiveContent = true;
+      Layout.ActiveContent = layoutContent;
+      _insideInternalSetActiveContent = false;
+    }
 
-            foreach (var fwc in _fwList)
-                fwc.UpdateThemeResources(oldTheme);
+    public event EventHandler ActiveContentChanged;
 
-            if (_navigatorWindow != null)
-                _navigatorWindow.UpdateThemeResources();
+    #endregion
 
-            if (_overlayWindow != null)
-                _overlayWindow.UpdateThemeResources();
-        }
+    #region AnchorableContextMenu
 
-        #endregion
+    /// <summary>
+    /// AnchorableContextMenu Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AnchorableContextMenuProperty =
+        DependencyProperty.Register( "AnchorableContextMenu", typeof( ContextMenu ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( ContextMenu )null ) );
 
-        #region GridSplitterWidth
+    /// <summary>
+    /// Gets or sets the AnchorableContextMenu property.  This dependency property 
+    /// indicates the context menu to show up for anchorables.
+    /// </summary>
+    public ContextMenu AnchorableContextMenu
+    {
+      get
+      {
+        return ( ContextMenu )GetValue( AnchorableContextMenuProperty );
+      }
+      set
+      {
+        SetValue( AnchorableContextMenuProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// GridSplitterWidth Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty GridSplitterWidthProperty =
-            DependencyProperty.Register("GridSplitterWidth", typeof(double), typeof(DockingManager),
-                new FrameworkPropertyMetadata((double)6.0));
+    #endregion
 
-        /// <summary>
-        /// Gets or sets the GridSplitterWidth property.  This dependency property 
-        /// indicates width of grid splitters.
-        /// </summary>
-        public double GridSplitterWidth
-        {
-            get { return (double)GetValue(GridSplitterWidthProperty); }
-            set { SetValue(GridSplitterWidthProperty, value); }
-        }
+    #region Theme
 
-        #endregion
+    /// <summary>
+    /// Theme Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ThemeProperty =
+        DependencyProperty.Register( "Theme", typeof( Theme ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( null,
+                new PropertyChangedCallback( OnThemeChanged ) ) );
 
-        #region GridSplitterHeight
+    /// <summary>
+    /// Gets or sets the Theme property.  This dependency property 
+    /// indicates the theme to use for AvalonDock controls.
+    /// </summary>
+    public Theme Theme
+    {
+      get
+      {
+        return ( Theme )GetValue( ThemeProperty );
+      }
+      set
+      {
+        SetValue( ThemeProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// GridSplitterHeight Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty GridSplitterHeightProperty =
-            DependencyProperty.Register("GridSplitterHeight", typeof(double), typeof(DockingManager),
-                new FrameworkPropertyMetadata((double)6.0));
+    /// <summary>
+    /// Handles changes to the Theme property.
+    /// </summary>
+    private static void OnThemeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnThemeChanged( e );
+    }
 
-        /// <summary>
-        /// Gets or sets the GridSplitterHeight property.  This dependency property 
-        /// indicates height of grid splitters.
-        /// </summary>
-        public double GridSplitterHeight
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the Theme property.
+    /// </summary>
+    protected virtual void OnThemeChanged( DependencyPropertyChangedEventArgs e )
+    {
+      var oldTheme = e.OldValue as Theme;
+      var newTheme = e.NewValue as Theme;
+      var resources = this.Resources;
+      if( oldTheme != null )
+      {
+        if( oldTheme is DictionaryTheme )
         {
-            get { return (double)GetValue(GridSplitterHeightProperty); }
-            set { SetValue(GridSplitterHeightProperty, value); }
+          if( currentThemeResourceDictionary != null )
+          {
+            resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
+            currentThemeResourceDictionary = null;
+          }
         }
-
-        #endregion
-
-        internal void _ExecuteContentActivateCommand(LayoutContent content)
+        else
         {
-            content.IsActive = true;
+          var resourceDictionaryToRemove =
+             resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
+          if( resourceDictionaryToRemove != null )
+            resources.MergedDictionaries.Remove(
+                resourceDictionaryToRemove );
         }
+      }
 
-        #region DocumentPaneMenuItemHeaderTemplate
-
-        /// <summary>
-        /// DocumentPaneMenuItemHeaderTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateProperty =
-            DependencyProperty.Register("DocumentPaneMenuItemHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null,
-                    new PropertyChangedCallback(OnDocumentPaneMenuItemHeaderTemplateChanged),
-                    new CoerceValueCallback(CoerceDocumentPaneMenuItemHeaderTemplateValue)));
-
-        /// <summary>
-        /// Gets or sets the DocumentPaneMenuItemHeaderTemplate property.  This dependency property 
-        /// indicates the header template to use while creating menu items for the document panes.
-        /// </summary>
-        public DataTemplate DocumentPaneMenuItemHeaderTemplate
+      if( newTheme != null )
+      {
+        if( newTheme is DictionaryTheme )
         {
-            get { return (DataTemplate)GetValue(DocumentPaneMenuItemHeaderTemplateProperty); }
-            set { SetValue(DocumentPaneMenuItemHeaderTemplateProperty, value); }
+          currentThemeResourceDictionary = ( ( DictionaryTheme )newTheme ).ThemeResourceDictionary;
+          resources.MergedDictionaries.Add( currentThemeResourceDictionary );
         }
-
-        /// <summary>
-        /// Handles changes to the DocumentPaneMenuItemHeaderTemplate property.
-        /// </summary>
-        private static void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else
         {
-            ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateChanged(e);
+          resources.MergedDictionaries.Add( new ResourceDictionary() { Source = newTheme.GetResourceUri() } );
         }
+      }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplate property.
-        /// </summary>
-        protected virtual void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        { 
-        }
+      foreach( var fwc in _fwList )
+        fwc.UpdateThemeResources( oldTheme );
 
-        /// <summary>
-        /// Coerces the DocumentPaneMenuItemHeaderTemplate value.
-        /// </summary>
-        private static object CoerceDocumentPaneMenuItemHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null &&
-                d.GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty) != null)
-                return null;
-            if (value == null)
-                return d.GetValue(DocumentHeaderTemplateProperty);
+      if( _navigatorWindow != null )
+        _navigatorWindow.UpdateThemeResources();
 
-            return value;
-        }
+      if( _overlayWindow != null )
+        _overlayWindow.UpdateThemeResources();
+    }
 
-        #endregion
+    #endregion
 
-        #region DocumentPaneMenuItemHeaderTemplateSelector
+    #region GridSplitterWidth
 
-        /// <summary>
-        /// DocumentPaneMenuItemHeaderTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateSelectorProperty =
-            DependencyProperty.Register("DocumentPaneMenuItemHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null,
-                    new PropertyChangedCallback(OnDocumentPaneMenuItemHeaderTemplateSelectorChanged),
-                    new CoerceValueCallback(CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue)));
+    /// <summary>
+    /// GridSplitterWidth Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty GridSplitterWidthProperty =
+        DependencyProperty.Register( "GridSplitterWidth", typeof( double ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( double )6.0 ) );
 
-        /// <summary>
-        /// Gets or sets the DocumentPaneMenuItemHeaderTemplateSelector property.  This dependency property 
-        /// indicates the data template selector to use for the menu items show when user select the DocumentPane document switch context menu.
-        /// </summary>
-        public DataTemplateSelector DocumentPaneMenuItemHeaderTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty); }
-            set { SetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets the GridSplitterWidth property.  This dependency property 
+    /// indicates width of grid splitters.
+    /// </summary>
+    public double GridSplitterWidth
+    {
+      get
+      {
+        return ( double )GetValue( GridSplitterWidthProperty );
+      }
+      set
+      {
+        SetValue( GridSplitterWidthProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handles changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
-        /// </summary>
-        private static void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(e);
-        }
+    #endregion
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
-        /// </summary>
-        protected virtual void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null &&
-                DocumentPaneMenuItemHeaderTemplate != null)
-                DocumentPaneMenuItemHeaderTemplate = null;
+    #region GridSplitterHeight
 
-        }
+    /// <summary>
+    /// GridSplitterHeight Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty GridSplitterHeightProperty =
+        DependencyProperty.Register( "GridSplitterHeight", typeof( double ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( double )6.0 ) );
 
-        /// <summary>
-        /// Coerces the DocumentPaneMenuItemHeaderTemplateSelector value.
-        /// </summary>
-        private static object CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue(DependencyObject d, object value)
-        {
-            return value;
-        }
+    /// <summary>
+    /// Gets or sets the GridSplitterHeight property.  This dependency property 
+    /// indicates height of grid splitters.
+    /// </summary>
+    public double GridSplitterHeight
+    {
+      get
+      {
+        return ( double )GetValue( GridSplitterHeightProperty );
+      }
+      set
+      {
+        SetValue( GridSplitterHeightProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region IconContentTemplate
+    internal void _ExecuteContentActivateCommand( LayoutContent content )
+    {
+      content.IsActive = true;
+    }
 
-        /// <summary>
-        /// IconContentTemplate Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty IconContentTemplateProperty =
-            DependencyProperty.Register("IconContentTemplate", typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null));
+    #region DocumentPaneMenuItemHeaderTemplate
+
+    /// <summary>
+    /// DocumentPaneMenuItemHeaderTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateProperty =
+        DependencyProperty.Register( "DocumentPaneMenuItemHeaderTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null,
+                new PropertyChangedCallback( OnDocumentPaneMenuItemHeaderTemplateChanged ),
+                new CoerceValueCallback( CoerceDocumentPaneMenuItemHeaderTemplateValue ) ) );
+
+    /// <summary>
+    /// Gets or sets the DocumentPaneMenuItemHeaderTemplate property.  This dependency property 
+    /// indicates the header template to use while creating menu items for the document panes.
+    /// </summary>
+    public DataTemplate DocumentPaneMenuItemHeaderTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( DocumentPaneMenuItemHeaderTemplateProperty );
+      }
+      set
+      {
+        SetValue( DocumentPaneMenuItemHeaderTemplateProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Gets or sets the IconContentTemplate property.  This dependency property 
-        /// indicates the data template to use while extracting the icon from model.
-        /// </summary>
-        public DataTemplate IconContentTemplate
-        {
-            get { return (DataTemplate)GetValue(IconContentTemplateProperty); }
-            set { SetValue(IconContentTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Handles changes to the DocumentPaneMenuItemHeaderTemplate property.
+    /// </summary>
+    private static void OnDocumentPaneMenuItemHeaderTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentPaneMenuItemHeaderTemplateChanged( e );
+    }
 
-        #endregion
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplate property.
+    /// </summary>
+    protected virtual void OnDocumentPaneMenuItemHeaderTemplateChanged( DependencyPropertyChangedEventArgs e )
+    {
+    }
 
-        #region IconContentTemplateSelector
+    /// <summary>
+    /// Coerces the DocumentPaneMenuItemHeaderTemplate value.
+    /// </summary>
+    private static object CoerceDocumentPaneMenuItemHeaderTemplateValue( DependencyObject d, object value )
+    {
+      if( value != null &&
+          d.GetValue( DocumentPaneMenuItemHeaderTemplateSelectorProperty ) != null )
+        return null;
+      if( value == null )
+        return d.GetValue( DocumentHeaderTemplateProperty );
 
-        /// <summary>
-        /// IconContentTemplateSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty IconContentTemplateSelectorProperty =
-            DependencyProperty.Register("IconContentTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null));
+      return value;
+    }
 
-        /// <summary>
-        /// Gets or sets the IconContentTemplateSelector property.  This dependency property 
-        /// indicates data template selector to use while selecting the datatamplate for content icons.
-        /// </summary>
-        public DataTemplateSelector IconContentTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(IconContentTemplateSelectorProperty); }
-            set { SetValue(IconContentTemplateSelectorProperty, value); }
-        }
+    #endregion
 
-        #endregion
+    #region DocumentPaneMenuItemHeaderTemplateSelector
 
-        #region LayoutItems
+    /// <summary>
+    /// DocumentPaneMenuItemHeaderTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateSelectorProperty =
+        DependencyProperty.Register( "DocumentPaneMenuItemHeaderTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null,
+                new PropertyChangedCallback( OnDocumentPaneMenuItemHeaderTemplateSelectorChanged ),
+                new CoerceValueCallback( CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue ) ) );
 
-        List<LayoutItem> _layoutItems = new List<LayoutItem>();
+    /// <summary>
+    /// Gets or sets the DocumentPaneMenuItemHeaderTemplateSelector property.  This dependency property 
+    /// indicates the data template selector to use for the menu items show when user select the DocumentPane document switch context menu.
+    /// </summary>
+    public DataTemplateSelector DocumentPaneMenuItemHeaderTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( DocumentPaneMenuItemHeaderTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( DocumentPaneMenuItemHeaderTemplateSelectorProperty, value );
+      }
+    }
 
-        bool _suspendLayoutItemCreation = false;
+    /// <summary>
+    /// Handles changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
+    /// </summary>
+    private static void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnDocumentPaneMenuItemHeaderTemplateSelectorChanged( e );
+    }
 
-        void DetachLayoutItems()
-        {
-            if (Layout != null)
-            {
-                _layoutItems.ForEach<LayoutItem>(i => i.Detach());
-                _layoutItems.Clear();
-                Layout.ElementAdded -= new EventHandler<LayoutElementEventArgs>(Layout_ElementAdded);
-                Layout.ElementRemoved -= new EventHandler<LayoutElementEventArgs>(Layout_ElementRemoved);
-            }
-        }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
+    /// </summary>
+    protected virtual void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( e.NewValue != null &&
+          DocumentPaneMenuItemHeaderTemplate != null )
+        DocumentPaneMenuItemHeaderTemplate = null;
 
-        void Layout_ElementRemoved(object sender, LayoutElementEventArgs e)
-        {
-            if (_suspendLayoutItemCreation)
-                return;
+    }
 
-            CollectLayoutItemsDeleted();
-        }
+    /// <summary>
+    /// Coerces the DocumentPaneMenuItemHeaderTemplateSelector value.
+    /// </summary>
+    private static object CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue( DependencyObject d, object value )
+    {
+      return value;
+    }
 
-        void Layout_ElementAdded(object sender, LayoutElementEventArgs e)
-        {
-            if (_suspendLayoutItemCreation)
-                return;
+    #endregion
 
-            foreach (var content in Layout.Descendents().OfType<LayoutContent>())
-            {
-                if (content is LayoutDocument)
-                    CreateDocumentLayoutItem(content as LayoutDocument);
-                else //if (content is LayoutAnchorable)
-                    CreateAnchorableLayoutItem(content as LayoutAnchorable);
-            }
+    #region IconContentTemplate
 
-            CollectLayoutItemsDeleted();
-        }
+    /// <summary>
+    /// IconContentTemplate Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IconContentTemplateProperty =
+        DependencyProperty.Register( "IconContentTemplate", typeof( DataTemplate ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplate )null ) );
 
+    /// <summary>
+    /// Gets or sets the IconContentTemplate property.  This dependency property 
+    /// indicates the data template to use while extracting the icon from model.
+    /// </summary>
+    public DataTemplate IconContentTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( IconContentTemplateProperty );
+      }
+      set
+      {
+        SetValue( IconContentTemplateProperty, value );
+      }
+    }
 
-        DispatcherOperation _collectLayoutItemsOperations = null;
-        void CollectLayoutItemsDeleted()
-        {
-            if (_collectLayoutItemsOperations != null)
-                return;
-            _collectLayoutItemsOperations = Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    _collectLayoutItemsOperations = null;
-                    foreach (var itemToRemove in _layoutItems.Where(item => item.LayoutElement.Root != Layout).ToArray())
-                    {
+    #endregion
 
-                        if (itemToRemove != null &&
-                            itemToRemove.Model != null &&
-                            itemToRemove.Model is UIElement)
-                        {
-                            //((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(itemToRemove.Model as UIElement);
-                        }
+    #region IconContentTemplateSelector
 
-                        itemToRemove.Detach();
-                        _layoutItems.Remove(itemToRemove);
+    /// <summary>
+    /// IconContentTemplateSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty IconContentTemplateSelectorProperty =
+        DependencyProperty.Register( "IconContentTemplateSelector", typeof( DataTemplateSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( DataTemplateSelector )null ) );
 
-                    }
-                }));
-        }
+    /// <summary>
+    /// Gets or sets the IconContentTemplateSelector property.  This dependency property 
+    /// indicates data template selector to use while selecting the datatamplate for content icons.
+    /// </summary>
+    public DataTemplateSelector IconContentTemplateSelector
+    {
+      get
+      {
+        return ( DataTemplateSelector )GetValue( IconContentTemplateSelectorProperty );
+      }
+      set
+      {
+        SetValue( IconContentTemplateSelectorProperty, value );
+      }
+    }
 
+    #endregion
 
-        void AttachLayoutItems()
-        {
-            if (Layout != null)
-            {
-                foreach (var document in Layout.Descendents().OfType<LayoutDocument>().ToArray())
-                {
-                    CreateDocumentLayoutItem(document);
-                    //var documentItem = new LayoutDocumentItem();
-                    //documentItem.Attach(document);
-                    //ApplyStyleToLayoutItem(documentItem);
-                    //_layoutItems.Add(documentItem);
-                }
-                foreach (var anchorable in Layout.Descendents().OfType<LayoutAnchorable>().ToArray())
-                {
-                    CreateAnchorableLayoutItem(anchorable);
-                    //var anchorableItem = new LayoutAnchorableItem();
-                    //anchorableItem.Attach(anchorable);
-                    //ApplyStyleToLayoutItem(anchorableItem);
-                    //_layoutItems.Add(anchorableItem);
-                }
+    #region LayoutItems
 
-                Layout.ElementAdded += new EventHandler<LayoutElementEventArgs>(Layout_ElementAdded);
-                Layout.ElementRemoved += new EventHandler<LayoutElementEventArgs>(Layout_ElementRemoved);
-            }
-        }
+    List<LayoutItem> _layoutItems = new List<LayoutItem>();
 
-        void ApplyStyleToLayoutItem(LayoutItem layoutItem)
-        {
-            layoutItem._ClearDefaultBindings();
-            if (LayoutItemContainerStyle != null)
-                layoutItem.Style = LayoutItemContainerStyle;
-            else if (LayoutItemContainerStyleSelector != null)
-                layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle(layoutItem.Model, layoutItem);
-            layoutItem._SetDefaultBindings();
-        }
+    bool _suspendLayoutItemCreation = false;
 
-        void CreateAnchorableLayoutItem(LayoutAnchorable contentToAttach)
-        {
-            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
-                return;
+    void DetachLayoutItems()
+    {
+      if( Layout != null )
+      {
+        _layoutItems.ForEach<LayoutItem>( i => i.Detach() );
+        _layoutItems.Clear();
+        Layout.ElementAdded -= new EventHandler<LayoutElementEventArgs>( Layout_ElementAdded );
+        Layout.ElementRemoved -= new EventHandler<LayoutElementEventArgs>( Layout_ElementRemoved );
+      }
+    }
 
-            var layoutItem = new LayoutAnchorableItem();
-            layoutItem.Attach(contentToAttach);
-            ApplyStyleToLayoutItem(layoutItem);
-            _layoutItems.Add(layoutItem);
+    void Layout_ElementRemoved( object sender, LayoutElementEventArgs e )
+    {
+      if( _suspendLayoutItemCreation )
+        return;
 
-            if (contentToAttach != null &&
-                contentToAttach.Content != null &&
-                contentToAttach.Content is UIElement)
-            {
-                InternalAddLogicalChild(contentToAttach.Content);
-            }
+      CollectLayoutItemsDeleted();
+    }
 
-        }
+    void Layout_ElementAdded( object sender, LayoutElementEventArgs e )
+    {
+      if( _suspendLayoutItemCreation )
+        return;
 
-        void CreateDocumentLayoutItem(LayoutDocument contentToAttach)
-        {
-            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
-                return;
+      foreach( var content in Layout.Descendents().OfType<LayoutContent>() )
+      {
+        if( content is LayoutDocument )
+          CreateDocumentLayoutItem( content as LayoutDocument );
+        else //if (content is LayoutAnchorable)
+          CreateAnchorableLayoutItem( content as LayoutAnchorable );
+      }
+
+      CollectLayoutItemsDeleted();
+    }
 
-            var layoutItem = new LayoutDocumentItem();
-            layoutItem.Attach(contentToAttach);
-            ApplyStyleToLayoutItem(layoutItem);
-            _layoutItems.Add(layoutItem);
 
-            if (contentToAttach != null &&
-                contentToAttach.Content != null &&
-                contentToAttach.Content is UIElement)
+    DispatcherOperation _collectLayoutItemsOperations = null;
+    void CollectLayoutItemsDeleted()
+    {
+      if( _collectLayoutItemsOperations != null )
+        return;
+      _collectLayoutItemsOperations = Dispatcher.BeginInvoke( new Action( () =>
             {
-                InternalAddLogicalChild(contentToAttach.Content);
-            }
+              _collectLayoutItemsOperations = null;
+              foreach( var itemToRemove in _layoutItems.Where( item => item.LayoutElement.Root != Layout ).ToArray() )
+              {
 
-        }
+                if( itemToRemove != null &&
+                        itemToRemove.Model != null &&
+                        itemToRemove.Model is UIElement )
+                {
+                      //((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(itemToRemove.Model as UIElement);
+                    }
+
+                itemToRemove.Detach();
+                _layoutItems.Remove( itemToRemove );
+
+              }
+            } ) );
+    }
 
-        #region LayoutItemContainerStyle
-
-        /// <summary>
-        /// LayoutItemContainerStyle Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutItemContainerStyleProperty =
-            DependencyProperty.Register("LayoutItemContainerStyle", typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata((Style)null,
-                    new PropertyChangedCallback(OnLayoutItemContainerStyleChanged)));
-
-        /// <summary>
-        /// Gets or sets the LayoutItemContainerStyle property.  This dependency property 
-        /// indicates the style to apply to LayoutDocumentItem objects. A LayoutDocumentItem object is created when a new LayoutDocument is created inside the current Layout.
-        /// </summary>
-        public Style LayoutItemContainerStyle
+
+    void AttachLayoutItems()
+    {
+      if( Layout != null )
+      {
+        foreach( var document in Layout.Descendents().OfType<LayoutDocument>().ToArray() )
         {
-            get { return (Style)GetValue(LayoutItemContainerStyleProperty); }
-            set { SetValue(LayoutItemContainerStyleProperty, value); }
+          CreateDocumentLayoutItem( document );
+          //var documentItem = new LayoutDocumentItem();
+          //documentItem.Attach(document);
+          //ApplyStyleToLayoutItem(documentItem);
+          //_layoutItems.Add(documentItem);
         }
-
-        /// <summary>
-        /// Handles changes to the LayoutItemContainerStyle property.
-        /// </summary>
-        private static void OnLayoutItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        foreach( var anchorable in Layout.Descendents().OfType<LayoutAnchorable>().ToArray() )
         {
-            ((DockingManager)d).OnLayoutItemContainerStyleChanged(e);
+          CreateAnchorableLayoutItem( anchorable );
+          //var anchorableItem = new LayoutAnchorableItem();
+          //anchorableItem.Attach(anchorable);
+          //ApplyStyleToLayoutItem(anchorableItem);
+          //_layoutItems.Add(anchorableItem);
         }
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyle property.
-        /// </summary>
-        protected virtual void OnLayoutItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+        Layout.ElementAdded += new EventHandler<LayoutElementEventArgs>( Layout_ElementAdded );
+        Layout.ElementRemoved += new EventHandler<LayoutElementEventArgs>( Layout_ElementRemoved );
+      }
+    }
+
+    void ApplyStyleToLayoutItem( LayoutItem layoutItem )
+    {
+      layoutItem._ClearDefaultBindings();
+      if( LayoutItemContainerStyle != null )
+        layoutItem.Style = LayoutItemContainerStyle;
+      else if( LayoutItemContainerStyleSelector != null )
+        layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle( layoutItem.Model, layoutItem );
+      layoutItem._SetDefaultBindings();
+    }
+
+    void CreateAnchorableLayoutItem( LayoutAnchorable contentToAttach )
+    {
+      if( _layoutItems.Any( item => item.LayoutElement == contentToAttach ) )
+      {
+        foreach( var item in _layoutItems )
         {
-            AttachLayoutItems();
+          ApplyStyleToLayoutItem( item );
         }
+        return;
+      }
 
-        #endregion
+      var layoutItem = new LayoutAnchorableItem();
+      layoutItem.Attach( contentToAttach );
+      ApplyStyleToLayoutItem( layoutItem );
+      _layoutItems.Add( layoutItem );
 
-        #region LayoutItemContainerStyleSelector
+      if( contentToAttach != null &&
+          contentToAttach.Content != null &&
+          contentToAttach.Content is UIElement )
+      {
+        InternalAddLogicalChild( contentToAttach.Content );
+      }
 
-        /// <summary>
-        /// LayoutItemContainerStyleSelector Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty LayoutItemContainerStyleSelectorProperty =
-            DependencyProperty.Register("LayoutItemContainerStyleSelector", typeof(StyleSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((StyleSelector)null,
-                    new PropertyChangedCallback(OnLayoutItemContainerStyleSelectorChanged)));
+    }
 
-        /// <summary>
-        /// Gets or sets the LayoutItemContainerStyleSelector property.  This dependency property 
-        /// indicates style selector of the LayoutDocumentItemStyle.
-        /// </summary>
-        public StyleSelector LayoutItemContainerStyleSelector
+    void CreateDocumentLayoutItem( LayoutDocument contentToAttach )
+    {
+      if( _layoutItems.Any( item => item.LayoutElement == contentToAttach ) )
+      {
+        foreach( var item in _layoutItems )
         {
-            get { return (StyleSelector)GetValue(LayoutItemContainerStyleSelectorProperty); }
-            set { SetValue(LayoutItemContainerStyleSelectorProperty, value); }
+          ApplyStyleToLayoutItem( item );
         }
+        return;
+      }
 
-        /// <summary>
-        /// Handles changes to the LayoutItemContainerStyleSelector property.
-        /// </summary>
-        private static void OnLayoutItemContainerStyleSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnLayoutItemContainerStyleSelectorChanged(e);
-        }
+      var layoutItem = new LayoutDocumentItem();
+      layoutItem.Attach( contentToAttach );
+      ApplyStyleToLayoutItem( layoutItem );
+      _layoutItems.Add( layoutItem );
 
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyleSelector property.
-        /// </summary>
-        protected virtual void OnLayoutItemContainerStyleSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            AttachLayoutItems();
-        }
+      if( contentToAttach != null &&
+          contentToAttach.Content != null &&
+          contentToAttach.Content is UIElement )
+      {
+        InternalAddLogicalChild( contentToAttach.Content );
+      }
 
-        #endregion
+    }
 
-        /// <summary>
-        /// Return the LayoutItem wrapper for the content passed as argument
-        /// </summary>
-        /// <param name="content">LayoutContent to search</param>
-        /// <returns>Either a LayoutAnchorableItem or LayoutDocumentItem which contains the LayoutContent passed as argument</returns>
-        public LayoutItem GetLayoutItemFromModel(LayoutContent content)
-        {
-            return _layoutItems.FirstOrDefault(item => item.LayoutElement == content);
-        }
-        #endregion
+    #region LayoutItemContainerStyle
+
+    /// <summary>
+    /// LayoutItemContainerStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutItemContainerStyleProperty =
+        DependencyProperty.Register( "LayoutItemContainerStyle", typeof( Style ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( Style )null,
+                new PropertyChangedCallback( OnLayoutItemContainerStyleChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the LayoutItemContainerStyle property.  This dependency property 
+    /// indicates the style to apply to LayoutDocumentItem objects. A LayoutDocumentItem object is created when a new LayoutDocument is created inside the current Layout.
+    /// </summary>
+    public Style LayoutItemContainerStyle
+    {
+      get
+      {
+        return ( Style )GetValue( LayoutItemContainerStyleProperty );
+      }
+      set
+      {
+        SetValue( LayoutItemContainerStyleProperty, value );
+      }
+    }
 
-        #region NavigatorWindow
-        NavigatorWindow _navigatorWindow = null;
+    /// <summary>
+    /// Handles changes to the LayoutItemContainerStyle property.
+    /// </summary>
+    private static void OnLayoutItemContainerStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutItemContainerStyleChanged( e );
+    }
 
-        void ShowNavigatorWindow()
-        {
-            if (_navigatorWindow == null)
-            {
-                _navigatorWindow = new NavigatorWindow(this)
-                { 
-                    Owner = Window.GetWindow(this),
-                    WindowStartupLocation = WindowStartupLocation.CenterOwner
-                };
-            }
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyle property.
+    /// </summary>
+    protected virtual void OnLayoutItemContainerStyleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      AttachLayoutItems();
+    }
 
-            _navigatorWindow.ShowDialog();
-            _navigatorWindow = null;
-        }
+    #endregion
 
-        bool IsNavigatorWindowActive
-        {
-            get { return _navigatorWindow != null; }
-        }
+    #region LayoutItemContainerStyleSelector
 
+    /// <summary>
+    /// LayoutItemContainerStyleSelector Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty LayoutItemContainerStyleSelectorProperty =
+        DependencyProperty.Register( "LayoutItemContainerStyleSelector", typeof( StyleSelector ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( StyleSelector )null,
+                new PropertyChangedCallback( OnLayoutItemContainerStyleSelectorChanged ) ) );
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
-            {
-                if (e.IsDown && e.Key == Key.Tab)
-                {
-                    if (!IsNavigatorWindowActive)
-                    {
-                        ShowNavigatorWindow();
-                        e.Handled = true;
-                    }
-                }
-            }
+    /// <summary>
+    /// Gets or sets the LayoutItemContainerStyleSelector property.  This dependency property 
+    /// indicates style selector of the LayoutDocumentItemStyle.
+    /// </summary>
+    public StyleSelector LayoutItemContainerStyleSelector
+    {
+      get
+      {
+        return ( StyleSelector )GetValue( LayoutItemContainerStyleSelectorProperty );
+      }
+      set
+      {
+        SetValue( LayoutItemContainerStyleSelectorProperty, value );
+      }
+    }
 
-            base.OnPreviewKeyDown(e);
-        }
+    /// <summary>
+    /// Handles changes to the LayoutItemContainerStyleSelector property.
+    /// </summary>
+    private static void OnLayoutItemContainerStyleSelectorChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DockingManager )d ).OnLayoutItemContainerStyleSelectorChanged( e );
+    }
+
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyleSelector property.
+    /// </summary>
+    protected virtual void OnLayoutItemContainerStyleSelectorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      AttachLayoutItems();
+    }
 
-        #endregion
+    #endregion
 
-        #region ShowSystemMenu
+    /// <summary>
+    /// Return the LayoutItem wrapper for the content passed as argument
+    /// </summary>
+    /// <param name="content">LayoutContent to search</param>
+    /// <returns>Either a LayoutAnchorableItem or LayoutDocumentItem which contains the LayoutContent passed as argument</returns>
+    public LayoutItem GetLayoutItemFromModel( LayoutContent content )
+    {
+      return _layoutItems.FirstOrDefault( item => item.LayoutElement == content );
+    }
+    #endregion
 
-        /// <summary>
-        /// ShowSystemMenu Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ShowSystemMenuProperty =
-            DependencyProperty.Register("ShowSystemMenu", typeof(bool), typeof(DockingManager),
-                new FrameworkPropertyMetadata((bool)true));
+    #region NavigatorWindow
+    NavigatorWindow _navigatorWindow = null;
 
-        /// <summary>
-        /// Gets or sets the ShowSystemMenu property.  This dependency property 
-        /// indicates if floating windows should show the system menu when a custom context menu is not defined.
-        /// </summary>
-        public bool ShowSystemMenu
+    void ShowNavigatorWindow()
+    {
+      if( _navigatorWindow == null )
+      {
+        _navigatorWindow = new NavigatorWindow( this )
         {
-            get { return (bool)GetValue(ShowSystemMenuProperty); }
-            set { SetValue(ShowSystemMenuProperty, value); }
-        }
+          Owner = Window.GetWindow( this ),
+          WindowStartupLocation = WindowStartupLocation.CenterOwner
+        };
+      }
 
-        #endregion
+      _navigatorWindow.ShowDialog();
+      _navigatorWindow = null;
+    }
 
-        #region AllowMixedOrientation
+    bool IsNavigatorWindowActive
+    {
+      get
+      {
+        return _navigatorWindow != null;
+      }
+    }
 
-        /// <summary>
-        /// AllowMixedOrientation Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty AllowMixedOrientationProperty =
-            DependencyProperty.Register("AllowMixedOrientation", typeof(bool), typeof(DockingManager),
-                new FrameworkPropertyMetadata((bool)false));
 
-        /// <summary>
-        /// Gets or sets the AllowMixedOrientation property.  This dependency property 
-        /// indicates if the manager should allow mixed orientation for document panes.
-        /// </summary>
-        public bool AllowMixedOrientation
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( Keyboard.IsKeyDown( Key.LeftCtrl ) || Keyboard.IsKeyDown( Key.RightCtrl ) )
+      {
+        if( e.IsDown && e.Key == Key.Tab )
         {
-            get { return (bool)GetValue(AllowMixedOrientationProperty); }
-            set { SetValue(AllowMixedOrientationProperty, value); }
+          if( !IsNavigatorWindowActive )
+          {
+            ShowNavigatorWindow();
+            e.Handled = true;
+          }
         }
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    #endregion
+
+    #region ShowSystemMenu
+
+    /// <summary>
+    /// ShowSystemMenu Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ShowSystemMenuProperty =
+        DependencyProperty.Register( "ShowSystemMenu", typeof( bool ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( bool )true ) );
+
+    /// <summary>
+    /// Gets or sets the ShowSystemMenu property.  This dependency property 
+    /// indicates if floating windows should show the system menu when a custom context menu is not defined.
+    /// </summary>
+    public bool ShowSystemMenu
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSystemMenuProperty );
+      }
+      set
+      {
+        SetValue( ShowSystemMenuProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
+    #region AllowMixedOrientation
 
+    /// <summary>
+    /// AllowMixedOrientation Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty AllowMixedOrientationProperty =
+        DependencyProperty.Register( "AllowMixedOrientation", typeof( bool ), typeof( DockingManager ),
+            new FrameworkPropertyMetadata( ( bool )false ) );
+
+    /// <summary>
+    /// Gets or sets the AllowMixedOrientation property.  This dependency property 
+    /// indicates if the manager should allow mixed orientation for document panes.
+    /// </summary>
+    public bool AllowMixedOrientation
+    {
+      get
+      {
+        return ( bool )GetValue( AllowMixedOrientationProperty );
+      }
+      set
+      {
+        SetValue( AllowMixedOrientationProperty, value );
+      }
     }
+
+    #endregion
+
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
index 1b2f5b35..f298300f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
@@ -26,622 +26,670 @@ using System.ComponentModel;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
-    [Serializable]
-    public class LayoutAnchorable : LayoutContent
+  [Serializable]
+  public class LayoutAnchorable : LayoutContent
+  {
+    public LayoutAnchorable()
     {
-        #region IsVisible
-        [XmlIgnore]
-        public bool IsVisible
-        {
-            get
-            {
-                return Parent != null && !(Parent is LayoutRoot);
-            }
-            set
-            {
-                if (value)
-                {
-                    Show();
-                }
-                else
-                {
-                    Hide();
-                }
-            }
-        }
-
-        public event EventHandler IsVisibleChanged;
+      // LayoutAnchorable will hide by default, not close.
+      _canClose = false;
+    }
 
-        void NotifyIsVisibleChanged()
+    #region IsVisible
+    [XmlIgnore]
+    public bool IsVisible
+    {
+      get
+      {
+        return Parent != null && !( Parent is LayoutRoot );
+      }
+      set
+      {
+        if( value )
         {
-            if (IsVisibleChanged != null)
-                IsVisibleChanged(this, EventArgs.Empty);
+          Show();
         }
-
-        [XmlIgnore]
-        public bool IsHidden
+        else
         {
-            get
-            {
-                return (Parent is LayoutRoot);
-            }
+          Hide();
         }
+      }
+    }
 
-        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
-        {
-            UpdateParentVisibility();
-            RaisePropertyChanged("IsVisible");
-            NotifyIsVisibleChanged();
-            RaisePropertyChanged("IsHidden");
-            RaisePropertyChanged("IsAutoHidden");
-            base.OnParentChanged(oldValue, newValue);
-        }
+    public event EventHandler IsVisibleChanged;
 
-        void UpdateParentVisibility()
-        {
-            var parentPane = Parent as ILayoutElementWithVisibility;
-            if (parentPane != null)
-                parentPane.ComputeVisibility();
-        }
+    void NotifyIsVisibleChanged()
+    {
+      if( IsVisibleChanged != null )
+        IsVisibleChanged( this, EventArgs.Empty );
+    }
 
-        #endregion
+    [XmlIgnore]
+    public bool IsHidden
+    {
+      get
+      {
+        return ( Parent is LayoutRoot );
+      }
+    }
+
+    protected override void OnParentChanged( ILayoutContainer oldValue, ILayoutContainer newValue )
+    {
+      UpdateParentVisibility();
+      RaisePropertyChanged( "IsVisible" );
+      NotifyIsVisibleChanged();
+      RaisePropertyChanged( "IsHidden" );
+      RaisePropertyChanged( "IsAutoHidden" );
+      base.OnParentChanged( oldValue, newValue );
+    }
+
+    void UpdateParentVisibility()
+    {
+      var parentPane = Parent as ILayoutElementWithVisibility;
+      if( parentPane != null )
+        parentPane.ComputeVisibility();
+    }
+
+    #endregion
 
-        #region AutoHideWidth
+    #region AutoHideWidth
 
-        private double _autohideWidth = 0.0;
-        public double AutoHideWidth
+    private double _autohideWidth = 0.0;
+    public double AutoHideWidth
+    {
+      get
+      {
+        return _autohideWidth;
+      }
+      set
+      {
+        if( _autohideWidth != value )
         {
-            get { return _autohideWidth; }
-            set
-            {
-                if (_autohideWidth != value)
-                {
-                    RaisePropertyChanging("AutoHideWidth");
-                    value = Math.Max(value, _autohideMinWidth);
-                    _autohideWidth = value;
-                    RaisePropertyChanged("AutoHideWidth");
-                }
-            }
+          RaisePropertyChanging( "AutoHideWidth" );
+          value = Math.Max( value, _autohideMinWidth );
+          _autohideWidth = value;
+          RaisePropertyChanged( "AutoHideWidth" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region AutoHideMinWidth
+    #region AutoHideMinWidth
 
-        private double _autohideMinWidth = 100.0;
-        public double AutoHideMinWidth
+    private double _autohideMinWidth = 100.0;
+    public double AutoHideMinWidth
+    {
+      get
+      {
+        return _autohideMinWidth;
+      }
+      set
+      {
+        if( _autohideMinWidth != value )
         {
-            get { return _autohideMinWidth; }
-            set
-            {
-                if (_autohideMinWidth != value)
-                {
-                    RaisePropertyChanging("AutoHideMinWidth");
-                    if (value < 0)
-                        throw new ArgumentException("value");
-                    _autohideMinWidth = value;
-                    RaisePropertyChanged("AutoHideMinWidth");
-                }
-            }
+          RaisePropertyChanging( "AutoHideMinWidth" );
+          if( value < 0 )
+            throw new ArgumentException( "value" );
+          _autohideMinWidth = value;
+          RaisePropertyChanged( "AutoHideMinWidth" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region AutoHideHeight
+    #region AutoHideHeight
 
-        private double _autohideHeight = 0.0;
-        public double AutoHideHeight
+    private double _autohideHeight = 0.0;
+    public double AutoHideHeight
+    {
+      get
+      {
+        return _autohideHeight;
+      }
+      set
+      {
+        if( _autohideHeight != value )
         {
-            get { return _autohideHeight; }
-            set
-            {
-                if (_autohideHeight != value)
-                {
-                    RaisePropertyChanging("AutoHideHeight");
-                    value = Math.Max(value, _autohideMinHeight);
-                    _autohideHeight = value;
-                    RaisePropertyChanged("AutoHideHeight");
-                }
-            }
+          RaisePropertyChanging( "AutoHideHeight" );
+          value = Math.Max( value, _autohideMinHeight );
+          _autohideHeight = value;
+          RaisePropertyChanged( "AutoHideHeight" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region AutoHideMinHeight
+    #region AutoHideMinHeight
 
-        private double _autohideMinHeight = 100.0;
-        public double AutoHideMinHeight
+    private double _autohideMinHeight = 100.0;
+    public double AutoHideMinHeight
+    {
+      get
+      {
+        return _autohideMinHeight;
+      }
+      set
+      {
+        if( _autohideMinHeight != value )
         {
-            get { return _autohideMinHeight; }
-            set
-            {
-                if (_autohideMinHeight != value)
-                {
-                    RaisePropertyChanging("AutoHideMinHeight");
-                    if (value < 0)
-                        throw new ArgumentException("value");
-                    _autohideMinHeight = value;
-                    RaisePropertyChanged("AutoHideMinHeight");
-                }
-            }
+          RaisePropertyChanging( "AutoHideMinHeight" );
+          if( value < 0 )
+            throw new ArgumentException( "value" );
+          _autohideMinHeight = value;
+          RaisePropertyChanged( "AutoHideMinHeight" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        /// <summary>
-        /// Hide this contents
-        /// </summary>
-        /// <remarks>Add this content to <see cref="ILayoutRoot.Hidden"/> collection of parent root.</remarks>
-        public void Hide(bool cancelable = true)
-        {
-            if (!IsVisible)
-            {
-                IsSelected = true;
-                IsActive = true;
-                return;
-            }
+    /// <summary>
+    /// Hide this contents
+    /// </summary>
+    /// <remarks>Add this content to <see cref="ILayoutRoot.Hidden"/> collection of parent root.</remarks>
+    public void Hide( bool cancelable = true )
+    {
+      if( !IsVisible )
+      {
+        IsSelected = true;
+        IsActive = true;
+        return;
+      }
+
+      if( cancelable )
+      {
+        CancelEventArgs args = new CancelEventArgs();
+        OnHiding( args );
+        if( args.Cancel )
+          return;
+      }
+
+      RaisePropertyChanging( "IsHidden" );
+      RaisePropertyChanging( "IsVisible" );
+      //if (Parent is ILayoutPane)
+      {
+        var parentAsGroup = Parent as ILayoutGroup;
+        PreviousContainer = parentAsGroup;
+        PreviousContainerIndex = parentAsGroup.IndexOfChild( this );
+      }
+      Root.Hidden.Add( this );
+      RaisePropertyChanged( "IsVisible" );
+      RaisePropertyChanged( "IsHidden" );
+      NotifyIsVisibleChanged();
+    }
 
-            if (cancelable)
-            {
-                CancelEventArgs args = new CancelEventArgs();
-                OnHiding(args);
-                if (args.Cancel)
-                    return;
-            }
+    public event EventHandler<CancelEventArgs> Hiding;
 
-            RaisePropertyChanging("IsHidden");
-            RaisePropertyChanging("IsVisible");
-            //if (Parent is ILayoutPane)
-            {
-                var parentAsGroup = Parent as ILayoutGroup;
-                PreviousContainer = parentAsGroup;
-                PreviousContainerIndex = parentAsGroup.IndexOfChild(this);
-            }
-            Root.Hidden.Add(this);
-            RaisePropertyChanged("IsVisible");
-            RaisePropertyChanged("IsHidden");
-            NotifyIsVisibleChanged();
-        }
+    protected virtual void OnHiding( CancelEventArgs args )
+    {
+      if( Hiding != null )
+        Hiding( this, args );
+    }
 
-        public event EventHandler<CancelEventArgs> Hiding;
 
-        protected virtual void OnHiding(CancelEventArgs args)
+    /// <summary>
+    /// Show the content
+    /// </summary>
+    /// <remarks>Try to show the content where it was previously hidden.</remarks>
+    public void Show()
+    {
+      if( IsVisible )
+        return;
+
+      if( !IsHidden )
+        throw new InvalidOperationException();
+
+      RaisePropertyChanging( "IsHidden" );
+      RaisePropertyChanging( "IsVisible" );
+
+      bool added = false;
+      var root = Root;
+      if( root != null && root.Manager != null )
+      {
+        if( root.Manager.LayoutUpdateStrategy != null )
+          added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable( root as LayoutRoot, this, PreviousContainer );
+      }
+
+      if( !added && PreviousContainer != null )
+      {
+        var previousContainerAsLayoutGroup = PreviousContainer as ILayoutGroup;
+        if( PreviousContainerIndex < previousContainerAsLayoutGroup.ChildrenCount )
+          previousContainerAsLayoutGroup.InsertChildAt( PreviousContainerIndex, this );
+        else
+          previousContainerAsLayoutGroup.InsertChildAt( previousContainerAsLayoutGroup.ChildrenCount, this );
+        IsSelected = true;
+        IsActive = true;
+      }
+
+      if( root != null && root.Manager != null )
+      {
+        if( root.Manager.LayoutUpdateStrategy != null )
         {
-            if (Hiding != null)
-                Hiding(this, args);
+          root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable( root as LayoutRoot, this );
         }
+      }
 
+      PreviousContainer = null;
+      PreviousContainerIndex = -1;
 
-        /// <summary>
-        /// Show the content
-        /// </summary>
-        /// <remarks>Try to show the content where it was previously hidden.</remarks>
-        public void Show()
+      RaisePropertyChanged( "IsVisible" );
+      RaisePropertyChanged( "IsHidden" );
+      NotifyIsVisibleChanged();
+    }
+
+    protected override void InternalDock()
+    {
+      var root = Root as LayoutRoot;
+      LayoutAnchorablePane anchorablePane = null;
+
+      if( root.ActiveContent != null &&
+          root.ActiveContent != this )
+      {
+        //look for active content parent pane
+        anchorablePane = root.ActiveContent.Parent as LayoutAnchorablePane;
+      }
+
+      if( anchorablePane == null )
+      {
+        //look for a pane on the right side
+        anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().Where( pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right ).FirstOrDefault();
+      }
+
+      if( anchorablePane == null )
+      {
+        //look for an available pane
+        anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+      }
+
+
+      bool added = false;
+      if( root.Manager.LayoutUpdateStrategy != null )
+      {
+        added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable( root, this, anchorablePane );
+      }
+
+      if( !added )
+      {
+        if( anchorablePane == null )
         {
-            if (IsVisible)
-                return;
+          var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+          if( root.RootPanel != null )
+          {
+            mainLayoutPanel.Children.Add( root.RootPanel );
+          }
 
-            if (!IsHidden)
-                throw new InvalidOperationException();
+          root.RootPanel = mainLayoutPanel;
+          anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength( 200.0, GridUnitType.Pixel ) };
+          mainLayoutPanel.Children.Add( anchorablePane );
+        }
 
-            RaisePropertyChanging("IsHidden");
-            RaisePropertyChanging("IsVisible");
+        anchorablePane.Children.Add( this );
+        added = true;
+      }
 
-            bool added = false;
-            var root = Root;
-            if (root != null && root.Manager != null)
-            {
-                if (root.Manager.LayoutUpdateStrategy != null)
-                    added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable(root as LayoutRoot, this, PreviousContainer);
-            }
+      if( root.Manager.LayoutUpdateStrategy != null )
+      {
+        root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable( root, this );
+      }
 
-            if (!added && PreviousContainer != null)
-            {
-                var previousContainerAsLayoutGroup = PreviousContainer as ILayoutGroup;
-                if (PreviousContainerIndex < previousContainerAsLayoutGroup.ChildrenCount)
-                    previousContainerAsLayoutGroup.InsertChildAt(PreviousContainerIndex, this);
-                else
-                    previousContainerAsLayoutGroup.InsertChildAt(previousContainerAsLayoutGroup.ChildrenCount, this);
-                IsSelected = true;
-                IsActive = true;
-            }
+      base.InternalDock();
+    }
 
-            if (root != null && root.Manager != null)
-            {
-                if (root.Manager.LayoutUpdateStrategy != null)
-                {
-                    root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable(root as LayoutRoot, this);
-                }
-            }
+    /// <summary>
+    /// Add the anchorable to a DockingManager layout
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="strategy"></param>
+    public void AddToLayout( DockingManager manager, AnchorableShowStrategy strategy )
+    {
+      if( IsVisible ||
+          IsHidden )
+        throw new InvalidOperationException();
+
+
+      bool most = ( strategy & AnchorableShowStrategy.Most ) == AnchorableShowStrategy.Most;
+      bool left = ( strategy & AnchorableShowStrategy.Left ) == AnchorableShowStrategy.Left;
+      bool right = ( strategy & AnchorableShowStrategy.Right ) == AnchorableShowStrategy.Right;
+      bool top = ( strategy & AnchorableShowStrategy.Top ) == AnchorableShowStrategy.Top;
+      bool bottom = ( strategy & AnchorableShowStrategy.Bottom ) == AnchorableShowStrategy.Bottom;
+
+      if( !most )
+      {
+        var side = AnchorSide.Left;
+        if( left )
+          side = AnchorSide.Left;
+        if( right )
+          side = AnchorSide.Right;
+        if( top )
+          side = AnchorSide.Top;
+        if( bottom )
+          side = AnchorSide.Bottom;
+
+        var anchorablePane = manager.Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault( p => p.GetSide() == side );
+        if( anchorablePane != null )
+          anchorablePane.Children.Add( this );
+        else
+          most = true;
+      }
+
+
+      if( most )
+      {
+        if( manager.Layout.RootPanel == null )
+          manager.Layout.RootPanel = new LayoutPanel() { Orientation = ( left || right ? Orientation.Horizontal : Orientation.Vertical ) };
+
+        if( left || right )
+        {
+          if( manager.Layout.RootPanel.Orientation == Orientation.Vertical &&
+              manager.Layout.RootPanel.ChildrenCount > 1 )
+          {
+            manager.Layout.RootPanel = new LayoutPanel( manager.Layout.RootPanel );
+          }
 
-            PreviousContainer = null;
-            PreviousContainerIndex = -1;
+          manager.Layout.RootPanel.Orientation = Orientation.Horizontal;
 
-            RaisePropertyChanged("IsVisible");
-            RaisePropertyChanged("IsHidden");
-            NotifyIsVisibleChanged();
+          if( left )
+            manager.Layout.RootPanel.Children.Insert( 0, new LayoutAnchorablePane( this ) );
+          else
+            manager.Layout.RootPanel.Children.Add( new LayoutAnchorablePane( this ) );
         }
-
-        protected override void InternalDock()
+        else
         {
-            var root = Root as LayoutRoot;
-            LayoutAnchorablePane anchorablePane = null;
-
-            if (root.ActiveContent != null &&
-                root.ActiveContent != this)
-            {
-                //look for active content parent pane
-                anchorablePane = root.ActiveContent.Parent as LayoutAnchorablePane;
-            }
+          if( manager.Layout.RootPanel.Orientation == Orientation.Horizontal &&
+              manager.Layout.RootPanel.ChildrenCount > 1 )
+          {
+            manager.Layout.RootPanel = new LayoutPanel( manager.Layout.RootPanel );
+          }
 
-            if (anchorablePane == null)
-            {
-                //look for a pane on the right side
-                anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
-            }
+          manager.Layout.RootPanel.Orientation = Orientation.Vertical;
 
-            if (anchorablePane == null)
-            {
-                //look for an available pane
-                anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
-            }
+          if( top )
+            manager.Layout.RootPanel.Children.Insert( 0, new LayoutAnchorablePane( this ) );
+          else
+            manager.Layout.RootPanel.Children.Add( new LayoutAnchorablePane( this ) );
+        }
 
+      }
+    }
 
-            bool added = false;
-            if (root.Manager.LayoutUpdateStrategy != null)
-            {
-                added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable(root, this, anchorablePane);
-            }
 
-            if (!added)
-            {
-                if (anchorablePane == null)
-                {
-                    var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
-                    if (root.RootPanel != null)
-                    {
-                        mainLayoutPanel.Children.Add(root.RootPanel);
-                    }
-
-                    root.RootPanel = mainLayoutPanel;
-                    anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
-                    mainLayoutPanel.Children.Add(anchorablePane);
-                }
-
-                anchorablePane.Children.Add(this);
-                added = true;
-            }
+    /// <summary>
+    /// Get a value indicating if the anchorable is anchored to a border in an autohide status
+    /// </summary>
+    public bool IsAutoHidden
+    {
+      get
+      {
+        return Parent != null && Parent is LayoutAnchorGroup;
+      }
+    }
 
-            if (root.Manager.LayoutUpdateStrategy != null)
-            {
-                root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable(root, this);
-            }
 
-            base.InternalDock();
+    #region AutoHide
+    public void ToggleAutoHide()
+    {
+      #region Anchorable is already auto hidden
+      if( IsAutoHidden )
+      {
+        var parentGroup = Parent as LayoutAnchorGroup;
+        var parentSide = parentGroup.Parent as LayoutAnchorSide;
+        var previousContainer = ( ( ILayoutPreviousContainer )parentGroup ).PreviousContainer as LayoutAnchorablePane;
+
+        if( previousContainer == null )
+        {
+          AnchorSide side = ( parentGroup.Parent as LayoutAnchorSide ).Side;
+          switch( side )
+          {
+            case AnchorSide.Right:
+              if( parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal )
+              {
+                previousContainer = new LayoutAnchorablePane();
+                previousContainer.DockMinWidth = this.AutoHideMinWidth;
+                parentGroup.Root.RootPanel.Children.Add( previousContainer );
+              }
+              else
+              {
+                previousContainer = new LayoutAnchorablePane();
+                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                root.RootPanel = panel;
+                panel.Children.Add( oldRootPanel );
+                panel.Children.Add( previousContainer );
+              }
+              break;
+            case AnchorSide.Left:
+              if( parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal )
+              {
+                previousContainer = new LayoutAnchorablePane();
+                previousContainer.DockMinWidth = this.AutoHideMinWidth;
+                parentGroup.Root.RootPanel.Children.Insert( 0, previousContainer );
+              }
+              else
+              {
+                previousContainer = new LayoutAnchorablePane();
+                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                root.RootPanel = panel;
+                panel.Children.Add( previousContainer );
+                panel.Children.Add( oldRootPanel );
+              }
+              break;
+            case AnchorSide.Top:
+              if( parentGroup.Root.RootPanel.Orientation == Orientation.Vertical )
+              {
+                previousContainer = new LayoutAnchorablePane();
+                previousContainer.DockMinHeight = this.AutoHideMinHeight;
+                parentGroup.Root.RootPanel.Children.Insert( 0, previousContainer );
+              }
+              else
+              {
+                previousContainer = new LayoutAnchorablePane();
+                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
+                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                root.RootPanel = panel;
+                panel.Children.Add( previousContainer );
+                panel.Children.Add( oldRootPanel );
+              }
+              break;
+            case AnchorSide.Bottom:
+              if( parentGroup.Root.RootPanel.Orientation == Orientation.Vertical )
+              {
+                previousContainer = new LayoutAnchorablePane();
+                previousContainer.DockMinHeight = this.AutoHideMinHeight;
+                parentGroup.Root.RootPanel.Children.Add( previousContainer );
+              }
+              else
+              {
+                previousContainer = new LayoutAnchorablePane();
+                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
+                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                root.RootPanel = panel;
+                panel.Children.Add( oldRootPanel );
+                panel.Children.Add( previousContainer );
+              }
+              break;
+          }
         }
-
-        /// <summary>
-        /// Add the anchorable to a DockingManager layout
-        /// </summary>
-        /// <param name="manager"></param>
-        /// <param name="strategy"></param>
-        public void AddToLayout(DockingManager manager, AnchorableShowStrategy strategy)
+        else
         {
-            if (IsVisible ||
-                IsHidden)
-                throw new InvalidOperationException();
-
-
-            bool most = (strategy & AnchorableShowStrategy.Most) == AnchorableShowStrategy.Most;
-            bool left = (strategy & AnchorableShowStrategy.Left) == AnchorableShowStrategy.Left;
-            bool right = (strategy & AnchorableShowStrategy.Right) == AnchorableShowStrategy.Right;
-            bool top = (strategy & AnchorableShowStrategy.Top) == AnchorableShowStrategy.Top;
-            bool bottom = (strategy & AnchorableShowStrategy.Bottom) == AnchorableShowStrategy.Bottom;
-
-            if (!most)
-            { 
-                var side = AnchorSide.Left;
-                if (left)
-                    side = AnchorSide.Left;
-                if (right)
-                    side = AnchorSide.Right;
-                if (top)
-                    side = AnchorSide.Top;
-                if (bottom)
-                    side = AnchorSide.Bottom;
-
-                var anchorablePane = manager.Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(p => p.GetSide() == side);
-                if (anchorablePane != null)
-                    anchorablePane.Children.Add(this);
-                else
-                    most = true;
-            }
-
-
-            if (most)
-            {
-                if (manager.Layout.RootPanel == null)
-                    manager.Layout.RootPanel = new LayoutPanel() { Orientation = (left || right ? Orientation.Horizontal : Orientation.Vertical) };
-
-                if (left || right)
-                {
-                    if (manager.Layout.RootPanel.Orientation == Orientation.Vertical &&
-                        manager.Layout.RootPanel.ChildrenCount > 1)
-                    {
-                        manager.Layout.RootPanel = new LayoutPanel(manager.Layout.RootPanel);
-                    }
-
-                    manager.Layout.RootPanel.Orientation = Orientation.Horizontal;
-
-                    if (left)
-                        manager.Layout.RootPanel.Children.Insert(0, new LayoutAnchorablePane(this));
-                    else
-                        manager.Layout.RootPanel.Children.Add(new LayoutAnchorablePane(this));
-                }
-                else
-                {
-                    if (manager.Layout.RootPanel.Orientation == Orientation.Horizontal &&
-                        manager.Layout.RootPanel.ChildrenCount > 1)
-                    {
-                        manager.Layout.RootPanel = new LayoutPanel(manager.Layout.RootPanel);
-                    }
-
-                    manager.Layout.RootPanel.Orientation = Orientation.Vertical;
-
-                    if (top)
-                        manager.Layout.RootPanel.Children.Insert(0, new LayoutAnchorablePane(this));
-                    else
-                        manager.Layout.RootPanel.Children.Add(new LayoutAnchorablePane(this));
-                }
+          //I'm about to remove parentGroup, redirect any content (ie hidden contents) that point to it
+          //to previousContainer
+          LayoutRoot root = parentGroup.Root as LayoutRoot;
+          foreach( var cnt in root.Descendents().OfType<ILayoutPreviousContainer>().Where( c => c.PreviousContainer == parentGroup ) )
+          {
+            cnt.PreviousContainer = previousContainer;
+          }
+        }
 
-            }
+        foreach( var anchorableToToggle in parentGroup.Children.ToArray() )
+        {
+          previousContainer.Children.Add( anchorableToToggle );
         }
 
+        parentSide.Children.Remove( parentGroup );
 
-        /// <summary>
-        /// Get a value indicating if the anchorable is anchored to a border in an autohide status
-        /// </summary>
-        public bool IsAutoHidden
+        var parent = previousContainer.Parent as LayoutGroupBase;
+        while( ( parent != null ) )
         {
-            get { return Parent != null && Parent is LayoutAnchorGroup; }
+          if( parent is LayoutGroup<ILayoutPanelElement> )
+          {
+            (( LayoutGroup<ILayoutPanelElement> )parent).ComputeVisibility();
+          }
+          parent = parent.Parent as LayoutGroupBase;
         }
+      }
+      #endregion
+      #region Anchorable is docked
+      else if( Parent is LayoutAnchorablePane )
+      {
+        var root = Root;
+        var parentPane = Parent as LayoutAnchorablePane;
+
+        var newAnchorGroup = new LayoutAnchorGroup();
+
+        ( ( ILayoutPreviousContainer )newAnchorGroup ).PreviousContainer = parentPane;
 
+        foreach( var anchorableToImport in parentPane.Children.ToArray() )
+          newAnchorGroup.Children.Add( anchorableToImport );
 
-        #region AutoHide
-        public void ToggleAutoHide()
+        //detect anchor side for the pane
+        var anchorSide = parentPane.GetSide();
+
+        switch( anchorSide )
         {
-            #region Anchorable is already auto hidden
-            if (IsAutoHidden)
+          case AnchorSide.Right:
+            if( root.RightSide != null )
             {
-                var parentGroup = Parent as LayoutAnchorGroup;
-                var parentSide = parentGroup.Parent as LayoutAnchorSide;
-                var previousContainer = ((ILayoutPreviousContainer)parentGroup).PreviousContainer as LayoutAnchorablePane;
-
-                if (previousContainer == null)
-                {
-                    AnchorSide side = (parentGroup.Parent as LayoutAnchorSide).Side;
-                    switch (side)
-                    {
-                        case AnchorSide.Right:
-                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal)
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                previousContainer.DockMinWidth = this.AutoHideMinWidth;
-                                parentGroup.Root.RootPanel.Children.Add(previousContainer);
-                            }
-                            else
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
-                                LayoutRoot root = parentGroup.Root as LayoutRoot;
-                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
-                                root.RootPanel = panel;
-                                panel.Children.Add(oldRootPanel);
-                                panel.Children.Add(previousContainer);
-                            }
-                            break;
-                        case AnchorSide.Left:
-                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal)
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                previousContainer.DockMinWidth = this.AutoHideMinWidth;
-                                parentGroup.Root.RootPanel.Children.Insert(0, previousContainer);
-                            }
-                            else
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
-                                LayoutRoot root = parentGroup.Root as LayoutRoot;
-                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
-                                root.RootPanel = panel;
-                                panel.Children.Add(previousContainer);
-                                panel.Children.Add(oldRootPanel);
-                            }
-                            break;
-                        case AnchorSide.Top:
-                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                previousContainer.DockMinHeight = this.AutoHideMinHeight;
-                                parentGroup.Root.RootPanel.Children.Insert(0, previousContainer);
-                            }
-                            else
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
-                                LayoutRoot root = parentGroup.Root as LayoutRoot;
-                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
-                                root.RootPanel = panel;
-                                panel.Children.Add(previousContainer);
-                                panel.Children.Add(oldRootPanel);
-                            }
-                            break;
-                        case AnchorSide.Bottom:
-                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                previousContainer.DockMinHeight = this.AutoHideMinHeight;
-                                parentGroup.Root.RootPanel.Children.Add(previousContainer);
-                            }
-                            else
-                            {
-                                previousContainer = new LayoutAnchorablePane();
-                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
-                                LayoutRoot root = parentGroup.Root as LayoutRoot;
-                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
-                                root.RootPanel = panel;
-                                panel.Children.Add(oldRootPanel);
-                                panel.Children.Add(previousContainer);
-                            }
-                            break;
-                    }
-                }
-                else
-                { 
-                    //I'm about to remove parentGroup, redirect any content (ie hidden contents) that point to it
-                    //to previousContainer
-                    LayoutRoot root = parentGroup.Root as LayoutRoot;
-                    foreach (var cnt in root.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer == parentGroup))
-                    {
-                        cnt.PreviousContainer = previousContainer;
-                    }
-                }
-
-
-                foreach (var anchorableToToggle in parentGroup.Children.ToArray())
-                {
-                    previousContainer.Children.Add(anchorableToToggle);
-                }
-
-                parentSide.Children.Remove(parentGroup);
+              root.RightSide.Children.Add( newAnchorGroup );
             }
-            #endregion
-            #region Anchorable is docked
-            else if (Parent is LayoutAnchorablePane)
+            break;
+          case AnchorSide.Left:
+            if( root.LeftSide != null )
             {
-                var root = Root;
-                var parentPane = Parent as LayoutAnchorablePane;
-
-                var newAnchorGroup = new LayoutAnchorGroup();
-
-                ((ILayoutPreviousContainer)newAnchorGroup).PreviousContainer = parentPane;
-
-                foreach (var anchorableToImport in parentPane.Children.ToArray())
-                    newAnchorGroup.Children.Add(anchorableToImport);
-
-                //detect anchor side for the pane
-                var anchorSide = parentPane.GetSide();
-
-                switch (anchorSide)
-                {
-                    case AnchorSide.Right:
-                        root.RightSide.Children.Add(newAnchorGroup);
-                        break;
-                    case AnchorSide.Left:
-                        root.LeftSide.Children.Add(newAnchorGroup);
-                        break;
-                    case AnchorSide.Top:
-                        root.TopSide.Children.Add(newAnchorGroup);
-                        break;
-                    case AnchorSide.Bottom:
-                        root.BottomSide.Children.Add(newAnchorGroup);
-                        break;
-                }
+              root.LeftSide.Children.Add( newAnchorGroup );
             }
-            #endregion
+            break;
+          case AnchorSide.Top:
+            if( root.TopSide != null )
+            {
+              root.TopSide.Children.Add( newAnchorGroup );
+            }
+            break;
+          case AnchorSide.Bottom:
+            if( root.BottomSide != null )
+            {
+              root.BottomSide.Children.Add( newAnchorGroup );
+            }
+            break;
         }
+      }
+      #endregion
+    }
 
-        #endregion
+    #endregion
 
-        #region CanHide
+    #region CanHide
 
-        private bool _canHide = true;
-        public bool CanHide
+    private bool _canHide = true;
+    public bool CanHide
+    {
+      get
+      {
+        return _canHide;
+      }
+      set
+      {
+        if( _canHide != value )
         {
-            get { return _canHide; }
-            set
-            {
-                if (_canHide != value)
-                {
-                    _canHide = value;
-                    RaisePropertyChanged("CanHide");
-                }
-            }
+          _canHide = value;
+          RaisePropertyChanged( "CanHide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region CanAutoHide
+    #region CanAutoHide
 
-        private bool _canAutoHide = true;
-        public bool CanAutoHide
+    private bool _canAutoHide = true;
+    public bool CanAutoHide
+    {
+      get
+      {
+        return _canAutoHide;
+      }
+      set
+      {
+        if( _canAutoHide != value )
         {
-            get { return _canAutoHide; }
-            set
-            {
-                if (_canAutoHide != value)
-                {
-                    _canAutoHide = value;
-                    RaisePropertyChanged("CanAutoHide");
-                }
-            }
+          _canAutoHide = value;
+          RaisePropertyChanged( "CanAutoHide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
 
-        public override void ReadXml(System.Xml.XmlReader reader)
-        {
-            if (reader.MoveToAttribute("CanHide"))
-                CanHide = bool.Parse(reader.Value);
-            if (reader.MoveToAttribute("CanAutoHide"))
-                CanAutoHide = bool.Parse(reader.Value);
-            if (reader.MoveToAttribute("AutoHideWidth"))
-                AutoHideWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
-            if (reader.MoveToAttribute("AutoHideHeight"))
-                AutoHideHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
-            if (reader.MoveToAttribute("AutoHideMinWidth"))
-                AutoHideMinWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
-            if (reader.MoveToAttribute("AutoHideMinHeight"))
-                AutoHideMinHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
-
-            base.ReadXml(reader);
-        }
+    public override void ReadXml( System.Xml.XmlReader reader )
+    {
+      if( reader.MoveToAttribute( "CanHide" ) )
+        CanHide = bool.Parse( reader.Value );
+      if( reader.MoveToAttribute( "CanAutoHide" ) )
+        CanAutoHide = bool.Parse( reader.Value );
+      if( reader.MoveToAttribute( "AutoHideWidth" ) )
+        AutoHideWidth = double.Parse( reader.Value, CultureInfo.InvariantCulture );
+      if( reader.MoveToAttribute( "AutoHideHeight" ) )
+        AutoHideHeight = double.Parse( reader.Value, CultureInfo.InvariantCulture );
+      if( reader.MoveToAttribute( "AutoHideMinWidth" ) )
+        AutoHideMinWidth = double.Parse( reader.Value, CultureInfo.InvariantCulture );
+      if( reader.MoveToAttribute( "AutoHideMinHeight" ) )
+        AutoHideMinHeight = double.Parse( reader.Value, CultureInfo.InvariantCulture );
+
+      base.ReadXml( reader );
+    }
 
-        public override void WriteXml(System.Xml.XmlWriter writer)
-        {
-            if (!CanHide)
-                writer.WriteAttributeString("CanHide", CanHide.ToString());
-            if (!CanAutoHide)
-                writer.WriteAttributeString("CanAutoHide", CanAutoHide.ToString(CultureInfo.InvariantCulture));
-            if (AutoHideWidth > 0)
-                writer.WriteAttributeString("AutoHideWidth", AutoHideWidth.ToString(CultureInfo.InvariantCulture));
-            if (AutoHideHeight > 0)
-                writer.WriteAttributeString("AutoHideHeight", AutoHideHeight.ToString(CultureInfo.InvariantCulture));
-            if (AutoHideMinWidth != 25.0)
-                writer.WriteAttributeString("AutoHideMinWidth", AutoHideMinWidth.ToString(CultureInfo.InvariantCulture));
-            if (AutoHideMinHeight != 25.0)
-                writer.WriteAttributeString("AutoHideMinHeight", AutoHideMinHeight.ToString(CultureInfo.InvariantCulture));
-
-
-            base.WriteXml(writer);
-        }
+    public override void WriteXml( System.Xml.XmlWriter writer )
+    {
+      if( !CanHide )
+        writer.WriteAttributeString( "CanHide", CanHide.ToString() );
+      if( !CanAutoHide )
+        writer.WriteAttributeString( "CanAutoHide", CanAutoHide.ToString( CultureInfo.InvariantCulture ) );
+      if( AutoHideWidth > 0 )
+        writer.WriteAttributeString( "AutoHideWidth", AutoHideWidth.ToString( CultureInfo.InvariantCulture ) );
+      if( AutoHideHeight > 0 )
+        writer.WriteAttributeString( "AutoHideHeight", AutoHideHeight.ToString( CultureInfo.InvariantCulture ) );
+      if( AutoHideMinWidth != 25.0 )
+        writer.WriteAttributeString( "AutoHideMinWidth", AutoHideMinWidth.ToString( CultureInfo.InvariantCulture ) );
+      if( AutoHideMinHeight != 25.0 )
+        writer.WriteAttributeString( "AutoHideMinHeight", AutoHideMinHeight.ToString( CultureInfo.InvariantCulture ) );
+
+
+      base.WriteXml( writer );
+    }
 
-        public override void Close()
-        {
-          this.CloseAnchorable();
-        }
+    public override void Close()
+    {
+      this.CloseAnchorable();
+    }
 
-        internal void CloseAnchorable()
-        {
-          if( this.TestCanClose() )
-          {
-            if( this.IsAutoHidden )
-              this.ToggleAutoHide();
+    internal void CloseAnchorable()
+    {
+      if( this.TestCanClose() )
+      {
+        if( this.IsAutoHidden )
+          this.ToggleAutoHide();
 
-            this.CloseInternal();
-          }
-        }
+        this.CloseInternal();
+      }
+    }
 
 
 #if TRACE
@@ -651,5 +699,5 @@ namespace Xceed.Wpf.AvalonDock.Layout
           System.Diagnostics.Trace.WriteLine( "Anchorable()" );
         }
 #endif
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
index 5be6de32..ec2ef161 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
@@ -744,7 +744,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
         #region CanClose
 
-        private bool _canClose = true;
+        internal bool _canClose = true;
         public bool CanClose
         {
             get { return _canClose; }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
index d55bf630..1170e3bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
@@ -28,923 +28,966 @@ using System.Xml.Schema;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
-    [ContentProperty("RootPanel")]
-    [Serializable]
-    public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSerializable
+  [ContentProperty( "RootPanel" )]
+  [Serializable]
+  public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSerializable
+  {
+    public LayoutRoot()
     {
-        public LayoutRoot()
-        { 
-            RightSide = new LayoutAnchorSide();
-            LeftSide = new LayoutAnchorSide();
-            TopSide = new LayoutAnchorSide();
-            BottomSide = new LayoutAnchorSide();
-            RootPanel = new LayoutPanel(new LayoutDocumentPane());
-        }
+      RightSide = new LayoutAnchorSide();
+      LeftSide = new LayoutAnchorSide();
+      TopSide = new LayoutAnchorSide();
+      BottomSide = new LayoutAnchorSide();
+      RootPanel = new LayoutPanel( new LayoutDocumentPane() );
+    }
 
 
-        #region RootPanel
+    #region RootPanel
 
-        private LayoutPanel _rootPanel;
-        public LayoutPanel RootPanel
+    private LayoutPanel _rootPanel;
+    public LayoutPanel RootPanel
+    {
+      get
+      {
+        return _rootPanel;
+      }
+      set
+      {
+        if( _rootPanel != value )
         {
-            get { return _rootPanel; }
-            set
-            {
-                if (_rootPanel != value)
-                {
-                    RaisePropertyChanging("RootPanel");
-                    if (_rootPanel != null &&
-                        _rootPanel.Parent == this)
-                        _rootPanel.Parent = null;
-                    _rootPanel = value;
-
-                    if (_rootPanel == null)
-                        _rootPanel = new LayoutPanel(new LayoutDocumentPane());
-
-                    if (_rootPanel != null)
-                        _rootPanel.Parent = this;
-                    RaisePropertyChanged("RootPanel");
-                }
-            }
+          RaisePropertyChanging( "RootPanel" );
+          if( _rootPanel != null &&
+              _rootPanel.Parent == this )
+            _rootPanel.Parent = null;
+          _rootPanel = value;
+
+          if( _rootPanel == null )
+            _rootPanel = new LayoutPanel( new LayoutDocumentPane() );
+
+          if( _rootPanel != null )
+            _rootPanel.Parent = this;
+          RaisePropertyChanged( "RootPanel" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region TopSide
+    #region TopSide
 
-        private LayoutAnchorSide _topSide = null;
-        public LayoutAnchorSide TopSide
+    private LayoutAnchorSide _topSide = null;
+    public LayoutAnchorSide TopSide
+    {
+      get
+      {
+        return _topSide;
+      }
+      set
+      {
+        if( _topSide != value )
         {
-            get { return _topSide; }
-            set
-            {
-                if (_topSide != value)
-                {
-                    RaisePropertyChanging("TopSide");
-                    _topSide = value;
-                    if (_topSide != null)
-                        _topSide.Parent = this;
-                    RaisePropertyChanged("TopSide");
-                }
-            }
+          RaisePropertyChanging( "TopSide" );
+          _topSide = value;
+          if( _topSide != null )
+            _topSide.Parent = this;
+          RaisePropertyChanged( "TopSide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region RightSide
+    #region RightSide
 
-        private LayoutAnchorSide _rightSide;
-        public LayoutAnchorSide RightSide
+    private LayoutAnchorSide _rightSide;
+    public LayoutAnchorSide RightSide
+    {
+      get
+      {
+        return _rightSide;
+      }
+      set
+      {
+        if( _rightSide != value )
         {
-            get { return _rightSide; }
-            set
-            {
-                if (_rightSide != value)
-                {
-                    RaisePropertyChanging("RightSide");
-                    _rightSide = value;
-                    if (_rightSide != null)
-                        _rightSide.Parent = this;
-                    RaisePropertyChanged("RightSide");
-                }
-            }
+          RaisePropertyChanging( "RightSide" );
+          _rightSide = value;
+          if( _rightSide != null )
+            _rightSide.Parent = this;
+          RaisePropertyChanged( "RightSide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region LeftSide
+    #region LeftSide
 
-        private LayoutAnchorSide _leftSide = null;
-        public LayoutAnchorSide LeftSide
+    private LayoutAnchorSide _leftSide = null;
+    public LayoutAnchorSide LeftSide
+    {
+      get
+      {
+        return _leftSide;
+      }
+      set
+      {
+        if( _leftSide != value )
         {
-            get { return _leftSide; }
-            set
-            {
-                if (_leftSide != value)
-                {
-                    RaisePropertyChanging("LeftSide");
-                    _leftSide = value;
-                    if (_leftSide != null)
-                        _leftSide.Parent = this;
-                    RaisePropertyChanged("LeftSide");
-                }
-            }
+          RaisePropertyChanging( "LeftSide" );
+          _leftSide = value;
+          if( _leftSide != null )
+            _leftSide.Parent = this;
+          RaisePropertyChanged( "LeftSide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region BottomSide
+    #region BottomSide
 
-        private LayoutAnchorSide _bottomSide = null;
-        public LayoutAnchorSide BottomSide
+    private LayoutAnchorSide _bottomSide = null;
+    public LayoutAnchorSide BottomSide
+    {
+      get
+      {
+        return _bottomSide;
+      }
+      set
+      {
+        if( _bottomSide != value )
         {
-            get { return _bottomSide; }
-            set
-            {
-                if (_bottomSide != value)
-                {
-                    RaisePropertyChanging("BottomSide");
-                    _bottomSide = value;
-                    if (_bottomSide != null)
-                        _bottomSide.Parent = this;
-                    RaisePropertyChanged("BottomSide");
-                }
-            }
+          RaisePropertyChanging( "BottomSide" );
+          _bottomSide = value;
+          if( _bottomSide != null )
+            _bottomSide.Parent = this;
+          RaisePropertyChanged( "BottomSide" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region FloatingWindows
-        ObservableCollection<LayoutFloatingWindow> _floatingWindows = null;
+    #region FloatingWindows
+    ObservableCollection<LayoutFloatingWindow> _floatingWindows = null;
 
-        public ObservableCollection<LayoutFloatingWindow> FloatingWindows
+    public ObservableCollection<LayoutFloatingWindow> FloatingWindows
+    {
+      get
+      {
+        if( _floatingWindows == null )
         {
-            get 
-            {
-                if (_floatingWindows == null)
-                {
-                    _floatingWindows = new ObservableCollection<LayoutFloatingWindow>();
-                    _floatingWindows.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(_floatingWindows_CollectionChanged);
-                }
-
-                return _floatingWindows; 
-            }
+          _floatingWindows = new ObservableCollection<LayoutFloatingWindow>();
+          _floatingWindows.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler( _floatingWindows_CollectionChanged );
         }
 
-        void _floatingWindows_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (e.OldItems != null && (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                foreach (LayoutFloatingWindow element in e.OldItems)
-                {
-                    if (element.Parent == this)
-                        element.Parent = null;
-                }
-            } 
-
-            if (e.NewItems != null && (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
-            {
-                foreach (LayoutFloatingWindow element in e.NewItems)
-                    element.Parent = this;
-            }
-        }
-        #endregion
-
-        #region HiddenAnchorables
-
-        ObservableCollection<LayoutAnchorable> _hiddenAnchorables = null;
+        return _floatingWindows;
+      }
+    }
 
-        public ObservableCollection<LayoutAnchorable> Hidden
+    void _floatingWindows_CollectionChanged( object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e )
+    {
+      if( e.OldItems != null && ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        foreach( LayoutFloatingWindow element in e.OldItems )
         {
-            get
-            {
-                if (_hiddenAnchorables == null)
-                {
-                    _hiddenAnchorables = new ObservableCollection<LayoutAnchorable>();
-                    _hiddenAnchorables.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(_hiddenAnchorables_CollectionChanged);
-                }
-
-                return _hiddenAnchorables;
-            }
+          if( element.Parent == this )
+            element.Parent = null;
         }
+      }
+
+      if( e.NewItems != null && ( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace ) )
+      {
+        foreach( LayoutFloatingWindow element in e.NewItems )
+          element.Parent = this;
+      }
+    }
+    #endregion
 
-        void _hiddenAnchorables_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
-            {
-                if (e.OldItems != null)
-                {
-                    foreach (LayoutAnchorable element in e.OldItems)
-                    {
-                        if (element.Parent == this)
-                            element.Parent = null;
-                    }
-                }
-            }
-
-            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
-                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
-            {
-                if (e.NewItems != null)
-                {
-                    foreach (LayoutAnchorable element in e.NewItems)
-                    {
-                        if (element.Parent != this)
-                        {
-                            if (element.Parent != null)
-                                element.Parent.RemoveChild(element);
-                            element.Parent = this;
-                        }
-
-                    }
-                }
-            }
-
-
-
-        }
+    #region HiddenAnchorables
 
-        #endregion
+    ObservableCollection<LayoutAnchorable> _hiddenAnchorables = null;
 
-        #region Children
-        public IEnumerable<ILayoutElement> Children
+    public ObservableCollection<LayoutAnchorable> Hidden
+    {
+      get
+      {
+        if( _hiddenAnchorables == null )
         {
-            get
-            {
-                if (RootPanel != null)
-                    yield return RootPanel;
-                if (_floatingWindows != null)
-                {
-                    foreach (var floatingWindow in _floatingWindows)
-                        yield return floatingWindow;
-                }
-                if (TopSide != null)
-                    yield return TopSide;
-                if (RightSide != null)
-                    yield return RightSide;
-                if (BottomSide != null)
-                    yield return BottomSide;
-                if (LeftSide != null)
-                    yield return LeftSide;
-                if (_hiddenAnchorables != null)
-                {
-                    foreach (var hiddenAnchorable in _hiddenAnchorables)
-                        yield return hiddenAnchorable;
-                }
-            }
+          _hiddenAnchorables = new ObservableCollection<LayoutAnchorable>();
+          _hiddenAnchorables.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler( _hiddenAnchorables_CollectionChanged );
         }
-        public void RemoveChild(ILayoutElement element)
-        {
-            if (element == RootPanel)
-                RootPanel = null;
-            else if (_floatingWindows != null && _floatingWindows.Contains(element))
-                _floatingWindows.Remove(element as LayoutFloatingWindow);
-            else if (_hiddenAnchorables != null && _hiddenAnchorables.Contains(element))
-                _hiddenAnchorables.Remove(element as LayoutAnchorable);
-            else if (element == TopSide)
-                TopSide = null;
-            else if (element == RightSide)
-                RightSide = null;
-            else if (element == BottomSide)
-                BottomSide = null;
-            else if (element == LeftSide)
-                LeftSide = null;
 
-        }
+        return _hiddenAnchorables;
+      }
+    }
 
-        public void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
+    void _hiddenAnchorables_CollectionChanged( object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e )
+    {
+      if( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace )
+      {
+        if( e.OldItems != null )
         {
-            if (oldElement == RootPanel)
-                RootPanel = (LayoutPanel)newElement;
-            else if (_floatingWindows != null && _floatingWindows.Contains(oldElement))
-            {
-                int index = _floatingWindows.IndexOf(oldElement as LayoutFloatingWindow);
-                _floatingWindows.Remove(oldElement as LayoutFloatingWindow);
-                _floatingWindows.Insert(index, newElement as LayoutFloatingWindow);
-            }
-            else if (_hiddenAnchorables != null && _hiddenAnchorables.Contains(oldElement))
-            {
-                int index = _hiddenAnchorables.IndexOf(oldElement as LayoutAnchorable);
-                _hiddenAnchorables.Remove(oldElement as LayoutAnchorable);
-                _hiddenAnchorables.Insert(index, newElement as LayoutAnchorable);
-            }
-            else if (oldElement == TopSide)
-                TopSide = (LayoutAnchorSide)newElement;
-            else if (oldElement == RightSide)
-                RightSide = (LayoutAnchorSide)newElement;
-            else if (oldElement == BottomSide)
-                BottomSide = (LayoutAnchorSide)newElement;
-            else if (oldElement == LeftSide)
-                LeftSide = (LayoutAnchorSide)newElement;
+          foreach( LayoutAnchorable element in e.OldItems )
+          {
+            if( element.Parent == this )
+              element.Parent = null;
+          }
         }
+      }
 
-        public int ChildrenCount
+      if( e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+          e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace )
+      {
+        if( e.NewItems != null )
         {
-            get
+          foreach( LayoutAnchorable element in e.NewItems )
+          {
+            if( element.Parent != this )
             {
-                return 5 +
-                    (_floatingWindows != null ? _floatingWindows.Count : 0) + 
-                    (_hiddenAnchorables != null ? _hiddenAnchorables.Count : 0); 
+              if( element.Parent != null )
+                element.Parent.RemoveChild( element );
+              element.Parent = this;
             }
-        }
-        #endregion
-
-        #region ActiveContent
-
-        [field:NonSerialized]
-        private WeakReference _activeContent = null;
-        private bool _activeContentSet = false;
 
-        [XmlIgnore]
-        public LayoutContent ActiveContent
-        {
-            get { return _activeContent.GetValueOrDefault<LayoutContent>(); }
-            set
-            {
-                var currentValue = ActiveContent;
-                if (currentValue != value)
-                {
-                    InternalSetActiveContent(currentValue, value);
-                }
-            }
+          }
         }
+      }
 
-        void InternalSetActiveContent(LayoutContent currentValue, LayoutContent newActiveContent)
-        {
-            RaisePropertyChanging("ActiveContent");
-            if (currentValue != null)
-                currentValue.IsActive = false;
-            _activeContent = new WeakReference(newActiveContent);
-            currentValue = ActiveContent;
-            if (currentValue != null)
-                currentValue.IsActive = true;
-            RaisePropertyChanged("ActiveContent");
-            _activeContentSet = currentValue != null;
-            if (currentValue != null)
-            {
-                if (currentValue.Parent is LayoutDocumentPane || currentValue is LayoutDocument)
-                    LastFocusedDocument = currentValue;
-            }
-            else
-                LastFocusedDocument = null;
-        }
 
-        void UpdateActiveContentProperty()
-        {
-            var activeContent = ActiveContent;
-            if (_activeContentSet && (activeContent == null || activeContent.Root != this))
-            {
-                _activeContentSet = false;
-                InternalSetActiveContent(activeContent, null);
-            }
-        }
-        #endregion
 
-        #region LastFocusedDocument
+    }
 
-        [field: NonSerialized]
-        private WeakReference _lastFocusedDocument = null;
-        [field: NonSerialized]
-        private bool _lastFocusedDocumentSet = false;
+    #endregion
 
-        [XmlIgnore]
-        public LayoutContent LastFocusedDocument
+    #region Children
+    public IEnumerable<ILayoutElement> Children
+    {
+      get
+      {
+        if( RootPanel != null )
+          yield return RootPanel;
+        if( _floatingWindows != null )
         {
-            get { return _lastFocusedDocument.GetValueOrDefault<LayoutContent>(); }
-            private set
-            {
-                var currentValue = LastFocusedDocument;
-                if (currentValue != value)
-                {
-                    RaisePropertyChanging("LastFocusedDocument");
-                    if (currentValue != null)
-                        currentValue.IsLastFocusedDocument = false;
-                    _lastFocusedDocument = new WeakReference(value);
-                    currentValue = LastFocusedDocument;
-                    if (currentValue != null)
-                        currentValue.IsLastFocusedDocument = true;
-                    _lastFocusedDocumentSet = currentValue != null;
-                    RaisePropertyChanged("LastFocusedDocument");
-                }
-            }
+          foreach( var floatingWindow in _floatingWindows )
+            yield return floatingWindow;
         }
-
-        #endregion
-
-        #region Manager
-
-
-        [NonSerialized]
-        private DockingManager _manager = null;
-
-        [XmlIgnore]
-        public DockingManager Manager
+        if( TopSide != null )
+          yield return TopSide;
+        if( RightSide != null )
+          yield return RightSide;
+        if( BottomSide != null )
+          yield return BottomSide;
+        if( LeftSide != null )
+          yield return LeftSide;
+        if( _hiddenAnchorables != null )
         {
-            get { return _manager; }
-            internal set
-            {
-                if (_manager != value)
-                {
-                    RaisePropertyChanging("Manager");
-                    _manager = value;
-                    RaisePropertyChanged("Manager");
-                }
-            }
+          foreach( var hiddenAnchorable in _hiddenAnchorables )
+            yield return hiddenAnchorable;
         }
+      }
+    }
+    public void RemoveChild( ILayoutElement element )
+    {
+      if( element == RootPanel )
+        RootPanel = null;
+      else if( _floatingWindows != null && _floatingWindows.Contains( element ) )
+        _floatingWindows.Remove( element as LayoutFloatingWindow );
+      else if( _hiddenAnchorables != null && _hiddenAnchorables.Contains( element ) )
+        _hiddenAnchorables.Remove( element as LayoutAnchorable );
+      else if( element == TopSide )
+        TopSide = null;
+      else if( element == RightSide )
+        RightSide = null;
+      else if( element == BottomSide )
+        BottomSide = null;
+      else if( element == LeftSide )
+        LeftSide = null;
 
-        #endregion
-
-        #region CollectGarbage
+    }
 
-        /// <summary>
-        /// Removes any empty container not directly referenced by other layout items
-        /// </summary>
-        public void CollectGarbage()
-        {
-            bool exitFlag = true;
+    public void ReplaceChild( ILayoutElement oldElement, ILayoutElement newElement )
+    {
+      if( oldElement == RootPanel )
+        RootPanel = ( LayoutPanel )newElement;
+      else if( _floatingWindows != null && _floatingWindows.Contains( oldElement ) )
+      {
+        int index = _floatingWindows.IndexOf( oldElement as LayoutFloatingWindow );
+        _floatingWindows.Remove( oldElement as LayoutFloatingWindow );
+        _floatingWindows.Insert( index, newElement as LayoutFloatingWindow );
+      }
+      else if( _hiddenAnchorables != null && _hiddenAnchorables.Contains( oldElement ) )
+      {
+        int index = _hiddenAnchorables.IndexOf( oldElement as LayoutAnchorable );
+        _hiddenAnchorables.Remove( oldElement as LayoutAnchorable );
+        _hiddenAnchorables.Insert( index, newElement as LayoutAnchorable );
+      }
+      else if( oldElement == TopSide )
+        TopSide = ( LayoutAnchorSide )newElement;
+      else if( oldElement == RightSide )
+        RightSide = ( LayoutAnchorSide )newElement;
+      else if( oldElement == BottomSide )
+        BottomSide = ( LayoutAnchorSide )newElement;
+      else if( oldElement == LeftSide )
+        LeftSide = ( LayoutAnchorSide )newElement;
+    }
 
-            #region collect empty panes
-            do
-            {
-                exitFlag = true;
-
-                //for each content that references via PreviousContainer a disconnected Pane set the property to null
-                foreach (var content in this.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer != null && 
-                    (c.PreviousContainer.Parent == null || c.PreviousContainer.Parent.Root != this)))
-                {
-                    content.PreviousContainer = null;
-                }
-
-                //for each pane that is empty
-                foreach (var emptyPane in this.Descendents().OfType<ILayoutPane>().Where(p => p.ChildrenCount == 0))
-                {
-                    //...set null any reference coming from contents not yet hosted in a floating window
-                    foreach (var contentReferencingEmptyPane in this.Descendents().OfType<LayoutContent>()
-                        .Where(c => ((ILayoutPreviousContainer)c).PreviousContainer == emptyPane && !c.IsFloating))
-                    {
-                        if (contentReferencingEmptyPane is LayoutAnchorable &&
-                            !((LayoutAnchorable)contentReferencingEmptyPane).IsVisible)
-                            continue;
-
-                        ((ILayoutPreviousContainer)contentReferencingEmptyPane).PreviousContainer = null;
-                        contentReferencingEmptyPane.PreviousContainerIndex = -1;
-                    }
-
-                    //...if this pane is the only documentpane present in the layout than skip it
-                    if (emptyPane is LayoutDocumentPane &&
-                        this.Descendents().OfType<LayoutDocumentPane>().Count(c => c != emptyPane) == 0)
-                        continue;
-
-                    //...if this empty panes is not referenced by anyone, than removes it from its parent container
-                    if (!this.Descendents().OfType<ILayoutPreviousContainer>().Any(c => c.PreviousContainer == emptyPane))
-                    {
-                        var parentGroup = emptyPane.Parent as ILayoutContainer;
-                        parentGroup.RemoveChild(emptyPane);
-                        exitFlag = false;
-                        break;
-                    }
-                }
-
-                if (!exitFlag)
-                {
-                    //removes any empty anchorable pane group
-                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where(p => p.ChildrenCount == 0))
-                    {
-                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
-                        parentGroup.RemoveChild(emptyPaneGroup);
-                        exitFlag = false;
-                        break;
-                    }
-                }
-
-                if (!exitFlag)
-                {
-                    //removes any empty layout panel
-                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutPanel>().Where(p => p.ChildrenCount == 0))
-                    {
-                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
-                        parentGroup.RemoveChild(emptyPaneGroup);
-                        exitFlag = false;
-                        break;
-                    }
-                }
-
-                if (!exitFlag)
-                {
-                    //removes any empty floating window
-                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutFloatingWindow>().Where(p => p.ChildrenCount == 0))
-                    {
-                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
-                        parentGroup.RemoveChild(emptyPaneGroup);
-                        exitFlag = false;
-                        break;
-                    }
-                }
-
-                if (!exitFlag)
-                {
-                    //removes any empty anchor group
-                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorGroup>().Where(p => p.ChildrenCount == 0))
-                    {
-                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
-                        parentGroup.RemoveChild(emptyPaneGroup);
-                        exitFlag = false;
-                        break;
-                    }
-                }
+    public int ChildrenCount
+    {
+      get
+      {
+        return 5 +
+            ( _floatingWindows != null ? _floatingWindows.Count : 0 ) +
+            ( _hiddenAnchorables != null ? _hiddenAnchorables.Count : 0 );
+      }
+    }
+    #endregion
 
-            }
-            while (!exitFlag);
-            #endregion
+    #region ActiveContent
 
-            #region collapse single child anchorable pane groups
-            do
-            {
-                exitFlag = true;
-                //for each pane that is empty
-                foreach (var paneGroupToCollapse in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where(p => p.ChildrenCount == 1 && p.Children[0] is LayoutAnchorablePaneGroup).ToArray())
-                {
-                    var singleChild = paneGroupToCollapse.Children[0] as LayoutAnchorablePaneGroup;
-                    paneGroupToCollapse.Orientation = singleChild.Orientation;
-                    paneGroupToCollapse.RemoveChild(singleChild);
-                    while (singleChild.ChildrenCount > 0)
-                    {
-                        paneGroupToCollapse.InsertChildAt(
-                            paneGroupToCollapse.ChildrenCount, singleChild.Children[0]);
-                    }
-
-                    exitFlag = false;
-                    break;
-                }
+    [field: NonSerialized]
+    private WeakReference _activeContent = null;
+    private bool _activeContentSet = false;
 
-            }
-            while (!exitFlag);
+    [XmlIgnore]
+    public LayoutContent ActiveContent
+    {
+      get
+      {
+        return _activeContent.GetValueOrDefault<LayoutContent>();
+      }
+      set
+      {
+        var currentValue = ActiveContent;
+        if( currentValue != value )
+        {
+          InternalSetActiveContent( currentValue, value );
+        }
+      }
+    }
 
+    void InternalSetActiveContent( LayoutContent currentValue, LayoutContent newActiveContent )
+    {
+      RaisePropertyChanging( "ActiveContent" );
+      if( currentValue != null )
+        currentValue.IsActive = false;
+      _activeContent = new WeakReference( newActiveContent );
+      currentValue = ActiveContent;
+      if( currentValue != null )
+        currentValue.IsActive = true;
+      RaisePropertyChanged( "ActiveContent" );
+      _activeContentSet = currentValue != null;
+      if( currentValue != null )
+      {
+        if( currentValue.Parent is LayoutDocumentPane || currentValue is LayoutDocument )
+          LastFocusedDocument = currentValue;
+      }
+      else
+        LastFocusedDocument = null;
+    }
 
+    void UpdateActiveContentProperty()
+    {
+      var activeContent = ActiveContent;
+      if( _activeContentSet && ( activeContent == null || activeContent.Root != this ) )
+      {
+        _activeContentSet = false;
+        InternalSetActiveContent( activeContent, null );
+      }
+    }
+    #endregion
 
-            #endregion
+    #region LastFocusedDocument
 
-            #region collapse single child document pane groups
-            do
-            {
-                exitFlag = true;
-                //for each pane that is empty
-                foreach (var paneGroupToCollapse in this.Descendents().OfType<LayoutDocumentPaneGroup>().Where(p => p.ChildrenCount == 1 && p.Children[0] is LayoutDocumentPaneGroup).ToArray())
-                {
-                    var singleChild = paneGroupToCollapse.Children[0] as LayoutDocumentPaneGroup;
-                    paneGroupToCollapse.Orientation = singleChild.Orientation;
-                    paneGroupToCollapse.RemoveChild(singleChild);
-                    while (singleChild.ChildrenCount > 0)
-                    {
-                        paneGroupToCollapse.InsertChildAt(
-                            paneGroupToCollapse.ChildrenCount, singleChild.Children[0]);
-                    }
-
-                    exitFlag = false;
-                    break;
-                }
+    [field: NonSerialized]
+    private WeakReference _lastFocusedDocument = null;
+    [field: NonSerialized]
+    private bool _lastFocusedDocumentSet = false;
 
-            }
-            while (!exitFlag);
-
-
-
-            #endregion
-
-            //do
-            //{
-            //  exitFlag = true;
-            //  //for each panel that has only one child
-            //  foreach( var panelToCollapse in this.Descendents().OfType<LayoutPanel>().Where( p => p.ChildrenCount == 1 && p.Children[ 0 ] is LayoutPanel ).ToArray() )
-            //  {
-            //    var singleChild = panelToCollapse.Children[ 0 ] as LayoutPanel;
-            //    panelToCollapse.Orientation = singleChild.Orientation;
-            //    panelToCollapse.RemoveChild( singleChild );
-            //    ILayoutPanelElement[] singleChildChildren = new ILayoutPanelElement[ singleChild.ChildrenCount ];
-            //    singleChild.Children.CopyTo( singleChildChildren, 0 );
-            //    while( singleChild.ChildrenCount > 0 )
-            //    {
-            //      panelToCollapse.InsertChildAt(
-            //          panelToCollapse.ChildrenCount, singleChildChildren[ panelToCollapse.ChildrenCount ] );
-            //    }
-
-            //    exitFlag = false;
-            //    break;
-            //  }
-
-            //}
-            //while( !exitFlag );
-
-            #region Update ActiveContent and LastFocusedDocument properties
-            UpdateActiveContentProperty();
-            #endregion
-#if DEBUG
-            System.Diagnostics.Debug.Assert(
-                !this.Descendents().OfType<LayoutAnchorablePane>().Any(a => a.ChildrenCount == 0 && a.IsVisible));
-#if TRACE
-            RootPanel.ConsoleDump(4);
-#endif
-#endif
+    [XmlIgnore]
+    public LayoutContent LastFocusedDocument
+    {
+      get
+      {
+        return _lastFocusedDocument.GetValueOrDefault<LayoutContent>();
+      }
+      private set
+      {
+        var currentValue = LastFocusedDocument;
+        if( currentValue != value )
+        {
+          RaisePropertyChanging( "LastFocusedDocument" );
+          if( currentValue != null )
+            currentValue.IsLastFocusedDocument = false;
+          _lastFocusedDocument = new WeakReference( value );
+          currentValue = LastFocusedDocument;
+          if( currentValue != null )
+            currentValue.IsLastFocusedDocument = true;
+          _lastFocusedDocumentSet = currentValue != null;
+          RaisePropertyChanged( "LastFocusedDocument" );
         }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        public event EventHandler Updated;
+    #region Manager
 
-        internal void FireLayoutUpdated()
-        {
-            if (Updated != null)
-                Updated(this, EventArgs.Empty);
-        }
 
-        #region LayoutElement Added/Removed events
+    [NonSerialized]
+    private DockingManager _manager = null;
 
-        internal void OnLayoutElementAdded(LayoutElement element)
+    [XmlIgnore]
+    public DockingManager Manager
+    {
+      get
+      {
+        return _manager;
+      }
+      internal set
+      {
+        if( _manager != value )
         {
-            if (ElementAdded != null)
-                ElementAdded(this, new LayoutElementEventArgs(element));
+          RaisePropertyChanging( "Manager" );
+          _manager = value;
+          RaisePropertyChanged( "Manager" );
         }
+      }
+    }
 
-        public event EventHandler<LayoutElementEventArgs> ElementAdded;
+    #endregion
 
-        internal void OnLayoutElementRemoved(LayoutElement element)
-        {
-            if (element.Descendents().OfType<LayoutContent>().Any(c => c == LastFocusedDocument))
-                LastFocusedDocument = null;
-            if (element.Descendents().OfType<LayoutContent>().Any(c => c == ActiveContent))
-                ActiveContent = null;
-            if (ElementRemoved != null)
-                ElementRemoved(this, new LayoutElementEventArgs(element));
-        }
+    #region CollectGarbage
 
-        public event EventHandler<LayoutElementEventArgs> ElementRemoved;
+    /// <summary>
+    /// Removes any empty container not directly referenced by other layout items
+    /// </summary>
+    public void CollectGarbage()
+    {
+      bool exitFlag = true;
 
-    #endregion
+      #region collect empty panes
+      do
+      {
+        exitFlag = true;
 
-        public XmlSchema GetSchema()
+        //for each content that references via PreviousContainer a disconnected Pane set the property to null
+        foreach( var content in this.Descendents().OfType<ILayoutPreviousContainer>().Where( c => c.PreviousContainer != null &&
+             ( c.PreviousContainer.Parent == null || c.PreviousContainer.Parent.Root != this ) ) )
         {
-          return null;
+          content.PreviousContainer = null;
         }
 
-        public void ReadXml( XmlReader reader )
+        //for each pane that is empty
+        foreach( var emptyPane in this.Descendents().OfType<ILayoutPane>().Where( p => p.ChildrenCount == 0 ) )
         {
-          reader.MoveToContent();
-          if( reader.IsEmptyElement )
+          //...set null any reference coming from contents not yet hosted in a floating window
+          foreach( var contentReferencingEmptyPane in this.Descendents().OfType<LayoutContent>()
+              .Where( c => ( ( ILayoutPreviousContainer )c ).PreviousContainer == emptyPane && !c.IsFloating ) )
           {
-            reader.Read();
-            return;
-          }
+            if( contentReferencingEmptyPane is LayoutAnchorable &&
+                !( ( LayoutAnchorable )contentReferencingEmptyPane ).IsVisible )
+              continue;
 
-          var layoutPanelElements = ReadRootPanel( reader );
-          if( layoutPanelElements != null )
-          {
-            //Create the RootPanel with the first child
-            RootPanel = new LayoutPanel( layoutPanelElements.First() );
-            //Add all children to RootPanel
-            for( int i = 1; i < layoutPanelElements.Count; ++i )
-            {
-              RootPanel.Children.Add( layoutPanelElements[ i ] );
-            }
+            ( ( ILayoutPreviousContainer )contentReferencingEmptyPane ).PreviousContainer = null;
+            contentReferencingEmptyPane.PreviousContainerIndex = -1;
           }
 
-          TopSide = ( LayoutAnchorSide )ReadElement( reader );
-          if( TopSide != null )
-          {
-            TopSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
-            reader.Read();
-          }
-          RightSide = ( LayoutAnchorSide )ReadElement( reader );
-          if( RightSide != null )
-          {
-            RightSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
-            reader.Read();
-          }
-          LeftSide = ( LayoutAnchorSide )ReadElement( reader );
-          if( LeftSide != null )
+          //...if this pane is the only documentpane present in the layout than skip it
+          if( emptyPane is LayoutDocumentPane &&
+              this.Descendents().OfType<LayoutDocumentPane>().Count( c => c != emptyPane ) == 0 )
+            continue;
+
+          //...if this empty panes is not referenced by anyone, than removes it from its parent container
+          if( !this.Descendents().OfType<ILayoutPreviousContainer>().Any( c => c.PreviousContainer == emptyPane ) )
           {
-            LeftSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
-            reader.Read();
+            var parentGroup = emptyPane.Parent as ILayoutContainer;
+            parentGroup.RemoveChild( emptyPane );
+            exitFlag = false;
+            break;
           }
-          BottomSide = ( LayoutAnchorSide )ReadElement( reader );
-          if( BottomSide != null )
+        }
+
+        if( !exitFlag )
+        {
+          //removes any empty anchorable pane group
+          foreach( var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where( p => p.ChildrenCount == 0 ) )
           {
-            BottomSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
-            reader.Read();
+            var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+            parentGroup.RemoveChild( emptyPaneGroup );
+            exitFlag = false;
+            break;
           }
+        }
 
-          FloatingWindows.Clear();
-          var floatingWindows = ReadElementList( reader );
-          foreach( var floatingWindow in floatingWindows )
+        if( !exitFlag )
+        {
+          //removes any empty layout panel
+          foreach( var emptyPaneGroup in this.Descendents().OfType<LayoutPanel>().Where( p => p.ChildrenCount == 0 ) )
           {
-            FloatingWindows.Add( ( LayoutFloatingWindow )floatingWindow );
+            var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+            parentGroup.RemoveChild( emptyPaneGroup );
+            exitFlag = false;
+            break;
           }
+        }
 
-          Hidden.Clear();
-          var hidden = ReadElementList( reader );
-          foreach( var hiddenObject in hidden )
+        if( !exitFlag )
+        {
+          //removes any empty floating window
+          foreach( var emptyPaneGroup in this.Descendents().OfType<LayoutFloatingWindow>().Where( p => p.ChildrenCount == 0 ) )
           {
-            Hidden.Add( ( LayoutAnchorable )hiddenObject );
+            var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+            parentGroup.RemoveChild( emptyPaneGroup );
+            exitFlag = false;
+            break;
           }
         }
 
-        private List<ILayoutPanelElement> ReadRootPanel( XmlReader reader )
+        if( !exitFlag )
         {
-          var result = new List<ILayoutPanelElement>();
-
-          var startElementName = reader.LocalName;
-          reader.Read();
-          if( reader.LocalName.Equals(startElementName) && (reader.NodeType == XmlNodeType.EndElement) )
+          //removes any empty anchor group
+          foreach( var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorGroup>().Where( p => p.ChildrenCount == 0 ) )
           {
-            return null;
+            var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+            parentGroup.RemoveChild( emptyPaneGroup );
+            exitFlag = false;
+            break;
           }
+        }
 
-          while( reader.NodeType == XmlNodeType.Whitespace )
+      }
+      while( !exitFlag );
+      #endregion
+
+      #region collapse single child anchorable pane groups
+      do
+      {
+        exitFlag = true;
+        //for each pane that is empty
+        foreach( var paneGroupToCollapse in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where( p => p.ChildrenCount == 1 && p.Children[ 0 ] is LayoutAnchorablePaneGroup ).ToArray() )
+        {
+          var singleChild = paneGroupToCollapse.Children[ 0 ] as LayoutAnchorablePaneGroup;
+          paneGroupToCollapse.Orientation = singleChild.Orientation;
+          paneGroupToCollapse.RemoveChild( singleChild );
+          while( singleChild.ChildrenCount > 0 )
           {
-            reader.Read();
+            paneGroupToCollapse.InsertChildAt(
+                paneGroupToCollapse.ChildrenCount, singleChild.Children[ 0 ] );
           }
 
-          if( reader.LocalName.Equals("RootPanel"))
-          {
-            reader.Read();
+          exitFlag = false;
+          break;
+        }
 
-            while( true )
-            {
-              //Read all RootPanel children
-              var element = ReadElement( reader ) as ILayoutPanelElement;
-              if( element != null )
-              {
-                result.Add( element );
-              }
-              else if( reader.NodeType == XmlNodeType.EndElement )
-              {
-                break;
-              }
-            }
-          }
+      }
+      while( !exitFlag );
 
-          reader.ReadEndElement();
 
-          return result;
-        }
 
-        private List<object> ReadElementList( XmlReader reader )
-        {
-          var resultList = new List<object>();
+      #endregion
 
-          if( reader.IsEmptyElement )
+      #region collapse single child document pane groups
+      do
+      {
+        exitFlag = true;
+        //for each pane that is empty
+        foreach( var paneGroupToCollapse in this.Descendents().OfType<LayoutDocumentPaneGroup>().Where( p => p.ChildrenCount == 1 && p.Children[ 0 ] is LayoutDocumentPaneGroup ).ToArray() )
+        {
+          var singleChild = paneGroupToCollapse.Children[ 0 ] as LayoutDocumentPaneGroup;
+          paneGroupToCollapse.Orientation = singleChild.Orientation;
+          paneGroupToCollapse.RemoveChild( singleChild );
+          while( singleChild.ChildrenCount > 0 )
           {
-            reader.Read();
-            return resultList;
+            paneGroupToCollapse.InsertChildAt(
+                paneGroupToCollapse.ChildrenCount, singleChild.Children[ 0 ] );
           }
 
-          var startElementName = reader.LocalName;
-          reader.Read();
-          if( reader.LocalName.Equals(startElementName) && (reader.NodeType == XmlNodeType.EndElement) )
-          {
-            return null;
-          }
+          exitFlag = false;
+          break;
+        }
 
-          while( reader.NodeType == XmlNodeType.Whitespace )
-          {
-            reader.Read();
-          }
+      }
+      while( !exitFlag );
 
-          while( true )
-          {
-            var result = ReadElement( reader ) as LayoutFloatingWindow;
-            if( result == null )
-            {
-              break;
-            }
 
-            resultList.Add( result );
-          }
 
-          reader.ReadEndElement();
+      #endregion
+
+      //do
+      //{
+      //  exitFlag = true;
+      //  //for each panel that has only one child
+      //  foreach( var panelToCollapse in this.Descendents().OfType<LayoutPanel>().Where( p => p.ChildrenCount == 1 && p.Children[ 0 ] is LayoutPanel ).ToArray() )
+      //  {
+      //    var singleChild = panelToCollapse.Children[ 0 ] as LayoutPanel;
+      //    panelToCollapse.Orientation = singleChild.Orientation;
+      //    panelToCollapse.RemoveChild( singleChild );
+      //    ILayoutPanelElement[] singleChildChildren = new ILayoutPanelElement[ singleChild.ChildrenCount ];
+      //    singleChild.Children.CopyTo( singleChildChildren, 0 );
+      //    while( singleChild.ChildrenCount > 0 )
+      //    {
+      //      panelToCollapse.InsertChildAt(
+      //          panelToCollapse.ChildrenCount, singleChildChildren[ panelToCollapse.ChildrenCount ] );
+      //    }
+
+      //    exitFlag = false;
+      //    break;
+      //  }
+
+      //}
+      //while( !exitFlag );
+
+      #region Update ActiveContent and LastFocusedDocument properties
+      UpdateActiveContentProperty();
+      #endregion
+#if DEBUG
+      System.Diagnostics.Debug.Assert(
+          !this.Descendents().OfType<LayoutAnchorablePane>().Any( a => a.ChildrenCount == 0 && a.IsVisible ) );
+#if TRACE
+            RootPanel.ConsoleDump(4);
+#endif
+#endif
+    }
+
+    #endregion
+
+    public event EventHandler Updated;
+
+    internal void FireLayoutUpdated()
+    {
+      if( Updated != null )
+        Updated( this, EventArgs.Empty );
+    }
+
+    #region LayoutElement Added/Removed events
 
-          return resultList;
+    internal void OnLayoutElementAdded( LayoutElement element )
+    {
+      if( ElementAdded != null )
+        ElementAdded( this, new LayoutElementEventArgs( element ) );
+    }
+
+    public event EventHandler<LayoutElementEventArgs> ElementAdded;
+
+    internal void OnLayoutElementRemoved( LayoutElement element )
+    {
+      if( element.Descendents().OfType<LayoutContent>().Any( c => c == LastFocusedDocument ) )
+        LastFocusedDocument = null;
+      if( element.Descendents().OfType<LayoutContent>().Any( c => c == ActiveContent ) )
+        ActiveContent = null;
+      if( ElementRemoved != null )
+        ElementRemoved( this, new LayoutElementEventArgs( element ) );
+    }
+
+    public event EventHandler<LayoutElementEventArgs> ElementRemoved;
+
+    #endregion
+
+    public XmlSchema GetSchema()
+    {
+      return null;
+    }
+
+    public void ReadXml( XmlReader reader )
+    {
+      reader.MoveToContent();
+      if( reader.IsEmptyElement )
+      {
+        reader.Read();
+        return;
+      }
+
+      var layoutPanelElements = ReadRootPanel( reader );
+      if( layoutPanelElements != null )
+      {
+        RootPanel = new LayoutPanel();
+        //Add all children to RootPanel
+        for( int i = 0; i < layoutPanelElements.Count; ++i )
+        {
+          RootPanel.Children.Add( layoutPanelElements[ i ] );
         }
+      }
+
+      TopSide = new LayoutAnchorSide();
+      if( ReadElement( reader ) != null )
+      {
+        FillLayoutAnchorSide( reader, TopSide );
+      }
+      RightSide = new LayoutAnchorSide();
+      if( ReadElement( reader ) != null )
+      {
+        FillLayoutAnchorSide( reader, RightSide );
+      }
+      LeftSide = new LayoutAnchorSide();
+      if( ReadElement( reader ) != null )
+      {
+        FillLayoutAnchorSide( reader, LeftSide );
+      }
+      BottomSide = new LayoutAnchorSide();
+      if( ReadElement( reader ) != null )
+      {
+        FillLayoutAnchorSide( reader, BottomSide );
+      }
+
+      FloatingWindows.Clear();
+      var floatingWindows = ReadElementList( reader );
+      foreach( var floatingWindow in floatingWindows )
+      {
+        FloatingWindows.Add( ( LayoutFloatingWindow )floatingWindow );
+      }
+
+      Hidden.Clear();
+      var hidden = ReadElementList( reader );
+      foreach( var hiddenObject in hidden )
+      {
+        Hidden.Add( ( LayoutAnchorable )hiddenObject );
+      }
+    }
+
+    private void FillLayoutAnchorSide( XmlReader reader, LayoutAnchorSide layoutAnchorSide )
+    {
+      var result = new List<LayoutAnchorGroup>();
 
-        private object ReadElement( XmlReader reader )
+      while( true )
+      {
+        //Read all layoutAnchorSide children
+        var element = ReadElement( reader ) as LayoutAnchorGroup;
+        if( element != null )
         {
-          if( reader.NodeType == XmlNodeType.EndElement )
-          {
-            return null;
-          }
+          result.Add( element );
+        }
+        else if( reader.NodeType == XmlNodeType.EndElement )
+        {
+          break;
+        }
+      }
 
-          while( reader.NodeType == XmlNodeType.Whitespace )
-          {
-            reader.Read();
-          }
+      reader.ReadEndElement();
+      foreach( var las in result )
+      {
+        layoutAnchorSide.Children.Add( las );
+      }
+    }
 
-          XmlSerializer serializer;
-          switch( reader.LocalName )
-          {
-            case "LayoutAnchorablePaneGroup":
-              serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) );
-              break;
-            case "LayoutAnchorablePane":
-              serializer = new XmlSerializer( typeof( LayoutAnchorablePane ) );
-              break;
-            case "LayoutAnchorable":
-              serializer = new XmlSerializer( typeof( LayoutAnchorable ) );
-              break;
-            case "LayoutDocumentPaneGroup":
-              serializer = new XmlSerializer( typeof( LayoutDocumentPaneGroup ) );
-              break;
-            case "LayoutDocumentPane":
-              serializer = new XmlSerializer( typeof( LayoutDocumentPane ) );
-              break;
-            case "LayoutDocument":
-              serializer = new XmlSerializer( typeof( LayoutDocument ) );
-              break;
-            case "LayoutAnchorGroup":
-              serializer = new XmlSerializer( typeof( LayoutAnchorGroup ) );
-              break;
-            case "LayoutPanel":
-              serializer = new XmlSerializer( typeof( LayoutPanel ) );
-              break;
-            case "LayoutDocumentFloatingWindow":
-              serializer = new XmlSerializer( typeof( LayoutDocumentFloatingWindow ) );
-              break;
-            case "LayoutAnchorableFloatingWindow":
-              serializer = new XmlSerializer( typeof( LayoutAnchorableFloatingWindow ) );
-              break;
-            case "LeftSide":
-            case "RightSide":
-            case "TopSide":
-            case "BottomSide":
-              if( reader.IsEmptyElement )
-              {
-                reader.Read();
-                return null;
-              }
-              reader.Read();
-              return new LayoutAnchorSide();
-            default:
-              var type = LayoutRoot.FindType( reader.LocalName );
-              if( type == null )
-              {
-                throw new ArgumentException( "AvalonDock.LayoutRoot doesn't know how to deserialize " + reader.LocalName );
-              }
-              serializer = new XmlSerializer( type );
-              break;
-          }
+    private List<ILayoutPanelElement> ReadRootPanel( XmlReader reader )
+    {
+      var result = new List<ILayoutPanelElement>();
 
-          return serializer.Deserialize( reader );
-        }
+      var startElementName = reader.LocalName;
+      reader.Read();
+      if( reader.LocalName.Equals( startElementName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
+      {
+        return null;
+      }
+
+      while( reader.NodeType == XmlNodeType.Whitespace )
+      {
+        reader.Read();
+      }
+
+      if( reader.LocalName.Equals( "RootPanel" ) )
+      {
+        reader.Read();
 
-        public void WriteXml( XmlWriter writer )
+        while( true )
         {
-          writer.WriteStartElement( "RootPanel" );
-          if( RootPanel != null )
+          //Read all RootPanel children
+          var element = ReadElement( reader ) as ILayoutPanelElement;
+          if( element != null )
           {
-            RootPanel.WriteXml( writer );
+            result.Add( element );
           }
-          writer.WriteEndElement();
-
-          writer.WriteStartElement( "TopSide" );
-          if( TopSide != null )
+          else if( reader.NodeType == XmlNodeType.EndElement )
           {
-            TopSide.WriteXml( writer );
+            break;
           }
-          writer.WriteEndElement();
+        }
+      }
 
-          writer.WriteStartElement( "RightSide" );
-          if( RightSide != null )
-          {
-            RightSide.WriteXml( writer );
-          }
-          writer.WriteEndElement();
+      reader.ReadEndElement();
 
-          writer.WriteStartElement( "LeftSide" );
-          if( LeftSide != null )
-          {
-            LeftSide.WriteXml( writer );
-          }
-          writer.WriteEndElement();
+      return result;
+    }
 
-          writer.WriteStartElement( "BottomSide" );
-          if( BottomSide != null )
-          {
-            BottomSide.WriteXml( writer );
-          }
-          writer.WriteEndElement();
+    private List<object> ReadElementList( XmlReader reader )
+    {
+      var resultList = new List<object>();
+
+      if( reader.IsEmptyElement )
+      {
+        reader.Read();
+        return resultList;
+      }
+
+      var startElementName = reader.LocalName;
+      reader.Read();
+      if( reader.LocalName.Equals( startElementName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
+      {
+        return null;
+      }
+
+      while( reader.NodeType == XmlNodeType.Whitespace )
+      {
+        reader.Read();
+      }
+
+      while( true )
+      {
+        var result = ReadElement( reader ) as LayoutFloatingWindow;
+        if( result == null )
+        {
+          break;
+        }
+
+        resultList.Add( result );
+      }
 
-          // Write all floating windows (can be LayoutDocumentFloatingWindow or LayoutAnchorableFloatingWindow).
-          // To prevent "can not create instance of abstract type", the type is retrieved with GetType().Name
-          writer.WriteStartElement( "FloatingWindows" );
-          foreach( var layoutFloatingWindow in FloatingWindows )
+      reader.ReadEndElement();
+
+      return resultList;
+    }
+
+    private object ReadElement( XmlReader reader )
+    {
+      if( reader.NodeType == XmlNodeType.EndElement )
+      {
+        return null;
+      }
+
+      while( reader.NodeType == XmlNodeType.Whitespace )
+      {
+        reader.Read();
+      }
+
+      XmlSerializer serializer;
+      switch( reader.LocalName )
+      {
+        case "LayoutAnchorablePaneGroup":
+          serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) );
+          break;
+        case "LayoutAnchorablePane":
+          serializer = new XmlSerializer( typeof( LayoutAnchorablePane ) );
+          break;
+        case "LayoutAnchorable":
+          serializer = new XmlSerializer( typeof( LayoutAnchorable ) );
+          break;
+        case "LayoutDocumentPaneGroup":
+          serializer = new XmlSerializer( typeof( LayoutDocumentPaneGroup ) );
+          break;
+        case "LayoutDocumentPane":
+          serializer = new XmlSerializer( typeof( LayoutDocumentPane ) );
+          break;
+        case "LayoutDocument":
+          serializer = new XmlSerializer( typeof( LayoutDocument ) );
+          break;
+        case "LayoutAnchorGroup":
+          serializer = new XmlSerializer( typeof( LayoutAnchorGroup ) );
+          break;
+        case "LayoutPanel":
+          serializer = new XmlSerializer( typeof( LayoutPanel ) );
+          break;
+        case "LayoutDocumentFloatingWindow":
+          serializer = new XmlSerializer( typeof( LayoutDocumentFloatingWindow ) );
+          break;
+        case "LayoutAnchorableFloatingWindow":
+          serializer = new XmlSerializer( typeof( LayoutAnchorableFloatingWindow ) );
+          break;
+        case "LeftSide":
+        case "RightSide":
+        case "TopSide":
+        case "BottomSide":
+          if( reader.IsEmptyElement )
           {
-            writer.WriteStartElement( layoutFloatingWindow.GetType().Name );
-            layoutFloatingWindow.WriteXml( writer );
-            writer.WriteEndElement();
+            reader.Read();
+            return null;
           }
-          writer.WriteEndElement();
-
-          writer.WriteStartElement( "Hidden" );
-          foreach( var layoutAnchorable in Hidden )
+          return reader.Read();
+        default:
+          var type = LayoutRoot.FindType( reader.LocalName );
+          if( type == null )
           {
-            layoutAnchorable.WriteXml( writer );
+            throw new ArgumentException( "AvalonDock.LayoutRoot doesn't know how to deserialize " + reader.LocalName );
           }
-          writer.WriteEndElement();
-        }
+          serializer = new XmlSerializer( type );
+          break;
+      }
 
-        internal static Type FindType( string name )
+      return serializer.Deserialize( reader );
+    }
+
+    public void WriteXml( XmlWriter writer )
+    {
+      writer.WriteStartElement( "RootPanel" );
+      if( RootPanel != null )
+      {
+        RootPanel.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+
+      writer.WriteStartElement( "TopSide" );
+      if( TopSide != null )
+      {
+        TopSide.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+
+      writer.WriteStartElement( "RightSide" );
+      if( RightSide != null )
+      {
+        RightSide.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+
+      writer.WriteStartElement( "LeftSide" );
+      if( LeftSide != null )
+      {
+        LeftSide.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+
+      writer.WriteStartElement( "BottomSide" );
+      if( BottomSide != null )
+      {
+        BottomSide.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+
+      // Write all floating windows (can be LayoutDocumentFloatingWindow or LayoutAnchorableFloatingWindow).
+      // To prevent "can not create instance of abstract type", the type is retrieved with GetType().Name
+      writer.WriteStartElement( "FloatingWindows" );
+      foreach( var layoutFloatingWindow in FloatingWindows )
+      {
+        writer.WriteStartElement( layoutFloatingWindow.GetType().Name );
+        layoutFloatingWindow.WriteXml( writer );
+        writer.WriteEndElement();
+      }
+      writer.WriteEndElement();
+
+      writer.WriteStartElement( "Hidden" );
+      foreach( var layoutAnchorable in Hidden )
+      {
+        layoutAnchorable.WriteXml( writer );
+      }
+      writer.WriteEndElement();
+    }
+
+    internal static Type FindType( string name )
+    {
+      foreach( var assembly in AppDomain.CurrentDomain.GetAssemblies() )
+      {
+        foreach( var type in assembly.GetTypes() )
         {
-          foreach( var assembly in AppDomain.CurrentDomain.GetAssemblies() )
-          {
-            foreach( var type in assembly.GetTypes() )
-            {
-              if( type.Name.Equals( name ) )
-                return type;
-            }
-          }
-          return null;
+          if( type.Name.Equals( name ) )
+            return type;
         }
+      }
+      return null;
+    }
 
 #if TRACE
         public override void ConsoleDump(int tab)
@@ -969,5 +1012,5 @@ namespace Xceed.Wpf.AvalonDock.Layout
 #endif
 
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
index f82cf8c3..3800cc83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 [assembly: AssemblyCulture( "" )]
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
index b3237473..33b1c73e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
@@ -23,581 +23,789 @@
                     xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters"
                     xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties">
 
-    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
-    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
-    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
-    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
-    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
-    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
+  <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+  <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+  <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter" />
+  <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter" />
+  <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter" />
+  <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
+  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
 
-   <!--DocumentPaneControlStyle-->
-    <Style x:Key="DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                        <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                              Panel.ZIndex="1">
-                              <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                Focusable="False"
-                                Grid.Column="1">
-                                <avalonDockControls:DropDownButton.DropDownContextMenu>
-                                    <avalonDockControls:ContextMenuEx
-                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
-                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
-                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
-                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
-                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
-                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
-                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
-                                            </Style>
-                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                    </avalonDockControls:ContextMenuEx>
-                                </avalonDockControls:DropDownButton.DropDownContextMenu>
-                              <Border Background="White">
-                                 <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinDocMenu.png" />
-                              </Border>
-                            </avalonDockControls:DropDownButton>                            
-                        </Grid>
-                        <Border x:Name="ContentPanel" 
-                                VerticalAlignment="Stretch" 
-                                HorizontalAlignment="Stretch"  
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}" 
-                                Grid.Column="0" 
-                                KeyboardNavigation.DirectionalNavigation="Contained" 
-                                Grid.Row="1"
-                                KeyboardNavigation.TabIndex="2" 
-                                KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter x:Name="PART_SelectedContentHost" 
-                                              ContentSource="SelectedContent" 
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle">
+  <!--DocumentPaneControlStyle-->
+  <Style x:Key="DocumentPaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
+                  Panel.ZIndex="1">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel"
+                                                       Grid.Column="0"
+                                                       IsItemsHost="true"
+                                                       Grid.Row="0"
+                                                       KeyboardNavigation.TabIndex="1" />
+              <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
+                                                 Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                 Focusable="False"
+                                                 Grid.Column="1">
+                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                  <avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                    <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                      <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"
+                             BasedOn="{StaticResource {x:Type MenuItem}}">
+                        <Setter Property="HeaderTemplate"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+                        <Setter Property="HeaderTemplateSelector"
+                                Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+                        <Setter Property="IconTemplate"
+                                Value="{Binding Path=Root.Manager.IconContentTemplate}" />
+                        <Setter Property="IconTemplateSelector"
+                                Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
+                        <Setter Property="Command"
+                                Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}" />
+                      </Style>
+                    </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                  </avalonDockControls:ContextMenuEx>
+                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                <Border Background="White">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinDocMenu.png">
+                  </Image>
+                </Border>
+              </avalonDockControls:DropDownButton>
+            </Grid>
+            <Border x:Name="ContentPanel"
+                    VerticalAlignment="Stretch"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="1"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}"
+                         Value="0">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="MenuDropDownButton" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="Visibility"
+                  Value="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}" />
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="IsEnabled"
+                  Value="{Binding IsEnabled}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Padding"
+                  Value="2,0,2,0" />
+          <Setter Property="Margin"
+                  Value="0,2,0,0" />
+          <Setter Property="Template">
             <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                    <Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                    <Setter Property="Padding" Value="2,0,2,0"/>
-                    <Setter Property="Margin" Value="0,2,0,0"/>
-                    <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Grid SnapsToDevicePixels="true">
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
 
-                           <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}"
-                                               Background="{TemplateBinding Background}" 
-							                          Padding="{TemplateBinding Padding}"
-   				                                BorderThickness="1,1,1,0" >
-                                 <ContentPresenter 
-								                x:Name="Content" 
-								                ContentSource="Header" 
-                                                HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                                VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                                RecognizesAccessKey="True" 
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                           </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                           <Trigger Property="Selector.IsSelected" Value="true">
-                              <Setter Property="Background" Value="White" />
-                              <Setter Property="Panel.ZIndex" Value="1" />
-                              <Setter Property="Margin" Value="0,0,0,-2"/>
-                              <Setter Property="Margin" TargetName="Content" Value="0,0,0,3"/>
-                           </Trigger>
-                           <MultiTrigger>
-                              <MultiTrigger.Conditions>
-                                 <Condition Property="IsMouseOver" Value="true"/>
-                                 <Condition Property="Selector.IsSelected" Value="false"/>
-                              </MultiTrigger.Conditions>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                              <Setter Property="Panel.ZIndex" Value="0" />
-                           </MultiTrigger>
-                           <Trigger Property="IsEnabled" Value="false">
-                              <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                           </Trigger>
-                        </ControlTemplate.Triggers>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-                </Style>
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}"
+                          BorderThickness="1,1,1,0">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Border>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="Background"
+                            Value="White" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="0,0,0,-2" />
+                    <Setter Property="Margin"
+                            TargetName="Content"
+                            Value="0,0,0,3" />
+                  </Trigger>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
 
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-    <!--AnchorablePaneControlStyle-->
-    <Style x:Key="AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-      <Setter Property="Foreground"
-              Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
-      <Setter Property="Background"
-              Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}" />
-      <Setter Property="TabStripPlacement" Value="Bottom"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-                    <Grid ClipToBounds="true" 
-                          SnapsToDevicePixels="true" 
-                          KeyboardNavigation.TabNavigation="Local"
-                          >
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <!--Following border is required to catch mouse events-->
-                        <Border Background="Transparent" Grid.RowSpan="2"/>
-                        <Border x:Name="ContentPanel" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}"
-                                Grid.Column="0" 
-                                KeyboardNavigation.DirectionalNavigation="Contained" 
-                                Grid.Row="0" 
-                                KeyboardNavigation.TabIndex="2"
-                                KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              ContentSource="SelectedContent" 
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="2,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+  <!--AnchorablePaneControlStyle-->
+  <Style x:Key="AnchorablePaneControlStyle"
+         TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+    <Setter Property="Foreground"
+            Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Background"
+            Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}" />
+    <Setter Property="TabStripPlacement"
+            Value="Bottom" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+          <Grid ClipToBounds="true"
+                SnapsToDevicePixels="true"
+                KeyboardNavigation.TabNavigation="Local">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <!--Following border is required to catch mouse events-->
+            <Border Background="Transparent"
+                    Grid.RowSpan="2" />
+            <Border x:Name="ContentPanel"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    Grid.Column="0"
+                    KeyboardNavigation.DirectionalNavigation="Contained"
+                    Grid.Row="0"
+                    KeyboardNavigation.TabIndex="2"
+                    KeyboardNavigation.TabNavigation="Cycle">
+              <ContentPresenter x:Name="PART_SelectedContentHost"
+                                ContentSource="SelectedContent"
+                                Margin="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel"
+                                                       Margin="2,0,2,2"
+                                                       IsItemsHost="true"
+                                                       Grid.Row="1"
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       Panel.ZIndex="1" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
 
-        <Setter Property="ItemContainerStyle">
+    <Setter Property="ItemContainerStyle">
+      <Setter.Value>
+        <Style TargetType="{x:Type TabItem}">
+          <Setter Property="IsSelected"
+                  Value="{Binding IsSelected, Mode=TwoWay}" />
+          <Setter Property="IsEnabled"
+                  Value="{Binding IsEnabled}" />
+          <Setter Property="ToolTip"
+                  Value="{Binding ToolTip}" />
+          <Setter Property="Template">
             <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                   <Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
-                   <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
-                   <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Grid SnapsToDevicePixels="true">
-                           <Border x:Name="Bd" 
-							              BorderBrush="{TemplateBinding BorderBrush}"
-                                   BorderThickness="1,0,1,1"
-							              Background="{TemplateBinding Background}" 
-							              Padding="{TemplateBinding Padding}">
-                              <ContentPresenter 
-								            x:Name="Content" 
-								            ContentSource="Header" 
-                                    HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
-                                    VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                    RecognizesAccessKey="True" 
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                           </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                           <Trigger Property="Selector.IsSelected"
-								        Value="true">
-                              <Setter Property="Background"
-									    Value="White" />
-                              <Setter Property="Panel.ZIndex" 
-                                        Value="1" />
-                              <Setter Property="Margin" Value="0,-1,-1,-2"/>
-                           </Trigger>
-                           <MultiTrigger>
-                              <MultiTrigger.Conditions>
-                                 <Condition Property="IsMouseOver" Value="true"/>
-                                 <Condition Property="Selector.IsSelected" Value="false"/>
-                              </MultiTrigger.Conditions>
-                              <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
-                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                              <Setter Property="Panel.ZIndex" Value="0" />
-                           </MultiTrigger>
-                           <Trigger Property="IsEnabled" Value="false">
-                              <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                           </Trigger>
-                        </ControlTemplate.Triggers>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count, FallbackValue=1}" Value="1">
-                            <Setter Property="Visibility" Value="Collapsed"/>
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
+              <ControlTemplate TargetType="{x:Type TabItem}">
+                <Grid SnapsToDevicePixels="true">
+                  <Border x:Name="Bd"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="1,0,1,1"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
+                    <ContentPresenter x:Name="Content"
+                                      ContentSource="Header"
+                                      HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                      RecognizesAccessKey="True"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Border>
+                </Grid>
+                <ControlTemplate.Triggers>
+                  <Trigger Property="Selector.IsSelected"
+                           Value="true">
+                    <Setter Property="Background"
+                            Value="White" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="1" />
+                    <Setter Property="Margin"
+                            Value="0,-1,-1,-2" />
+                  </Trigger>
+                  <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                      <Condition Property="IsMouseOver"
+                                 Value="true" />
+                      <Condition Property="Selector.IsSelected"
+                                 Value="false" />
+                    </MultiTrigger.Conditions>
+                    <Setter Property="Background"
+                            Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                    <Setter Property="Panel.ZIndex"
+                            Value="0" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled"
+                           Value="false">
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+                </ControlTemplate.Triggers>
+              </ControlTemplate>
             </Setter.Value>
-        </Setter>
+          </Setter>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count, FallbackValue=1}"
+                         Value="1">
+              <Setter Property="Visibility"
+                      Value="Collapsed" />
+            </DataTrigger>
+          </Style.Triggers>
+        </Style>
+      </Setter.Value>
+    </Setter>
 
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
+    <Setter Property="ItemTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
 
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    <Setter Property="ContentTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DropDownControlArea 
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                >
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                              ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                              ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </avalonDockControls:DropDownControlArea>
+  <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                  ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+              </avalonDockControls:DropDownControlArea>
 
-                            <avalonDockControls:DropDownButton
-                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                Focusable="False"
-                                Grid.Column="1"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                              <Border Background="White">
-                                 <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png" />
-                              </Border>
-                           </avalonDockControls:DropDownButton>
+              <avalonDockControls:DropDownButton Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                 Focusable="False"
+                                                 Grid.Column="1"
+                                                 DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                <Border Background="White">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png">
+                  </Image>
+                </Border>
+              </avalonDockControls:DropDownButton>
 
-                            <Button x:Name="PART_AutoHidePin" 
-                                Grid.Column="2" 
-                                Focusable="False"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
-                              <Border Background="White">
-                                 <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinAutoHide.png" />
-                              </Border>
-                           </Button>
+              <Button x:Name="PART_AutoHidePin"
+                      Grid.Column="2"
+                      Focusable="False"
+                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
+                <Border Background="White">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinAutoHide.png">
+                  </Image>
+                </Border>
+              </Button>
 
-                            <Button x:Name="PART_HidePin" 
-                                Grid.Column="3" 
-                                Focusable="False"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
-                              <Border Background="White">
-                                 <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png" />
-                              </Border>
-                           </Button>
+              <Button x:Name="PART_HidePin"
+                      Grid.Column="3"
+                      Focusable="False"
+                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                      Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                <Border Background="White">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png">
+                  </Image>
+                </Border>
+              </Button>
 
 
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
-                                <Setter.Value>
-                                    <RotateTransform Angle="90"/>
-                                </Setter.Value>
-                            </Setter>
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="LayoutTransform"
+                      TargetName="PART_AutoHidePin">
+                <Setter.Value>
+                  <RotateTransform Angle="90" />
+                </Setter.Value>
+              </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="True">
+              <Setter Property="Command"
+                      TargetName="PART_HidePin"
+                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="ToolTip"
+                      TargetName="PART_HidePin"
+                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <ControlTemplate x:Key="AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-    <ControlTemplate x:Key="AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
-        <ItemsControl 
-            ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}" 
-            >
-            <ItemsControl.LayoutTransform>
-                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
-            </ItemsControl.LayoutTransform>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal"/>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
+  <ControlTemplate x:Key="AnchorSideTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
 
-    <ControlTemplate x:Key="AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
-        <Border BorderThickness="1" 
-                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                Margin="2"
-                Padding="2">
-            <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                              ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                              ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-        </Border>
-    </ControlTemplate>
+  <ControlTemplate x:Key="AnchorGroupTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+    <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+      <ItemsControl.LayoutTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}" />
+      </ItemsControl.LayoutTransform>
+      <ItemsControl.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+    </ItemsControl>
+  </ControlTemplate>
 
-    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                        <Grid x:Name="PART_DockingManagerDropTargets" >
-                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockLeft.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockRight.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockBottom.PNG" Stretch="None" />
-                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockTop.PNG" Stretch="None"/>
-                        </Grid>
-                        <Grid x:Name="PART_AnchorablePaneDropTargets">
-                            <Grid Width="88" Height="88" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"  Stretch="Uniform"/>
-                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneTop.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"  Stretch="None"/>
-                                </Border>                                
-                            </Grid>
-                        </Grid>
-                        <Grid x:Name="PART_DocumentPaneDropTargets">
-                            <Grid Width="88" Height="88" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"  Stretch="Uniform"/>
-                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneTop.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneRight.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneBottom.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneLeft.png"  Stretch="None"/>
-                                </Border>
-                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"  Stretch="None"/>
-                                </Border>
-                            </Grid>
-                        </Grid>
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+  <ControlTemplate x:Key="AnchorTemplate"
+                   TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+    <Border BorderThickness="1"
+            BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
+            Margin="2"
+            Padding="2">
+      <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+    </Border>
+  </ControlTemplate>
 
-    <DataTemplate x:Key="DocumentHeaderTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
+  <Style x:Key="{x:Type avalonDockControls:OverlayWindow}"
+         TargetType="{x:Type avalonDockControls:OverlayWindow}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+          <Canvas x:Name="PART_DropTargetsContainer"
+                  Opacity="0.9">
+            <Path x:Name="PART_PreviewBox"
+                  Fill="AliceBlue"
+                  StrokeThickness="2"
+                  Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            <Grid x:Name="PART_DockingManagerDropTargets">
+              <Image x:Name="PART_DockingManagerDropTargetLeft"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Left"
+                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockLeft.PNG"
+                     Stretch="None">
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetRight"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Right"
+                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockRight.PNG"
+                     Stretch="None">
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetBottom"
+                     VerticalAlignment="Bottom"
+                     HorizontalAlignment="Center"
+                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockBottom.PNG"
+                     Stretch="None">
+              </Image>
+              <Image x:Name="PART_DockingManagerDropTargetTop"
+                     VerticalAlignment="Top"
+                     HorizontalAlignment="Center"
+                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockTop.PNG"
+                     Stretch="None">
+              </Image>
+            </Grid>
+            <Grid x:Name="PART_AnchorablePaneDropTargets">
+              <Grid Width="88"
+                    Height="88"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"
+                       Stretch="Uniform">
+                </Image>
+                <Border Name="PART_AnchorablePaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneTop.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneRight.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneBottom.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneLeft.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_AnchorablePaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+            <Grid x:Name="PART_DocumentPaneDropTargets">
+              <Grid Width="88"
+                    Height="88"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <Image Grid.ColumnSpan="3"
+                       Grid.RowSpan="3"
+                       Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"
+                       Stretch="Uniform">
+                </Image>
+                <Border Name="PART_DocumentPaneDropTargetTop"
+                        Grid.Column="1"
+                        Grid.Row="0">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneTop.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetRight"
+                        Grid.Column="2"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneRight.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetBottom"
+                        Grid.Column="1"
+                        Grid.Row="2">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneBottom.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetLeft"
+                        Grid.Column="0"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneLeft.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+                <Border Name="PART_DocumentPaneDropTargetInto"
+                        Grid.Column="1"
+                        Grid.Row="1">
+                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"
+                         Stretch="None">
+                  </Image>
+                </Border>
+              </Grid>
+            </Grid>
+          </Canvas>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-    <DataTemplate x:Key="AnchorableHeaderTemplate">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
-                <Setter Property="Margin" Value="0" TargetName="title"/>
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
+  <DataTemplate x:Key="DocumentHeaderTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis">
+    </TextBlock>
+  </DataTemplate>
 
-    <DataTemplate x:Key="DocumentTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
+  <DataTemplate x:Key="AnchorableHeaderTemplate">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Image x:Name="icon"
+             Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+             Stretch="Uniform">
+      </Image>
+      <TextBlock x:Name="title"
+                 Margin="4,0,0,0"
+                 Text="{Binding Title}"
+                 TextTrimming="CharacterEllipsis"
+                 Grid.Column="1">
+      </TextBlock>
+    </Grid>
+    <DataTemplate.Triggers>
+      <DataTrigger Binding="{Binding IconSource}"
+                   Value="{x:Null}">
+        <Setter Property="Margin"
+                Value="0"
+                TargetName="title" />
+      </DataTrigger>
+    </DataTemplate.Triggers>
+  </DataTemplate>
 
-    <DataTemplate x:Key="AnchorableTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
-    </DataTemplate>
+  <DataTemplate x:Key="DocumentTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis">
+    </TextBlock>
+  </DataTemplate>
 
-    <DataTemplate x:Key="IconContentTemplate">
-        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-    </DataTemplate>
+  <DataTemplate x:Key="AnchorableTitleTemplate">
+    <TextBlock Text="{Binding Title}"
+               TextTrimming="CharacterEllipsis">
+    </TextBlock>
+  </DataTemplate>
 
-    <ContextMenu x:Key="AnchorableContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
-                Command="{Binding Path=DockCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
-                Command="{Binding Path=AutoHideCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
-                Command="{Binding Path=HideCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
+  <DataTemplate x:Key="IconContentTemplate">
+    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+           Stretch="Uniform">
+    </Image>
+  </DataTemplate>
 
-    <ContextMenu x:Key="DocumentContextMenu">
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
-                  Command="{Binding Path=CloseCommand}"
-                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
-                  Command="{Binding Path=CloseAllButThisCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
-                  Command="{Binding Path=CloseAllCommand}" />
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
-                  Command="{Binding Path=FloatCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
-                  Command="{Binding Path=DockAsDocumentCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
-                Command="{Binding Path=NewHorizontalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
-                Command="{Binding Path=NewVerticalTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
-                Command="{Binding Path=MoveToNextTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
-                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
-                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-    </ContextMenu>
+  <ContextMenu x:Key="AnchorableContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}"
+              Command="{Binding Path=DockCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
+              Command="{Binding Path=AutoHideCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
+              Command="{Binding Path=HideCommand}">
+      <MenuItem.Visibility>
+        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
+          <Binding Path="IsEnabled"
+                   RelativeSource="{RelativeSource Self}"
+                   Mode="OneWay"
+                   Converter="{StaticResource BoolToVisibilityConverter}" />
+          <Binding Path="CanClose" />
+        </MultiBinding>
+      </MenuItem.Visibility>
+    </MenuItem>
+  </ContextMenu>
 
-    <!--DockingManager-->
-    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource DocumentPaneControlStyle}"/>
-        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AnchorablePaneControlStyle}"/>
-        <Setter Property="AnchorSideTemplate" Value="{StaticResource AnchorSideTemplate}"/>
-        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AnchorGroupTemplate}"/>
-        <Setter Property="AnchorTemplate" Value="{StaticResource AnchorTemplate}"/>
-        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource DocumentHeaderTemplate}"/>
-        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AnchorableHeaderTemplate}"/>
-        <Setter Property="DocumentTitleTemplate" Value="{StaticResource DocumentTitleTemplate}"/>
-        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AnchorableTitleTemplate}"/>
-        <Setter Property="AnchorableContextMenu" Value="{StaticResource AnchorableContextMenu}"/>
-        <Setter Property="DocumentContextMenu" Value="{StaticResource DocumentContextMenu}"/>
-        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource DocumentHeaderTemplate}"/>
-        <Setter Property="IconContentTemplate" Value="{StaticResource IconContentTemplate}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid FlowDirection="LeftToRight">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
-                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
-                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
-                            <ContentPresenter 
-                                x:Name="PART_AutoHideArea"
+  <ContextMenu x:Key="DocumentContextMenu">
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+              Command="{Binding Path=CloseCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}"
+              Command="{Binding Path=CloseAllButThisCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+              Command="{Binding Path=CloseAllCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}"
+              Command="{Binding Path=FloatCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}"
+              Command="{Binding Path=DockAsDocumentCommand}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
+              Command="{Binding Path=NewHorizontalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
+              Command="{Binding Path=NewVerticalTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
+              Command="{Binding Path=MoveToNextTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+    <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
+              Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+  </ContextMenu>
+
+  <!--DockingManager-->
+  <Style x:Key="{x:Type avalonDock:DockingManager}"
+         TargetType="{x:Type avalonDock:DockingManager}">
+    <Setter Property="DocumentPaneControlStyle"
+            Value="{StaticResource DocumentPaneControlStyle}" />
+    <Setter Property="AnchorablePaneControlStyle"
+            Value="{StaticResource AnchorablePaneControlStyle}" />
+    <Setter Property="AnchorSideTemplate"
+            Value="{StaticResource AnchorSideTemplate}" />
+    <Setter Property="AnchorGroupTemplate"
+            Value="{StaticResource AnchorGroupTemplate}" />
+    <Setter Property="AnchorTemplate"
+            Value="{StaticResource AnchorTemplate}" />
+    <Setter Property="DocumentHeaderTemplate"
+            Value="{StaticResource DocumentHeaderTemplate}" />
+    <Setter Property="AnchorableHeaderTemplate"
+            Value="{StaticResource AnchorableHeaderTemplate}" />
+    <Setter Property="DocumentTitleTemplate"
+            Value="{StaticResource DocumentTitleTemplate}" />
+    <Setter Property="AnchorableTitleTemplate"
+            Value="{StaticResource AnchorableTitleTemplate}" />
+    <Setter Property="AnchorableContextMenu"
+            Value="{StaticResource AnchorableContextMenu}" />
+    <Setter Property="DocumentContextMenu"
+            Value="{StaticResource DocumentContextMenu}" />
+    <Setter Property="DocumentPaneMenuItemHeaderTemplate"
+            Value="{StaticResource DocumentHeaderTemplate}" />
+    <Setter Property="IconContentTemplate"
+            Value="{StaticResource IconContentTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid FlowDirection="LeftToRight">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Content="{TemplateBinding LayoutRootPanel}"
+                                Grid.Column="1"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding RightSidePanel}"
+                                Grid.Column="2"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding LeftSidePanel}"
+                                Grid.Column="0"
+                                Grid.Row="1" />
+              <ContentPresenter Content="{TemplateBinding TopSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="0" />
+              <ContentPresenter Content="{TemplateBinding BottomSidePanel}"
+                                Grid.Column="1"
+                                Grid.Row="2" />
+              <ContentPresenter x:Name="PART_AutoHideArea"
                                 Content="{TemplateBinding AutoHideWindow}"
                                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                Grid.Column="1" Grid.Row="1"/> <!---->
+                                Grid.Column="1"
+                                Grid.Row="1" />
+              <!---->
                         </Grid>
                     </Border>
                 </ControlTemplate>
@@ -606,475 +814,588 @@
     </Style>
 
     <!--LayoutGridResizerControl-->
-    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-                    <Border Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+              <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}"
+                     TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                <Setter Property="Background"
+                        Value="Transparent" />
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                      <Border Background="{TemplateBinding Background}" />
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+              <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+                      <Border Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                          ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </Border>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+              <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+                      <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                                                              DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
-                                <!-- Close button should be moved out to the container style -->
-                                <Button x:Name="DocumentCloseButton" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Grid.Column="1" Margin="5,0,0,0" Visibility="Hidden" 
-                                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
-                                </Button>
-                            </Grid>
+                          <Grid>
+                            <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Border Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                            <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                            <!-- Close button should be moved out to the container style -->
+                            <Button x:Name="DocumentCloseButton"
+                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                    Grid.Column="1"
+                                    Margin="5,0,0,0"
+                                    Visibility="Hidden"
+                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                              <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png">
+                              </Image>
+                            </Button>
+                          </Grid>
                         </Border>
-                    </avalonDockControls:DropDownControlArea>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                      </avalonDockControls:DropDownControlArea>
+                      <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=IsSelected}"
+                                     Value="true">
+                          <Setter Property="Visibility"
+                                  Value="Visible"
+                                  TargetName="DocumentCloseButton" />
                         </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                          <Setter Property="Visibility"
+                                  Value="Visible"
+                                  TargetName="DocumentCloseButton" />
                         </Trigger>
-                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
+                        <DataTrigger Binding="{Binding Path=CanClose}"
+                                     Value="false">
+                          <Setter Property="Visibility"
+                                  Value="Collapsed"
+                                  TargetName="DocumentCloseButton" />
                         </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                      </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-                    <avalonDockControls:DropDownControlArea 
-                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+              <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+                      <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                                                              DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                          <Grid>
+                            <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
                                               ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                              ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
-                                <avalonDockControls:DropDownControlArea 
-                                    Grid.Column="0"
-                                    DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                    DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
+                                              ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                            <avalonDockControls:DropDownControlArea Grid.Column="0"
+                                                                    DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                                    DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}">
+                            </avalonDockControls:DropDownControlArea>
+                          </Grid>
                         </Border>
-                    </avalonDockControls:DropDownControlArea>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                      </avalonDockControls:DropDownControlArea>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            KeyboardNavigation.TabNavigation="Cycle">
+              <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+                      <Border Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              KeyboardNavigation.TabNavigation="Cycle">
                         <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Border x:Name="Header">
-                                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Border>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                          </Grid.RowDefinitions>
+                          <Border x:Name="Header">
+                            <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
+                          </Border>
 
-                            <ContentPresenter 
-                                Grid.Row="1"
-                                FlowDirection="{TemplateBinding FlowDirection}"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                          <ContentPresenter Grid.Row="1"
+                                            FlowDirection="{TemplateBinding FlowDirection}"
+                                            Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                            <!--<ContentPresenter 
+                          <!--<ContentPresenter 
                                 FlowDirection="{TemplateBinding FlowDirection}"
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
                                 ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 Grid.Row="1"/>-->
                         </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
+                      </Border>
+                      <ControlTemplate.Triggers>
                         <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True"/>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
+                          <MultiDataTrigger.Conditions>
+                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}"
+                                       Value="True" />
+                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}"
+                                       Value="True" />
+                          </MultiDataTrigger.Conditions>
+                          <Setter Property="Visibility"
+                                  Value="Collapsed"
+                                  TargetName="Header" />
                         </MultiDataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                      </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="3"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    CornerRadius="3,3,3,3"
-                    GlassFrameThickness="0"
-                    ShowSystemMenu="False"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                            <Grid Margin="3">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="16"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
-                                              ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                              ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+              <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}"
+                     TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+                <Setter Property="Background"
+                        Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                <Setter Property="BorderBrush"
+                        Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
+                <Setter Property="BorderThickness"
+                        Value="3" />
+                <Setter Property="shell:WindowChrome.WindowChrome">
+                  <Setter.Value>
+                    <shell:WindowChrome ResizeBorderThickness="10"
+                                        CaptionHeight="16"
+                                        CornerRadius="3,3,3,3"
+                                        GlassFrameThickness="0"
+                                        ShowSystemMenu="False" />
+                  </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+                      <Grid>
+                        <Border x:Name="WindowBorder"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}">
+                          <Grid Margin="3">
+                            <Grid.RowDefinitions>
+                              <RowDefinition Height="16" />
+                              <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}"
+                                                ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                                ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
 
 
-                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Focusable="False"
-                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                        Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                        Grid.Column="2">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png"/>
-                                    </Button>
+                              <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                      CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                      Grid.Column="2">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png" >
+                                </Image>
+                              </Button>
 
-                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Focusable="False"
-                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                        Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                        Grid.Column="2">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png"/>
-                                    </Button>
+                              <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                      CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                      Grid.Column="2">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png" >
+                                </Image>
+                              </Button>
 
-                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Focusable="False"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Grid.Column="3">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
-                                    </Button>
-                                </Grid>
-                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
+                              <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                      Grid.Column="3">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png" >
+                                </Image>
+                              </Button>
                             </Grid>
+                            <ContentPresenter Content="{TemplateBinding Content}"
+                                              Grid.Row="1" />
+                          </Grid>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                      </Grid>
+                      <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState"
+                                 Value="Maximized">
+                          <Setter Property="Padding"
+                                  Value="3"
+                                  TargetName="WindowBorder" />
                         </Trigger>
-                        <DataTrigger Binding="{Binding Model.RootDocument.IsActive, RelativeSource={RelativeSource Self}}" Value="True">
-                              <Setter TargetName="WindowBorder" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        <DataTrigger Binding="{Binding Model.RootDocument.IsActive, RelativeSource={RelativeSource Self}}"
+                                     Value="True">
+                          <Setter TargetName="WindowBorder"
+                                  Property="BorderBrush"
+                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                         </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                      </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="3"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    CornerRadius="3,3,3,3"
-                    GlassFrameThickness="0"
-                    ShowSystemMenu="False"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                            <Grid Margin="3">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="16"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
+              <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}"
+                     TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                <Setter Property="Background"
+                        Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                <Setter Property="BorderBrush"
+                        Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
+                <Setter Property="BorderThickness"
+                        Value="3" />
+                <Setter Property="shell:WindowChrome.WindowChrome">
+                  <Setter.Value>
+                    <shell:WindowChrome ResizeBorderThickness="10"
+                                        CaptionHeight="16"
+                                        CornerRadius="3,3,3,3"
+                                        GlassFrameThickness="0"
+                                        ShowSystemMenu="False" />
+                  </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                      <Grid>
+                        <Border x:Name="WindowBorder"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}">
+                          <Grid Margin="3">
+                            <Grid.RowDefinitions>
+                              <RowDefinition Height="16" />
+                              <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid>
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
 
-                                    <Border
-                                        Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
-                                        <avalonDockControls:DropDownControlArea 
-                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                                            <ContentPresenter Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                  ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                                  ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                        </avalonDockControls:DropDownControlArea>
-                                    </Border>
+                              <Border Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                                        DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                  <ContentPresenter Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
+                                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </avalonDockControls:DropDownControlArea>
+                              </Border>
 
 
-                                    <avalonDockControls:DropDownButton
-                                        x:Name="SinglePaneContextMenu"
-                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
-                                        Focusable="False"
-                                        Grid.Column="1"
-                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                        DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png"/>
-                                    </avalonDockControls:DropDownButton>
+                              <avalonDockControls:DropDownButton x:Name="SinglePaneContextMenu"
+                                                                 shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                                 Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                                 Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                                                 Focusable="False"
+                                                                 Grid.Column="1"
+                                                                 DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                                 DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png" >
+                                </Image>
+                              </avalonDockControls:DropDownButton>
 
-                                    <Button 
-                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Focusable="False"
-                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                        Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                        Grid.Column="2">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png"/>
-                                    </Button>
+                              <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                      CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                      Grid.Column="2">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png" >
+                                </Image>
+                              </Button>
 
-                                    <Button 
-                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Focusable="False"
-                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                        Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                        Grid.Column="2">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png"/>
-                                    </Button>
+                              <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                      CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                      Grid.Column="2">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png" >
+                                </Image>
+                              </Button>
 
-                                    <Button 
-                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Focusable="False"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                        Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                        ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                        Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Grid.Column="3">
-                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
-                                    </Button>
-                                </Grid>
-                                <ContentPresenter
-                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
+                              <Button x:Name="CloseButton"
+                                      shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                      Focusable="False"
+                                      Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                      Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                      Grid.Column="3">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png" >
+                                </Image>
+                              </Button>
                             </Grid>
+                            <ContentPresenter Content="{TemplateBinding Content}"
+                                              Grid.Row="1" />
+                          </Grid>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                      </Grid>
+                      <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState"
+                                 Value="Maximized">
+                          <Setter Property="Padding"
+                                  Value="3"
+                                  TargetName="WindowBorder" />
                         </Trigger>
-                           <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.IsActive, RelativeSource={RelativeSource Self}}" Value="True">
-                              <Setter TargetName="WindowBorder" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.IsActive, RelativeSource={RelativeSource Self}}"
+                                     Value="True">
+                          <Setter TargetName="WindowBorder"
+                                  Property="BorderBrush"
+                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                         </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                        <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
+                                     Value="True">
+                          <Setter Property="Command"
+                                  TargetName="CloseButton"
+                                  Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+                          <Setter Property="ToolTip"
+                                  TargetName="CloseButton"
+                                  Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
 
-    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-    </Style>
+                        </DataTrigger>
+                      </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
 
-    <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    CornerRadius="3,3,3,3"
-                    GlassFrameThickness="4"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-                    <Grid>
-                        <Border x:Name="WindowBorder" BorderThickness="3"
+              <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}"
+                     TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+                <Setter Property="Background"
+                        Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+              </Style>
+
+              <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}"
+                     TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                <Setter Property="Background"
+                        Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                <Setter Property="SizeToContent"
+                        Value="WidthAndHeight" />
+                <Setter Property="ResizeMode"
+                        Value="NoResize" />
+                <Setter Property="shell:WindowChrome.WindowChrome">
+                  <Setter.Value>
+                    <shell:WindowChrome ResizeBorderThickness="10"
+                                        CaptionHeight="16"
+                                        CornerRadius="3,3,3,3"
+                                        GlassFrameThickness="4" />
+                  </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                      <Grid>
+                        <Border x:Name="WindowBorder"
+                                BorderThickness="3"
                                 Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
                                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
-                            <Grid Margin="5">
+                          <Grid Margin="5">
+                            <Grid.RowDefinitions>
+                              <RowDefinition Height="54" />
+                              <RowDefinition Height="*" />
+                              <RowDefinition Height="42" />
+                            </Grid.RowDefinitions>
+
+                            <Grid>
+                              <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                              </Grid.RowDefinitions>
+                              <Grid>
+                                <Grid.ColumnDefinitions>
+                                  <ColumnDefinition Width="Auto" />
+                                  <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                       Stretch="None" >
+                                </Image>
+                                <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}"
+                                           TextTrimming="CharacterEllipsis"
+                                           Grid.Column="1"
+                                           VerticalAlignment="Center"
+                                           FontWeight="Bold"
+                                           Margin="4,0,0,0" >
+                                </TextBlock>
+                              </Grid>
+                              <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}"
+                                         TextTrimming="CharacterEllipsis"
+                                         VerticalAlignment="Center" >
+                              </TextBlock>
+                            </Grid>
+
+                            <Grid Grid.Row="1">
+                              <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+                              <Grid Margin="5">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="54"/>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="42"/>
+                                  <RowDefinition Height="Auto" />
+                                  <RowDefinition />
                                 </Grid.RowDefinitions>
-
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition/>
-                                    </Grid.RowDefinitions>
-                                    <Grid>
+                                <TextBlock Text="Active Tool Windows"
+                                           FontWeight="Bold"
+                                           Margin="0,3,0,4" >
+                                </TextBlock>
+                                <ListBox Grid.Row="1"
+                                         ItemsSource="{Binding Anchorables}"
+                                         SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}"
+                                         Background="Transparent"
+                                         BorderThickness="0"
+                                         MaxHeight="400"
+                                         FocusVisualStyle="{x:Null}">
+                                  <ListBox.ItemContainerStyle>
+                                    <Style TargetType="ListBoxItem">
+                                      <Setter Property="Cursor"
+                                              Value="Hand" />
+                                      <Style.Triggers>
+                                        <Trigger Property="IsMouseOver"
+                                                 Value="True">
+                                          <Setter Property="Background"
+                                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                          <Setter Property="TextElement.Foreground"
+                                                  Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                                        </Trigger>
+                                      </Style.Triggers>
+                                    </Style>
+                                  </ListBox.ItemContainerStyle>
+                                  <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                      <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition/>
+                                          <ColumnDefinition Width="Auto" />
+                                          <ColumnDefinition />
                                         </Grid.ColumnDefinitions>
-                                        <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
-                                    </Grid>
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
-                                </Grid>
-
-                                <Grid Grid.Row="1">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <Grid Margin="5">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
-                                        <ListBox Grid.Row="1" ItemsSource="{Binding Anchorables}" SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" Background="Transparent" BorderThickness="0" MaxHeight="400" FocusVisualStyle="{x:Null}">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem">
-                                                    <Setter Property="Cursor" Value="Hand"/>
-                                                    <Style.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                                                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
-                                                        </Trigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                            <ColumnDefinition/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                        <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,2,0,2"/>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Grid>
-                                    <Grid Grid.Column="1" Margin="5">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
-                                        <ListBox Grid.Row="1" ItemsSource="{Binding Documents}" SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" Background="Transparent" BorderThickness="0" MaxHeight="400" FocusVisualStyle="{x:Null}">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem">
-                                                    <Setter Property="Cursor" Value="Hand"/>
-                                                    <Style.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                                                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
-                                                        </Trigger>     
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                            <ColumnDefinition/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
-                                                        <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,2,0,2"/>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                            <ListBox.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <WrapPanel Orientation="Vertical"/>
-                                                </ItemsPanelTemplate>
-                                            </ListBox.ItemsPanel>
-                                        </ListBox>
-                                    </Grid>
-                                </Grid>
+                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                               Stretch="None">
+                                        </Image>
+                                        <TextBlock Text="{Binding LayoutElement.Title}"
+                                                   TextTrimming="CharacterEllipsis"
+                                                   Grid.Column="1"
+                                                   Margin="4,2,0,2">
+                                        </TextBlock>
+                                      </Grid>
+                                    </DataTemplate>
+                                  </ListBox.ItemTemplate>
+                                </ListBox>
+                              </Grid>
+                              <Grid Grid.Column="1"
+                                    Margin="5">
+                                <Grid.RowDefinitions>
+                                  <RowDefinition Height="Auto" />
+                                  <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Text="Active Files"
+                                           FontWeight="Bold"
+                                           Margin="0,3,0,4">
+                                </TextBlock>
+                                <ListBox Grid.Row="1"
+                                         ItemsSource="{Binding Documents}"
+                                         SelectedItem="{Binding SelectedDocument, Mode=TwoWay}"
+                                         Background="Transparent"
+                                         BorderThickness="0"
+                                         MaxHeight="400"
+                                         FocusVisualStyle="{x:Null}">
+                                  <ListBox.ItemContainerStyle>
+                                    <Style TargetType="ListBoxItem">
+                                      <Setter Property="Cursor"
+                                              Value="Hand" />
+                                      <Style.Triggers>
+                                        <Trigger Property="IsMouseOver"
+                                                 Value="True">
+                                          <Setter Property="Background"
+                                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                          <Setter Property="TextElement.Foreground"
+                                                  Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                                        </Trigger>
+                                      </Style.Triggers>
+                                    </Style>
+                                  </ListBox.ItemContainerStyle>
+                                  <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                      <Grid>
+                                        <Grid.ColumnDefinitions>
+                                          <ColumnDefinition Width="Auto" />
+                                          <ColumnDefinition />
+                                        </Grid.ColumnDefinitions>
+                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                               Stretch="None">
+                                        </Image>
+                                        <TextBlock Text="{Binding LayoutElement.Title}"
+                                                   TextTrimming="CharacterEllipsis"
+                                                   Grid.Column="1"
+                                                   Margin="4,2,0,2">
+                                        </TextBlock>
+                                      </Grid>
+                                    </DataTemplate>
+                                  </ListBox.ItemTemplate>
+                                  <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                      <WrapPanel Orientation="Vertical" />
+                                    </ItemsPanelTemplate>
+                                  </ListBox.ItemsPanel>
+                                </ListBox>
+                              </Grid>
+                            </Grid>
 
-                                <Grid Grid.Row="2">
-                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
-                                </Grid>
+                            <Grid Grid.Row="2">
+                              <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
+                                         VerticalAlignment="Center">
+                              </TextBlock>
                             </Grid>
+                          </Grid>
                         </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+                      </Grid>
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
 
-    </Style>
+              </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
index 5d73417a..2f447660 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
@@ -100,6 +100,7 @@
     <Compile Include="Controls\Shell\WindowChrome.cs" />
     <Compile Include="Controls\Shell\WindowChromeWorker.cs" />
     <Compile Include="Converters\ActivateCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\AnchorableContextMenuHideVisibilityConverter.cs" />
     <Compile Include="Converters\AutoHideCommandLayoutItemFromLayoutModelConverter.cs" />
     <Compile Include="Converters\HideCommandLayoutItemFromLayoutModelConverter.cs" />
     <Compile Include="Converters\InverseBoolToVisibilityConverter.cs" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.cs
new file mode 100644
index 00000000..c65238fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,2 @@
+
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/Themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Themes/generic.baml
new file mode 100644
index 00000000..22f928b7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Themes/generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
new file mode 100644
index 00000000..2d06a706
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
new file mode 100644
index 00000000..f0a26271
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
new file mode 100644
index 00000000..a624b88a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
new file mode 100644
index 00000000..5e49fd06
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
new file mode 100644
index 00000000..77d9552c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
new file mode 100644
index 00000000..b92e3121
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.resources
new file mode 100644
index 00000000..7aaab51e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
new file mode 100644
index 00000000..de139964
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
new file mode 100644
index 00000000..5980151d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
new file mode 100644
index 00000000..49c61057
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
new file mode 100644
index 00000000..b102a440
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..0423a185
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
@@ -0,0 +1,42 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Themes\generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\Xceed.Wpf.AvalonDock.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.g.resources
new file mode 100644
index 00000000..c29e0a29
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.lref
new file mode 100644
index 00000000..138d068a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.lref
@@ -0,0 +1,4 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..c65238fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,2 @@
+
+
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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..7f04cc18
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml 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
new file mode 100644
index 00000000..2d06a706
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources 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
new file mode 100644
index 00000000..f0a26271
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources 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
new file mode 100644
index 00000000..a624b88a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources 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
new file mode 100644
index 00000000..5e49fd06
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources 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
new file mode 100644
index 00000000..77d9552c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources 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
new file mode 100644
index 00000000..b92e3121
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources 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
new file mode 100644
index 00000000..7aaab51e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources 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
new file mode 100644
index 00000000..de139964
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources 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
new file mode 100644
index 00000000..5980151d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources 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
new file mode 100644
index 00000000..49c61057
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources 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
new file mode 100644
index 00000000..b102a440
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources 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
new file mode 100644
index 00000000..10353340
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
@@ -0,0 +1,42 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Themes\generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..709a3188
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources differ
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
new file mode 100644
index 00000000..d95c9eaa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref
@@ -0,0 +1,4 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
index 2f3526f4..d0eecffc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
@@ -26,9 +26,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal class VirtualList : IList, IList<object>, INotifyCollectionChanged, IDisposable
   {
-
-    #region CONSTRUCTORS
-
     public VirtualList( VirtualPageManager pagingManager )
       : this( pagingManager, -1 )
     {
@@ -46,8 +43,6 @@ namespace Xceed.Wpf.DataGrid
       m_virtualCount = virtualCount;
     }
 
-    #endregion CONSTRUCTORS
-
     #region VirtualPagingManager Property
 
     public VirtualPageManager PagingManager
@@ -58,9 +53,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion VirtualPagingManager Property
-
-
+    #endregion
 
     #region VirtualCount Property
 
@@ -78,27 +71,89 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion VirtualCount Property
+    #endregion
 
-    internal int IndexOf( object item )
+    #region TableOfContent Property
+
+    internal VirtualListTableOfContent TableOfContent
     {
-      if( ( item == null ) || ( this.IsDisposed ) )
-        return -1;
+      get
+      {
+        return m_tableOfContent;
+      }
+    }
 
-      EmptyDataItem emptyDataItem = item as EmptyDataItem;
+    #endregion
 
-      if( emptyDataItem != null )
+    #region VirtualPagingManager Property
+
+    internal VirtualPageManager VirtualPagingManager
+    {
+      get
       {
-        if( ( emptyDataItem.ParentVirtualList == this ) && ( emptyDataItem.Index < m_virtualCount ) )
-          return emptyDataItem.Index;
+        return m_pagingManager;
+      }
+      set
+      {
+        // null is an acceptable value when disposing the list
+        if( ( m_pagingManager != null ) && ( value != null ) )
+          throw new InvalidOperationException( "An attempt was made to set a VirtualPageManager when one has already been provided." );
 
-        return -1;
+        m_pagingManager = value;
       }
+    }
 
-      return m_tableOfContent.IndexOf( item );
+    #endregion
+
+    #region IsDisposed Property
+
+    internal bool IsDisposed
+    {
+      get
+      {
+        return m_flags[ ( int )VirtualItemBookFlags.Disposed ];
+      }
+      private set
+      {
+        m_flags[ ( int )VirtualItemBookFlags.Disposed ] = value;
+      }
     }
 
-    #region PUBLIC METHODS
+    #endregion
+
+    #region IsRestarting Property
+
+    internal bool IsRestarting
+    {
+      get
+      {
+        return m_flags[ ( int )VirtualItemBookFlags.Restarting ];
+      }
+      private set
+      {
+        m_flags[ ( int )VirtualItemBookFlags.Restarting ] = value;
+      }
+    }
+
+    #endregion
+
+    #region HasPagePendingCommit Property
+
+    internal bool HasPagePendingCommit
+    {
+      get
+      {
+        foreach( VirtualPage page in m_tableOfContent.VirtualPages )
+        {
+          if( page.IsCommitPending )
+            return true;
+        }
+
+        return false;
+      }
+    }
+
+    #endregion
 
 #if DEBUG
     public override string ToString()
@@ -119,41 +174,24 @@ namespace Xceed.Wpf.DataGrid
     }
 #endif
 
-    #endregion PUBLIC METHODS
-
+    internal int IndexOf( object item )
+    {
+      if( ( item == null ) || ( this.IsDisposed ) )
+        return -1;
 
-    #region INTERNAL PROPERTIES
+      EmptyDataItem emptyDataItem = item as EmptyDataItem;
 
-    internal VirtualListTableOfContent TableOfContent
-    {
-      get
+      if( emptyDataItem != null )
       {
-        return m_tableOfContent;
-      }
-    }
+        if( ( emptyDataItem.ParentVirtualList == this ) && ( emptyDataItem.Index < m_virtualCount ) )
+          return emptyDataItem.Index;
 
-    internal VirtualPageManager VirtualPagingManager
-    {
-      get
-      {
-        return m_pagingManager;
+        return -1;
       }
-      set
-      {
-        // null is an acceptable value when disposing the list
-        if( ( m_pagingManager != null ) && ( value != null ) )
-          throw new InvalidOperationException( "An attempt was made to set a VirtualPageManager when one has already been provided." );
 
-        m_pagingManager = value;
-      }
+      return m_tableOfContent.IndexOf( item );
     }
 
-
-    #endregion INTERNAL PROPERTIES
-
-
-    #region INTERNAL METHODS
-
     internal bool IsPageDirty( int index )
     {
       VirtualPage page = this.GetPageOrDefaultForItemIndex( index, true );
@@ -220,24 +258,6 @@ namespace Xceed.Wpf.DataGrid
         virtualizedItemInfo = page.GetVirtualizedItemInfoAtIndex( index );
 
         Debug.Assert( virtualizedItemInfo != null );
-
-
-        //if( ( virtualizedItemInfo == null ) && ( createPageIfLineNotFound ) )
-        //{
-        //  // No VirtualizedItemInfo was found at the requested index.
-        //  LinkedListNode<VirtualPage> firstPageNode = m_pageNodes.First;
-
-        //  Debug.Assert( firstPageNode != null, "If the page is not null, there should be at least one page in the book." );
-
-        //  if( firstPageNode.Value != page )
-        //  {
-        //    
-        //    page = this.CreateNewPage( index );
-
-        //    virtualizedItemInfo = page.GetVirtualizedItemInfoAtIndex( index );
-        //    this.AddPageToFront( page );
-        //  }
-        //}
       }
       else if( createPageIfLineNotFound )
       {
@@ -259,7 +279,9 @@ namespace Xceed.Wpf.DataGrid
       if( m_tableOfContent.TryGetPageForSourceIndex( sourceIndex, out page ) )
       {
         if( page.LockPage() )
+        {
           Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "List: " + this.GetHashCode().ToString() + " - LOCKING PAGE: " + page.ToString() + " for index: " + sourceIndex.ToString() + " NEW LOCKED PAGES COUNT: " + this.GetLockedPageCount().ToString() );
+        }
 
         this.PreEmptiveLoadPages( sourceIndex, page );
       }
@@ -277,7 +299,6 @@ namespace Xceed.Wpf.DataGrid
         if( page.UnlockPage() )
         {
           Debug.Assert( this.GetLockedPageCount() >= 0 );
-
           Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "List: " + this.GetHashCode().ToString() + " - UN-LOCKING PAGE: " + page.ToString() + " for index: " + sourceIndex.ToString() + " NEW LOCKED PAGES COUNT: " + this.GetLockedPageCount().ToString() );
 
           m_pagingManager.CleanUpAndDisposeUnused();
@@ -287,8 +308,7 @@ namespace Xceed.Wpf.DataGrid
 
     private void PreEmptiveLoadPages( int sourceIndex, VirtualPage page )
     {
-      // The VirtualList is disposed or part of a PagingManager
-      // that will be disposed (only disconnected when dispose is required)
+      // The VirtualList is disposed or part of a PagingManager that will be disposed (only disconnected when dispose is required)
       if( !this.PagingManager.IsConnected )
         return;
 
@@ -297,8 +317,7 @@ namespace Xceed.Wpf.DataGrid
       double preemptivePageQueryRatio = m_pagingManager.PreemptivePageQueryRatio;
       int pageSize = m_pagingManager.PageSize;
 
-      double pageRatio = ( preemptivePageQueryRatio > 0.5 ) ? 0.5 :
-        ( preemptivePageQueryRatio < 0.0 ) ? 0 : preemptivePageQueryRatio;
+      double pageRatio = ( preemptivePageQueryRatio > 0.5 ) ? 0.5 : ( preemptivePageQueryRatio < 0.0 ) ? 0 : preemptivePageQueryRatio;
 
       double boundariesItemCount = ( pageRatio * pageSize );
 
@@ -319,8 +338,7 @@ namespace Xceed.Wpf.DataGrid
       {
         VirtualPage preEmptivePage = null;
 
-        // We do not want to move the pre-emptive page to the front if it is already created since it does not count as a
-        // legitimate user-acess.
+        // We do not want to move the pre-emptive page to the front if it is already created since it does not count as a legitimate user-acess.
         preEmptivePage = this.GetPageOrDefaultForItemIndex( preEmptivePageStartIndex, true );
 
         if( preEmptivePage == null )
@@ -332,7 +350,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-
     internal bool IsAsyncCommitQueuedForItem( object item )
     {
       VirtualPage virtualPage;
@@ -351,7 +368,9 @@ namespace Xceed.Wpf.DataGrid
         Debug.Assert( page.ParentVirtualList == this );
 
         if( page.IsDirty )
+        {
           m_pagingManager.QueueCommitData( page );
+        }
       }
     }
 
@@ -361,6 +380,7 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualList requested, checking for pages to commit or abort..." );
+
       this.IsRestarting = true;
       m_pagingManager.OnVirtualListRestarting( this );
 
@@ -373,10 +393,8 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        // Restart every pages this VirtualList contains 
-
-        // Keep a reference to the pages that need to restart
-        // in order to know when this VirtualList is restarted
+        // Restart every pages this VirtualList contains.
+        // Keep a reference to the pages that need to restart in order to know when this VirtualList is restarted
         m_restartingPages.AddRange( m_tableOfContent.VirtualPages );
 
         for( int i = virtualPagesCount - 1; i >= 0; i-- )
@@ -385,16 +403,16 @@ namespace Xceed.Wpf.DataGrid
           Debug.Assert( !page.IsDisposed );
 
           if( !page.IsRestarting )
+          {
             page.Restart();
+          }
         }
       }
     }
 
     internal void OnVirtualPageRestarting( VirtualPage page )
     {
-      // Notify the VirtualPageManager that this page is restarted
-      // to ensure it commits its data or aborts the QueryItems
-      // if already invoked
+      // Notify the VirtualPageManager that this page is restarted to ensure it commits its data or aborts the QueryItems if already invoked
       Debug.Assert( m_restartingPages.Contains( page ) );
       m_pagingManager.OnVirtualListPageRestarting( this, page );
     }
@@ -402,21 +420,16 @@ namespace Xceed.Wpf.DataGrid
     internal void OnVirtualPageRestarted( VirtualPage page )
     {
       Debug.Assert( m_restartingPages.Contains( page ) );
+
       // The page is restarted, remove it from the restarting pages
       m_restartingPages.Remove( page );
 
-      // Notify the manager that this page is restarted in order
-      // to let it remove it from its m_pageNodes and also
-      // from this VirtualList TableOfContent.
-      // NOTE: We do not remove it from the TableOfContent
-      // immediately to avoid have to insert a condition in 
-      // VirtualPageManager.RemovePage since this method
-      // used widely to ensure a page is removed from the 
-      // TableOfContent and from the m_pageNodes list.
+      // Notify the manager that this page is restarted in order to let it remove it from its m_pageNodes and also from this VirtualList TableOfContent.
+      // NOTE: We do not remove it from the TableOfContent immediately to avoid have to insert a condition in  VirtualPageManager.RemovePage since this method
+      // used widely to ensure a page is removed from the TableOfContent and from the m_pageNodes list.
       m_pagingManager.OnVirtualListPageRestarted( this, page );
 
-      // Ensure all restarted pages completed their commit or abort operation
-      // before notifying that this list is restarted
+      // Ensure all restarted pages completed their commit or abort operation before notifying that this list is restarted
       if( m_restartingPages.Count == 0 )
       {
         Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Cleared VirtualList" );
@@ -424,22 +437,16 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion INTERNAL METHODS
-
-    #region INTERNAL CALLBACKS METHODS
-
     internal void FillEmptyPage( AsyncQueryInfo asyncQueryInfo, object[] fetchedItems )
     {
-      // The VirtualList is disposed or part of a PagingManager
-      // that will be disposed (only disconnected when dispose is required)
+      // The VirtualList is disposed or part of a PagingManager that will be disposed (only disconnected when dispose is required)
       if( !this.PagingManager.IsConnected )
         return;
 
       Debug.Assert( !this.IsDisposed );
       Debug.Assert( !asyncQueryInfo.IsDisposed );
 
-      // We do not want to move the page we are about to fill to the front since it does not count as a legitimate user-acess.
-      // It will get moved to the front when one of its item is accessed.
+      // We do not want to move the page we are about to fill to the front since it does not count as a legitimate user-acess.  It will get moved to the front when one of its item is accessed.
       VirtualPage page = null;
       page = this.GetPageOrDefaultForItemIndex( asyncQueryInfo.StartIndex, true );
 
@@ -469,18 +476,12 @@ namespace Xceed.Wpf.DataGrid
 
         Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Replaced TOC items/index for page: " + page.ToString() );
 
-        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs(
-          NotifyCollectionChangedAction.Replace,
-          fetchedItems, oldItems,
-          asyncQueryInfo.StartIndex ) );
+        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, fetchedItems, oldItems, asyncQueryInfo.StartIndex ) );
       }
       else
       {
-        // The expected count was not met.  Maybe the user told us the source was bigger than it really is, or maybe there
-        // were delete operations made on the source since the last restart.
-        //
-        // Let's refresh the CollectionView.
-        // This will restart the VirtualItemBook and raise the CollectionView's OnCollectionChanged Reset notification.
+        // The expected count was not met.  Maybe the user told us the source was bigger than it really is, or maybe there were delete operations made on the source since the last restart.
+        // Let's refresh the CollectionView. This will restart the VirtualItemBook and raise the CollectionView's OnCollectionChanged Reset notification.
         this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
       }
     }
@@ -492,7 +493,7 @@ namespace Xceed.Wpf.DataGrid
 
       int indexForItemInPage = asyncCommitInfo.VirtualizedItemInfos[ 0 ].Index;
 
-      // We do not want to move the page we are about flag has committed to the front since it does not count as a legitimate user-access.
+      // We do not want to move the page we are about to flag has committed to the front since it does not count as a legitimate user-access.
       // It will get moved to the front when one of its items is accessed.
       VirtualPage page = null;
       page = this.GetPageOrDefaultForItemIndex( indexForItemInPage, true );
@@ -535,70 +536,16 @@ namespace Xceed.Wpf.DataGrid
           }
           else
           {
-            // We just completed the last commit operation for a Restart request.  
-            // Send another reset action which will in turn call another restart request.
-            // This time, no pages should have to be committed and the restart will end correctly, synchronously with the reset.
-
-            //this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
             this.Restart();
           }
         }
       }
     }
 
-    #endregion INTERNAL CALLBACKS METHODS
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsDisposed
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemBookFlags.Disposed ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualItemBookFlags.Disposed ] = value;
-      }
-    }
-
-    internal bool IsRestarting
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemBookFlags.Restarting ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualItemBookFlags.Restarting ] = value;
-      }
-    }
-
-    #endregion
-
-    #region PRIVATE PROPERTIES
-
-    internal bool HasPagePendingCommit
-    {
-      get
-      {
-        foreach( VirtualPage page in m_tableOfContent.VirtualPages )
-        {
-          if( page.IsCommitPending )
-            return true;
-        }
-
-        return false;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE METHODS
-
     private void EndRestart()
     {
       Debug.Assert( m_restartingPages.Count == 0 );
+
       m_virtualCount = -1;
       this.IsRestarting = false;
 
@@ -630,12 +577,14 @@ namespace Xceed.Wpf.DataGrid
 
       m_tableOfContent.AddPage( page );
 
-      // If we have a pending commit page, this brandly new created page will get its query data queued when we are notified
-      // of a commit completed and that we no longer have any pages awaiting commiting.
+      // If we have a pending commit page, this brandly new created page will get its query data queued when we are notified of a commit completed and that we no longer have any pages awaiting commiting.
       if( !this.HasPagePendingCommit )
+      {
         m_pagingManager.QueueQueryData( page );
+      }
 
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Creating VirtualItemPlaceHolder for page: " + page.ToString() );
+
       return page;
     }
 
@@ -676,7 +625,9 @@ namespace Xceed.Wpf.DataGrid
         Debug.Assert( page != null );
 
         if( ( page != null ) && ( page.IsLocked ) )
+        {
           lockedPages.Add( page );
+        }
       }
 
       return lockedPages;
@@ -689,42 +640,22 @@ namespace Xceed.Wpf.DataGrid
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, ( count != -1 ) ? "QUERY VIRTUAL COUNT: " + count.ToString() : "QUERY VIRTUAL COUNT NOT HANDLED, SETTING COUNT TO ZERO." );
 
       if( count == -1 )
+      {
         count = 0;
+      }
 
       m_virtualCount = count;
     }
 
     private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
     {
-      if( this.CollectionChanged != null )
-        this.CollectionChanged( this, e );
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private List<VirtualPage> m_restartingPages = new List<VirtualPage>();
-    private VirtualPageManager m_pagingManager;
-    private BitVector32 m_flags;
-    private int m_virtualCount;
-    private VirtualListTableOfContent m_tableOfContent;
-
-    #endregion PRIVATE FIELDS
-
-
-    #region PRIVATE NESTED ENUMS
+      var handler = this.CollectionChanged;
+      if( handler == null )
+        return;
 
-    [Flags]
-    private enum VirtualItemBookFlags
-    {
-      Restarting = 1,
-      Disposed = 2,
+      handler.Invoke( this, e );
     }
 
-    #endregion PRIVATE NESTED ENUMS
-
-
     #region IList<object> Members
 
     int IList<object>.IndexOf( object item )
@@ -925,8 +856,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-
-
     #region IDisposable Members
 
     public void Dispose()
@@ -935,6 +864,7 @@ namespace Xceed.Wpf.DataGrid
       if( m_tableOfContent != null )
       {
         Debug.Assert( m_tableOfContent.VirtualPages.Count == 0 );
+
         m_tableOfContent.Dispose();
         m_tableOfContent = null;
       }
@@ -945,5 +875,18 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    private List<VirtualPage> m_restartingPages = new List<VirtualPage>();
+    private VirtualPageManager m_pagingManager;
+    private BitVector32 m_flags;
+    private int m_virtualCount;
+    private VirtualListTableOfContent m_tableOfContent;
+
+    [Flags]
+    private enum VirtualItemBookFlags
+    {
+      Restarting = 1,
+      Disposed = 2,
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
index fa5edec0..2dc5900c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
@@ -16,19 +16,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Windows.Threading;
-using System.Collections.Specialized;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class VirtualPage
-    : List<VirtualizedItemInfo>, IDisposable
+  internal class VirtualPage : List<VirtualizedItemInfo>, IDisposable
   {
-    #region CONSTRUCTORS
-
     internal static VirtualPage CreateEmptyPage( VirtualList parentVirtualList, int startSourceIndex, int entryCount )
     {
       if( parentVirtualList == null )
@@ -76,9 +71,7 @@ namespace Xceed.Wpf.DataGrid
       this.IsFilled = true;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region RemoveAfterOperation
+    #region RemoveAfterOperation Property
 
     public bool RemoveAfterOperation
     {
@@ -118,7 +111,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsEmpty Property
+    #endregion
 
     #region IsFilled Property
 
@@ -137,7 +130,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsFilled Property
+    #endregion
 
     #region IsDisposed Read-Only Property
 
@@ -165,7 +158,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsCommitPending Property
+    #endregion
 
     #region IsDirty Property
 
@@ -188,7 +181,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsDirty Property
+    #endregion
 
     #region IsLocked Property
 
@@ -200,9 +193,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsLocked Property
+    #endregion
 
-    #region IsRemovable
+    #region IsRemovable Property
 
     public bool IsRemovable
     {
@@ -213,7 +206,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsRemovable
+    #endregion
 
     #region ParentVirtualList Property
 
@@ -225,8 +218,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ParentVirtualList Property
-
+    #endregion
 
     #region StartDataIndex Property
 
@@ -238,7 +230,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion StartDataIndex Property
+    #endregion
 
     #region EndDataIndex Property
 
@@ -250,10 +242,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion EndDataIndex Property
-
-
-    #region PUBLIC METHODS
+    #endregion
 
     public VirtualizedItemInfo GetVirtualizedItemInfoAtIndex( int sourceIndex )
     {
@@ -271,8 +260,9 @@ namespace Xceed.Wpf.DataGrid
       string representation = string.Empty;
 
       if( !this.IsFilled )
+      {
         representation += "Fill Pending - ";
-
+      }
 
       if( this.IsEmpty )
       {
@@ -301,131 +291,14 @@ namespace Xceed.Wpf.DataGrid
       return items;
     }
 
-    #endregion PUBLIC METHODS
-
-
-    #region PRIVATE CALLBACKS
-
-    private void AsyncQueryInfo_BuiltInAbort( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnBuiltInAbort( this, queryInfo );
-      this.IsAborting = false;
-    }
-
-    private void AsyncQueryInfo_BeginQueryItems( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnQueryItems( this, queryInfo );
-    }
-
-    private void AsyncQueryInfo_AbortQueryItems( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnAbortQueryItems( this, queryInfo );
-
-      this.IsAborting = false;
-
-      // If the page was removed, it was also disposed.
-      // This case means the page was not restarting
-      if( !this.RemoveAfterOperation && this.ParentVirtualList.IsRestarting )
-        this.Restart();
-    }
-
-    private void AsyncQueryInfo_EndQueryItems( AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-      Debug.Assert( !this.IsAborting );
-      this.ParentVirtualList.PagingManager.OnQueryItemsCompleted( this, queryInfo, fetchedItems );
-
-      if( this.ParentVirtualList.IsRestarting )
-        this.Restart();
-    }
-
-    private void AsyncQueryInfo_QueryErrorChanged( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnQueryErrorChanged( this, queryInfo );
-
-      if( this.ParentVirtualList.IsRestarting )
-        this.Restart();
-    }
-
-    private void AsyncCommitInfo_BeginCommitItems( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitItems( this, commitInfo );
-    }
-
-    private void AsyncCommitInfo_EndCommitItems( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitItemsCompleted( this, commitInfo );
-
-      if( this.ParentVirtualList.IsRestarting )
-        this.Restart();
-    }
-
-    private void AsyncCommitInfo_CommitErrorChanged( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitErrorChanged( this, commitInfo );
-
-      if( this.ParentVirtualList.IsRestarting )
-        this.Restart();
-    }
-
-    #endregion PRIVATE CALLBACKS
-
-    #region INTERNAL METHODS
-
-    /// <summary>
-    /// Increments the page's lock count.  
-    /// Returns True if the lock count went from 0 to 1, meaning that the page is now considered locked and is not up for removal.
-    /// </summary>
     internal bool LockPage()
     {
       m_lockCount++;
 
-      // Returns True if the page just became locked or False if the call simply incremented the lock count.
+      // Returns True if the page just became locked (and is not up for removal) or False if the call simply incremented the lock count.
       return m_lockCount == 1;
     }
 
-    /// <summary>
-    /// Decrements the page's lock count.
-    /// Returns True if the lock count is down to 0, meaning that the page is now considered unlocked and is up for removal.
-    /// </summary>
     internal bool UnlockPage()
     {
       if( m_lockCount > 0 )
@@ -442,7 +315,7 @@ namespace Xceed.Wpf.DataGrid
         return false;
       }
 
-      // Returns True if the page just became unlocked or False if the call simply decremented the lock count.
+      // Returns True if the page just became unlocked (and is up for removal) or False if the call simply decremented the lock count.
       return m_lockCount == 0;
     }
 
@@ -455,7 +328,16 @@ namespace Xceed.Wpf.DataGrid
 
       if( m_asyncQueryInfo != null )
       {
-        this.IsAborting = true;
+        // This method can be reentered by another thread, while it's already being processed, with the result that the AbortQuery delegate may not be trigged by the CollectionView,
+        // and hence the client code not prevented it must abort the query/operation/connection.
+        lock( this )
+        {
+          if( this.IsAborting )
+            return;
+
+          this.IsAborting = true;
+        }
+
         m_asyncQueryInfo.AbortQuery();
       }
     }
@@ -463,7 +345,6 @@ namespace Xceed.Wpf.DataGrid
     internal void QueueQueryData( Dispatcher dispatcher )
     {
       Debug.Assert( !this.IsDisposed );
-
       Debug.Assert( m_asyncQueryInfo == null );
 
       m_asyncQueryInfo = new AsyncQueryInfo(
@@ -485,12 +366,12 @@ namespace Xceed.Wpf.DataGrid
 
       // This can occur when the user notify us that the QueryData is completed for an AsyncQueryInfo.StartIndex that refers to a Page which does exists
       // but that was removed, then re-created thus creating another asyncQueryInfo and queuing another QueryData.
-      // The only way to get rid of this situation would be to keep a ref to the queued asyncQueryInfo even if we get rid of the page and re-link the same instance
-      // to the newly created page.  This optimization could be done in a future version.  For now, let's return and the second asyncQueryInfo will take care of filling
-      // the newly created page.
+      // The only way to get rid of this situation would be to keep a ref to the queued asyncQueryInfo even if we get rid of the page and re-link the same instance to the newly
+      // created page.  This optimization could be done in a future version.  For now, let's return and the second asyncQueryInfo will take care of filling the newly created page.
       if( m_asyncQueryInfo != asyncQueryInfo )
       {
         Debug.Assert( false );
+
         return;
       }
 
@@ -511,6 +392,7 @@ namespace Xceed.Wpf.DataGrid
       }
 
       this.IsFilled = true;
+
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Page Filled - " + this.ToString() );
     }
 
@@ -529,6 +411,7 @@ namespace Xceed.Wpf.DataGrid
         if( ( virtualizedItemInfo.IsDirty ) && ( !this.IsAsyncCommitInfoQueuedForItem( virtualizedItemInfo.DataItem ) ) )
         {
           Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "QueueCommitData for page " + this.ToString() + " and index " + virtualizedItemInfo.Index );
+
           dirtyItemInfoNotAlreadyPendingCommit.Add( virtualizedItemInfo );
         }
       }
@@ -587,6 +470,7 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsRestarting )
       {
         Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualPage requested for " + this.ToString() );
+
         this.IsRestarting = true;
         this.ParentVirtualList.OnVirtualPageRestarting( this );
       }
@@ -600,78 +484,160 @@ namespace Xceed.Wpf.DataGrid
 
     internal void EndRestart()
     {
-      // VirtualPage will be disposed by the VirtualPageManager
-      // when it removes the page from is m_pageNodeList
+      // VirtualPage will be disposed by the VirtualPageManager when it removes the page from is m_pageNodeList
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualPage completed for " + this.ToString() );
+
       this.IsRestarting = false;
       this.ParentVirtualList.OnVirtualPageRestarted( this );
     }
 
-    #endregion INTERNAL METHODS
+    private void AsyncQueryInfo_BuiltInAbort( AsyncQueryInfo queryInfo )
+    {
+      if( this.IsDisposed )
+        return;
 
-    #region PRIVATE METHODS
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
 
-    private int SourceIndexToPageEntryIndex( int sourceIndex )
+      this.ParentVirtualList.PagingManager.OnBuiltInAbort( this, queryInfo );
+      this.IsAborting = false;
+    }
+
+    private void AsyncQueryInfo_BeginQueryItems( AsyncQueryInfo queryInfo )
     {
-      if( ( this.Count != 0 ) && ( ( sourceIndex >= m_startDataIndex ) && ( sourceIndex <= this.EndDataIndex ) ) )
-        return sourceIndex - m_startDataIndex;
+      if( this.IsDisposed )
+        return;
 
-      return -1;
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
+
+      this.ParentVirtualList.PagingManager.OnQueryItems( this, queryInfo );
     }
 
-    private bool ContainsItem( object item )
+    private void AsyncQueryInfo_AbortQueryItems( AsyncQueryInfo queryInfo )
     {
-      int count = this.Count;
+      if( this.IsDisposed )
+        return;
 
-      for( int i = 0; i < count; i++ )
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
+
+      this.ParentVirtualList.PagingManager.OnAbortQueryItems( this, queryInfo );
+
+      this.IsAborting = false;
+
+      // If the page was removed, it was also disposed. This case means the page was not restarting
+      if( !this.RemoveAfterOperation && this.ParentVirtualList.IsRestarting )
       {
-        if( this[ i ].DataItem == item )
-          return true;
+        this.Restart();
       }
+    }
 
-      return false;
+    private void AsyncQueryInfo_EndQueryItems( AsyncQueryInfo queryInfo, object[] fetchedItems )
+    {
+      if( this.IsDisposed )
+        return;
+
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
+      Debug.Assert( !this.IsAborting );
+
+      // The page can be removed when the CollectionView raises a CollectionChanged and the selection is consequently updated, so make sure to lock it until the update operation is done.
+      this.LockPage();
+
+      this.ParentVirtualList.PagingManager.OnQueryItemsCompleted( this, queryInfo, fetchedItems );
+
+      this.UnlockPage();
+
+      if( this.ParentVirtualList.IsRestarting )
+      {
+        this.Restart();
+      }
     }
 
-    #endregion PRIVATE METHODS
+    private void AsyncQueryInfo_QueryErrorChanged( AsyncQueryInfo queryInfo )
+    {
+      if( this.IsDisposed )
+        return;
 
-    #region PRIVATE FIELDS
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
 
-    private BitVector32 m_flags;
+      this.ParentVirtualList.PagingManager.OnQueryErrorChanged( this, queryInfo );
 
-    private int m_startDataIndex;
-    private int m_lockCount;
+      if( this.ParentVirtualList.IsRestarting )
+      {
+        this.Restart();
+      }
+    }
 
-    private VirtualList m_parentVirtualList;
+    private void AsyncCommitInfo_BeginCommitItems( AsyncCommitInfo commitInfo )
+    {
+      if( this.IsDisposed )
+        return;
 
-    private AsyncQueryInfo m_asyncQueryInfo;
-    private List<AsyncCommitInfo> m_asyncCommitInfoList;
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
 
-    #endregion PRIVATE FIELDS
+      this.ParentVirtualList.PagingManager.OnCommitItems( this, commitInfo );
+    }
 
-    #region PRIVATE NESTED ENUMS
+    private void AsyncCommitInfo_EndCommitItems( AsyncCommitInfo commitInfo )
+    {
+      if( this.IsDisposed )
+        return;
 
-    [Flags]
-    private enum VirtualItemPageFlags
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
+
+      this.ParentVirtualList.PagingManager.OnCommitItemsCompleted( this, commitInfo );
+
+      // Make sure the page has not been removed by the previous call before accessing the parent virtual list.
+      if( !this.IsDisposed && this.ParentVirtualList.IsRestarting )
+      {
+        this.Restart();
+      }
+    }
+
+    private void AsyncCommitInfo_CommitErrorChanged( AsyncCommitInfo commitInfo )
     {
-      IsFilled = 1,
-      IsDisposed = 2,
+      if( this.IsDisposed )
+        return;
+
+      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
+
+      this.ParentVirtualList.PagingManager.OnCommitErrorChanged( this, commitInfo );
+
+      if( this.ParentVirtualList.IsRestarting )
+      {
+        this.Restart();
+      }
+    }
+
+    private int SourceIndexToPageEntryIndex( int sourceIndex )
+    {
+      if( ( this.Count != 0 ) && ( ( sourceIndex >= m_startDataIndex ) && ( sourceIndex <= this.EndDataIndex ) ) )
+        return sourceIndex - m_startDataIndex;
+
+      return -1;
     }
 
-    #endregion PRIVATE NESTED ENUMS
+    private bool ContainsItem( object item )
+    {
+      int count = this.Count;
+
+      for( int i = 0; i < count; i++ )
+      {
+        if( this[ i ].DataItem == item )
+          return true;
+      }
+
+      return false;
+    }
 
     #region IDisposable Members
 
     public void Dispose()
     {
-
       Debug.Assert( !this.IsDisposed );
-
       Debug.Assert( ( m_asyncCommitInfoList != null ) && ( m_asyncCommitInfoList.Count == 0 ), "Some async commit are not completed while disposing VirtualPage" );
 
       if( m_asyncQueryInfo != null )
       {
-        // We must dispose the AsyncQueryInfo to be sure
-        // it does not root this VirtualPage instance
+        // We must dispose the AsyncQueryInfo to be sure it does not root this VirtualPage instance
         m_asyncQueryInfo.Dispose();
         m_asyncQueryInfo = null;
       }
@@ -684,5 +650,22 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    private BitVector32 m_flags;
+
+    private int m_startDataIndex;
+    private int m_lockCount;
+
+    private VirtualList m_parentVirtualList;
+
+    public AsyncQueryInfo m_asyncQueryInfo;
+    private List<AsyncCommitInfo> m_asyncCommitInfoList;
+
+    [Flags]
+    private enum VirtualItemPageFlags
+    {
+      IsFilled = 1,
+      IsDisposed = 2,
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
index 41bde2fd..2969c085 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
@@ -16,29 +16,20 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Threading;
-using System.Diagnostics;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal abstract class VirtualPageManager : IDisposable
   {
-    #region STATIC MEMBERS
-
     internal static bool DebugDataVirtualization = false;
     private const DispatcherPriority CommitDataPriority = DispatcherPriority.Input;
     private const int EstimatedLockedPageCount = 3;
 
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    public VirtualPageManager( Dispatcher dispatcher,
-      int pageSize, int maxRealizedItemCount, double preemptivePageQueryRatio )
+    public VirtualPageManager( Dispatcher dispatcher, int pageSize, int maxRealizedItemCount, double preemptivePageQueryRatio )
     {
       if( dispatcher == null )
         throw new ArgumentNullException( "dispatcher" );
@@ -64,9 +55,7 @@ namespace Xceed.Wpf.DataGrid
       this.IsConnected = true;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region DISPATCHER PROPERTY
+    #region Dispatcher Property
 
     public Dispatcher Dispatcher
     {
@@ -74,8 +63,7 @@ namespace Xceed.Wpf.DataGrid
       private set;
     }
 
-    #endregion DISPATCHER PROPERTY
-
+    #endregion
 
     #region PageSize Property
 
@@ -87,7 +75,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PageSize Property
+    #endregion
 
     #region MaxRealizedItemCount Property
 
@@ -99,7 +87,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion MaxRealizedItemCount Property
+    #endregion
 
     #region PreemptivePageQueryRatio Property
 
@@ -115,7 +103,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PreemptivePageQueryRatio Property
+    #endregion
 
     #region ManagedLists Property
 
@@ -124,15 +112,17 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_readOnlyManagedLists == null )
+        {
           m_readOnlyManagedLists = new ReadOnlyCollection<VirtualList>( m_managedLists );
+        }
 
         return m_readOnlyManagedLists;
       }
     }
 
-    #endregion ManagedLists Property
+    #endregion
 
-    #region IsDisposed Private Property
+    #region IsDisposed Property
 
     protected bool IsDisposed
     {
@@ -148,7 +138,47 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region RestartingManager Private Property
+    #region EstimatedTotalPageCount Property
+
+    internal int EstimatedTotalPageCount
+    {
+      get
+      {
+        return m_maxRemovablePageCount + VirtualPageManager.EstimatedLockedPageCount;
+      }
+    }
+
+    #endregion
+
+    #region Version Property
+
+    internal int Version
+    {
+      get
+      {
+        return m_version;
+      }
+    }
+
+    #endregion
+
+    #region IsConnected Property
+
+    internal bool IsConnected
+    {
+      get
+      {
+        return m_flags[ ( int )VirtualPageManagerFlags.IsConnected ];
+      }
+      private set
+      {
+        m_flags[ ( int )VirtualPageManagerFlags.IsConnected ] = value;
+      }
+    }
+
+    #endregion
+
+    #region RestartingManager Property
 
     private bool RestartingManager
     {
@@ -164,7 +194,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ShouldRefreshAfterRestart Private Property
+    #region ShouldRefreshAfterRestart Property
 
     private bool ShouldRefreshAfterRestart
     {
@@ -180,34 +210,50 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region LastRemovable Property
 
-    #region DATA VIRTUALIZATION METHODS
-
-    protected virtual void OnVirtualPageManagerRestarting()
+    private LinkedListNode<VirtualPage> LastRemovable
     {
+      get
+      {
+        LinkedListNode<VirtualPage> lastRemovableNode = m_pageNodes.Last;
+
+        while( lastRemovableNode != null )
+        {
+          Debug.Assert( lastRemovableNode.Value != null );
+
+          VirtualPage page = lastRemovableNode.Value;
+
+          if( page.IsRemovable )
+            return lastRemovableNode;
+
+          lastRemovableNode = lastRemovableNode.Previous;
+        }
+
+        return lastRemovableNode;
+      }
     }
 
-    protected virtual void OnVirtualPageManagerRestarted( bool shouldRefresh )
+    #endregion
+
+    protected abstract int OnQueryItemCountCore( VirtualList virtualList );
+
+    protected virtual void OnVirtualPageManagerRestarting()
     {
     }
 
-    internal void QueueQueryData( VirtualPage page )
+    protected virtual void OnVirtualPageManagerRestarted( bool shouldRefresh )
     {
-      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
-      page.QueueQueryData( this.Dispatcher );
     }
 
-    internal void QueueCommitData( VirtualPage page )
+    protected virtual void EndRestart()
     {
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "QueueCommitData for page " + page.ToString() );
-      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
-      Debug.Assert( page.IsFilled );
-      Debug.Assert( page.IsDirty );
+      this.RestartingManager = false;
 
-      if( this.RestartingManager )
-        this.ShouldRefreshAfterRestart = true;
+      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualPageManager (" + this.GetHashCode() + ")- All virtual Lists restarted." );
 
-      page.QueueCommitData( this.Dispatcher );
+      this.OnVirtualPageManagerRestarted( this.ShouldRefreshAfterRestart );
+      this.ShouldRefreshAfterRestart = false;
     }
 
     protected internal abstract void OnBuiltInAbort( VirtualPage virtualPage, AsyncQueryInfo queryInfo );
@@ -217,13 +263,10 @@ namespace Xceed.Wpf.DataGrid
       return this.OnQueryItemCountCore( virtualList );
     }
 
-    protected abstract int OnQueryItemCountCore( VirtualList virtualList );
-
     protected internal abstract void OnQueryItems( VirtualPage page, AsyncQueryInfo queryInfo );
 
     protected internal virtual void OnAbortQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
     {
-
     }
 
     protected internal virtual void OnQueryItemsCompleted( VirtualPage page, AsyncQueryInfo queryInfo, object[] fetchedItems )
@@ -250,174 +293,139 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    #endregion DATA VIRTUALIZATION METHODS
-
-    #region PAGE MANAGEMENT
-
-    internal List<LinkedListNode<VirtualPage>> GetUnlockedPendingFillNodes()
+    internal virtual void OnVirtualListRestarting( VirtualList virtualList )
     {
-      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = new List<LinkedListNode<VirtualPage>>();
+      Debug.Assert( m_managedLists.Contains( virtualList ) );
+      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
+    }
 
-      LinkedListNode<VirtualPage> lastUnlockedPendingFillNode = m_pageNodes.Last;
+    internal virtual void OnVirtualListRestarted( VirtualList virtualList )
+    {
+      Debug.Assert( m_managedLists.Contains( virtualList ) );
+      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
 
-      while( lastUnlockedPendingFillNode != null )
+      if( this.RestartingManager )
       {
-        VirtualPage page = lastUnlockedPendingFillNode.Value;
-
-        Debug.Assert( page != null );
-
-        if( ( !page.IsLocked ) && ( !page.IsFilled ) )
-        {
-          unlockedPendingFillNodes.Add( lastUnlockedPendingFillNode );
-        }
-
-        lastUnlockedPendingFillNode = lastUnlockedPendingFillNode.Previous;
+        m_restartingListsCount--;
       }
 
-      return unlockedPendingFillNodes;
-    }
-
-    private LinkedListNode<VirtualPage> LastRemovable
-    {
-      get
+      // Make sure that no page nodes belonging to this virtual list are left in the linked list. Remove all remaining ones since after the manager is restarted, its content is completely cleared.
+      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
+      while( pageNode != null )
       {
-        LinkedListNode<VirtualPage> lastRemovableNode = m_pageNodes.Last;
-
-        while( lastRemovableNode != null )
-        {
-          Debug.Assert( lastRemovableNode.Value != null );
+        LinkedListNode<VirtualPage> previousNode = pageNode.Previous;
 
-          VirtualPage page = lastRemovableNode.Value;
+        if( pageNode.Value.ParentVirtualList == virtualList )
+          throw new DataGridInternalException( "A VirtualPage was not remove from its parent VirtualList after it is restarted" );
 
-          if( page.IsRemovable )
-            return lastRemovableNode;
+        pageNode = previousNode;
+      }
 
-          lastRemovableNode = lastRemovableNode.Previous;
-        }
+      this.IncrementVersion();
 
-        return lastRemovableNode;
+      // If the manager is restarting, no page left and no more list restarting
+      if( this.RestartingManager && ( m_pageNodes.Count == 0 ) && ( m_restartingListsCount == 0 ) )
+      {
+        this.EndRestart();
       }
     }
 
-    internal void CleanUpAndDisposeUnused()
+    internal virtual void OnVirtualListPageRestarting( VirtualList virtualList, VirtualPage page )
     {
-      // Remove the less used unlocked pages.  This will also ask to save it.
-      //
-      // Also remove all pending fill pages which are not locked wether or not we are under the max unlocked page count.
-      // This is so the abort query event is raised so that the user can abort his fetching of data.
-
-
-      // Start with the unlocked pending fill pages since it is mandatory to remove them all in order to abort the async
-      // data fetching.  
-      // The first node in the list returned by the GetUnlockedPendingFillNodes method is the oldest one, so we can start
-      // removing from the beginning of the returned list.
-      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = this.GetUnlockedPendingFillNodes();
-
-      int unlockedPendingFillCount = unlockedPendingFillNodes.Count;
+      Debug.Assert( m_managedLists.Contains( virtualList ) );
 
-      for( int i = 0; i < unlockedPendingFillCount; i++ )
-      {
-        this.QueueCommitDataOrAbortIfRequired( unlockedPendingFillNodes[ i ], true );
-      }
+      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Find( page );
 
-      // Then, move on to removing the other unlocked pages not up for commit, if we are above the max item in memory limit.
-      // There should not be any pending fill pages left which are not locked.
+      Debug.Assert( pageNode != null );
 
-      int removablePageItemCount = this.GetRemovablePageItemCount();
+      // RemovePageNode takes care of either raising the AbortQueryData event or aborting the QueryData Dispatcher Operation altogether.
+      // It also takes care of raising the CommitVirtualData event for loaded pages which contains modified data.
+      this.QueueCommitDataOrAbortIfRequired( pageNode, false );
+    }
 
-      while( removablePageItemCount > m_maxRealizedItemCount )
-      {
-        LinkedListNode<VirtualPage> lastRemovable = this.LastRemovable;
+    internal virtual void OnVirtualListPageRestarted( VirtualList virtualList, VirtualPage page )
+    {
+      Debug.Assert( m_managedLists.Contains( virtualList ) );
+      Debug.Assert( m_pageNodes.Contains( page ) );
 
-        Debug.Assert( lastRemovable != null );
+      this.RemovePage( page );
+    }
 
-        removablePageItemCount -= lastRemovable.Value.Count;
+    internal void QueueQueryData( VirtualPage page )
+    {
+      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
 
-        this.QueueCommitDataOrAbortIfRequired( lastRemovable, true );
-      }
+      page.QueueQueryData( this.Dispatcher );
     }
 
-    private int GetRemovablePageCount()
+    internal void QueueCommitData( VirtualPage page )
     {
-      int removablePageCount = 0;
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
+      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "QueueCommitData for page " + page.ToString() );
+      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
+      Debug.Assert( page.IsFilled );
+      Debug.Assert( page.IsDirty );
 
-      while( pageNode != null )
+      if( this.RestartingManager )
       {
-        VirtualPage page = pageNode.Value;
-
-        Debug.Assert( page != null );
-
-        if( ( page != null ) && ( page.IsRemovable ) )
-          removablePageCount++;
-
-        pageNode = pageNode.Previous;
+        this.ShouldRefreshAfterRestart = true;
       }
 
-      return removablePageCount;
+      page.QueueCommitData( this.Dispatcher );
     }
 
-    private int GetRemovablePageItemCount()
+    internal List<LinkedListNode<VirtualPage>> GetUnlockedPendingFillNodes()
     {
-      int removablePageItemCount = 0;
+      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = new List<LinkedListNode<VirtualPage>>();
 
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
+      LinkedListNode<VirtualPage> lastUnlockedPendingFillNode = m_pageNodes.Last;
 
-      while( pageNode != null )
+      while( lastUnlockedPendingFillNode != null )
       {
-        VirtualPage page = pageNode.Value;
+        VirtualPage page = lastUnlockedPendingFillNode.Value;
 
         Debug.Assert( page != null );
 
-        if( ( page != null ) && ( page.IsRemovable ) )
+        if( ( !page.IsLocked ) && ( !page.IsFilled ) )
         {
-          removablePageItemCount += page.Count;
+          unlockedPendingFillNodes.Add( lastUnlockedPendingFillNode );
         }
 
-        pageNode = pageNode.Previous;
+        lastUnlockedPendingFillNode = lastUnlockedPendingFillNode.Previous;
       }
 
-      return removablePageItemCount;
+      return unlockedPendingFillNodes;
     }
 
-    private void QueueCommitDataOrAbortIfRequired(
-      LinkedListNode<VirtualPage> pageNode,
-      bool removeAfterOperation )
+    internal void CleanUpAndDisposeUnused()
     {
-      VirtualPage page = pageNode.Value;
+      // Remove the less used unlocked pages.  This will also ask to save it.
 
-      // Update the flag in case this page must be removed
-      // after an abort or commit operation
-      page.RemoveAfterOperation = removeAfterOperation;
+      // Also remove all pending fill pages which are not locked wether or not we are under the max unlocked page count.
+      // This is so the abort query event is raised so that the user can abort his fetching of data.
 
-      // The only circumstance when we should remove a page which is not removable is if we are restarting.
-      Debug.Assert( ( page != null )
-                    && ( !page.IsDisposed )
-                    && ( ( page.IsRemovable ) || ( page.ParentVirtualList.IsRestarting ) ) );
+      // Start with the unlocked pending fill pages since it is mandatory to remove them all in order to abort the async data fetching.  
+      // The first node in the list returned by the GetUnlockedPendingFillNodes method is the oldest one, so we can start removing from the beginning of the returned list.
+      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = this.GetUnlockedPendingFillNodes();
 
-      if( page.IsDirty )
-      {
-        // Don't remove pages which contains modifications.  We'll remove them from the book when they are committed, if they
-        // aren't locked.
-        this.QueueCommitData( page );
-      }
-      else if( !page.IsFilled )
+      int unlockedPendingFillCount = unlockedPendingFillNodes.Count;
+
+      for( int i = 0; i < unlockedPendingFillCount; i++ )
       {
-        // The page is not filled, we must send abort
-        // the QueryData for this page in case it was sent
-        page.AbortQueryDataOperation();
+        this.QueueCommitDataOrAbortIfRequired( unlockedPendingFillNodes[ i ], true );
       }
 
-      // The page must be removed after operation
-      // and it has nothing to commit and is not 
-      // currently aborting an operation. It is safe
-      // to remove it
-      if( removeAfterOperation
-          && !page.IsCommitPending
-          && !page.IsAborting )
+      // Then, move on to removing the other unlocked pages not up for commit, if we are above the max item in memory limit.  There should not be any pending fill pages left which are not locked.
+      int removablePageItemCount = this.GetRemovablePageItemCount();
+
+      while( removablePageItemCount > m_maxRealizedItemCount )
       {
-        this.RemovePage( page );
+        LinkedListNode<VirtualPage> lastRemovable = this.LastRemovable;
+
+        Debug.Assert( lastRemovable != null );
+
+        removablePageItemCount -= lastRemovable.Value.Count;
+
+        this.QueueCommitDataOrAbortIfRequired( lastRemovable, true );
       }
     }
 
@@ -427,8 +435,6 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       Debug.Assert( page != null );
-      //Debug.Assert( !page.IsRestarting );
-
       Debug.Assert( !page.IsDirty );
 
       // A filled page is being removed.  Change the version.
@@ -455,7 +461,6 @@ namespace Xceed.Wpf.DataGrid
       if( firstNode.Value != page )
       {
         LinkedListNode<VirtualPage> node = m_pageNodes.Find( page );
-
         m_pageNodes.Remove( node );
         m_pageNodes.AddFirst( node );
 
@@ -468,8 +473,7 @@ namespace Xceed.Wpf.DataGrid
       if( page == null )
         throw new ArgumentNullException( "page", "TODOOC: An internal error occured while paging data. Page cannot be null." );
 
-      // We call clean-up before the call to AddFirst since if we do 
-      // it afterward and the page is pending fill, we will remove it.
+      // We call clean-up before the call to AddFirst since if we do it afterward and the page is pending fill, we will remove it.
       this.CleanUpAndDisposeUnused();
 
       if( insertPosition == PageInsertPosition.Front )
@@ -484,16 +488,13 @@ namespace Xceed.Wpf.DataGrid
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Added To " + ( ( insertPosition == PageInsertPosition.Front ) ? "Front" : "Back" ) + ": Page " + page.ToString() );
     }
 
-    #endregion PAGE MANAGEMENT
-
-    #region RESTART MANAGEMENT
-
     internal void Restart()
     {
       if( this.RestartingManager )
         return;
 
       this.RestartingManager = true;
+
       Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualPageManager (" + this.GetHashCode() + ") - Restarting all virtual Lists. " );
 
       this.OnVirtualPageManagerRestarting();
@@ -517,115 +518,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected virtual void EndRestart()
-    {
-      this.RestartingManager = false;
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualPageManager (" + this.GetHashCode() + ")- All virtual Lists restarted." );
-
-      this.OnVirtualPageManagerRestarted( this.ShouldRefreshAfterRestart );
-
-      this.ShouldRefreshAfterRestart = false;
-    }
-
-    internal virtual void OnVirtualListRestarting( VirtualList virtualList )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
-    }
-
-    internal virtual void OnVirtualListRestarted( VirtualList virtualList )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
-
-      if( this.RestartingManager )
-        m_restartingListsCount--;
-
-      // Make sure that no page nodes belonging to this virtual 
-      // list are left in the linked list. Remove all remaining ones
-      // since after the manager is restarted, its content is 
-      // completely cleared
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
-      while( pageNode != null )
-      {
-        LinkedListNode<VirtualPage> previousNode = pageNode.Previous;
-
-        if( pageNode.Value.ParentVirtualList == virtualList )
-          throw new DataGridInternalException( "A VirtualPage was not remove from its parent VirtualList after it is restarted" );
-
-        pageNode = previousNode;
-      }
-
-      this.IncrementVersion();
-
-      // If the manager is restarting, no page left and no more list restarting
-      if( this.RestartingManager
-          && ( m_pageNodes.Count == 0 )
-          && ( m_restartingListsCount == 0 ) )
-      {
-        this.EndRestart();
-      }
-    }
-
-    internal virtual void OnVirtualListPageRestarting( VirtualList virtualList, VirtualPage page )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Find( page );
-
-      Debug.Assert( pageNode != null );
-
-      // RemovePageNode takes care of either raising the AbortQueryData event or aborting the QueryData Dispatcher Operation altogether.
-      // It also takes care of raising the CommitVirtualData event for loaded pages which contains modified data.
-      this.QueueCommitDataOrAbortIfRequired( pageNode, false );
-    }
-
-    internal virtual void OnVirtualListPageRestarted( VirtualList virtualList, VirtualPage page )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-      Debug.Assert( m_pageNodes.Contains( page ) );
-      this.RemovePage( page );
-    }
-
-    #endregion RESTART MANAGEMENT
-
-
-    #region INTERNAL PROPERTIES
-
-    internal int EstimatedTotalPageCount
-    {
-      get
-      {
-        return m_maxRemovablePageCount + VirtualPageManager.EstimatedLockedPageCount;
-      }
-    }
-
-    internal int Version
-    {
-      get
-      {
-        return m_version;
-      }
-    }
-
-    internal bool IsConnected
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualPageManagerFlags.IsConnected ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualPageManagerFlags.IsConnected ] = value;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
     internal void Disconnect()
     {
       this.IsConnected = false;
@@ -654,6 +546,7 @@ namespace Xceed.Wpf.DataGrid
         if( virtualList.IsAsyncCommitQueuedForItem( item ) )
         {
           Debug.Assert( !( item is EmptyDataItem ), "A commit operation should not have been queued for an EmptyDataItem." );
+
           return true;
         }
 
@@ -676,6 +569,7 @@ namespace Xceed.Wpf.DataGrid
         if( virtualList.IsItemDirty( item ) )
         {
           Debug.Assert( !( item is EmptyDataItem ), "An EmptyDataItem should not have been flagged as dirty." );
+
           return true;
         }
 
@@ -768,7 +662,9 @@ namespace Xceed.Wpf.DataGrid
         Debug.Assert( m_managedLists.Contains( virtualList ) );
 
         if( !currentVirtualLists.Contains( virtualList ) )
+        {
           currentVirtualLists.Add( virtualList );
+        }
 
         pageNode = pageNode.Next;
       }
@@ -781,67 +677,95 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion INTERNAL METHODS
+    private int GetRemovablePageCount()
+    {
+      int removablePageCount = 0;
 
-    #region PRIVATE METHODS
+      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
 
-    private void IncrementVersion()
-    {
-      unchecked
+      while( pageNode != null )
       {
-        m_version++;
-      }
-    }
+        VirtualPage page = pageNode.Value;
 
-    #endregion PRIVATE METHODS
+        Debug.Assert( page != null );
 
-    #region PRIVATE FIELDS
+        if( ( page != null ) && ( page.IsRemovable ) )
+        {
+          removablePageCount++;
+        }
 
-    private int m_version;
-    private int m_restartingListsCount;
+        pageNode = pageNode.Previous;
+      }
 
-    private BitVector32 m_flags = new BitVector32();
+      return removablePageCount;
+    }
 
-    private LinkedList<VirtualPage> m_pageNodes;
+    private int GetRemovablePageItemCount()
+    {
+      int removablePageItemCount = 0;
 
-    private List<VirtualList> m_managedLists;
-    private ReadOnlyCollection<VirtualList> m_readOnlyManagedLists;
+      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
 
-    private int m_pageSize;
-    private int m_maxRealizedItemCount;
-    private double m_preemptivePageQueryRatio;
-    private int m_maxRemovablePageCount;
+      while( pageNode != null )
+      {
+        VirtualPage page = pageNode.Value;
 
-    #endregion PRIVATE FIELDS
+        Debug.Assert( page != null );
 
+        if( ( page != null ) && ( page.IsRemovable ) )
+        {
+          removablePageItemCount += page.Count;
+        }
 
-    #region PageInsertPosition private Enum
+        pageNode = pageNode.Previous;
+      }
 
-    internal enum PageInsertPosition
-    {
-      Front = 0,
-      Back = 1
+      return removablePageItemCount;
     }
 
-    #endregion
+    private void QueueCommitDataOrAbortIfRequired( LinkedListNode<VirtualPage> pageNode, bool removeAfterOperation )
+    {
+      VirtualPage page = pageNode.Value;
 
-    #region VirtualPageManagerFlags Enum
+      // Update the flag in case this page must be removed after an abort or commit operation
+      page.RemoveAfterOperation = removeAfterOperation;
 
-    private enum VirtualPageManagerFlags
-    {
-      RestartingManager = 1,
-      ShouldRefreshAfterRestart = 2,
-      IsDisposed = 4,
-      IsConnected = 8,
+      // The only circumstance when we should remove a page which is not removable is if we are restarting.
+      Debug.Assert( ( page != null ) && ( !page.IsDisposed ) && ( ( page.IsRemovable ) || ( page.ParentVirtualList.IsRestarting ) ) );
+
+      if( page.IsDirty )
+      {
+        // Don't remove pages which contains modifications.  We'll remove them from the book when they are committed, if they aren't locked.
+        this.QueueCommitData( page );
+      }
+      else if( !page.IsFilled )
+      {
+        // The page is not filled, we must send abort the QueryData for this page in case it was sent
+        page.AbortQueryDataOperation();
+      }
+
+      // The page must be removed after operation and it has nothing to commit and is not  currently aborting an operation. It is safe to remove it
+      if( removeAfterOperation && !page.IsCommitPending && !page.IsAborting )
+      {
+        this.RemovePage( page );
+      }
     }
 
-    #endregion
+    private void IncrementVersion()
+    {
+      unchecked
+      {
+        m_version++;
+      }
+    }
 
     #region IDisposable Members
 
     public void Dispose()
     {
+
       this.DisposeCore();
+
     }
 
     protected virtual void DisposeCore()
@@ -860,5 +784,34 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    private int m_version;
+    private int m_restartingListsCount;
+
+    private BitVector32 m_flags = new BitVector32();
+
+    private LinkedList<VirtualPage> m_pageNodes;
+
+    private List<VirtualList> m_managedLists;
+    private ReadOnlyCollection<VirtualList> m_readOnlyManagedLists;
+
+    private int m_pageSize;
+    private int m_maxRealizedItemCount;
+    private double m_preemptivePageQueryRatio;
+    private int m_maxRemovablePageCount;
+
+    internal enum PageInsertPosition
+    {
+      Front = 0,
+      Back = 1
+    }
+
+    private enum VirtualPageManagerFlags
+    {
+      RestartingManager = 1,
+      ShouldRefreshAfterRestart = 2,
+      IsDisposed = 4,
+      IsConnected = 8,
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
index 83aaf5df..0abec623 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
@@ -14,7 +14,9 @@
 
   ***********************************************************************************/
 
+using System;
 using System.Collections;
+using System.Data;
 using System.Windows;
 
 namespace Xceed.Wpf.DataGrid
@@ -23,6 +25,7 @@ namespace Xceed.Wpf.DataGrid
   {
     public DataGridForeignKeyDescription()
     {
+      this.SetForeignKeyConverter();
     }
 
     #region ForeignKeyConverter Property
@@ -122,5 +125,102 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    protected virtual void SetForeignKeyConverter()
+    {
+      this.ForeignKeyConverter = new DataGridForeignKeyConverter();
+    }
+
+    internal Type GetDataType()
+    {
+      var itemsSource = this.ItemsSource;
+      if( itemsSource == null )
+        return null;
+
+      var displayMemberPath = this.DisplayMemberPath;
+      var foreignKeyConverter = this.ForeignKeyConverter;
+
+      if( string.IsNullOrWhiteSpace( displayMemberPath ) && ( foreignKeyConverter == null ) )
+        return null;
+
+      try
+      {
+        //Use the DisplayMemberPath or the ForeignKeyConverter to find the converted value data type, using a DataRowView or reflection.
+        if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
+        {
+          foreach( object item in itemsSource )
+          {
+            var dataRowView = item as DataRowView;
+            if( dataRowView == null )
+              continue;
+
+            if( !string.IsNullOrWhiteSpace( displayMemberPath ) )
+            {
+              var dataColumn = dataRowView.Row.Table.Columns[ displayMemberPath ];
+              if( dataColumn != null )
+              {
+                return dataColumn.DataType;
+              }
+            }
+            else
+            {
+              var valuePath = this.ValuePath;
+              if( valuePath != null )
+              {
+                var key = dataRowView[ valuePath ];
+                var value = foreignKeyConverter.GetValueFromKey( key, this );
+                if( value != null )
+                {
+                  return value.GetType();
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          foreach( object item in itemsSource )
+          {
+            if( item == null )
+              continue;
+
+            if( !string.IsNullOrWhiteSpace( displayMemberPath ) )
+              return item.GetType().GetProperty( displayMemberPath ).PropertyType;
+
+            if( item is Enum )
+              return item.GetType();
+
+            var valuePath = this.ValuePath;
+            if( valuePath != null )
+            {
+              var key = item.GetType().GetProperty( valuePath ).GetValue( item, null );
+              var value = foreignKeyConverter.GetValueFromKey( key, this );
+              if( value != null )
+              {
+                return value.GetType();
+              }
+            }
+          }
+        }
+      }
+      catch
+      {
+        //Swallow the exception, no need to terminate the application, since the original value will be exported.
+      }
+
+      return null;
+    }
+
+    internal object GetDisplayValue( object fieldValue )
+    {
+      if( fieldValue == null )
+        return null;
+
+      var foreignKeyConverter = this.ForeignKeyConverter;
+      if( foreignKeyConverter != null )
+        return foreignKeyConverter.GetValueFromKey( fieldValue, this );
+
+      return fieldValue;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
index d765727b..816d0cd3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
@@ -21,11 +21,8 @@ namespace Xceed.Wpf.DataGrid
 {
   public class DataTableForeignKeyDescription : DataGridForeignKeyDescription
   {
-    #region CONSTRUCTORS
-
     public DataTableForeignKeyDescription()
     {
-      this.ForeignKeyConverter = new DataTableForeignKeyConverter();
     }
 
     internal DataTableForeignKeyDescription( ForeignKeyConstraint constraint )
@@ -34,8 +31,6 @@ namespace Xceed.Wpf.DataGrid
       this.ForeignKeyConstraint = constraint;
     }
 
-    #endregion
-
     #region ForeignKeyConstraint Property
 
     public static readonly DependencyProperty ForeignKeyConstraintProperty = DependencyProperty.Register(
@@ -70,7 +65,10 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region PRIVATE METHODS
+    protected override void SetForeignKeyConverter()
+    {
+      this.ForeignKeyConverter = new DataTableForeignKeyConverter();
+    }
 
     private void UpdateValuePath()
     {
@@ -111,7 +109,5 @@ namespace Xceed.Wpf.DataGrid
 
       this.ItemsSource = relatedTable.DefaultView;
     }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
index db3b3f9e..e06f09cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
@@ -15,19 +15,14 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Threading;
-using System.Diagnostics;
 using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid
 {
   public class AsyncQueryInfo : IDisposable
   {
-    #region CONSTRUCTORS
-
     internal AsyncQueryInfo(
       Dispatcher dispatcher,
       Action<AsyncQueryInfo> beginQueryDelegate,
@@ -50,34 +45,6 @@ namespace Xceed.Wpf.DataGrid
       m_requestedItemCount = requestedItemCount;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region BeginQueryDelegateInvoked Private Property
-
-    private bool BeginQueryDelegateInvoked
-    {
-      get
-      {
-        return m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ];
-      }
-      set
-      {
-        m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ] = value;
-      }
-    }
-
-    #endregion
-
-    #region EndQueryDelegateDispatcherOperation Private Property
-
-    private DispatcherOperation EndQueryDelegateDispatcherOperation
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
     #region StartIndex Property
 
     public int StartIndex
@@ -88,7 +55,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion StartIndex Property
+    #endregion
 
     #region RequestedItemCount Property
 
@@ -100,23 +67,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion RequestedItemCount  Property
-
-    #region ShouldAbort Property
-
-    public bool ShouldAbort
-    {
-      get
-      {
-        return m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ];
-      }
-      private set
-      {
-        m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ] = value;
-      }
-    }
-
-    #endregion ShouldAbort Property
+    #endregion
 
     #region AsyncState Property
 
@@ -126,7 +77,7 @@ namespace Xceed.Wpf.DataGrid
       set;
     }
 
-    #endregion AsyncState Property
+    #endregion
 
     #region Error Property
 
@@ -146,18 +97,31 @@ namespace Xceed.Wpf.DataGrid
 
           if( m_queryErrorChangedDelegate != null )
           {
-            m_dispatcher.Invoke(
-              DispatcherPriority.Send,
-              m_queryErrorChangedDelegate,
-              this );
+            m_dispatcher.Invoke( DispatcherPriority.Send, m_queryErrorChangedDelegate, this );
           }
         }
       }
     }
 
-    #endregion Error Property
+    #endregion
+
+    #region ShouldAbort Property
+
+    public bool ShouldAbort
+    {
+      get
+      {
+        return m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ];
+      }
+      private set
+      {
+        m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ] = value;
+      }
+    }
+
+    #endregion
 
-    #region IsDisposed Internal Property
+    #region IsDisposed Property
 
     internal bool IsDisposed
     {
@@ -173,7 +137,21 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region PUBLIC METHODS
+    #region BeginQueryDelegateInvoked Property
+
+    private bool BeginQueryDelegateInvoked
+    {
+      get
+      {
+        return m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ];
+      }
+      set
+      {
+        m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ] = value;
+      }
+    }
+
+    #endregion
 
     public void EndQuery( object[] items )
     {
@@ -181,21 +159,15 @@ namespace Xceed.Wpf.DataGrid
       if( this.IsDisposed )
         return;
 
-      if( this.EndQueryDelegateDispatcherOperation != null )
+      if( m_endQueryDelegateDispatcherOperation != null )
         throw new InvalidOperationException( "An attempt was made to call EndQuery when it has already been called for this AsyncQueryInfo." );
 
       if( this.ShouldAbort )
         return;
 
-      this.EndQueryDelegateDispatcherOperation = 
-        m_dispatcher.BeginInvoke( DispatcherPriority.Background, m_endQueryDelegate,
-        this, new object[] { items } );
+      m_endQueryDelegateDispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Background, m_endQueryDelegate, this, new object[] { items } );
     }
 
-    #endregion PUBLIC METHODS
-
-    #region INTERNAL METHODS
-
     internal void QueueQuery()
     {
       Debug.Assert( !this.IsDisposed, "The AsyncQueryInfo is disposed" );
@@ -203,71 +175,51 @@ namespace Xceed.Wpf.DataGrid
       this.ShouldAbort = false;
       this.BeginQueryDelegateInvoked = false;
 
-      var endQueryDelegateOperation = this.EndQueryDelegateDispatcherOperation;
-      if( endQueryDelegateOperation != null )
+      //Make sure to abort the EndQuery operation before queuing a new query.
+      if( m_endQueryDelegateDispatcherOperation != null )
       {
-        this.EndQueryDelegateDispatcherOperation.Abort();
-        this.EndQueryDelegateDispatcherOperation = null;
+        m_endQueryDelegateDispatcherOperation.Abort();
+        m_endQueryDelegateDispatcherOperation = null;
       }
 
 #if SILVERLIGHT
       m_dispatcher.BeginInvoke( new Action( this.BeginQuery ) );
 #else
-      m_beginQueryDispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Background,
-        new Action( this.BeginQueryDispatcherCallback ) );
+      m_beginQueryDispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( this.BeginQueryDispatcherCallback ) );
 #endif
     }
 
-    private void BeginQueryDispatcherCallback()
-    {
-      m_beginQueryDispatcherOperation = null;
-
-      Debug.Assert( !this.IsDisposed );
-
-      if( this.ShouldAbort )
-      {
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "BUILT-IN BeginQueryDispatcherCallback Aborted! (" + this.GetHashCode() + ") For page at starting index: " + m_startIndex.ToString() );
-        m_builtInAbortDelegate( this );
-        return;
-      }
-
-      m_beginQueryDelegate( this );
-      this.BeginQueryDelegateInvoked = true;
-    }
-
     internal void AbortQuery()
     {
       Debug.Assert( !this.IsDisposed );
 
-      // Already dispatcher on the UI Thread the method that will fill the page.  
-      // If it did have one, we would have invoked instead of BeginInvoked the endQuery delegate.
-      var endQueryDelegateOperation = this.EndQueryDelegateDispatcherOperation;
-      if( endQueryDelegateOperation != null )
+      // Make sure to abort the EndQuery operation before queuing an abort query.
+      if( m_endQueryDelegateDispatcherOperation != null )
       {
-        this.EndQueryDelegateDispatcherOperation.Abort();
-        this.EndQueryDelegateDispatcherOperation = null;
+        m_endQueryDelegateDispatcherOperation.Abort();
+        m_endQueryDelegateDispatcherOperation = null;
       }
 
       if( this.ShouldAbort )
       {
         Debug.Assert( m_beginQueryDispatcherOperation == null );
+
         m_builtInAbortDelegate( this );
         return;
       }
 
       this.ShouldAbort = true;
 
-      // If the BeginQuery already had time to execute, then we know the user was notified of the query request.  
-      // Notify him to cancel the query as soon as possible.
+      // If the BeginQuery already had time to execute, then we know the user was notified of the query request.  Notify him to cancel the query as soon as possible.
       if( this.BeginQueryDelegateInvoked )
       {
         Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "CALLING Abort Query! For page at starting index: " + m_startIndex.ToString() );
+
         m_dispatcher.BeginInvoke( DispatcherPriority.Send, m_abortQueryDelegate, this );
       }
       else
       {
-        // BeginQueryDispatcherCallback was dispatched
-        // but not executed yet, abort it and return
+        // BeginQueryDispatcherCallback was dispatched but not executed yet, abort it and return
         if( m_beginQueryDispatcherOperation != null )
         {
           m_beginQueryDispatcherOperation.Abort();
@@ -278,9 +230,43 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion INTERNAL METHODS
+    private void BeginQueryDispatcherCallback()
+    {
+      m_beginQueryDispatcherOperation = null;
+
+      Debug.Assert( !this.IsDisposed );
+
+      if( this.ShouldAbort )
+      {
+        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "BUILT-IN BeginQueryDispatcherCallback Aborted! (" + this.GetHashCode() + ") For page at starting index: " + m_startIndex.ToString() );
+
+        m_builtInAbortDelegate( this );
+        return;
+      }
+
+      m_beginQueryDelegate( this );
+      this.BeginQueryDelegateInvoked = true;
+    }
 
-    #region PRIVATE FIELDS
+    #region IDisposable Members
+
+    public void Dispose()
+    {
+      m_dispatcher = null;
+
+      Debug.Assert( m_beginQueryDispatcherOperation == null, "A BeginQueryDispatcherCallback is still pending on the Dispatcher" );
+
+      m_beginQueryDispatcherOperation = null;
+      m_builtInAbortDelegate = null;
+      m_abortQueryDelegate = null;
+      m_beginQueryDelegate = null;
+      m_endQueryDelegate = null;
+      m_queryErrorChangedDelegate = null;
+
+      this.IsDisposed = true;
+    }
+
+    #endregion
 
     private int m_startIndex;
     private int m_requestedItemCount;
@@ -292,16 +278,13 @@ namespace Xceed.Wpf.DataGrid
     private Dispatcher m_dispatcher;
 
     private DispatcherOperation m_beginQueryDispatcherOperation;
+    private DispatcherOperation m_endQueryDelegateDispatcherOperation;
     private Action<AsyncQueryInfo> m_builtInAbortDelegate;
     private Action<AsyncQueryInfo> m_beginQueryDelegate;
     private Action<AsyncQueryInfo> m_abortQueryDelegate;
     private Action<AsyncQueryInfo, object[]> m_endQueryDelegate;
     private Action<AsyncQueryInfo> m_queryErrorChangedDelegate;
 
-    #endregion PRIVATE FIELDS
-
-    #region AsyncQueryInfoFlags Private Enum
-
     [Flags]
     private enum AsyncQueryInfoFlags
     {
@@ -310,27 +293,5 @@ namespace Xceed.Wpf.DataGrid
       BeginQueryDelegateInvoked = 4,
       IsDisposed = 8,
     }
-
-    #endregion
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      m_dispatcher = null;
-
-      Debug.Assert( m_beginQueryDispatcherOperation == null, "A BeginQueryDispatcherCallback is still pending on the Dispatcher" );
-
-      m_beginQueryDispatcherOperation = null;
-      m_builtInAbortDelegate = null;
-      m_abortQueryDelegate = null;
-      m_beginQueryDelegate = null;
-      m_endQueryDelegate = null;
-      m_queryErrorChangedDelegate = null;
-
-      this.IsDisposed = true;
-    }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs
deleted file mode 100644
index 259b4e41..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.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.Collections.Specialized;
-using System.Collections.ObjectModel;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class AutoFilterValuesChangedEventArgs : EventArgs
-  {
-    internal AutoFilterValuesChangedEventArgs(
-      DataGridDetailDescription detailDescription,
-      DataGridItemPropertyBase itemProperty,
-      IList autoFilterValues,
-      NotifyCollectionChangedEventArgs collectionChangedEvent )
-    {
-      if( itemProperty == null )
-        throw new ArgumentNullException( "itemProperty" );
-
-      if( autoFilterValues == null )
-        throw new ArgumentNullException( "autoFilterValues" );
-
-      if( collectionChangedEvent == null )
-        throw new ArgumentNullException( "collectionChangedEvent" );
-
-      this.DetailDescription = detailDescription;
-      this.ItemProperty = itemProperty;
-      this.CollectionChangedEventArgs = collectionChangedEvent;
-      this.AutoFilterValues = autoFilterValues;
-    }
-
-    internal DataGridDetailDescription DetailDescription
-    {
-      get;
-      private set;
-    }
-
-    public DataGridItemPropertyBase ItemProperty
-    {
-      get;
-      private set;
-    }
-
-    public NotifyCollectionChangedEventArgs CollectionChangedEventArgs
-    {
-      get;
-      private set;
-    }
-
-    public ICollection AutoFilterValues
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
index 7bca758d..0b56e991 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
@@ -46,7 +46,7 @@ namespace Xceed.Wpf.DataGrid
         startIndex = dataGridCollectionViewGroup.GetFirstRawItemGlobalSortedIndex();
         endIndex = startIndex + dataGridCollectionViewGroup.GlobalRawItemCount - 1;
       }
-      else if(collectionViewGroup.ItemCount > 0)
+      else if( collectionViewGroup.ItemCount > 0 )
       {
         if( dataGridContext == null )
           throw new DataGridInternalException( "This collectionViewGroup require a DataGridContext instance" );
@@ -61,8 +61,8 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      return (startIndex >= 0 ) && (startIndex <= endIndex)
-        ? new SelectionRange(startIndex, endIndex)
+      return ( startIndex >= 0 ) && ( startIndex <= endIndex )
+        ? new SelectionRange( startIndex, endIndex )
         : SelectionRange.Empty;
     }
 
@@ -96,7 +96,7 @@ namespace Xceed.Wpf.DataGrid
       {
         if( item is CollectionViewGroup )
         {
-          foreach(var subItem in ( ( CollectionViewGroup )item ).GetLeafItems())
+          foreach( var subItem in ( ( CollectionViewGroup )item ).GetLeafItems() )
           {
             yield return subItem;
           }
@@ -141,7 +141,6 @@ namespace Xceed.Wpf.DataGrid
 
     internal static IEnumerable<CollectionViewGroup> GetSubGroups( this CollectionViewGroup collectionViewGroup )
     {
-
       foreach( var item in collectionViewGroup.GetItems() )
       {
         var subGroup = item as CollectionViewGroup;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
index 7c4ccd74..97e9ce23 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
@@ -33,39 +33,5 @@ namespace Xceed.Wpf.DataGrid
       get;
       set;
     }
-
-    public event EventHandler<CustomDistinctValueItemFilterEventArgs> Filter
-    {
-      add
-      {
-        EventHandler<CustomDistinctValueItemFilterEventArgs> eventHandler = m_filter;
-
-        if( eventHandler != null )
-        {
-          throw new DataGridException( "A Filter event is already registered for this custom distinct value configuration." );
-        }
-        else
-        {
-          m_filter = value;
-        }
-      }
-      remove
-      {
-        // The event handler was not registered on this configuration, ignore it
-        if( ( value != null ) && ( value != m_filter ) )
-          return;
-
-        if( m_filter != null )
-          EventHandler<CustomDistinctValueItemFilterEventArgs>.Remove( m_filter, value );
-      }
-    }
-
-    private event EventHandler<CustomDistinctValueItemFilterEventArgs> m_filter;
-
-    internal void RaiseCustomDistinctValueItemSelectedEvent( CustomDistinctValueItemFilterEventArgs args )
-    {
-      if( m_filter != null )
-        m_filter( this, args );
-    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
index 642346d9..f09e6d94 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
@@ -27,7 +27,6 @@ using System.Threading;
 using System.Windows.Data;
 using Xceed.Utils.Collections;
 using Xceed.Utils.Data;
-using Xceed.Wpf.DataGrid.Stats;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -72,8 +71,6 @@ namespace Xceed.Wpf.DataGrid
       if( collection == null )
         throw new ArgumentNullException( "collection" );
 
-      this.UpdateChangedPropertyStatsOnly = parentDataGridCollectionView.UpdateChangedPropertyStatsOnly;
-
       //If already deferring refreshes while a detail grid is expanded.
       if( parentDataGridCollectionView.InDeferRefresh )
       {
@@ -108,54 +105,6 @@ namespace Xceed.Wpf.DataGrid
       this.RootGroup = new DataGridCollectionViewGroupRoot( this );
     }
 
-    #region StatFunctions Property
-
-    internal StatFunctionCollection StatFunctions
-    {
-      get
-      {
-        return m_statFunctions;
-      }
-    }
-
-    private StatFunctionCollection m_statFunctions; // = null
-
-    #endregion StatFunctions Property
-
-    #region InvalidatedStatFunctions Property
-
-    internal ICollection<StatFunction> InvalidatedStatFunctions
-    {
-      get
-      {
-        return m_invalidatedStatFunctions;
-      }
-    }
-
-    private HashSet<StatFunction> m_invalidatedStatFunctions = new HashSet<StatFunction>();
-
-    #endregion
-
-    #region UpdateChangedPropertyStatsOnly Property
-
-    internal bool UpdateChangedPropertyStatsOnly
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region CalculateChangedPropertyStatsOnly Property
-
-    internal bool CalculateChangedPropertyStatsOnly
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
     #region SourceItems Property
 
     public IList SourceItems
@@ -280,18 +229,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region CanHaveDetails Property
-
-    internal override bool CanHaveDetails
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
     #region SortedItemVersion Property
 
     internal int SortedItemVersion
@@ -338,20 +275,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region RootGroupChanged Internal Event
-
-    internal event EventHandler RootGroupChanged;
-
-    private void OnRootGroupChanged( EventArgs e )
-    {
-      if( this.RootGroupChanged != null )
-      {
-        this.RootGroupChanged( this, e );
-      }
-    }
-
-    #endregion RootGroupChanged Internal Event
-
     public override bool MoveCurrentToPosition( int position )
     {
       if( position == this.CurrentPosition )
@@ -392,10 +315,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( ( !this.IsSourceSupportingChangeNotification ) && ( sourceIndex != -1 ) )
       {
-        DeferredOperation deferredOperation = new DeferredOperation(
-          DeferredOperation.DeferredOperationAction.Remove,
-          sourceIndex,
-          new object[] { dataItem } );
+        DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Remove, sourceIndex, new object[] { dataItem } );
 
         this.ExecuteOrQueueSourceItemOperation( deferredOperation );
       }
@@ -423,11 +343,6 @@ namespace Xceed.Wpf.DataGrid
       this.ExecuteOrQueueSourceItemOperation( deferredOperation );
     }
 
-    public void RefreshDistinctValuesForFieldName( string fieldName )
-    {
-      this.ForceRefreshDistinctValuesForFieldName( fieldName );
-    }
-
     public void RefreshUnboundItemProperties( object item = null )
     {
       DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.RefreshUnboundItemProperties, item );
@@ -456,70 +371,6 @@ namespace Xceed.Wpf.DataGrid
     internal override void CreateDefaultCollections( DataGridDetailDescription parentDetailDescription )
     {
       base.CreateDefaultCollections( parentDetailDescription );
-
-      m_statFunctions = ( parentDetailDescription != null ) ? parentDetailDescription.StatFunctions : new StatFunctionCollection();
-    }
-
-    internal override void RefreshDistinctValuesForField( DataGridItemPropertyBase dataGridItemProperty )
-    {
-      if( dataGridItemProperty == null )
-        return;
-
-      if( !dataGridItemProperty.CalculateDistinctValues )
-        return;
-
-      // List containing current column distinct values, we pass the DistinctvaluesEqualityComparer if any. Null will force the HashTable to use the default one
-      HashSet<object> currentColumnDistinctValues = new HashSet<object>( new EqualityComparerWrapper( dataGridItemProperty.DistinctValuesEqualityComparer ) );
-
-      ReadOnlyObservableHashList readOnlyColumnDistinctValues = null;
-
-      // If the key is not set in DistinctValues yet, do not calculate distinct values for this field
-      if( !( ( DistinctValuesDictionary )this.DistinctValues ).InternalTryGetValue( dataGridItemProperty.Name, out readOnlyColumnDistinctValues ) )
-        return;
-
-      ObservableHashList columnDistinctValues = readOnlyColumnDistinctValues.InnerObservableHashList;
-
-      // We use the DistinctValuesSortComparer if present, else the SortComparer for the DataGridItemProperty, else, the Comparer used is the one of the base class.
-      IComparer distinctValuesSortComparer = dataGridItemProperty.DistinctValuesSortComparer;
-
-      using( columnDistinctValues.DeferINotifyCollectionChanged() )
-      {
-        // If none was specified, we use the default SortComparer for the DataGridItemProperty
-        if( distinctValuesSortComparer == null )
-        {
-          distinctValuesSortComparer = dataGridItemProperty.SortComparer;
-        }
-
-        List<RawItem> currentItemsList = this.GetItemsList();
-        int rowsCount = currentItemsList.Count; // Parse every rows to get distinct values
-        int maximumDistinctValuesCount = dataGridItemProperty.MaxDistinctValues;
-
-        for( int rowIndex = 0; rowIndex < rowsCount; rowIndex++ )
-        {
-          object rowItem = currentItemsList[ rowIndex ].DataItem;
-
-          // If we have more than one filtered item :
-          // we need to verify if the row passes every AUTO filter except the filtered one to get
-          if( this.DistinctValuesConstraint == DistinctValuesConstraint.Filtered )
-          {
-            if( !this.PassesAutoFilter( rowItem, dataGridItemProperty ) )
-              continue;
-          }
-
-          object distinctValue = dataGridItemProperty.GetValue( rowItem );
-
-          // Allow the user to provide the corresponding distinct value for this item
-          distinctValue = dataGridItemProperty.GetDistinctValueFromItem( distinctValue );
-
-          // Compute current value to be able to remove unused values Accept if -1 => no maximum, or less than maximum specified
-          if( ( maximumDistinctValuesCount == -1 ) || ( maximumDistinctValuesCount > currentColumnDistinctValues.Count ) )
-          {
-            currentColumnDistinctValues.Add( distinctValue );
-          }
-        }
-
-        DataGridCollectionViewBase.RemoveUnusedDistinctValues( distinctValuesSortComparer, currentColumnDistinctValues, columnDistinctValues, null );
-      }
     }
 
     internal override bool CanCreateItemProperties()
@@ -530,22 +381,31 @@ namespace Xceed.Wpf.DataGrid
       return ( m_sourceItems.Count != 0 );
     }
 
-    internal override bool CanCreateDetailDescriptions()
-    {
-      if( base.CanCreateDetailDescriptions() )
-        return true;
-
-      return ( m_sourceItems.Count != 0 );
-    }
-
     internal override int IndexOfSourceItem( object item )
     {
       if( item != null )
       {
-        RawItem rawItem = this.GetFirstRawItemFromDataItem( item );
-        if( rawItem != null )
+        // The source index of raw items may not be up-to-date if some operations were deferred.
+        if( !this.DeferredOperationManager.HasPendingOperations )
         {
-          return rawItem.Index;
+          // Use the RawItem/DataItem mapping instead of looping through the list for efficency.
+          var rawItem = this.GetFirstRawItemFromDataItem( item );
+
+          if( rawItem != null )
+            return rawItem.Index;
+        }
+
+        IList list = this.Enumeration as IList;
+        if( list != null )
+          return list.IndexOf( item );
+
+        var index = 0;
+        foreach( var obj in this.Enumeration )
+        {
+          if( obj == item )
+            return index;
+
+          index++;
         }
       }
 
@@ -586,15 +446,6 @@ namespace Xceed.Wpf.DataGrid
         case DeferredOperation.DeferredOperationAction.RefreshDistincValues:
           {
             refreshForced = false;
-            if( this.DistinctValuesUpdateMode == DistinctValuesUpdateMode.Manual )
-            {
-              //Let the AutoFilterControl (or the user) decide when to refresh DistinctValues.
-              this.RaiseDistinctValuesRefreshNeeded();
-            }
-            else
-            {
-              this.ForceRefreshDistinctValues( deferredOperation.FilteredItemsChanged );
-            }
             break;
           }
 
@@ -605,11 +456,13 @@ namespace Xceed.Wpf.DataGrid
             // Ensure to defer the CurrentItem change when regrouping is completed to be sure the SaveCurrent has the right values when restoring
             using( this.DeferCurrencyEvent() )
             {
-              int oldCurrentPosition = -1;
-              RawItem oldCurrentRawItem = null;
+              var oldCurrentPosition = -1;
+              var oldCurrentRawItem = default( RawItem );
+
               this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
 
-              SortDescriptionInfo[] sortDescriptionInfos;
+              var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
+
               this.GroupItems();
               this.PrepareSort( out sortDescriptionInfos );
               this.SortItems( sortDescriptionInfos );
@@ -641,11 +494,13 @@ namespace Xceed.Wpf.DataGrid
             // Ensure to defer the CurrentItem change when resort is completed to be sure the SaveCurrent has the right values when restoring
             using( this.DeferCurrencyEvent() )
             {
-              int oldCurrentPosition = -1;
-              RawItem oldCurrentRawItem = null;
+              var oldCurrentPosition = -1;
+              var oldCurrentRawItem = default( RawItem );
+
               this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
 
-              SortDescriptionInfo[] sortDescriptionInfos;
+              var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
+
               this.PrepareSort( out sortDescriptionInfos );
               this.SortItems( sortDescriptionInfos );
 
@@ -699,50 +554,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal override void ProcessInvalidatedGroupStats( HashSet<DataGridCollectionViewGroup> invalidatedGroups )
-    {
-      foreach( DataGridCollectionViewGroup group in invalidatedGroups )
-      {
-        group.InvokeStatFunctionsPropertyChanged( this );
-      }
-
-      if( m_hasGroupSortBasedOnStats )
-      {
-        using( this.DeferCurrencyEvent() )
-        {
-          object oldCurrentDataItem = this.CurrentItem;
-          int oldCurrentPosition = this.CurrentPosition;
-
-          this.SortGroups();
-
-          RawItem currentRawItem = null;
-
-          if( oldCurrentDataItem != null )
-          {
-            currentRawItem = this.GetFirstRawItemFromDataItem( oldCurrentDataItem );
-          }
-
-          if( currentRawItem == null )
-          {
-            if( ( oldCurrentPosition > 0 ) && ( oldCurrentPosition < this.RootGroup.GlobalRawItemCount ) )
-            {
-              currentRawItem = this.RootGroup.GetRawItemAtGlobalSortedIndex( oldCurrentPosition );
-            }
-          }
-
-          if( currentRawItem != null )
-          {
-            this.SetCurrentItem( currentRawItem.GetGlobalSortedIndex(), oldCurrentDataItem, false, false );
-          }
-
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-        }
-      }
-
-      this.CalculateChangedPropertyStatsOnly = false;
-      this.InvalidatedStatFunctions.Clear();
-    }
-
     internal override void ForceRefresh( bool sendResetNotification, bool initialLoad, bool setCurrentToFirstOnInitialLoad )
     {
       if( this.Refreshing )
@@ -752,18 +563,16 @@ namespace Xceed.Wpf.DataGrid
         throw new InvalidOperationException( "An attempt was made to refresh the DataGridCollectionView while it is already in the process of refreshing distinct values." );
 
       this.SetCurrentEditItem( null );
-      int oldCurrentPosition = -1;
-      RawItem oldCurrentRawItem = null;
 
-      // The cache of PropertyDescriptors for the StatFunctions will be recreated if needed in GetStatFunctionProperties().
-      m_statisticalProperties = null;
+      var oldCurrentPosition = -1;
+      var oldCurrentRawItem = default( RawItem );
 
       if( !initialLoad )
       {
         this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
       }
 
-      SortDescriptionInfo[] sortDescriptionInfos = null;
+      var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
 
       using( this.DeferCurrencyEvent() )
       {
@@ -773,20 +582,20 @@ namespace Xceed.Wpf.DataGrid
         {
           lock( this.SyncRoot )
           {
-            DeferredOperationManager deferredOperationManager = this.DeferredOperationManager;
+            var deferredOperationManager = this.DeferredOperationManager;
 
             lock( deferredOperationManager )
             {
               deferredOperationManager.ClearDeferredOperations();
               m_lastAddCount = -1;
-              bool bLoaded = false;
 
-              IEnumerable enumeration = this.Enumeration;
-              CollectionView collectionView = enumeration as CollectionView;
+              var bLoaded = false;
+              var enumeration = this.Enumeration;
+              var collectionView = enumeration as CollectionView;
 
               if( collectionView == null )
               {
-                IList list = enumeration as IList;
+                var list = enumeration as IList;
 
                 if( list != null )
                 {
@@ -798,17 +607,12 @@ namespace Xceed.Wpf.DataGrid
 
                   for( int i = 0; i < count; i++ )
                   {
-                    object item = list[ i ];
-                    RawItem rawItem = new RawItem( i, item );
+                    var item = list[ i ];
+                    var rawItem = new RawItem( i, item );
+
                     m_sourceItemList.Add( rawItem );
                     this.AddRawItemDataItemMapping( rawItem );
-
-                    if( this.PassesFilter( item )
-                        && this.PassesAutoFilter( item, null )
-                        && this.PassesFilterCriterion( rawItem.DataItem ) )
-                    {
-                      m_filteredItemList.Add( rawItem );
-                    }
+                    m_filteredItemList.Add( rawItem );
                   }
 
                   bLoaded = true;
@@ -819,7 +623,7 @@ namespace Xceed.Wpf.DataGrid
               {
                 if( enumeration != null )
                 {
-                  int count = 128;
+                  var count = 128;
 
                   if( collectionView != null )
                   {
@@ -827,8 +631,7 @@ namespace Xceed.Wpf.DataGrid
                   }
                   else
                   {
-                    ICollection collection = enumeration as ICollection;
-
+                    var collection = enumeration as ICollection;
                     if( collection != null )
                     {
                       count = collection.Count;
@@ -839,23 +642,19 @@ namespace Xceed.Wpf.DataGrid
                   m_filteredItemList.Clear();
                   m_dataItemToRawItemMap.Clear();
 
-                  int index = 0;
-                  IEnumerator enumerator = enumeration.GetEnumerator();
+                  var index = 0;
+                  var enumerator = enumeration.GetEnumerator();
 
                   while( enumerator.MoveNext() )
                   {
-                    object item = enumerator.Current;
-                    RawItem rawItem = new RawItem( index, item );
+                    var item = enumerator.Current;
+                    var rawItem = new RawItem( index, item );
+
                     index++;
                     m_sourceItemList.Add( rawItem );
-                    this.AddRawItemDataItemMapping( rawItem );
 
-                    if( this.PassesFilter( item )
-                        && this.PassesAutoFilter( item, null )
-                        && this.PassesFilterCriterion( rawItem.DataItem ) )
-                    {
-                      m_filteredItemList.Add( rawItem );
-                    }
+                    this.AddRawItemDataItemMapping( rawItem );
+                    m_filteredItemList.Add( rawItem );
                   }
                 }
               }
@@ -872,16 +671,6 @@ namespace Xceed.Wpf.DataGrid
             }
           }
 
-          if( this.DistinctValuesUpdateMode == DistinctValuesUpdateMode.Manual )
-          {
-            //Let the AutoFilterControl (or the user) decide when to refresh DistinctValues.
-            this.RaiseDistinctValuesRefreshNeeded();
-          }
-          else
-          {
-            this.ForceRefreshDistinctValues( true );
-          }
-
           this.SortItems( sortDescriptionInfos );
 
           unchecked
@@ -916,6 +705,7 @@ namespace Xceed.Wpf.DataGrid
     internal override void ClearGroupSortComparers()
     {
       m_groupSortComparers.Clear();
+      m_groupSortComparers.TrimExcess();
     }
 
     internal RawItem GetRawItemAt( int index )
@@ -937,21 +727,6 @@ namespace Xceed.Wpf.DataGrid
       return m_sourceItemList.GetEnumerator();
     }
 
-    internal PropertyDescriptorCollection GetStatFunctionProperties()
-    {
-      if( m_statisticalProperties == null )
-      {
-        m_statisticalProperties = new PropertyDescriptorCollection( null );
-
-        foreach( StatFunction statFunction in m_statFunctions )
-        {
-          m_statisticalProperties.Add( new StatFunctionPropertyDescriptor( statFunction.ResultPropertyName ) );
-        }
-      }
-
-      return m_statisticalProperties;
-    }
-
     internal bool AddSourceItem( int startIndex, IList items, int newSourceItemCount )
     {
       if( items == null )
@@ -973,29 +748,17 @@ namespace Xceed.Wpf.DataGrid
       m_lastAddCount = newSourceItemCount;
       m_lastAddIndex = startIndex;
 
-      var filteredItemsChanged = false;
-
       for( int i = 0; i < items.Count; i++ )
       {
         var index = startIndex + i;
         var item = items[ i ];
         var rawItem = new RawItem( index, item );
 
-        if( this.PassesFilter( item ) && this.PassesAutoFilter( item, null ) && this.PassesFilterCriterion( item ) )
-        {
-          filteredItemsChanged = true;
-
-          this.AddRawItemInSourceList( index, rawItem );
-          this.AddRawItemInFilteredList( rawItem );
-          this.AddRawItemInGroup( rawItem );
-        }
-        else
-        {
-          this.AddRawItemInSourceList( index, rawItem );
-        }
+        this.AddRawItemInSourceList( index, rawItem );
+        this.AddRawItemInFilteredList( rawItem );
+        this.AddRawItemInGroup( rawItem );
       }
 
-      this.RefreshDistinctValues( filteredItemsChanged );
       return true;
     }
 
@@ -1009,8 +772,6 @@ namespace Xceed.Wpf.DataGrid
         return false;
       }
 
-      var filteredItemsChanged = false;
-
       for( int i = 0; i < count; i++ )
       {
         var rawItem = m_sourceItemList[ startIndex ];
@@ -1022,8 +783,6 @@ namespace Xceed.Wpf.DataGrid
 
         if( this.RemoveRawItemInFilteredList( rawItem ) )
         {
-          filteredItemsChanged = true;
-
           this.RemoveRawItemInSourceList( startIndex );
           this.RemoveRawItemInGroup( rawItem );
         }
@@ -1033,7 +792,6 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      this.RefreshDistinctValues( filteredItemsChanged );
       return true;
     }
 
@@ -1070,14 +828,12 @@ namespace Xceed.Wpf.DataGrid
             RawItem rawItem = m_sourceItemList[ oldStartIndex + i ];
             object oldItem = rawItem.DataItem;
             int globalSortedIndex = rawItem.GetGlobalSortedIndex();
+            object newItem = newItems[ i ];
 
             // globalSortedIndex == -1 means item does not pass filter
             if( globalSortedIndex != -1 )
             {
-              object newItem = newItems[ i ];
-
               bool itemChanged = !object.Equals( oldItem, newItem );
-
               if( ( this.CurrentEditItem == oldItem ) && ( itemChanged ) )
               {
                 try
@@ -1114,39 +870,20 @@ namespace Xceed.Wpf.DataGrid
 
                 DataGridCollectionViewGroup newGroup = rawItem.ParentGroup;
                 bool movedToDifferentParentGroup = oldGroup != newGroup;
-
-                if( m_statFunctions.Count > 0 )
-                {
-                  DeferredOperationManager deferredOperationManager = this.DeferredOperationManager;
-                  deferredOperationManager.InvalidateGroupStats( oldGroup, movedToDifferentParentGroup );
-                  if( movedToDifferentParentGroup )
-                  {
-                    deferredOperationManager.InvalidateGroupStats( rawItem.ParentGroup, true );
-                  }
-                }
               }
             }
             else
             {
-              Debug.Assert( rawItem.ParentGroup == null, "ParentGroup should be null, since according to the comment at the top of the if, the item is filtered out" );
-
-              DataGridCollectionViewGroup oldGroup = rawItem.ParentGroup;
-
-              // Since it is a replace, we must re-ensure position even if current item did not passed filter in case a property change would let it pass the filter
-              this.EnsurePosition( rawItem, globalSortedIndex );
-
-              DataGridCollectionViewGroup newGroup = rawItem.ParentGroup;
-              bool movedToDifferentParentGroup = oldGroup != newGroup;
-
-              if( m_statFunctions.Count > 0 )
+              if( newItem != oldItem )
               {
-                DeferredOperationManager deferredOperationManager = this.DeferredOperationManager;
-                deferredOperationManager.InvalidateGroupStats( oldGroup, movedToDifferentParentGroup );
-                if( movedToDifferentParentGroup )
-                {
-                  deferredOperationManager.InvalidateGroupStats( rawItem.ParentGroup, true );
-                }
+                this.RemoveRawItemDataItemMapping( rawItem );
+                rawItem.SetDataItem( newItem );
+                this.AddRawItemDataItemMapping( rawItem );
               }
+
+              // Since it is a replace, we must re-ensure position and invalidate stats function (no need to invalidate the old group, since the old item is filtered
+              // out, and thus has no parent group), even if it is an item being replaced by itself, in case a property changed would now let it pass the filter.
+              this.EnsurePosition( rawItem, globalSortedIndex );
             }
           }
           else
@@ -1283,274 +1020,17 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private List<RawItem> GetItemsList()
-    {
-      return ( this.DistinctValuesConstraint == DistinctValuesConstraint.FilteredWithAllFilters ) ? m_filteredItemList : m_sourceItemList;
-    }
-
     private void EnsurePosition( RawItem rawItem, int globalSortedIndex )
     {
       Debug.Assert( rawItem.GetGlobalSortedIndex() == globalSortedIndex );
 
       var dataItem = rawItem.DataItem;
 
-      if( this.PassesFilter( dataItem ) && this.PassesAutoFilter( dataItem, null ) && this.PassesFilterCriterion( dataItem ) )
-      {
-        if( globalSortedIndex == -1 )
-        {
-          this.AddRawItemInFilteredList( rawItem );
-          this.AddRawItemInGroup( rawItem );
-
-          this.RefreshDistinctValues( true );
-          return;
-        }
-        else
-        {
-          this.RefreshDistinctValues( true );
-        }
-      }
-      else
-      {
-        if( globalSortedIndex != -1 )
-        {
-          this.RemoveRawItemInFilteredList( rawItem );
-          this.RemoveRawItemInGroup( rawItem );
-        }
-
-        this.RefreshDistinctValues( true );
-        return;
-      }
-
-      // Verify the row is in the correct group.
-      var newGroup = this.GetRawItemNewGroup( rawItem );
-      var currentGroup = rawItem.ParentGroup;
-
-      if( currentGroup != newGroup )
-      {
-        using( this.DeferCurrencyEvent() )
-        {
-          if( m_statFunctions.Count > 0 )
-          {
-            var deferredOperationManager = this.DeferredOperationManager;
-
-            //If an item is moved from one group to another, make sure all stats for the specified groups are recalculated even if UpdateChangedPropertyStatsOnly is set to true
-            deferredOperationManager.InvalidateGroupStats( currentGroup, true );
-            deferredOperationManager.InvalidateGroupStats( newGroup, true );
-          }
-
-          var newSortIndex = newGroup.BinarySearchRawItem( rawItem, this.RawItemSortComparer );
-
-          if( newSortIndex < 0 )
-          {
-            newSortIndex = ~newSortIndex;
-          }
-
-          currentGroup.RemoveRawItemAt( rawItem.SortedIndex );
-          newGroup.InsertRawItem( newSortIndex, rawItem );
-          var newGlobalSortedIndex = rawItem.GetGlobalSortedIndex();
-          this.AdjustCurrencyAfterMove( globalSortedIndex, newGlobalSortedIndex, 1 );
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Move, rawItem.DataItem, newGlobalSortedIndex, globalSortedIndex ) );
-        }
-      }
-      else
-      {
-        if( m_statFunctions.Count > 0 )
-        {
-          this.DeferredOperationManager.InvalidateGroupStats( currentGroup );
-        }
-
-        // Verify sorting only if we have not changed group, since adding an item in a group will automatically sort it.
-        // Even if we are not sorted, we must ensure the order matches the natural order of the source.
-        int newSortIndex = newGroup.BinarySearchRawItem( rawItem, this.RawItemSortComparer );
-
-        if( newSortIndex < 0 )
-        {
-          newSortIndex = ~newSortIndex;
-        }
-
-        if( newSortIndex > rawItem.SortedIndex )
-        {
-          newSortIndex--;
-        }
-
-        if( rawItem.SortedIndex != newSortIndex )
-        {
-          using( this.DeferCurrencyEvent() )
-          {
-            newGroup.MoveRawItem( rawItem.SortedIndex, newSortIndex );
-            var newGlobalSortedIndex = rawItem.GetGlobalSortedIndex();
-            this.AdjustCurrencyAfterMove( globalSortedIndex, newGlobalSortedIndex, 1 );
-            this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Move, rawItem.DataItem, newGlobalSortedIndex, globalSortedIndex ) );
-          }
-        }
-      }
-    }
-
-    // excludedFilteredDataGridItemProperty is used to avoid filtering the column on which we are calculating Distinct Values if null, this parameter is ignored
-    private bool PassesAutoFilter( object item, DataGridItemPropertyBase excludedFilteredDataGridItemProperty )
-    {
-      AutoFilterMode autoFilterMode = this.AutoFilterMode;
-
-      if( autoFilterMode == AutoFilterMode.None )
-        return true;
-
-      bool isRowAccepted = false;
-      bool isColumnFiltered = false;
-
-      switch( autoFilterMode )
-      {
-        case AutoFilterMode.And:
-          // Initially, we accept the row and reject on any filter difference
-          isRowAccepted = true;
-          break;
-
-        case AutoFilterMode.Or:
-          // Initially, no criteria is met, we reject the row
-          isRowAccepted = false;
-          break;
-      }
-
-      ObservableCollection<DataGridItemPropertyBase> autoFilteItems = this.AutoFilteredDataGridItemProperties;
-      int autoFilterItemsCount = autoFilteItems.Count;
-
-      // The index of the last filtered item to calculate DistinctValuesConstraint.Filtered
-      int calculateDistinctValuesIndex = autoFilterItemsCount - 1; // Count for last item
-
-      for( int propertyIndex = 0; propertyIndex < autoFilterItemsCount; propertyIndex++ )
-      {
-        DataGridItemPropertyBase dataGridItemProperty = autoFilteItems[ propertyIndex ];
-
-        // If the excluded DataGridItemProperty is found
-        if( ( excludedFilteredDataGridItemProperty != null ) && ( dataGridItemProperty == excludedFilteredDataGridItemProperty ) )
-          continue;
-
-        // At least one column was filtered
-        isColumnFiltered = true;
-
-        bool isCurrentFilterAccepted = false;
-
-        // autoFilterValues will never be null
-        IList autoFilterValues = this.GetAutoFilterValues( dataGridItemProperty.Name );
-        int filterCount = autoFilterValues.Count;
-
-        if( filterCount > 0 )
-        {
-          // Only get value if there are autoFilterValues for this dataGridItemProperty
-          object columnValue = dataGridItemProperty.GetValue( item );
-
-          // Allow the user to provide the corresponding distinct value for this item
-          columnValue = dataGridItemProperty.GetDistinctValueFromItem( columnValue );
-
-          // Check if one of the items in filter list passes
-          for( int filterIndex = 0; filterIndex < filterCount; filterIndex++ )
-          {
-            object autoFilterValue = autoFilterValues[ filterIndex ];
-
-            // Use the DistinctValuesEqualityComparer for this DataGridItemProperty if specified
-            IEqualityComparer distinctValuesEqualityComparer = dataGridItemProperty.DistinctValuesEqualityComparer;
-
-            if( distinctValuesEqualityComparer != null )
-            {
-              if( distinctValuesEqualityComparer.Equals( autoFilterValue, columnValue ) )
-              {
-                // Current column correspond to Filter value
-                isCurrentFilterAccepted = true;
-                break;
-              }
-            }
-            else if( ItemsSourceHelper.IsEntityFramework( autoFilterValue ) && ItemsSourceHelper.IsEntityFramework( columnValue ) )
-            {
-              if( ( autoFilterValue is IComparable ) && ( columnValue is IComparable ) )
-              {
-                IComparable autoFilterValueComparable = ( IComparable )autoFilterValue;
-                IComparable columnValueComparable = ( IComparable )columnValue;
-
-                if( autoFilterValueComparable.CompareTo( columnValueComparable ) == 0 )
-                {
-                  isCurrentFilterAccepted = true;
-                  break;
-                }
-              }
-              else
-              {
-                if( Object.Equals( autoFilterValue, columnValue ) )
-                {
-                  isCurrentFilterAccepted = true;
-                  break;
-                }
-              }
-            }
-            else if( ObjectDataStore.CompareData( autoFilterValue, columnValue ) == 0 )
-            {
-              // Current column correspond to Filter value
-              isCurrentFilterAccepted = true;
-              break;
-            }
-          }
-        }
-
-        if( isCurrentFilterAccepted )
-        {
-          isRowAccepted = true;
-
-          // In FilteringMode.Or, accept the row right away, do not process other columns
-          if( autoFilterMode == AutoFilterMode.Or )
-            break;
-        }
-        else
-        {
-          // One filtered column doesn't correspond to Filter value
-          if( autoFilterMode == AutoFilterMode.And )
-          {
-            isRowAccepted = false;
-            break;
-          }
-        }
-      }
-
-      // If no filter provided for any column, accept the row
-      if( !isColumnFiltered )
-        isRowAccepted = true;
-
-      return isRowAccepted;
-    }
-
-    private bool PassesFilterCriterion( object item )
-    {
-      FilterCriteriaMode filterMode = this.FilterCriteriaMode;
-      bool passesFilter = true;
-
-      if( filterMode != FilterCriteriaMode.None )
+      if( globalSortedIndex != -1 )
       {
-        ReadOnlyCollection<DataGridItemPropertyBase> itemProperties =
-          this.FilteredCriterionItemProperties;
-
-        int itemPropertyCount = itemProperties.Count;
-
-        for( int i = 0; i < itemPropertyCount; i++ )
-        {
-          DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-          Debug.Assert( itemProperty.FilterCriterion != null );
-
-          if( itemProperty.FilterCriterion == null )
-            continue;
-
-          passesFilter = itemProperty.FilterCriterion.IsMatch( itemProperty.GetValue( item ) );
-
-          if( filterMode == FilterCriteriaMode.And )
-          {
-            if( !passesFilter )
-              break;
-          }
-          else
-          {
-            if( passesFilter )
-              break;
-          }
-        }
+        this.RemoveRawItemInFilteredList( rawItem );
+        this.RemoveRawItemInGroup( rawItem );
       }
-
-      return passesFilter;
     }
 
     private bool SetCurrentItem( int newCurrentPosition, bool isCancelable )
@@ -1663,6 +1143,8 @@ namespace Xceed.Wpf.DataGrid
         return false;
       }
 
+      m_lastAddCount = -1;
+
       if( oldStartIndex < newStartIndex )
       {
         for( int i = count - 1; i >= 0; i-- )
@@ -1670,8 +1152,8 @@ namespace Xceed.Wpf.DataGrid
           var oldIndex = oldStartIndex + i;
           var newIndex = newStartIndex + i;
 
-          Debug.Assert( (oldIndex >= 0) && (oldIndex < m_sourceItemList.Count) );
-          Debug.Assert( (newIndex >= 0) && (newIndex < m_sourceItemList.Count) );
+          Debug.Assert( ( oldIndex >= 0 ) && ( oldIndex < m_sourceItemList.Count ) );
+          Debug.Assert( ( newIndex >= 0 ) && ( newIndex < m_sourceItemList.Count ) );
 
           var rawItem = m_sourceItemList[ oldIndex ];
           var wasFiltered = this.RemoveRawItemInFilteredList( rawItem );
@@ -1698,8 +1180,8 @@ namespace Xceed.Wpf.DataGrid
           var oldIndex = oldStartIndex + i;
           var newIndex = newStartIndex + i;
 
-          Debug.Assert( (oldIndex >= 0) && (oldIndex < m_sourceItemList.Count) );
-          Debug.Assert( (newIndex >= 0) && (newIndex < m_sourceItemList.Count) );
+          Debug.Assert( ( oldIndex >= 0 ) && ( oldIndex < m_sourceItemList.Count ) );
+          Debug.Assert( ( newIndex >= 0 ) && ( newIndex < m_sourceItemList.Count ) );
 
           var rawItem = m_sourceItemList[ oldIndex ];
           var wasFiltered = this.RemoveRawItemInFilteredList( rawItem );
@@ -1780,7 +1262,7 @@ namespace Xceed.Wpf.DataGrid
 
     private void AddRawItemInSourceList( int index, RawItem rawItem )
     {
-      Debug.Assert( (index >= 0) && (index <= m_sourceItemList.Count) );
+      Debug.Assert( ( index >= 0 ) && ( index <= m_sourceItemList.Count ) );
       Debug.Assert( rawItem != null );
 
       m_sourceItemList.Insert( index, rawItem );
@@ -1799,7 +1281,7 @@ namespace Xceed.Wpf.DataGrid
 
       // The function take for granted that all RawItem's index are sequential,
       // or if there is gap, the index contained in the gap are not already contained in the list.
-      if( (m_filteredItemList.Count == 0) || (m_filteredItemList.Last().Index < rawItem.Index) )
+      if( ( m_filteredItemList.Count == 0 ) || ( m_filteredItemList.Last().Index < rawItem.Index ) )
       {
         m_filteredItemList.Add( rawItem );
       }
@@ -1832,7 +1314,9 @@ namespace Xceed.Wpf.DataGrid
         }
 
         var globalIndex = newGroup.GetFirstRawItemGlobalSortedIndex() + index;
+
         this.AdjustCurrencyBeforeAdd( globalIndex );
+
         newGroup.InsertRawItem( index, rawItem );
 
         unchecked
@@ -1842,17 +1326,11 @@ namespace Xceed.Wpf.DataGrid
 
         this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, rawItem.DataItem, globalIndex ) );
       }
-
-      //When adding an item, make sure all stats for the specified group are recalculated even if UpdateChangedPropertyStatsOnly is set to true
-      if( m_statFunctions.Count > 0 )
-      {
-        this.DeferredOperationManager.InvalidateGroupStats( rawItem.ParentGroup, true );
-      }
     }
 
     private void RemoveRawItemInSourceList( int index )
     {
-      Debug.Assert( (index >= 0) && (index < m_sourceItemList.Count) );
+      Debug.Assert( ( index >= 0 ) && ( index < m_sourceItemList.Count ) );
 
       this.RemoveRawItemDataItemMapping( m_sourceItemList[ index ] );
 
@@ -1874,7 +1352,7 @@ namespace Xceed.Wpf.DataGrid
       if( index < 0 )
         return false;
 
-      Debug.Assert( (index >= 0) && (index < m_filteredItemList.Count) );
+      Debug.Assert( ( index >= 0 ) && ( index < m_filteredItemList.Count ) );
 
       m_filteredItemList.RemoveAt( index );
 
@@ -1905,12 +1383,6 @@ namespace Xceed.Wpf.DataGrid
       // In the case of a remove, the CollectionChanged must be after the CurrentChanged since when the DataGridCollectionView is used with a Selector having the 
       // IsSynchronizedWithCurrent set, the Selector will set the current position to -1 if the selected item is removed. 
       this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, rawItem.DataItem, globalSortedIndex ) );
-
-      //When removing an item, make sure all stats for the specified group are recalculated even if UpdateChangedPropertyStatsOnly is set to true
-      if( m_statFunctions.Count > 0 )
-      {
-        this.DeferredOperationManager.InvalidateGroupStats( parentGroup, true );
-      }
     }
 
     private bool RefreshUnboundItemPropertiesCore( object dataItem = null )
@@ -2056,13 +1528,12 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void SortItems( SortDescriptionInfo[] sortDescriptionInfos )
+    private void SortItems( IList<SortDescriptionInfo> sortDescriptionInfos )
     {
       // We set the current item to -1 to prevent the developper to get an invalid position. We will replace the current item to the correct one later.
       this.SetCurrentItem( -1, null, false, false );
 
-      DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-
+      var rootGroup = this.RootGroup;
       if( rootGroup.IsBottomLevel )
       {
         rootGroup.SortRootRawItems( sortDescriptionInfos, m_sourceItemList );
@@ -2070,7 +1541,7 @@ namespace Xceed.Wpf.DataGrid
       else
       {
         // We use a new DataGridCollectionViewGroupRoot to prevent some event to be raised.
-        DataGridCollectionViewGroupRoot newRootGroup = new DataGridCollectionViewGroupRoot( rootGroup );
+        var newRootGroup = new DataGridCollectionViewGroupRoot( rootGroup );
 
         rootGroup.SortItems( sortDescriptionInfos, this.GetGroupSortComparers(), 0, m_sourceItemList, newRootGroup );
 
@@ -2085,12 +1556,8 @@ namespace Xceed.Wpf.DataGrid
 
     private void SortGroups()
     {
-      DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-
-      if( rootGroup.IsBottomLevel )
-        return;
-
-      rootGroup.SortGroups( this.GetGroupSortComparers(), 0 );
+      //This method assumes the that the RootGroup is not the bottom level group, i.e. there DataGrid is currently grouped.
+      this.RootGroup.SortGroups( this.GetGroupSortComparers(), 0 );
 
       unchecked
       {
@@ -2098,72 +1565,126 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void PrepareSort( out SortDescriptionInfo[] sortDescriptionInfos )
+    private void ResortGroups()
+    {
+      using( this.DeferCurrencyEvent() )
+      {
+        object oldCurrentDataItem = this.CurrentItem;
+        int oldCurrentPosition = this.CurrentPosition;
+
+        this.SortGroups();
+
+        RawItem currentRawItem = null;
+
+        if( oldCurrentDataItem != null )
+        {
+          currentRawItem = this.GetFirstRawItemFromDataItem( oldCurrentDataItem );
+        }
+
+        if( currentRawItem == null )
+        {
+          if( ( oldCurrentPosition > 0 ) && ( oldCurrentPosition < this.RootGroup.GlobalRawItemCount ) )
+          {
+            currentRawItem = this.RootGroup.GetRawItemAtGlobalSortedIndex( oldCurrentPosition );
+          }
+        }
+
+        if( currentRawItem != null )
+        {
+          this.SetCurrentItem( currentRawItem.GetGlobalSortedIndex(), oldCurrentDataItem, false, false );
+        }
+
+        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+      }
+    }
+
+    private void PrepareSort( out IList<SortDescriptionInfo> sortDescriptionInfos )
     {
-      sortDescriptionInfos = null;
+      sortDescriptionInfos = new List<SortDescriptionInfo>();
 
       lock( this.SyncRoot )
       {
         lock( this.DeferredOperationManager )
         {
-          SortDescriptionCollection sortDescriptions = this.SortDescriptions;
-          int sortDescriptionCount = sortDescriptions.Count;
+          var itemCount = m_sourceItemList.Count;
 
-          if( sortDescriptionCount > 0 )
+          foreach( var sortDescription in this.SortDescriptions )
           {
-            int itemCount = m_sourceItemList.Count;
-            sortDescriptionInfos = new SortDescriptionInfo[ sortDescriptionCount ];
-            DataGridItemPropertyCollection itemProperties = this.ItemProperties;
+            var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( this.ItemProperties, sortDescription.PropertyName );
+            var sortDescriptionInfo = new SortDescriptionInfo( itemProperty, sortDescription.Direction );
 
-            for( int i = 0; i < sortDescriptionCount; i++ )
-            {
-              SortDescription sortDescription = sortDescriptions[ i ];
-              DataGridItemPropertyBase dataProperty = itemProperties[ sortDescription.PropertyName ];
+            sortDescriptionInfos.Add( sortDescriptionInfo );
 
-              SortDescriptionInfo sortDescriptionInfo = new SortDescriptionInfo( dataProperty, sortDescription.Direction );
+            if( itemProperty == null )
+              continue;
 
-              sortDescriptionInfos[ i ] = sortDescriptionInfo;
+            // This will cache the data for the sorting
+            var dataStore = default( DataStore );
+            var isSortingOnForeignKeyDescription = false;
 
-              if( dataProperty == null )
-                continue;
+            var foreignKeyDescription = itemProperty.ForeignKeyDescription;
+            if( foreignKeyDescription != null )
+            {
+              var dataType = foreignKeyDescription.GetDataType();
+              if( dataType != null )
+              {
+                dataStore = DataGridCollectionView.CreateStore( dataType, itemCount );
+                isSortingOnForeignKeyDescription = true;
+              }
+            }
 
-              // This will cache the data for the sorting
-              DataStore dataStore;
+            itemProperty.IsSortingOnForeignKeyDescription = isSortingOnForeignKeyDescription;
 
-              if( dataProperty.SortComparer != null )
+            //Create the DataStore if it has not been created yet.
+            if( !isSortingOnForeignKeyDescription )
+            {
+              if( itemProperty.SortComparer != null )
               {
                 // If we have a sort comparer, keep the element in an object data type to increase the performance.
                 dataStore = DataGridCollectionView.CreateStore( typeof( object ), itemCount );
               }
               else
               {
-                dataStore = DataGridCollectionView.CreateStore( dataProperty.DataType, itemCount );
+                dataStore = DataGridCollectionView.CreateStore( itemProperty.DataType, itemCount );
               }
+            }
 
-              sortDescriptionInfo.DataStore = dataStore;
-
-              ISupportInitialize supportInitialize = dataProperty as ISupportInitialize;
+            sortDescriptionInfo.DataStore = dataStore;
 
-              if( supportInitialize != null )
-              {
-                supportInitialize.BeginInit();
-              }
+            var supportInitialize = itemProperty as ISupportInitialize;
+            if( supportInitialize != null )
+            {
+              supportInitialize.BeginInit();
+            }
 
-              try
+            try
+            {
+              if( isSortingOnForeignKeyDescription )
               {
-                for( int j = 0; j < itemCount; j++ )
+                for( int i = 0; i < itemCount; i++ )
                 {
-                  dataStore.SetData( j, dataProperty.GetValue( m_sourceItemList[ j ].DataItem ) );
+                  var value = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, m_sourceItemList[ i ].DataItem );
+
+                  dataStore.SetData( i, foreignKeyDescription.GetDisplayValue( value ) );
                 }
               }
-              finally
+              else
               {
-                if( supportInitialize != null )
+                for( int i = 0; i < itemCount; i++ )
                 {
-                  supportInitialize.EndInit();
+                  var value = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, m_sourceItemList[ i ].DataItem );
+
+                  dataStore.SetData( i, value );
                 }
               }
             }
+            finally
+            {
+              if( supportInitialize != null )
+              {
+                supportInitialize.EndInit();
+              }
+            }
           }
         }
       }
@@ -2174,45 +1695,33 @@ namespace Xceed.Wpf.DataGrid
       if( m_groupSortComparers.Count > 0 )
         return m_groupSortComparers;
 
-      m_hasGroupSortBasedOnStats = false;
+      var sortDescriptions = this.SortDescriptions;
 
-      SortDescriptionCollection sortDescriptions = this.SortDescriptions;
-      DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-
-      foreach( GroupDescription groupDescription in this.GroupDescriptions )
+      foreach( var groupDescription in this.GroupDescriptions )
       {
-        // Find the sortDescriptionInfo for the current sub group.
-        string groupDescriptionName = DataGridCollectionView.GetPropertyNameFromGroupDescription( groupDescription );
-        List<GroupSortComparer.SortInfo> sortInfos = new List<GroupSortComparer.SortInfo>( sortDescriptions.Count );
+        // Find all the SortInfos for the current sub group.
+        var groupDescriptionName = DataGridCollectionView.GetPropertyNameFromGroupDescription( groupDescription );
+        var sortInfos = new List<GroupSortComparer.SortInfo>( sortDescriptions.Count + 1 );
 
-        foreach( SortDescription sortDescription in sortDescriptions )
+        foreach( var sortDescription in sortDescriptions )
         {
-          ListSortDirection sortDirection = sortDescription.Direction;
-          string sortDescriptionName = sortDescription.PropertyName;
-          DataGridItemPropertyBase itemProperty = itemProperties[ sortDescriptionName ];
+          var sortDirection = sortDescription.Direction;
+          var sortDescriptionName = sortDescription.PropertyName;
+          var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( this.ItemProperties, sortDescriptionName );
 
-          if( itemProperty != null )
+          if( string.Equals( groupDescriptionName, sortDescriptionName ) )
           {
-            string sortStatResultPropertyName = itemProperty.GroupSortStatResultPropertyName;
-
-            if( !string.IsNullOrEmpty( sortStatResultPropertyName ) )
+            var foreignKeyDescription = ( itemProperty != null ) ? itemProperty.ForeignKeyDescription : null;
+            if( foreignKeyDescription != null )
             {
-              m_hasGroupSortBasedOnStats = true;
-
-              IComparer sortComparer = itemProperty.GroupSortStatResultComparer;
-
-              if( sortComparer == null )
+              if( foreignKeyDescription.ItemsSource != null
+                && ( !string.IsNullOrWhiteSpace( foreignKeyDescription.DisplayMemberPath ) || ( foreignKeyDescription.ForeignKeyConverter != null ) ) )
               {
-                sortComparer = StatResultComparer.Singleton;
+                sortInfos.Add( new GroupSortComparer.SortInfo( foreignKeyDescription, sortDirection, this.GetSortComparer( groupDescription, itemProperty ) ) );
               }
-
-              sortInfos.Add( new GroupSortComparer.SortInfo( sortStatResultPropertyName, sortDirection, sortComparer ) );
             }
-          }
 
-          if( string.Equals( groupDescriptionName, sortDescriptionName ) )
-          {
-            sortInfos.Add( this.CreateDefaultGroupSortInfo( groupDescription, itemProperty, sortDirection ) );
+            sortInfos.Add( new GroupSortComparer.SortInfo( sortDirection, this.GetSortComparer( groupDescription, itemProperty ) ) );
           }
         }
 
@@ -2222,10 +1731,10 @@ namespace Xceed.Wpf.DataGrid
       return m_groupSortComparers;
     }
 
-    private GroupSortComparer.SortInfo CreateDefaultGroupSortInfo( GroupDescription groupDescription, DataGridItemPropertyBase itemProperty, ListSortDirection sortDirection )
+    private IComparer GetSortComparer( GroupDescription groupDescription, DataGridItemPropertyBase itemProperty )
     {
-      DataGridGroupDescription dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-      IComparer sortComparer = null;
+      var dataGridGroupDescription = groupDescription as DataGridGroupDescription;
+      var sortComparer = default( IComparer );
 
       if( dataGridGroupDescription != null )
       {
@@ -2242,7 +1751,7 @@ namespace Xceed.Wpf.DataGrid
         sortComparer = ObjectComparer.Singleton;
       }
 
-      return new GroupSortComparer.SortInfo( null, sortDirection, sortComparer );
+      return sortComparer;
     }
 
     private void AdjustCurrentAndSendResetNotification( RawItem oldCurrentRawItem, int oldCurrentPosition )
@@ -2257,11 +1766,10 @@ namespace Xceed.Wpf.DataGrid
       // All the groups will be recreated. No need to trigger the StatFunctions PropertyChanged.
       this.DeferredOperationManager.ClearInvalidatedGroups();
 
-      // The previous GroupItems or SortItems have changed RootGroup but have not send the RootGroupChanged event. Do it here.
-      this.OnRootGroupChanged( EventArgs.Empty );
+      this.OnPropertyChanged( new PropertyChangedEventArgs( DataGridCollectionViewBase.RootGroupPropertyName ) );
 
-      //Flag that the Collection of groups itself has changed.
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "Groups" ) );
+      // Flag that the Collection of groups itself has changed.
+      this.OnPropertyChanged( new PropertyChangedEventArgs( DataGridCollectionViewBase.GroupsPropertyName ) );
     }
 
     private DataGridCollectionViewGroup GetRawItemNewGroup( RawItem rawItem )
@@ -2585,11 +2093,11 @@ namespace Xceed.Wpf.DataGrid
 
       if( item != null )
       {
-        RawItem rawItem = this.GetFirstRawItemFromDataItem( item );
+        var rawItem = this.GetFirstRawItemFromDataItem( item );
         if( rawItem != null )
         {
           // A SortedIndex of -1 means that the RawItem is not in the m_filteredItemList.
-          if( rawItem.SortedIndex > -1 )
+          if( rawItem.SortedIndex >= 0 )
             return rawItem.GetGlobalSortedIndex();
         }
       }
@@ -2829,79 +2337,9 @@ namespace Xceed.Wpf.DataGrid
     private List<RawItem> m_filteredItemList;
     private readonly RawItemMap m_dataItemToRawItemMap = new RawItemMap();
 
-    private PropertyDescriptorCollection m_statisticalProperties;
-    private List<WeakReference> m_tempStatFunctions = new List<WeakReference>();
-    private bool m_hasGroupSortBasedOnStats;
-
     private int m_sortedItemVersion;
     private DataGridCollectionView m_currentChildCollectionView;
 
-    #region Private Class StatFunctionPropertyDescriptor
-
-    private class StatFunctionPropertyDescriptor : PropertyDescriptor
-    {
-      public StatFunctionPropertyDescriptor( string propertyName )
-        : base( propertyName, null )
-      {
-      }
-
-      public override bool CanResetValue( object component )
-      {
-        return false;
-      }
-
-      public override Type ComponentType
-      {
-        get
-        {
-          return typeof( DataGridCollectionViewGroup );
-        }
-      }
-
-      public override object GetValue( object component )
-      {
-        DataGridCollectionViewGroup group = component as DataGridCollectionViewGroup;
-
-        if( group != null )
-          return group.GetStatFunctionValue( this.Name );
-
-        return null;
-      }
-
-      public override bool IsReadOnly
-      {
-        get
-        {
-          return true;
-        }
-      }
-
-      public override Type PropertyType
-      {
-        get
-        {
-          return typeof( object );
-        }
-      }
-
-      public override void ResetValue( object component )
-      {
-        throw new NotSupportedException( "This statistical property is read-only." );
-      }
-
-      public override void SetValue( object component, object value )
-      {
-        throw new NotSupportedException( "This statistical property is read-only." );
-      }
-
-      public override bool ShouldSerializeValue( object component )
-      {
-        return false;
-      }
-    }
-
-    #endregion
-
     #region Private Class EqualityComparerWrapper
 
     private class EqualityComparerWrapper : IEqualityComparer<object>
@@ -2932,6 +2370,5 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
-
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
index 3cb5ba7a..7e2f4ac7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
@@ -24,63 +24,45 @@ using System.Data;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Threading;
-using System.Xml;
 using Xceed.Utils.Collections;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
   public abstract partial class DataGridCollectionViewBase : CollectionView, IEditableCollectionView, IWeakEventListener, IItemProperties
   {
-    #region STATIC MEMBERS
+    #region Static Fields
+
+    internal static readonly string GroupsPropertyName = PropertyHelper.GetPropertyName( ( DataGridCollectionViewBase c ) => c.Groups );
+    internal static readonly string RootGroupPropertyName = PropertyHelper.GetPropertyName( ( DataGridCollectionViewBase c ) => c.RootGroup );
+
+    #endregion
+
+    #region Static Members
 
     internal static string GetPropertyNameFromGroupDescription( GroupDescription groupDescription )
     {
-      PropertyGroupDescription propertyGroupDescription = groupDescription as PropertyGroupDescription;
-
+      var propertyGroupDescription = groupDescription as PropertyGroupDescription;
       if( propertyGroupDescription != null )
         return propertyGroupDescription.PropertyName;
 
-      DataGridGroupDescription dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-
+      var dataGridGroupDescription = groupDescription as DataGridGroupDescription;
       if( dataGridGroupDescription != null )
         return dataGridGroupDescription.PropertyName;
 
       return null;
     }
 
-    private static List<DataGridItemPropertyBase> GetDataGridItemProperties( Dictionary<string, ItemsSourceHelper.FieldDescriptor> fieldDescriptors )
-    {
-      List<DataGridItemPropertyBase> itemProperties = new List<DataGridItemPropertyBase>( fieldDescriptors.Count );
-
-      foreach( KeyValuePair<string, ItemsSourceHelper.FieldDescriptor> fieldDescriptorKeyValuePair in fieldDescriptors )
-      {
-        ItemsSourceHelper.FieldDescriptor fieldDescriptor = fieldDescriptorKeyValuePair.Value;
-
-        itemProperties.Add( new DataGridItemProperty(
-                              fieldDescriptor.Name,
-                              fieldDescriptor.PropertyDescriptor,
-                              fieldDescriptor.DisplayName,
-                              fieldDescriptor.BindingXPath,
-                              fieldDescriptor.BindingPath,
-                              fieldDescriptor.DataType,
-                              true,
-                              fieldDescriptor.ReadOnly,
-                              fieldDescriptor.OverrideReadOnlyForInsertion,
-                              fieldDescriptor.IsASubRelationship,
-                              fieldDescriptor.ForeignKeyDescription ) );
-      }
-
-      return itemProperties;
-    }
-
-    private static List<DataGridItemPropertyBase> EmptyDataGridItemPropertyList = new List<DataGridItemPropertyBase>();
+    #endregion
 
-    #endregion STATIC MEMBERS
+//    static DataGridCollectionViewBase()
+//    {
+//      Licenser.VerifyLicenseSilently();
+//    }
 
     private DataGridCollectionViewBase()
       : base( new object[ 0 ] )
@@ -89,8 +71,6 @@ namespace Xceed.Wpf.DataGrid
       this.PreConstruct();
 
       m_distinctValues = new DistinctValuesDictionary( this );
-      m_autoFilterValues = new ReadOnlyDictionary<string, IList>();
-      m_autoFilteredDataGridItemProperties = new ObservableCollection<DataGridItemPropertyBase>();
 
       m_filteredItemProperties = new List<DataGridItemPropertyBase>();
       m_readOnlyFilteredItemProperties = new ReadOnlyCollection<DataGridItemPropertyBase>( m_filteredItemProperties );
@@ -110,12 +90,16 @@ namespace Xceed.Wpf.DataGrid
       bool autoCreateForeignKeyDescriptions )
       : this()
     {
+      m_desiredItemType = itemType;
+
+      m_itemProperties = new DataGridItemPropertyCollection();
+      m_detailDescriptions = new DataGridDetailDescriptionCollection();
+      m_defaultPropertyDescriptions = new PropertyDescriptionRouteDictionary();
+
       this.AutoCreateItemProperties = autoCreateItemProperties;
       this.AutoCreateDetailDescriptions = autoCreateDetailDescriptions;
       this.AutoCreateForeignKeyDescriptions = autoCreateForeignKeyDescriptions;
 
-      m_desiredItemType = itemType;
-
       if( itemType == null )
       {
         if( source != null )
@@ -124,58 +108,83 @@ namespace Xceed.Wpf.DataGrid
         }
         else if( modelSource != null )
         {
-          IQueryable queryable = modelSource as IQueryable;
-
+          var queryable = modelSource as IQueryable;
           if( queryable != null )
+          {
             itemType = queryable.ElementType;
+          }
         }
       }
       else
       {
-        Type listItemType = ItemsSourceHelper.GetItemTypeFromEnumeration( source );
-
-        if( listItemType == null )
-          listItemType = typeof( object );
-
+        var listItemType = ItemsSourceHelper.GetItemTypeFromEnumeration( source ) ?? typeof( object );
         if( !listItemType.IsAssignableFrom( itemType ) && !itemType.IsAssignableFrom( listItemType ) )
           throw new InvalidOperationException( "The itemType is not assignable to the type of the list." );
       }
 
-      this.SetSource( modelSource, source, itemType, true );
-
-      // This will create a new ItemProperties/DatatGridDetailDescriptions collection and pre-feed them with the 
-      // ItemProperties/DetailDescriptions detected on the source collection.
-      // For DataGridCollectionViews not supporting master/detail, the collection will be created but nothing will be inserted.
-      this.SetupDefaultDetailDescriptions();
+      m_modelSource = modelSource;
+      m_itemType = itemType;
+      m_enumeration = source;
 
-      this.SetupDefaultItemProperties();
       this.CreateDefaultCollections( null );
       this.RegisterChangedEvents();
+      this.SetupCurrent( true );
+      this.SetupDefaultPropertyDescriptions();
+      this.SetupDefaultDetailDescriptions();
+      this.PrepareItemProperties( m_itemProperties );
+
+      if( this.AutoCreateItemProperties )
+      {
+        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
+        ItemsSourceHelper.AutoDetectSynonyms( this );
+      }
     }
 
     internal DataGridCollectionViewBase( IEnumerable collection, DataGridDetailDescription parentDetailDescription, DataGridCollectionViewBase rootDataGridCollectionViewBase )
       : this()
     {
-      if( !this.CanHaveDetails )
-        throw new InvalidOperationException( "An attempt was made to provide a detail description for a source that cannot have details." );
-
       if( parentDetailDescription == null )
         throw new ArgumentNullException( "parentDetailDescription" );
 
+      m_rootDataGridCollectionViewBase = rootDataGridCollectionViewBase;
+      m_parentDetailDescription = parentDetailDescription;
+      m_itemProperties = parentDetailDescription.ItemProperties;
+      m_detailDescriptions = parentDetailDescription.DetailDescriptions;
+      m_defaultPropertyDescriptions = parentDetailDescription.DefaultPropertyDescriptions;
+
+      m_distinctValuesConstraint = m_parentDetailDescription.DistinctValuesConstraint;
+
       this.AutoCreateDetailDescriptions = parentDetailDescription.AutoCreateDetailDescriptions;
       this.AutoCreateItemProperties = parentDetailDescription.AutoCreateItemProperties;
       this.AutoCreateForeignKeyDescriptions = parentDetailDescription.AutoCreateForeignKeyDescriptions;
 
-      m_parentDetailDescription = parentDetailDescription;
-      m_rootDataGridCollectionViewBase = rootDataGridCollectionViewBase;
+      if( parentDetailDescription.ItemType == null )
+      {
+        parentDetailDescription.ItemType = ItemsSourceHelper.GetItemTypeFromEnumeration( collection ) ?? typeof( object );
+      }
 
-      Type itemType;
-      itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( collection );
+      m_modelSource = default( object );
+      m_itemType = parentDetailDescription.ItemType;
+      m_enumeration = collection;
 
-      if( itemType == null )
-        itemType = typeof( object );
+      this.CreateDefaultCollections( m_parentDetailDescription );
+      this.RegisterChangedEvents();
+      this.SetupCurrent( false );
+      this.SetupDefaultPropertyDescriptions();
+      this.SetupDefaultDetailDescriptions();
+
+      // Creates the item properties if auto-creation is ON and no one already created them.
+      if( this.AutoCreateItemProperties && !m_parentDetailDescription.AutoCreateItemPropertiesCompleted )
+      {
+        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
+        ItemsSourceHelper.AutoDetectSynonyms( this );
+
+        m_parentDetailDescription.AutoCreateItemPropertiesCompleted = true;
+      }
 
-      this.InitializeFromExternalDeclaration( collection, itemType );
+      m_filteredItemProperties.Clear();
+
+      this.PrepareItemProperties( m_itemProperties );
 
       // This is required in the Master/Detail scheme of things!
       this.ForceRefresh( false, true, false );
@@ -185,7 +194,7 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    #region ParentCollectionViewSource Property
+    #region ParentCollectionViewSource Internal Property
 
     internal DataGridCollectionViewSourceBase ParentCollectionViewSourceBase
     {
@@ -204,9 +213,9 @@ namespace Xceed.Wpf.DataGrid
 
     private DataGridCollectionViewSourceBase m_parentCollectionViewSourceBase;
 
-    #endregion ParentCollectionViewSource Property
+    #endregion
 
-    #region NeedsRefresh Property
+    #region NeedsRefresh Public Property
 
     public override bool NeedsRefresh
     {
@@ -216,9 +225,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion NeedsRefresh Property
+    #endregion
 
-    #region Culture Property
+    #region Culture Public Property
 
     public override CultureInfo Culture
     {
@@ -236,17 +245,16 @@ namespace Xceed.Wpf.DataGrid
         // apply our properties to the DataGridCollectionView.
         // 
         // See CollectionViewSource.ApplyPropertiesToView in reflector for a better understanding.
-        if( ( this.InDeferRefresh )
-          && ( m_parentCollectionViewSourceBase != null ) )
+        if( ( this.InDeferRefresh ) && ( m_parentCollectionViewSourceBase != null ) )
         {
           m_parentCollectionViewSourceBase.ApplyExtraPropertiesToView( this );
         }
       }
     }
 
-    #endregion Culture Property
+    #endregion
 
-    #region AutoCreateItemProperties Property
+    #region AutoCreateItemProperties Public Property
 
     public bool AutoCreateItemProperties
     {
@@ -260,9 +268,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoCreateItemProperties Property
+    #endregion
 
-    #region AutoCreateDetailDescriptions Property
+    #region AutoCreateDetailDescriptions Public Property
 
     internal bool AutoCreateDetailDescriptions
     {
@@ -276,9 +284,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoCreateDetailDescriptions Property
+    #endregion
 
-    #region ParentDetailDescription Property
+    #region ParentDetailDescription Public Property
 
     internal DataGridDetailDescription ParentDetailDescription
     {
@@ -289,9 +297,9 @@ namespace Xceed.Wpf.DataGrid
     }
 
 
-    #endregion ParentDetailDescription Property
+    #endregion
 
-    #region AutoCreateForeignKeyDescriptions Property
+    #region AutoCreateForeignKeyDescriptions Public Property
 
     public bool AutoCreateForeignKeyDescriptions
     {
@@ -307,7 +315,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region SyncRoot Property
+    #region SyncRoot Internal Property
 
     internal virtual object SyncRoot
     {
@@ -326,7 +334,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DeferredOperationManager Property
+    #region DeferredOperationManager Internal Property
 
     internal DeferredOperationManager DeferredOperationManager
     {
@@ -338,7 +346,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region InDeferRefresh Property
+    #region InDeferRefresh Internal Property
 
     internal bool InDeferRefresh
     {
@@ -350,7 +358,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Loaded Property
+    #region Loaded Internal Property
 
     internal bool Loaded
     {
@@ -366,7 +374,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region IsRefreshingDestinctValues Property
+    #region IsRefreshingDestinctValues Internal Property
 
     internal bool IsRefreshingDistinctValues
     {
@@ -382,7 +390,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Refreshing Property
+    #region Refreshing Internal Property
 
     internal bool Refreshing
     {
@@ -398,7 +406,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ModelSource Property
+    #region ModelSource Internal Property
 
     internal object ModelSource
     {
@@ -410,7 +418,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ItemEditionIsManuallyHandled Property
+    #region ItemEditionIsManuallyHandled Private Property
 
     private bool ItemEditionIsManuallyHandled
     {
@@ -426,7 +434,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region CreatingNewItemIsManuallyHandled Property
+    #region CreatingNewItemIsManuallyHandled Private Property
 
     private bool CreatingNewItemIsManuallyHandled
     {
@@ -442,36 +450,71 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ItemPropertiesCreated Property
+    #region ItemProperties Public Property
 
-    private bool ItemPropertiesCreated
+    public DataGridItemPropertyCollection ItemProperties
+    {
+      get
+      {
+        return m_itemProperties;
+      }
+    }
+
+    #endregion
+
+    #region DefaultItemPropertiesInitialized Private Property
+
+    private bool DefaultItemPropertiesInitialized
     {
       get
       {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.ItemPropertiesCreated ];
+        if( m_parentDetailDescription != null )
+          return m_parentDetailDescription.DefaultItemPropertiesInitialized;
+
+        return m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultItemPropertiesInitialized ];
       }
       set
       {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.ItemPropertiesCreated ] = value;
+        if( m_parentDetailDescription != null )
+        {
+          m_parentDetailDescription.DefaultItemPropertiesInitialized = value;
+        }
+        else
+        {
+          m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultItemPropertiesInitialized ] = value;
+        }
       }
     }
 
     #endregion
 
-    #region ItemProperties Property
+    #region DefaultPropertyDescriptionsCreated Private Property
 
-    public DataGridItemPropertyCollection ItemProperties
+    private bool DefaultPropertyDescriptionsCreated
     {
       get
       {
-        Debug.Assert( m_itemProperties != null );
-        return m_itemProperties;
+        if( m_parentDetailDescription != null )
+          return m_parentDetailDescription.DefaultPropertyDescriptionsCreated;
+
+        return m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultPropertyDescriptionsCreated ];
+      }
+      set
+      {
+        if( m_parentDetailDescription != null )
+        {
+          m_parentDetailDescription.DefaultPropertyDescriptionsCreated = value;
+        }
+        else
+        {
+          m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultPropertyDescriptionsCreated ] = value;
+        }
       }
     }
 
     #endregion
 
-    #region  CanCreateItemPropertiesFormModelSource Property
+    #region CanCreateItemPropertiesFormModelSource Private Property
 
     private bool CanCreateItemPropertiesFromModelSource
     {
@@ -483,7 +526,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DetailDeferRefreshes Property
+    #region DetailDeferRefreshes Internal Property
 
     internal List<List<IDisposable>> DetailDeferRefreshes
     {
@@ -497,7 +540,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DataGridContext Private Property
+    #region DataGridContext Internal Property
 
     internal DataGridContext DataGridContext
     {
@@ -525,19 +568,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region IsRootCollectionView Private Property
-
-    private bool IsRootCollectionView
-    {
-      get
-      {
-        return ( m_rootDataGridCollectionViewBase == null )
-            || ( m_rootDataGridCollectionViewBase == this );
-      }
-    }
-
-    #endregion
-
     #region DataGridCollectionViewBase ABSTRACT MEMBERS
 
     internal virtual int IndexOfSourceItem( object item )
@@ -559,110 +589,10 @@ namespace Xceed.Wpf.DataGrid
 
     internal abstract void ForceRefresh( bool sendResetNotification, bool initialLoad, bool setCurrentToFirstOnInitialLoad );
 
-    #endregion DataGridCollectionViewBase ABSTRACT MEMBERS
+    #endregion
 
     #region SOURCE
 
-    private void SetSource( object modelSource, IEnumerable source, Type itemType, bool setCurrentToFirst )
-    {
-      if( this.Loaded )
-        throw new InvalidOperationException( "An attempt was made to change the source when the collection view has already been loaded." );
-
-      m_modelSource = modelSource;
-      m_itemType = itemType;
-
-      this.SetSourceCore( source, setCurrentToFirst );
-    }
-
-    private void SetSourceCore( IEnumerable source, bool setCurrentToFirst )
-    {
-      Debug.Assert( !this.Loaded );
-
-      if( source == null )
-      {
-        m_enumeration = null;
-        m_notifyCollectionChanged = null;
-        m_dataTable = null;
-
-        this.SetCurrentItemAndPositionCore( null, -1, true, true );
-        return;
-      }
-
-      // Unsubscribe from old list event
-      if( m_notifyCollectionChanged != null )
-      {
-        CollectionChangedEventManager.RemoveListener( m_notifyCollectionChanged, this );
-      }
-
-      IBindingList oldBindingList = m_enumeration as IBindingList;
-
-      if( ( oldBindingList != null ) && ( oldBindingList.SupportsChangeNotification ) )
-      {
-        ListChangedEventManager.RemoveListener( oldBindingList, this );
-      }
-
-      m_enumeration = source;
-      m_notifyCollectionChanged = m_enumeration as INotifyCollectionChanged;
-
-      if( m_notifyCollectionChanged != null )
-      {
-        CollectionChangedEventManager.AddListener( m_notifyCollectionChanged, this );
-      }
-
-      if( m_notifyCollectionChanged == null )
-      {
-        IBindingList newBindingList = m_enumeration as IBindingList;
-
-        if( ( newBindingList != null ) && ( newBindingList.SupportsChangeNotification ) )
-        {
-          ListChangedEventManager.AddListener( newBindingList, this );
-        }
-      }
-
-      m_dataTable = m_enumeration as DataTable;
-
-      if( m_enumeration != null )
-      {
-        // Position to the first item
-        IEnumerator enumerator = m_enumeration.GetEnumerator();
-
-        if( enumerator.MoveNext() )
-        {
-          if( setCurrentToFirst )
-          {
-            this.SetCurrentItemAndPositionCore( enumerator.Current, 0, false, false );
-          }
-          else
-          {
-            this.SetCurrentItemAndPositionCore( null, -1, true, false );
-          }
-        }
-        else
-        {
-          this.SetCurrentItemAndPositionCore( null, -1, true, true );
-        }
-      }
-      else
-      {
-        this.SetCurrentItemAndPositionCore( null, -1, true, true );
-      }
-    }
-
-    internal void RemoveSourceChangedListenersForDetail()
-    {
-      if( m_notifyCollectionChanged != null )
-      {
-        CollectionChangedEventManager.RemoveListener( m_notifyCollectionChanged, this );
-      }
-
-      IBindingList bindingList = m_enumeration as IBindingList;
-
-      if( ( bindingList != null ) && ( bindingList.SupportsChangeNotification ) )
-      {
-        ListChangedEventManager.RemoveListener( bindingList, this );
-      }
-    }
-
     internal IEnumerable Enumeration
     {
       get
@@ -671,30 +601,12 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal INotifyCollectionChanged NotifyCollectionChanged
-    {
-      get
-      {
-        return m_notifyCollectionChanged;
-      }
-    }
-
     public Type ItemType
     {
       get
       {
         return m_itemType;
       }
-      private set
-      {
-        if( m_itemType == value )
-          return;
-
-        if( this.ItemPropertiesCreated )
-          throw new InvalidOperationException( "An attempt was made to modify the ItemType property after the DataGridItemProperty has been created." );
-
-        m_itemType = value;
-      }
     }
 
     internal Type DesiredItemType
@@ -709,15 +621,15 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return m_enumeration != null;
+        return ( m_enumeration != null );
       }
     }
 
-    #endregion SOURCE
+    #endregion
 
     #region SOURCE COLLECTION CHANGED HANDLERS
 
-    private void NotifyCollectionChanged_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnItemsSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
       Debug.Assert( !( this is DataGridVirtualizingCollectionViewBase ),
         "The DataGridVirtualizingCollectionView is unbound and therefore should never receive a notification from a source." );
@@ -769,11 +681,13 @@ namespace Xceed.Wpf.DataGrid
         }
 
         if( deferredOperation != null )
+        {
           this.ExecuteOrQueueSourceItemOperation( deferredOperation );
+        }
       }
     }
 
-    private void BindingList_ListChanged( object sender, ListChangedEventArgs e )
+    private void OnItemsSourceListChanged( object sender, ListChangedEventArgs e )
     {
       Debug.Assert( !( this is DataGridVirtualizingCollectionViewBase ),
         "The DataGridVirtualizingCollectionView is unbound and therefore should never receive a notification from a source." );
@@ -852,23 +766,6 @@ namespace Xceed.Wpf.DataGrid
             case ListChangedType.ItemChanged:
               {
                 var collectionView = this as DataGridCollectionView;
-
-                if( ( collectionView != null ) && collectionView.UpdateChangedPropertyStatsOnly && ( e.PropertyDescriptor != null ) )
-                {
-                  collectionView.CalculateChangedPropertyStatsOnly = true;
-
-                  var propertyName = e.PropertyDescriptor.Name;
-                  var invalidatedStatFunctions = collectionView.InvalidatedStatFunctions;
-
-                  foreach( var statFunction in collectionView.StatFunctions.Where( sf => sf.SourcePropertyNames.Contains( propertyName ) ) )
-                  {
-                    if( !invalidatedStatFunctions.Contains( statFunction ) )
-                    {
-                      invalidatedStatFunctions.Add( statFunction );
-                    }
-                  }
-                }
-
                 deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, index, items, index, items );
                 break;
               }
@@ -904,84 +801,78 @@ namespace Xceed.Wpf.DataGrid
 
     private void HandlePropertyDescriptorAdded( PropertyDescriptor property )
     {
-      // setting m_defaultItemProperties, will force the collection view to reanalyze the source to get a new list of default ItemProperties.
-      m_defaultItemProperties = null;
+      this.ClearDefaultPropertyDescriptions();
+      this.SetupDefaultPropertyDescriptions();
 
-      if( this.AutoCreateItemProperties )
-      {
-        string name = property.Name;
+      if( !this.AutoCreateItemProperties )
+        return;
 
-        if( m_itemProperties[ name ] == null )
-        {
-          foreach( DataGridItemPropertyBase itemProperty in this.GetDefaultItemProperties() )
-          {
-            if( itemProperty.Name == name )
-            {
-              this.AddValidItemProperty( itemProperty );
-              break;
-            }
-          }
-        }
-      }
+      if( m_itemProperties[ property.Name ] != null )
+        return;
+
+      var propertyRoute = PropertyRouteParser.Parse( property.Name );
+      if( propertyRoute == null )
+        return;
+
+      ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription( m_itemProperties, m_defaultPropertyDescriptions[ propertyRoute ] );
+      ItemsSourceHelper.AutoDetectSynonyms( this, DataGridItemPropertyRoute.Create( ItemsSourceHelper.GetItemPropertyFromProperty( m_itemProperties, propertyRoute ) ) );
     }
 
     private void HandlePropertyDescriptorChanged( PropertyDescriptor property )
     {
-      // setting m_defaultItemProperties, will force the collection view to reanalyse the source to get a new list of default ItemProperties.
-      m_defaultItemProperties = null;
+      this.ClearDefaultPropertyDescriptions();
+      this.SetupDefaultPropertyDescriptions();
 
-      if( this.AutoCreateItemProperties )
+      if( !this.AutoCreateItemProperties )
+        return;
+
+      if( property == null )
       {
-        if( property == null )
+        using( m_itemProperties.DeferCollectionChanged() )
         {
           for( int i = m_itemProperties.Count - 1; i >= 0; i-- )
           {
-            DataGridItemProperty oldItemProperty = m_itemProperties[ i ] as DataGridItemProperty;
-
+            var oldItemProperty = m_itemProperties[ i ] as DataGridItemProperty;
             if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
             {
               m_itemProperties.RemoveAt( i );
             }
           }
-
-          foreach( DataGridItemPropertyBase itemProperty in this.GetDefaultItemProperties() )
-          {
-            this.AddValidItemProperty( itemProperty );
-          }
         }
-        else
+
+        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
+        ItemsSourceHelper.AutoDetectSynonyms( this );
+      }
+      else
+      {
+        var oldItemProperty = m_itemProperties[ property.Name ] as DataGridItemProperty;
+
+        if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
         {
-          string name = property.Name;
-          DataGridItemProperty oldItemProperty = m_itemProperties[ name ] as DataGridItemProperty;
+          // It is better to completely remove the item property and add a new one instead of changing is content.
+          m_itemProperties.Remove( oldItemProperty );
 
-          if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
-          {
-            // It is better to completely remove the item property and add a new one instead of changing is content.
-            m_itemProperties.Remove( oldItemProperty );
-            List<DataGridItemPropertyBase> defaultItemProperties = this.GetDefaultItemProperties();
+          if( m_itemProperties[ property.Name ] != null )
+            return;
 
-            foreach( DataGridItemPropertyBase itemProperty in defaultItemProperties )
-            {
-              if( itemProperty.Name == name )
-              {
-                this.AddValidItemProperty( itemProperty );
-                break;
-              }
-            }
-          }
+          var propertyRoute = PropertyRouteParser.Parse( property.Name );
+          if( propertyRoute == null )
+            return;
+
+          ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription( m_itemProperties, m_defaultPropertyDescriptions[ propertyRoute ] );
+          ItemsSourceHelper.AutoDetectSynonyms( this, DataGridItemPropertyRoute.Create( ItemsSourceHelper.GetItemPropertyFromProperty( m_itemProperties, propertyRoute ) ) );
         }
       }
     }
 
     private void HandlePropertyDescriptorDeleted( PropertyDescriptor property )
     {
-      // setting m_defaultItemProperties, will force the collection view to reanalyse the source to get a new list of default ItemProperties.
-      m_defaultItemProperties = null;
+      this.ClearDefaultPropertyDescriptions();
+      this.SetupDefaultPropertyDescriptions();
 
       if( this.AutoCreateItemProperties )
       {
-        string name = property.Name;
-        DataGridItemProperty oldItemProperty = m_itemProperties[ name ] as DataGridItemProperty;
+        var oldItemProperty = m_itemProperties[ property.Name ] as DataGridItemProperty;
 
         if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
         {
@@ -990,186 +881,90 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SOURCE COLLECTION CHANGED HANDLERS
+    #endregion
 
     #region CHILD COLLECTION CHANGED HANDLERS
 
-    private void ItemProperties_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    // This method is also called for sub properties.
+    private void OnItemPropertiesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      // For detail DataGridCollectionView, this is usually called the first time the DetailDescription is used to generate a DataGridCollectionView.
+      var addedItems = default( IEnumerable<DataGridItemPropertyBase> );
+      var removedItems = default( IEnumerable<DataGridItemPropertyBase> );
 
       switch( e.Action )
       {
         case NotifyCollectionChangedAction.Add:
-
-          int newItemsCount = e.NewItems.Count;
-
-          for( int i = 0; i < newItemsCount; i++ )
-          {
-            DataGridItemPropertyBase dataGridItemProperty = e.NewItems[ i ] as DataGridItemPropertyBase;
-            Debug.Assert( dataGridItemProperty != null );
-
-            INotifyCollectionChanged collectionChanged = this.GetAutoFilterValues( dataGridItemProperty.Name ) as INotifyCollectionChanged;
-
-            if( collectionChanged != null )
-            {
-              collectionChanged.CollectionChanged += this.OnAutoFilterValuesChanged;
-            }
-
-            if( dataGridItemProperty.FilterCriterion != null )
-            {
-              this.AddFilteredItemProperty( dataGridItemProperty );
-            }
-          }
+          addedItems = e.NewItems.Cast<DataGridItemPropertyBase>();
           break;
 
         case NotifyCollectionChangedAction.Remove:
+          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
+          break;
 
-          int oldItemsCount = e.OldItems.Count;
-
-          using( this.DeferRefresh() )
-          {
-            for( int i = 0; i < oldItemsCount; i++ )
-            {
-              DataGridItemPropertyBase dataGridItemProperty = e.OldItems[ i ] as DataGridItemPropertyBase;
-              Debug.Assert( dataGridItemProperty != null );
-
-              string fieldName = dataGridItemProperty.Name;
+        case NotifyCollectionChangedAction.Replace:
+          addedItems = e.NewItems.Cast<DataGridItemPropertyBase>();
+          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
+          break;
 
-              INotifyCollectionChanged collectionChanged = this.GetAutoFilterValues( fieldName ) as INotifyCollectionChanged;
+        case NotifyCollectionChangedAction.Reset:
+          throw new NotSupportedException();
+      }
 
-              if( collectionChanged != null )
-              {
-                collectionChanged.CollectionChanged -= this.OnAutoFilterValuesChanged;
-              }
+      if( ( addedItems == null ) && ( removedItems == null ) )
+        return;
 
-              IList autoFilterValues = collectionChanged as IList;
+      var deferRefresh = ( this.Loaded ) ? this.DeferRefresh() : null;
 
-              if( autoFilterValues != null )
-              {
-                autoFilterValues.Clear();
-              }
-
-              this.AutoFilteredDataGridItemProperties.Remove( dataGridItemProperty );
-
-              // Clear DistinctValues for this item
-              // NOTE: we use InternalTryGetValue instead of [ ] or TryGetValue to avoid creating the item inside the DistinctValuesDictionary
-              ReadOnlyObservableHashList readOnlyObservableHashList = null;
-
-              if( ( ( DistinctValuesDictionary )this.DistinctValues ).InternalTryGetValue( fieldName, out readOnlyObservableHashList ) )
-              {
-                IList distinctValues = readOnlyObservableHashList.InnerObservableHashList;
-
-                if( distinctValues != null )
-                {
-                  distinctValues.Clear();
-                }
-              }
-
-              if( dataGridItemProperty.FilterCriterion != null )
-              {
-                m_filteredItemProperties.Remove( dataGridItemProperty );
-              }
-            }
-          }
-
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          int replaceItemsCount = e.NewItems.Count;
-
-          for( int i = 0; i < replaceItemsCount; i++ )
+      try
+      {
+        if( removedItems != null )
+        {
+          foreach( var itemProperty in removedItems )
           {
-            // If necessary, remove the old ItemProperty and add the new one in the list
-            // of ItemProperties having their FilterCriterion set.
-            DataGridItemPropertyBase dataGridItemProperty = e.OldItems[ i ] as DataGridItemPropertyBase;
-            Debug.Assert( dataGridItemProperty != null );
-
-            if( dataGridItemProperty.FilterCriterion != null )
-            {
-              m_filteredItemProperties.Remove( dataGridItemProperty );
-            }
-
-            dataGridItemProperty = e.NewItems[ i ] as DataGridItemPropertyBase;
-            Debug.Assert( dataGridItemProperty != null );
-
-            if( dataGridItemProperty.FilterCriterion != null )
-            {
-              this.AddFilteredItemProperty( dataGridItemProperty );
-            }
+            this.ClearItemProperty( itemProperty );
           }
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-
-          this.UnregisterAutoFilterCollectionChanged();
+        }
 
-          using( this.DeferRefresh() )
+        if( addedItems != null )
+        {
+          foreach( var itemProperty in addedItems )
           {
-            this.ResetDistinctValues();
-            this.ResetAutoFilterValues();
-            this.AutoFilteredDataGridItemProperties.Clear();
-            m_filteredItemProperties.Clear();
+            this.PrepareItemProperty( itemProperty );
           }
-
-          break;
+        }
       }
-    }
-
-    private void OnAutoFilterValuesChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.OnProxyAutoFilterValuesChanged( this, e );
-
-      IList autoFilterValues = sender as IList;
-
-      Debug.Assert( autoFilterValues != null );
-      string fieldName = this.GetFieldNameFromAutoFitlerValues( autoFilterValues );
-      Debug.Assert( fieldName != null );
-      Debug.Assert( m_autoFilterValues != null );
-      Debug.Assert( m_autoFilterValues[ fieldName ] == autoFilterValues );
-
-      DataGridItemPropertyBase dataGridItemProperty = this.ItemProperties[ fieldName ];
-      Debug.Assert( dataGridItemProperty != null );
-
-      ObservableCollection<DataGridItemPropertyBase> autoFilteredItemProperties = this.AutoFilteredDataGridItemProperties;
-      Debug.Assert( autoFilteredItemProperties != null );
-
-      // If we are filtered
-      if( autoFilterValues.Count > 0 )
+      finally
       {
-        // If this is a newly filtered DataGridItemProperty
-        if( !autoFilteredItemProperties.Contains( dataGridItemProperty ) )
+        lock( this.SyncRoot )
         {
-          autoFilteredItemProperties.Add( dataGridItemProperty );
+          lock( this.DeferredOperationManager )
+          {
+            //This is required as the GroupSortStatResultPropertyName property affects this collection, and thus must be updated when there is a change to the ItemsProperties.
+            this.ClearGroupSortComparers();
+          }
         }
-      }
-      else
-      {
-        // There is no more filter values for this DataGridItemProperty, 
-        // remove it from m_autoFilteredItems. 
-        if( dataGridItemProperty != null )
+
+        if( deferRefresh != null )
         {
-          autoFilteredItemProperties.Remove( dataGridItemProperty );
+          deferRefresh.Dispose();
         }
       }
+    }
 
-      if( this.AutoFilterMode != AutoFilterMode.None )
-      {
-        AutoFilterValuesChangedEventArgs autoFilterValuesChangedEventArgs = new AutoFilterValuesChangedEventArgs( m_parentDetailDescription, dataGridItemProperty, autoFilterValues, e );
+    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
+    {
+      if( itemProperty == null )
+        return;
 
-        this.RaiseAutoFilterValuesChangedEvent( autoFilterValuesChangedEventArgs );
-        m_excludedItemPropertyFromDistinctValueCalculation = dataGridItemProperty;
+      var propertyName = e.PropertyName;
 
-        try
-        {
-          // The refresh may be defered, if it's the case, m_excludedItemPropertyFromDistinctValueCalculation will 
-          // not be considered.  This behavior is what we want since a defered refresh can mean aother operation
-          // altered the items of the source so we want to rebuild the distinct value.
-          this.Refresh();
-        }
-        finally
+      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
+      {
+        var itemProperties = itemProperty.ItemPropertiesInternal;
+        if( itemProperties != null )
         {
-          m_excludedItemPropertyFromDistinctValueCalculation = null;
+          this.ClearItemProperties( itemProperties );
+          this.PrepareItemProperties( itemProperties );
         }
       }
     }
@@ -1209,7 +1004,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CHILD COLLECTION CHANGED HANDLERS
+    #endregion
 
     #region PROXY EVENTS
 
@@ -1221,26 +1016,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal event EventHandler ProxyApplyingFilterCriterias;
-
-    private void OnProxyApplyingFilterCriterias( object sender, EventArgs e )
-    {
-      if( m_rootDataGridCollectionViewBase.ProxyApplyingFilterCriterias != null )
-      {
-        m_rootDataGridCollectionViewBase.ProxyApplyingFilterCriterias( sender, e );
-      }
-    }
-
-    internal event NotifyCollectionChangedEventHandler ProxyAutoFilterValuesChanged;
-
-    private void OnProxyAutoFilterValuesChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( m_rootDataGridCollectionViewBase.ProxyAutoFilterValuesChanged != null )
-      {
-        m_rootDataGridCollectionViewBase.ProxyAutoFilterValuesChanged( sender, e );
-      }
-    }
-
     internal event EventHandler ProxyCollectionRefresh;
 
     internal void OnProxyCollectionRefresh()
@@ -1271,7 +1046,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PROXY EVENTS
+    #endregion
 
     #region EDIT PROCESS
 
@@ -1306,19 +1081,18 @@ namespace Xceed.Wpf.DataGrid
         throw new ArgumentNullException( "item" );
 
       endEditCalled = false;
-      IEditableObject editableObject = ItemsSourceHelper.GetEditableObject( item );
+      var editableObject = ItemsSourceHelper.GetEditableObject( item );
 
       // editableObject can be an Xceed datarow when directly inserted as Items in the DataGridControl.
       if( ( editableObject != null ) && ( !( editableObject is Xceed.Wpf.DataGrid.DataRow ) ) )
       {
         // Keep a copy of the values, because if EndEdit throw ( for a DataView ), we loose the old values.
-        DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-        int count = itemProperties.Count;
-        object[] oldValueBeforeEndEdit = new object[ count ];
+        var itemProperties = this.ItemProperties;
+        var oldValueBeforeEndEdit = new Dictionary<DataGridItemPropertyBase, object>( itemProperties.Count );
 
-        for( int i = 0; i < count; i++ )
+        foreach( var itemProperty in itemProperties )
         {
-          oldValueBeforeEndEdit[ i ] = itemProperties[ i ].GetValue( item );
+          oldValueBeforeEndEdit[ itemProperty ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
         }
 
         try
@@ -1326,36 +1100,35 @@ namespace Xceed.Wpf.DataGrid
           editableObject.EndEdit();
           endEditCalled = true;
         }
-        catch
+        finally
         {
-          // Since the DataView of MS cancel the edition when EndEdit is throwing, we ensure to restart the edition mode.
-          editableObject.BeginEdit();
+          if( !endEditCalled )
+          {
+            // Since the DataView of MS cancel the edition when EndEdit is throwing, we ensure to restart the editing mode.
+            editableObject.BeginEdit();
 
-          itemProperties.SuspendUnboundItemPropertyChanged( item );
+            itemProperties.SuspendUnboundItemPropertyChanged( item );
 
-          try
-          {
-            // restore the oldvalues
-            for( int i = 0; i < count; i++ )
+            try
             {
-              DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-
-              bool readOnly = ( ( item == m_currentAddItem )
-                              && itemProperty.OverrideReadOnlyForInsertion.HasValue
-                              && itemProperty.OverrideReadOnlyForInsertion.Value )
-                ? false
-                : itemProperty.IsReadOnly;
+              // restore the oldvalues
+              foreach( var itemProperty in itemProperties )
+              {
+                var readOnly = ( ( item == m_currentAddItem ) && itemProperty.OverrideReadOnlyForInsertion.HasValue && itemProperty.OverrideReadOnlyForInsertion.Value )
+                                 ? false
+                                 : itemProperty.IsReadOnly;
 
-              if( !readOnly )
-                itemProperties[ i ].SetValue( item, oldValueBeforeEndEdit[ i ] );
+                if( !readOnly )
+                {
+                  ItemsSourceHelper.SetValueForItemProperty( itemProperty, item, oldValueBeforeEndEdit[ itemProperty ] );
+                }
+              }
+            }
+            finally
+            {
+              itemProperties.ResumeUnboundItemPropertyChanged( item );
             }
           }
-          finally
-          {
-            itemProperties.ResumeUnboundItemPropertyChanged( item );
-          }
-
-          throw;
         }
       }
     }
@@ -1451,7 +1224,7 @@ namespace Xceed.Wpf.DataGrid
         m_parentCollectionViewSourceBase.OnEditCommitted( e );
     }
 
-    #endregion EDIT PROCESS
+    #endregion
 
     #region INSERTION PROCESS
 
@@ -1538,7 +1311,7 @@ namespace Xceed.Wpf.DataGrid
         m_parentCollectionViewSourceBase.OnNewItemCanceled( e );
     }
 
-    #endregion INSERTION PROCESS
+    #endregion
 
     #region DELETION PROCESS
 
@@ -1555,638 +1328,29 @@ namespace Xceed.Wpf.DataGrid
       throw new InvalidOperationException( "An attempt was made to remove an item from the source collection." );
     }
 
-    public event EventHandler<DataGridRemovingItemEventArgs> RemovingItem;
-
-    internal void OnRemovingItem( DataGridRemovingItemEventArgs e )
-    {
-      if( this.RemovingItem != null )
-        this.RemovingItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnRemovingItem( e );
-    }
-
-    public event EventHandler<DataGridItemRemovedEventArgs> ItemRemoved;
-
-    internal void OnItemRemoved( DataGridItemRemovedEventArgs e )
-    {
-      if( this.ItemRemoved != null )
-        this.ItemRemoved( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnItemRemoved( e );
-    }
-
-    #endregion DELETION PROCESS
-
-    #region MASTER DETAIL
-
-    private static List<DataGridDetailDescription> EmptyDataGridDetailDescriptionList = new List<DataGridDetailDescription>();
-
-    internal virtual bool CanHaveDetails
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    private void DataGridDetailDescriptions_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( !this.CanHaveDetails )
-        throw new InvalidOperationException( "An attempt was made to modify the DetailDescriptions of a " + this.GetType().Name + ", which does not support master detail." );
-
-      // Set the AutoFilterValuesChanged event for each
-      // newly added DataGridDetailDescription added to 
-      // collection
-      int newItemsCount = ( e.NewItems != null )
-       ? e.NewItems.Count
-       : 0;
-
-      int oldItemsCount = ( e.OldItems != null )
-      ? e.OldItems.Count
-      : 0;
-
-      for( int i = 0; i < oldItemsCount; i++ )
-      {
-        DataGridDetailDescription description = e.OldItems[ i ] as DataGridDetailDescription;
-
-        if( description == null )
-          continue;
-
-        description.UnregisterAllAutoFilterValuesChangedEvent();
-      }
-
-      for( int i = 0; i < newItemsCount; i++ )
-      {
-        DataGridDetailDescription description = e.NewItems[ i ] as DataGridDetailDescription;
-
-        if( description == null )
-          continue;
-
-        description.DetailDescriptionAutoFilterValuesChanged = this.RaiseAutoFilterValuesChangedEvent;
-      }
-    }
-
-    internal DataGridDetailDescriptionCollection DetailDescriptions
-    {
-      get
-      {
-        Debug.Assert( m_dataGridDetailDescriptions != null );
-        return m_dataGridDetailDescriptions;
-      }
-    }
-
-    internal virtual List<DataGridDetailDescription> GetDefaultDetailDescriptions()
-    {
-      if( m_defaultDetailDescriptions == null )
-      {
-        if( this.CanCreateDetailDescriptions() )
-        {
-          m_defaultDetailDescriptions = this.CreateDetailDescriptions();
-
-          // Propagate the AutoCreateForeignKeyDescriptions values to the auto created DataGridDetailDescription.
-          foreach( var description in m_defaultDetailDescriptions.Where( item => item.IsAutoCreated ) )
-          {
-            description.AutoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
-          }
-        }
-        else
-        {
-          return DataGridCollectionViewBase.EmptyDataGridDetailDescriptionList;
-        }
-      }
-
-      return m_defaultDetailDescriptions;
-    }
-
-    internal virtual bool CanCreateDetailDescriptions()
-    {
-      return ( ( m_enumeration != null ) || ( m_itemType != typeof( object ) ) );
-    }
-
-    private List<DataGridDetailDescription> CreateDetailDescriptions()
-    {
-      //Source collection is a DataTable or a DataTable was detected by looking at the first item in the collection.
-      if( m_dataTable != null )
-        return this.CreateDetailDescriptionsForTable();
-
-      if( typeof( XmlNode ).IsAssignableFrom( m_itemType ) )
-        return new List<DataGridDetailDescription>();
-
-      //Unbound mode, we do not support Master/Detail in this scenario.
-      if( typeof( DataRow ).IsAssignableFrom( m_itemType ) )
-        return new List<DataGridDetailDescription>();
-
-      //we do not support Master/Details when Item is a Value type...
-      if( ItemsSourceHelper.IsValueType( m_itemType ) )
-        return new List<DataGridDetailDescription>();
-
-      //Check if the object is a Entity Framework Entity, before checking for IEnumerable (since Entity Framework does have IEnumerable
-      //properties, but require special handling )...
-      if( ItemsSourceHelper.IsEntityFramework( m_itemType ) )
-        return DataGridCollectionViewBase.CreateDetailDescriptionsForEntityFramework( m_itemType );
-
-      //If the first item maps to an object that implements IEnumerable, expand that as a Relation ( and only that )...
-      if( typeof( IEnumerable ).IsAssignableFrom( m_itemType ) )
-        return DataGridCollectionViewBase.CreateDetailDescriptionsForEnumerable();
-
-      if( typeof( IListSource ).IsAssignableFrom( m_itemType ) )
-        return DataGridCollectionViewBase.CreateDetailDescriptionsForListSource();
-
-      //If the Source collection implements ITypedList
-      var typedList = m_enumeration as ITypedList;
-      if( typedList != null )
-        return DataGridCollectionViewBase.GetDataGridDetailDescriptions( typedList.GetItemProperties( null ) );
-
-      var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( m_enumeration, m_itemType );
-      if( customTypeDescriptor != null )
-        return DataGridCollectionViewBase.GetDataGridDetailDescriptions( customTypeDescriptor.GetProperties() );
-
-      return DataGridCollectionViewBase.GetDataGridDetailDescriptions( TypeDescriptor.GetProperties( m_itemType ) );
-    }
-
-    private static List<DataGridDetailDescription> CreateDetailDescriptionsForEnumerable()
-    {
-      List<DataGridDetailDescription> newList = new List<DataGridDetailDescription>( 1 );
-      DataGridDetailDescription detailDesc = new EnumerableDetailDescription();
-      detailDesc.IsAutoCreated = true;
-
-      newList.Add( detailDesc );
-
-      return newList;
-    }
-
-    private static List<DataGridDetailDescription> CreateDetailDescriptionsForListSource()
-    {
-      List<DataGridDetailDescription> newList = new List<DataGridDetailDescription>( 1 );
-      ListSourceDetailDescription detailDesc = new ListSourceDetailDescription();
-      detailDesc.IsAutoCreated = true;
-
-      newList.Add( detailDesc );
-
-      return newList;
-    }
-
-    private List<DataGridDetailDescription> CreateDetailDescriptionsForTable()
-    {
-      List<DataGridDetailDescription> relations = new List<DataGridDetailDescription>( m_dataTable.ChildRelations.Count );
-      foreach( DataRelation relation in m_dataTable.ChildRelations )
-      {
-        DataRelationDetailDescription description = new DataRelationDetailDescription( relation );
-        description.IsAutoCreated = true;
-        relations.Add( description );
-      }
-
-      return relations;
-    }
-
-    private static List<DataGridDetailDescription> CreateDetailDescriptionsForEntityFramework( Type type )
-    {
-      List<DataGridDetailDescription> relations = new List<DataGridDetailDescription>();
-
-      // Gets all the public properties of the type.
-      PropertyInfo[] propertyInfos = type.GetProperties( BindingFlags.Instance | BindingFlags.Public );
-
-      // Loop throught the properties to build up the detail descriptions.
-      foreach( PropertyInfo propertyInfo in propertyInfos )
-      {
-        Type propertyType = propertyInfo.PropertyType;
-
-        // The property must be of type RelatedEnd and IEnumerable to continue.
-
-        if( ( propertyType.BaseType != null )
-          && ( propertyType.BaseType.FullName == "System.Data.Objects.DataClasses.RelatedEnd" )
-          && ( typeof( IEnumerable ).IsAssignableFrom( propertyInfo.PropertyType ) ) )
-        {
-          relations.Add( new EntityDetailDescription( propertyInfo.Name ) );
-        }
-      }
-
-      return relations;
-    }
-
-    private static List<DataGridDetailDescription> GetDataGridDetailDescriptions( PropertyDescriptorCollection properties )
-    {
-      Type enumrableType = typeof( IEnumerable );
-      Type listSourceType = typeof( IListSource );
-
-      List<DataGridDetailDescription> detailDescriptions = new List<DataGridDetailDescription>( properties.Count );
-
-      foreach( PropertyDescriptor property in properties )
-      {
-        // We only create details for properties that are browsable.
-        if( !property.IsBrowsable )
-          continue;
-
-        if( ItemsSourceHelper.IsASubRelationship( property.PropertyType ) )
-        {
-          PropertyDetailDescription description = new PropertyDetailDescription( property );
-          description.IsAutoCreated = true;
-          detailDescriptions.Add( description );
-        }
-      }
-
-      return detailDescriptions;
-    }
-
-    #endregion MASTER DETAIL
-
-    #region AUTO FILTERING
-
-    internal event EventHandler<AutoFilterValuesChangedEventArgs> AutoFilterValuesChanged;
-
-    public event EventHandler DistinctValuesRefreshNeeded;
-
-    internal AutoFilterMode AutoFilterMode
-    {
-      get
-      {
-        return m_autoFilterMode;
-      }
-      set
-      {
-        if( ( !this.CanAutoFilter ) && ( value != AutoFilterMode.None ) )
-          throw new NotSupportedException( "This collection view does not support automatic filtering." );
-
-        if( m_autoFilterMode != value )
-        {
-          m_autoFilterMode = value;
-
-          if( value == AutoFilterMode.None )
-          {
-            this.ResetDistinctValues();
-          }
-
-          if( this.Loaded )
-          {
-            this.Refresh();
-          }
-
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "AutoFilterMode" ) );
-        }
-      }
-    }
-
-    public virtual DistinctValuesConstraint DistinctValuesConstraint
-    {
-      get
-      {
-        return m_distinctValuesConstraint;
-      }
-      set
-      {
-        if( value != m_distinctValuesConstraint )
-        {
-          using( this.DeferRefresh() )
-          {
-            m_distinctValuesConstraint = value;
-
-            this.RefreshDistinctValues( true );
-          }
-        }
-      }
-    }
-
-    public DistinctValuesUpdateMode DistinctValuesUpdateMode
-    {
-      get
-      {
-        return m_distinctValueUpdateMode;
-      }
-      set
-      {
-        m_distinctValueUpdateMode = value;
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods" )]
-    public IDictionary<string, ReadOnlyObservableHashList> DistinctValues
-    {
-      get
-      {
-        return m_distinctValues;
-      }
-    }
-
-    internal IDictionary<string, IList> AutoFilterValues
-    {
-      get
-      {
-        return m_autoFilterValues;
-      }
-    }
-
-    public ICollection GetDistinctValues( string fieldName )
-    {
-      ReadOnlyObservableHashList distinctValues = null;
-
-      this.DistinctValues.TryGetValue( fieldName, out distinctValues );
-
-      return distinctValues;
-    }
-
-    internal ObservableCollection<DataGridItemPropertyBase> AutoFilteredDataGridItemProperties
-    {
-      get
-      {
-        return m_autoFilteredDataGridItemProperties;
-      }
-    }
-
-    internal static void RemoveUnusedDistinctValues( IComparer sortComparer, HashSet<object> currentValues, ObservableHashList cachedValues, object convertNullTo )
-    {
-      bool needsResort = false;
-      List<int> itemsToDelete = new List<int>();
-      int cachedValuesCount = cachedValues.Count;
-
-      // Find no more existing values
-      for( int i = 0; i < cachedValuesCount; i++ )
-      {
-        object cachedValue = cachedValues[ i ];
-
-        if( cachedValue == convertNullTo )
-        {
-          cachedValue = null;
-        }
-
-        if( currentValues.Remove( cachedValue ) )
-        {
-          // remaining items will only be newly added ones
-        }
-        else
-        {
-          // Item is not currently in column, will be deleted
-          itemsToDelete.Add( i );
-        }
-      }
-
-      // Remove unused items
-      int count = itemsToDelete.Count;
-
-      for( int i = count - 1; i >= 0; i-- )
-      {
-        cachedValues.RemoveAt( itemsToDelete[ i ] );
-      }
-
-      // Every item not removed from the current values are new values, we add them to columnDistinctValues
-      needsResort = ( currentValues.Count > 0 );
-
-      foreach( object key in currentValues )
-      {
-        if( key == null )
-        {
-          cachedValues.Add( convertNullTo );
-        }
-        else
-        {
-          cachedValues.Add( key );
-        }
-      }
-
-      if( needsResort )
-      {
-        cachedValues.Sort( sortComparer );
-      }
-    }
-
-    internal void RaiseAutoFilterValuesChangedEvent( AutoFilterValuesChangedEventArgs e )
-    {
-      // This will not be raised for Details since the ParentCollectionViewSourceBase
-      // is always null for a detail. The event will be raised by the 
-      // DataGridDetailDescription.AutoFilterValuesChanged internal Action
-      // to assert only 1 event is sent to the user event if there are more than
-      // 1 DataGridContext expanded.
-      if( this.AutoFilterValuesChanged != null )
-        this.AutoFilterValuesChanged( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnAutoFilterValuesChanged( e );
-    }
-
-    internal void RaiseDistinctValuesRefreshNeeded()
-    {
-      //The AutoFilterControl is the primary "user" of this events, it will use it to know when to update the DistinctValues when its DropDown gets open.
-      //However, users can subscribe to it, so they can update the DistinctValues when they use the AutoFilterControl outside the grid.
-      if( this.DistinctValuesRefreshNeeded != null )
-      {
-        this.DistinctValuesRefreshNeeded( this, EventArgs.Empty );
-      }
-
-      if( m_parentCollectionViewSourceBase != null )
-      {
-        m_parentCollectionViewSourceBase.RaiseDistinctValuesRefreshNeeded();
-      }
-    }
-
-    internal IList GetAutoFilterValues( string fieldName )
-    {
-      Debug.Assert( !string.IsNullOrEmpty( fieldName ), "fieldName can't be null" );
-
-      if( fieldName == null )
-        throw new ArgumentNullException( "dataGridItemProperty" );
-
-      IList autoFilterValues;
-
-      if( !m_autoFilterValues.TryGetValue( fieldName, out autoFilterValues ) )
-      {
-        ObservableHashList hashList = new ObservableHashList();
-        autoFilterValues = hashList;
-        m_autoFilterValues.InternalAdd( fieldName, hashList );
-
-        // Notify the DetailDescription that it must listen to 
-        // AutoFilterValues CollectionChanged for a specific
-        // field name and autoFilterValues in order to raise
-        // the AutoFilterValuesChanged properly
-        if( m_parentDetailDescription != null )
-          m_parentDetailDescription.RegisterAutoFilterValuesChangedEvent( fieldName, hashList );
-      }
-
-      return autoFilterValues;
-    }
-
-    internal void ForceRefreshDistinctValuesForFieldName( string fieldName )
-    {
-      if( this.AutoFilterMode == AutoFilterMode.None )
-        return;
-
-      // Avoid multiple refreshes caused by NotifyCollectionChanged events when adding or removing
-      // values from distinct values lists
-      if( this.IsRefreshingDistinctValues )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridCollectionView while it is already in the process of refreshing." );
-
-      this.IsRefreshingDistinctValues = true;
-
-      try
-      {
-        var dataGridItemProperty = this.ItemProperties[ fieldName ];
-        if( ( dataGridItemProperty == null ) || ( !dataGridItemProperty.CalculateDistinctValues ) )
-          return;
-
-        this.RefreshDistinctValuesForField( dataGridItemProperty );
-      }
-      finally
-      {
-        this.IsRefreshingDistinctValues = false;
-      }
-    }
-
-    internal abstract void RefreshDistinctValuesForField( DataGridItemPropertyBase dataGridItemProperty );
-
-    internal void ForceRefreshDistinctValues( bool filteredItemsChanged )
-    {
-      if( this.AutoFilterMode == AutoFilterMode.None )
-        return;
-
-      // Avoid multiple refreshes caused by NotifyCollectionChanged events when adding or removing
-      // values from distinct values lists
-      if( this.IsRefreshingDistinctValues )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridCollectionView while it is already in the process of refreshing." );
-
-      this.IsRefreshingDistinctValues = true;
-
-      try
-      {
-        for( int propertyIndex = 0; propertyIndex < m_itemProperties.Count; propertyIndex++ )
-        {
-          var dataGridItemProperty = m_itemProperties[ propertyIndex ];
-
-          if( !dataGridItemProperty.CalculateDistinctValues )
-            continue;
-
-          if( dataGridItemProperty == m_excludedItemPropertyFromDistinctValueCalculation )
-            continue;
-
-          // No modifications to filtered items, do not calculated Distinct Values for this DataGridItemProperty
-          if( ( this.DistinctValuesConstraint != DistinctValuesConstraint.All ) && ( !filteredItemsChanged ) )
-            continue;
-
-          this.RefreshDistinctValuesForField( dataGridItemProperty );
-        }
-      }
-      finally
-      {
-        this.IsRefreshingDistinctValues = false;
-      }
-    }
-
-    internal void RefreshDistinctValues( bool filteredItemsChanged )
-    {
-      Debug.Assert( !( this is DataGridVirtualizingCollectionViewBase ) );
-
-      this.EnsureThread();
-
-      lock( this.SyncRoot )
-      {
-        lock( this.DeferredOperationManager )
-        {
-          if( m_autoFilterMode == DataGrid.AutoFilterMode.None )
-            return;
-
-          if( filteredItemsChanged )
-          {
-            this.ExecuteOrQueueSourceItemOperation( DeferredOperation.RefreshDistinctValuesOperationWithFilteredItemsChanged );
-          }
-          else
-          {
-            this.ExecuteOrQueueSourceItemOperation( DeferredOperation.RefreshDistinctValuesOperation );
-          }
-        }
-      }
-    }
-
-    private void ResetDistinctValues()
-    {
-      //The internal ReadOnlyObservableHashList's must be removed, so they are re-created and properly populated when they are queried again.
-      m_distinctValues.InternalClear();
-    }
-
-    private void ResetAutoFilterValues()
-    {
-      if( m_autoFilterValues == null )
-        return;
-
-      foreach( IList values in m_autoFilterValues.Values )
-      {
-        if( values != null )
-          values.Clear();
-      }
-    }
-
-    private string GetFieldNameFromAutoFitlerValues( IList targetAutoFilterValues )
-    {
-      IDictionary<string, IList> autoFilterValues = this.AutoFilterValues;
-
-      foreach( string fieldName in autoFilterValues.Keys )
-      {
-        if( autoFilterValues[ fieldName ] == targetAutoFilterValues )
-          return fieldName;
-      }
-
-      return null;
-    }
-
-    #endregion AUTO FILTERING
-
-    #region FILTER CRITERION
-
-    public FilterCriteriaMode FilterCriteriaMode
-    {
-      get
-      {
-        return m_filterCriteriaMode;
-      }
-
-      set
-      {
-        if( value != m_filterCriteriaMode )
-        {
-          m_filterCriteriaMode = value;
-          this.ReapplyFilterCriterion();
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "FilterCriteriaMode" ) );
-        }
-      }
-    }
-
-    internal ReadOnlyCollection<DataGridItemPropertyBase> FilteredCriterionItemProperties
-    {
-      get
-      {
-        return m_readOnlyFilteredItemProperties;
-      }
-    }
-
-    // We use the FilterCriterionChanged event instead of the generic PropertyChanged 
-    // event to be more efficient and be advised if any of the FilterCriterion hierarchy
-    // sub-property changes.
-    private void ItemProperties_FilterCriterionChanged( object sender, EventArgs e )
-    {
-      this.ReapplyFilterCriterion();
-    }
+    public event EventHandler<DataGridRemovingItemEventArgs> RemovingItem;
 
-    private void ReapplyFilterCriterion()
+    internal void OnRemovingItem( DataGridRemovingItemEventArgs e )
     {
-      this.OnProxyApplyingFilterCriterias( this, EventArgs.Empty );
-
-      m_filteredItemProperties.Clear();
-
-      foreach( DataGridItemPropertyBase itemProperty in this.ItemProperties )
-      {
-        if( itemProperty.FilterCriterion != null )
-        {
-          this.AddFilteredItemProperty( itemProperty );
-        }
-      }
+      if( this.RemovingItem != null )
+        this.RemovingItem( this, e );
 
-      this.Refresh();
+      if( m_parentCollectionViewSourceBase != null )
+        m_parentCollectionViewSourceBase.OnRemovingItem( e );
     }
 
-    private void AddFilteredItemProperty( DataGridItemPropertyBase itemProperty )
+    public event EventHandler<DataGridItemRemovedEventArgs> ItemRemoved;
+
+    internal void OnItemRemoved( DataGridItemRemovedEventArgs e )
     {
-      m_filteredItemProperties.Add( itemProperty );
+      if( this.ItemRemoved != null )
+        this.ItemRemoved( this, e );
+
+      if( m_parentCollectionViewSourceBase != null )
+        m_parentCollectionViewSourceBase.OnItemRemoved( e );
     }
 
-    #endregion FILTER CRITERION
+    #endregion
 
     #region CURRENCY MANAGEMENT
 
@@ -2295,7 +1459,7 @@ namespace Xceed.Wpf.DataGrid
       m_flags[ ( int )DataGridCollectionViewBaseFlags.IsCurrentAfterLast ] = isCurrentAfterLast;
     }
 
-    #endregion CURRENCY MANAGEMENT
+    #endregion
 
     #region DEFERRED OPERATIONS HANDLING
 
@@ -2432,7 +1596,7 @@ namespace Xceed.Wpf.DataGrid
       m_deferredAddNewOperationManager.Add( deferredOperation );
     }
 
-    #endregion DEFERRED OPERATIONS HANDLING
+    #endregion
 
     protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
     {
@@ -2447,7 +1611,7 @@ namespace Xceed.Wpf.DataGrid
       base.OnCollectionChanged( args );
     }
 
-    internal virtual void ProcessInvalidatedGroupStats( HashSet<DataGridCollectionViewGroup> invalidatedGroups )
+    internal virtual void ProcessInvalidatedGroupStats( HashSet<DataGridCollectionViewGroup> invalidatedGroups, bool resortGroups )
     {
     }
 
@@ -2462,35 +1626,12 @@ namespace Xceed.Wpf.DataGrid
 
     internal virtual void CreateDefaultCollections( DataGridDetailDescription parentDetailDescription )
     {
-      Debug.Assert( parentDetailDescription == null || this.CanHaveDetails );
-
-      m_sortDescriptions = ( parentDetailDescription == null ) ? new DataGridSortDescriptionCollection() :
-        parentDetailDescription.SortDescriptions as DataGridSortDescriptionCollection;
+      Debug.Assert( parentDetailDescription == null );
 
+      m_sortDescriptions = ( parentDetailDescription == null ) ? new DataGridSortDescriptionCollection() : parentDetailDescription.SortDescriptions as DataGridSortDescriptionCollection;
       m_groupDescriptions = ( parentDetailDescription == null ) ? new GroupDescriptionCollection() : parentDetailDescription.GroupDescriptions;
     }
 
-    internal virtual void RegisterChangedEvents()
-    {
-      ( ( INotifyCollectionChanged )m_sortDescriptions ).CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnSortDescriptionsChanged );
-      ( ( INotifyCollectionChanged )m_groupDescriptions ).CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnGroupDescriptionsChanged );
-
-      ItemPropertyGroupSortStatNameChangedEventManager.AddListener( m_itemProperties, this );
-    }
-
-    internal virtual void UnregisterChangedEvents()
-    {
-      ( ( INotifyCollectionChanged )m_sortDescriptions ).CollectionChanged -= this.OnSortDescriptionsChanged;
-      ( ( INotifyCollectionChanged )m_groupDescriptions ).CollectionChanged -= this.OnGroupDescriptionsChanged;
-
-      ItemPropertyGroupSortStatNameChangedEventManager.RemoveListener( m_itemProperties, this );
-
-      m_itemProperties.CollectionChanged -= this.ItemProperties_CollectionChanged;
-      m_itemProperties.FilterCriterionChanged -= this.ItemProperties_FilterCriterionChanged;
-
-      this.UnregisterAutoFilterCollectionChanged();
-    }
-
     internal bool IsSourceSupportingChangeNotification
     {
       get
@@ -2505,355 +1646,357 @@ namespace Xceed.Wpf.DataGrid
       m_detailDeferRefreshes = new List<List<IDisposable>>();
     }
 
-    private void SetupDefaultDetailDescriptions()
+    internal void Dispose()
     {
-      if( this.CanHaveDetails )
+      if( this.ParentCollectionViewSourceBase != null )
       {
-        List<DataGridDetailDescription> defaultDetailDescriptions = this.GetDefaultDetailDescriptions();
+        this.ParentCollectionViewSourceBase = null;
 
-        if( this.AutoCreateDetailDescriptions )
-        {
-          m_dataGridDetailDescriptions = new DataGridDetailDescriptionCollection( defaultDetailDescriptions );
-        }
-        else
-        {
-          m_dataGridDetailDescriptions = new DataGridDetailDescriptionCollection( new List<DataGridDetailDescription>() );
-        }
-
-        m_dataGridDetailDescriptions.DefaultDetailDescriptions = defaultDetailDescriptions;
-      }
-      else
-      {
-        // We still create the DetailDescriptions collection but will validate on any modification that the collection view does
-        // in fact support master/detail.
-        m_dataGridDetailDescriptions = new DataGridDetailDescriptionCollection( new List<DataGridDetailDescription>() );
+        this.ClearDefaultPropertyDescriptions();
+        this.ClearItemProperties();
       }
 
-      CollectionChangedEventManager.AddListener( m_dataGridDetailDescriptions, this );
+      this.ClearItemProperties( m_itemProperties );
+      this.UnregisterChangedEvents();
     }
 
-    private void UnregisterAutoFilterCollectionChanged()
+    private void SetupDefaultDetailDescriptions()
     {
-      if( m_autoFilterValues != null )
+      if( ( m_parentDetailDescription != null ) && m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted )
+        return;
+
+      if( this.AutoCreateDetailDescriptions)
       {
-        foreach( INotifyCollectionChanged notifyCollectionChanged in m_autoFilterValues.Values )
+        var defaultDetailDescriptions = ItemsSourceHelper.CreateDetailDescriptions( m_itemType, m_enumeration );
+        if( defaultDetailDescriptions != null )
         {
-          notifyCollectionChanged.CollectionChanged -= this.OnAutoFilterValuesChanged;
+          foreach( var detailDescription in defaultDetailDescriptions )
+          {
+            if( m_detailDescriptions[ detailDescription.RelationName ] != null )
+              continue;
+
+            if( detailDescription.IsAutoCreated )
+            {
+              // Propagate the AutoCreateForeignKeyDescriptions values to the auto created DataGridDetailDescription.
+              detailDescription.AutoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
+            }
+
+            m_detailDescriptions.Add( detailDescription );
+          }
         }
       }
+
+      if( m_parentDetailDescription != null )
+      {
+        m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted = true;
+      }
     }
 
-    private void InitializeFromExternalDeclaration( IEnumerable collection, Type itemType )
+    private void SetupCurrent( bool setToFirstItem )
     {
-      Debug.Assert( m_parentDetailDescription.ItemProperties != null );
-      Debug.Assert( m_parentDetailDescription.DetailDescriptions != null );
-      Debug.Assert( m_parentDetailDescription.StatFunctions != null );
-      Debug.Assert( m_parentDetailDescription.SortDescriptions != null );
-      Debug.Assert( m_parentDetailDescription.GroupDescriptions != null );
-      Debug.Assert( itemType != null );
-      Debug.Assert( m_parentDetailDescription.AutoFilterValues != null );
-      Debug.Assert( m_parentDetailDescription.AutoFilteredItems != null );
-
-      m_itemProperties = m_parentDetailDescription.ItemProperties;
-
-      //Ensure that the default item properties and the item type is set on the ItemProperties collection
-      if( m_itemProperties.ItemType == null )
-        m_itemProperties.ItemType = itemType;
-
-      m_dataGridDetailDescriptions = m_parentDetailDescription.DetailDescriptions;
-
-      this.CreateDefaultCollections( m_parentDetailDescription );
-
-      m_autoFilterMode = m_parentDetailDescription.AutoFilterMode;
-      m_autoFilterValues = m_parentDetailDescription.AutoFilterValues as ReadOnlyDictionary<string, IList>;
-      m_autoFilteredDataGridItemProperties = m_parentDetailDescription.AutoFilteredItems;
-      m_distinctValuesConstraint = m_parentDetailDescription.DistinctValuesConstraint;
-      m_filterCriteriaMode = m_parentDetailDescription.FilterCriteriaMode;
-
-      //Register to the change notifications for the Group/Sort descriptions collections
-      this.RegisterChangedEvents();
-
-      // - then call the SetSource, with the source and the itemType...
-      this.SetSource( null, collection, itemType, false );
-
+      Debug.Assert( !this.Loaded );
 
-      //cross-initialize the DefaultDetailDescriptions of the DataGridCollectionView and/or DataGridDetailDescriptionCollection
-      if( m_dataGridDetailDescriptions.DefaultDetailDescriptions != null )
-      {
-        m_defaultDetailDescriptions = new List<DataGridDetailDescription>( m_dataGridDetailDescriptions.DefaultDetailDescriptions );
-      }
-      else
-      {
-        m_dataGridDetailDescriptions.DefaultDetailDescriptions = new List<DataGridDetailDescription>( this.GetDefaultDetailDescriptions() );
-      }
+      var enumerator = ( m_enumeration != null ) ? m_enumeration.GetEnumerator() : null;
 
-      //cross-initialize the DefaultItemProperties of the DataGridCollectionView and/or DataGridItemPropertyCollection
-      if( m_itemProperties.DefaultItemProperties != null )
-      {
-        m_defaultItemProperties = new List<DataGridItemPropertyBase>( m_itemProperties.DefaultItemProperties );
-      }
-      else
+      try
       {
-        m_itemProperties.DefaultItemProperties = new List<DataGridItemPropertyBase>( this.GetDefaultItemProperties() );
+        if( ( enumerator != null ) && enumerator.MoveNext() )
+        {
+          if( setToFirstItem )
+          {
+            this.SetCurrentItemAndPositionCore( enumerator.Current, 0, false, false );
+          }
+          else
+          {
+            this.SetCurrentItemAndPositionCore( null, -1, true, false );
+          }
+        }
+        else
+        {
+          this.SetCurrentItemAndPositionCore( null, -1, true, true );
+        }
       }
-
-      // Creates the item properties if auto-creation is ON and no one already created them.
-      if( ( this.AutoCreateItemProperties )
-        && ( !m_parentDetailDescription.AutoCreateItemPropertiesCompleted ) )
+      finally
       {
-        this.DetectSynonyms( m_itemProperties );
-
-        foreach( DataGridItemPropertyBase itemProperty in m_defaultItemProperties )
+        var disposable = enumerator as IDisposable;
+        if( disposable != null )
         {
-          this.AddValidItemProperty( itemProperty );
+          disposable.Dispose();
         }
-
-        m_parentDetailDescription.AutoCreateItemPropertiesCompleted = true;
       }
+    }
 
-      // List for ItemProperties changes to be able to refresh when AutoFilterValues changes
-      m_itemProperties.CollectionChanged += this.ItemProperties_CollectionChanged;
-      m_itemProperties.FilterCriterionChanged += this.ItemProperties_FilterCriterionChanged;
+    private void RegisterChangedEvents()
+    {
+      this.RegisterSourceChanged( m_enumeration );
 
-      // Register CollectionChanged for AutoFiltering on every DataGridItemProperties 
-      // already in ItemProperties since they are already defined
-      foreach( DataGridItemPropertyBase dataGridItemProperty in m_itemProperties )
-      {
-        INotifyCollectionChanged collectionChanged = this.GetAutoFilterValues( dataGridItemProperty.Name ) as INotifyCollectionChanged;
+      CollectionChangedEventManager.AddListener( m_sortDescriptions, this );
+      CollectionChangedEventManager.AddListener( m_groupDescriptions, this );
 
-        if( collectionChanged != null )
-          collectionChanged.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnAutoFilterValuesChanged );
-      }
+      ItemPropertyGroupSortStatNameChangedEventManager.AddListener( m_itemProperties, this );
 
-      // Creates the detail descriptions if auto-creation is ON no one already created them.
-      if( ( this.AutoCreateDetailDescriptions )
-        && ( !m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted ) )
+      if( m_parentDetailDescription == null )
       {
-        List<DataGridDetailDescription> defaultDetailDescriptions = this.GetDefaultDetailDescriptions();
-
-        foreach( DataGridDetailDescription detailDescription in defaultDetailDescriptions )
-        {
-          if( m_dataGridDetailDescriptions[ detailDescription.RelationName ] == null )
-            m_dataGridDetailDescriptions.Add( detailDescription );
-        }
-
-        m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted = true;
+        InitializeItemPropertyEventManager.AddListener( m_itemProperties, this );
+        CollectionChangedEventManager.AddListener( m_detailDescriptions, this );
       }
+    }
 
-      m_filteredItemProperties.Clear();
+    private void UnregisterChangedEvents()
+    {
+      this.UnregisterSourceChanged( m_enumeration );
 
-      foreach( DataGridItemPropertyBase itemProperty in m_itemProperties )
-      {
-        // Set default value for CalculateDistinctValues if not explicitly set
-        if( !itemProperty.IsCalculateDistinctValuesInitialized )
-          itemProperty.CalculateDistinctValues = m_parentDetailDescription.DefaultCalculateDistinctValues;
+      CollectionChangedEventManager.RemoveListener( m_sortDescriptions, this );
+      CollectionChangedEventManager.RemoveListener( m_groupDescriptions, this );
 
-        if( itemProperty.FilterCriterion != null )
-        {
-          this.AddFilteredItemProperty( itemProperty );
-        }
-      }
+      ItemPropertyGroupSortStatNameChangedEventManager.RemoveListener( m_itemProperties, this );
 
-      // We must manually add AutoFilterDataGridItemProperties if some AutoFilterValues were specified a the DataGridDetailDescription
-      // since those are used to know in which order filter were applied. Normally, those DataGridItemProperties are
-      // added in OnAutoFilterValuesChanged because the
-      if( m_autoFilterValues != null )
+      if( m_parentDetailDescription == null )
       {
-        foreach( string key in m_autoFilterValues.Keys )
-        {
-          IList autoFilterValues = m_autoFilterValues[ key ];
-
-          if( ( autoFilterValues != null ) && ( autoFilterValues.Count > 0 ) )
-          {
-            DataGridItemPropertyBase dataGridItemProperty = m_itemProperties[ key ];
-
-            if( dataGridItemProperty != null )
-            {
-              if( m_autoFilteredDataGridItemProperties.Contains( dataGridItemProperty ) == false )
-                m_autoFilteredDataGridItemProperties.Add( dataGridItemProperty );
-            }
-          }
-        }
+        InitializeItemPropertyEventManager.RemoveListener( m_itemProperties, this );
+        CollectionChangedEventManager.RemoveListener( m_detailDescriptions, this );
       }
     }
 
-    private void SetupDefaultItemProperties()
+    private void RegisterSourceChanged( IEnumerable source )
     {
-      m_itemProperties = new DataGridItemPropertyCollection();
-      m_itemProperties.ItemType = m_itemType;
-
-      // Listen for ItemProperties changes to be able to refresh when AutoFilterValues changes
-      m_itemProperties.CollectionChanged += this.ItemProperties_CollectionChanged;
-      m_itemProperties.FilterCriterionChanged += this.ItemProperties_FilterCriterionChanged;
+      if( source == null )
+        return;
 
-      // Calling GetDefaultItemProperties will also cache the result in m_defaultItemProperties
-      // if able to detect properties
-      List<DataGridItemPropertyBase> defaultItemProperties = this.GetDefaultItemProperties();
+      var collectionChanged = source as INotifyCollectionChanged;
+      var bindingList = source as IBindingList;
 
-      if( this.AutoCreateItemProperties )
+      if( collectionChanged != null )
       {
-        // Add new auto created item properties
-        foreach( DataGridItemPropertyBase defaultProperty in defaultItemProperties )
-        {
-          this.AddValidItemProperty( defaultProperty );
-        }
+        CollectionChangedEventManager.AddListener( collectionChanged, this );
+      }
+      else if( ( bindingList != null ) && bindingList.SupportsChangeNotification )
+      {
+        ListChangedEventManager.AddListener( bindingList, this );
       }
+    }
 
-      if( ( m_itemProperties.DefaultItemProperties == null ) && ( m_defaultItemProperties != null ) )
-        m_itemProperties.DefaultItemProperties = new List<DataGridItemPropertyBase>( m_defaultItemProperties );
+    private void UnregisterSourceChanged( IEnumerable source )
+    {
+      if( source == null )
+        return;
 
-      //no need to cycle through the content of the ItemProperties collection to update them since
-      //they originate from the default anyway.
+      var collectionChanged = source as INotifyCollectionChanged;
+      if( collectionChanged != null )
+      {
+        CollectionChangedEventManager.RemoveListener( collectionChanged, this );
+      }
     }
 
-    private void AddValidItemProperty( DataGridItemPropertyBase itemProperty )
+    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
     {
-      if( !itemProperty.Browsable )
+      if( itemProperties == null )
         return;
 
-      if( itemProperty.IsASubRelationship )
-        return;
+      CollectionChangedEventManager.AddListener( itemProperties, this );
+    }
 
-      if( m_itemProperties[ itemProperty.Name ] != null )
+    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
         return;
 
-      m_itemProperties.Add( itemProperty );
+      CollectionChangedEventManager.RemoveListener( itemProperties, this );
     }
 
-    private List<DataGridItemPropertyBase> GetDefaultItemProperties()
+    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
     {
-      if( m_defaultItemProperties == null )
-      {
-        if( this.CanCreateItemProperties() )
-        {
-          m_defaultItemProperties = this.CreateItemProperties();
-
-          // Set the synonyms on the item properties of the detail collection.
-          this.DetectSynonyms( m_defaultItemProperties );
-        }
-        else
-        {
-          return DataGridCollectionViewBase.EmptyDataGridItemPropertyList;
-        }
-      }
+      if( itemProperty == null )
+        return;
 
-      return m_defaultItemProperties;
+      PropertyChangedEventManager.AddListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
     }
 
-    private List<DataGridItemPropertyBase> CreateItemProperties()
+    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
     {
-      List<DataGridItemPropertyBase> itemProperties = null;
+      if( itemProperty == null )
+        return;
 
-      // That call will not always return existing property
-      // PropertyDescriptor, with an equivalent of a PropertyPath in is name, are also created for each sub index of a JaggedArray for example
-      this.ItemPropertiesCreated = true;
+      PropertyChangedEventManager.RemoveListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
+    }
 
-      DataTable modelDataTable = ( m_dataTable != null ) ? m_dataTable : m_modelSource as DataTable;
+    private void PrepareItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
 
-      if( modelDataTable != null )
-      {
-        itemProperties = this.CreateItemPropertiesForTable();
-      }
-      else if( typeof( DataRow ).IsAssignableFrom( m_itemType ) )
+      foreach( var itemProperty in itemProperties )
       {
-        itemProperties = new List<DataGridItemPropertyBase>();
+        this.PrepareItemProperty( itemProperty );
       }
 
+      this.RegisterItemProperties( itemProperties );
+    }
+
+    private void ClearItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
       if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
       {
-        Dictionary<string, ItemsSourceHelper.FieldDescriptor> fieldDescriptors = ItemsSourceHelper.GetFields( m_enumeration, m_itemType );
-        itemProperties = DataGridCollectionViewBase.GetDataGridItemProperties( fieldDescriptors );
+        this.ClearItemProperty( itemProperty );
       }
 
-      return itemProperties;
+      this.UnregisterItemProperties( itemProperties );
     }
 
-    private List<DataGridItemPropertyBase> CreateItemPropertiesForTable()
+    private void PrepareItemProperty( DataGridItemPropertyBase itemProperty )
     {
-      DataTable modelDataTable = ( m_dataTable != null ) ? m_dataTable : m_modelSource as DataTable;
-
-      Debug.Assert( modelDataTable != null,
-        "This method should not have been called in the first place if both m_dataTable and m_sourceSchema are null." );
+      if( itemProperty == null )
+        return;
 
+      // Set default value for CalculateDistinctValues if not explicitly set.
+      if( !itemProperty.IsCalculateDistinctValuesInitialized && ( m_parentDetailDescription != null ) )
+      {
+        itemProperty.CalculateDistinctValues = m_parentDetailDescription.DefaultCalculateDistinctValues;
+      }
 
-      DataColumnCollection columns = modelDataTable.Columns;
-      int columnCount = columns.Count;
-      List<DataGridItemPropertyBase> properties = new List<DataGridItemPropertyBase>( columnCount );
+      var propertyPath = PropertyRouteParser.Parse( itemProperty );
 
-      for( int i = 0; i < columnCount; i++ )
-      {
-        DataColumn column = columns[ i ];
+      this.RegisterItemProperty( itemProperty );
+      this.PrepareItemProperties( itemProperty.ItemPropertiesInternal );
+    }
 
-        DataGridItemProperty property = new DataGridItemProperty(
-          new DataRowColumnPropertyDescriptor( column ), true );
+    private void ClearItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
 
-        property.Title = column.Caption;
-        properties.Add( property );
-      }
+      this.ClearItemProperties( itemProperty.ItemPropertiesInternal );
+      this.UnregisterItemProperty( itemProperty );
 
-      return properties;
+      var propertyPath = PropertyRouteParser.Parse( itemProperty );
     }
 
-    private void DetectSynonyms( IEnumerable<DataGridItemPropertyBase> itemProperties )
+    private void SetupDefaultPropertyDescriptions()
     {
-      // The root CollectionView does not need to have its ItemProperties binded.
-      if( this.IsRootCollectionView || ( itemProperties == null ) )
+      if( this.DefaultPropertyDescriptionsCreated )
         return;
 
-      var rootItemsProperties = m_rootDataGridCollectionViewBase.ItemProperties;
-      Debug.Assert( rootItemsProperties != null );
+      var modelDataTable = ( m_enumeration as DataTable ) ?? ( m_modelSource as DataTable );
 
-      foreach( var itemProperty in itemProperties )
+      if( this.CanCreateItemProperties() )
+      {
+        this.DefaultItemPropertiesInitialized = false;
+        this.DefaultPropertyDescriptionsCreated = true;
+
+        ItemsSourceHelper.SetPropertyDescriptions( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, true );
+      }
+
+      if( !this.DefaultItemPropertiesInitialized )
       {
-        // A Synonym is already set.
-        if( itemProperty.Synonym != null )
-          continue;
+        this.DefaultItemPropertiesInitialized = true;
 
-        // Bind the DataGridItemProperty to a DataGridItemProperty of the root CollectionView.
-        var matchingItemProperty = rootItemsProperties[ itemProperty.Name ];
-        if( ( matchingItemProperty != null ) && ( matchingItemProperty.DataType == itemProperty.DataType ) )
+        // Initialize the item properties according to the default property descriptions.
+        foreach( var itemProperty in m_itemProperties )
         {
-          itemProperty.SetSynonym( matchingItemProperty.Name );
+          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
+
+          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, itemPropertyRoute );
+          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
         }
       }
     }
 
+    private void ClearDefaultPropertyDescriptions()
+    {
+      this.DefaultItemPropertiesInitialized = false;
+      this.DefaultPropertyDescriptionsCreated = false;
+
+      m_defaultPropertyDescriptions.Clear();
+    }
+
+    private void ClearItemProperties()
+    {
+      m_itemProperties.Clear();
+    }
+
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        if( sender is DataGridDetailDescriptionCollection )
+        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
+
+        if( sender == this.SortDescriptions )
         {
-          this.DataGridDetailDescriptions_CollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+          this.OnSortDescriptionsChanged( sender, eventArgs );
         }
-        else
+        else if( sender == this.GroupDescriptions )
         {
-          this.NotifyCollectionChanged_CollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+          this.OnGroupDescriptionsChanged( sender, eventArgs );
+        }
+        else if( sender == this.Enumeration )
+        {
+          this.OnItemsSourceCollectionChanged( sender, eventArgs );
+        }
+        else if( sender is DataGridItemPropertyCollection )
+        {
+          this.OnItemPropertiesCollectionChanged( sender, eventArgs );
         }
-
-        return true;
       }
+      else if( managerType == typeof( PropertyChangedEventManager ) )
+      {
+        var eventArgs = ( PropertyChangedEventArgs )e;
+        var itemProperty = sender as DataGridItemPropertyBase;
 
-      if( managerType == typeof( ListChangedEventManager ) )
+        if( itemProperty != null )
+        {
+          this.OnItemPropertyPropertyChanged( itemProperty, eventArgs );
+        }
+      }
+      else if( managerType == typeof( ListChangedEventManager ) )
       {
-        this.BindingList_ListChanged( sender, ( ListChangedEventArgs )e );
-        return true;
+        if( sender == this.Enumeration )
+        {
+          this.OnItemsSourceListChanged( sender, ( ListChangedEventArgs )e );
+        }
+      }
+      else if( managerType == typeof( ItemPropertyGroupSortStatNameChangedEventManager ) )
+      {
+        if( sender == this.ItemProperties )
+        {
+          this.ClearGroupSortComparers();
+        }
       }
+      else if( managerType == typeof( InitializeItemPropertyEventManager ) )
+      {
+        var eventArgs = ( InitializeItemPropertyEventArgs )e;
+
+        if( sender == this.ItemProperties )
+        {
+          var itemProperty = eventArgs.ItemProperty;
+          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
+          var modelDataTable = ( m_enumeration as DataTable ) ?? ( m_modelSource as DataTable );
 
-      if( managerType == typeof( ItemPropertyGroupSortStatNameChangedEventManager ) )
+          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, itemPropertyRoute );
+          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
+          ItemsSourceHelper.AutoDetectSynonyms( this, itemPropertyRoute );
+        }
+      }
+      else
       {
-        this.ClearGroupSortComparers();
-        return true;
+        return false;
       }
 
-      return false;
+      return true;
     }
 
-    #endregion IWeakEventListener Members
+    #endregion
 
-    #region ICollectionView MEMBERS
+    #region ICollectionView Members
 
     public override IDisposable DeferRefresh()
     {
@@ -2992,14 +2135,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal virtual bool CanAutoFilter
-    {
-      get
-      {
-        return true;
-      }
-    }
-
     public override Predicate<object> Filter
     {
       get
@@ -3027,7 +2162,7 @@ namespace Xceed.Wpf.DataGrid
       return true;
     }
 
-    #endregion ICollectionView MEMBERS
+    #endregion
 
     #region IEditableCollectionView
 
@@ -3076,9 +2211,7 @@ namespace Xceed.Wpf.DataGrid
           int newItemIndex;
           object newItem = ItemsSourceHelper.AddNewDataItem( this.Enumeration, null, out newItemIndex );
 
-          this.SetCurrentAddNew(
-            newItem,
-            newItemIndex );
+          this.SetCurrentAddNew( newItem, newItemIndex );
         }
 
         DataGridItemEventArgs initializingNewItemEventArgs = new DataGridItemEventArgs( this, m_currentAddItem );
@@ -3090,7 +2223,9 @@ namespace Xceed.Wpf.DataGrid
         this.QueueOperationForAddNew = false;
 
         if( m_currentAddItem != null )
+        {
           this.CancelNew();
+        }
 
         throw;
       }
@@ -3116,8 +2251,7 @@ namespace Xceed.Wpf.DataGrid
 
       try
       {
-        DataGridCommittingNewItemEventArgs committingNewItemEventArgs =
-          new DataGridCommittingNewItemEventArgs( this, m_currentAddItem, false );
+        DataGridCommittingNewItemEventArgs committingNewItemEventArgs = new DataGridCommittingNewItemEventArgs( this, m_currentAddItem, false );
 
         this.RootDataGridCollectionViewBase.OnCommittingNewItem( committingNewItemEventArgs );
 
@@ -3135,10 +2269,8 @@ namespace Xceed.Wpf.DataGrid
           int addItemPosition = m_currentAddItemPosition;
           ItemsSourceHelper.EndNewDataItem( this.Enumeration, null, m_currentAddItem, ref addItemPosition );
 
-          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation(
-            DeferredOperation.DeferredOperationAction.Add,
-            addItemPosition + 1, addItemPosition,
-            new object[] { m_currentAddItem } );
+          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, addItemPosition + 1,
+                                                                          addItemPosition, new object[] { m_currentAddItem } );
         }
         else
         {
@@ -3151,10 +2283,8 @@ namespace Xceed.Wpf.DataGrid
           if( committingNewItemEventArgs.Index >= committingNewItemEventArgs.NewCount )
             throw new InvalidOperationException( "The index at which the new item was inserted was greater than the new item count." );
 
-          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation(
-            DeferredOperation.DeferredOperationAction.Add,
-            committingNewItemEventArgs.NewCount, committingNewItemEventArgs.Index,
-            new object[] { m_currentAddItem } );
+          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, committingNewItemEventArgs.NewCount,
+                                                                          committingNewItemEventArgs.Index, new object[] { m_currentAddItem } );
         }
 
         this.SetCurrentAddNew( null, -1 );
@@ -3188,8 +2318,7 @@ namespace Xceed.Wpf.DataGrid
       {
         Debug.Assert( !this.IsSourceSupportingChangeNotification );
 
-        // No pending operation was in m_deferredAddNewOperationManager,
-        // so the list have not trigger notification for the new item added.
+        // No pending operation was in m_deferredAddNewOperationManager, so the list has not trigger notification for the new item added.
         // We will, in that case, raise the notification ourself.
         this.ExecuteOrQueueSourceItemOperation( addOperationToNotifyIfNotAlreadyQueued );
       }
@@ -3219,11 +2348,7 @@ namespace Xceed.Wpf.DataGrid
           if( !this.HasSource )
             throw new InvalidOperationException( "The CancelingNewItem event must be handled when not using an underlying data source." );
 
-          ItemsSourceHelper.CancelNewDataItem(
-            this.Enumeration,
-            null,
-            m_currentAddItem,
-            m_currentAddItemPosition );
+          ItemsSourceHelper.CancelNewDataItem( this.Enumeration, null, m_currentAddItem, m_currentAddItemPosition );
         }
 
         this.SetCurrentAddNew( null, -1 );
@@ -3270,7 +2395,7 @@ namespace Xceed.Wpf.DataGrid
 
       this.CommitEdit();
 
-      DataGridItemCancelEventArgs itemCancelEventArgs = new DataGridItemCancelEventArgs( this, item, false );
+      var itemCancelEventArgs = new DataGridItemCancelEventArgs( this, item, false );
       m_rootDataGridCollectionViewBase.OnBeginningEdit( itemCancelEventArgs );
 
       if( itemCancelEventArgs.Cancel )
@@ -3285,20 +2410,18 @@ namespace Xceed.Wpf.DataGrid
 
         if( !beginEditCalled )
         {
-          DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-          int count = itemProperties.Count;
-          m_oldValuesBeforeEdition = new object[ count ];
+          var itemProperties = this.ItemProperties;
+          m_oldValuesBeforeEdition = new Dictionary<DataGridItemPropertyBase, object>( itemProperties.Count );
 
-          for( int i = 0; i < count; i++ )
+          foreach( var itemProperty in itemProperties )
           {
-            m_oldValuesBeforeEdition[ i ] = itemProperties[ i ].GetValue( item );
+            m_oldValuesBeforeEdition[ itemProperty ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
           }
         }
       }
 
       m_currentEditItem = item;
-      DataGridItemEventArgs itemEventArgs = new DataGridItemEventArgs( this, item );
-      m_rootDataGridCollectionViewBase.OnEditBegun( itemEventArgs );
+      m_rootDataGridCollectionViewBase.OnEditBegun( new DataGridItemEventArgs( this, item ) );
     }
 
     public virtual void CommitEdit()
@@ -3306,7 +2429,7 @@ namespace Xceed.Wpf.DataGrid
       if( m_currentEditItem == null )
         return;
 
-      DataGridItemCancelEventArgs itemCancelEventArgs = new DataGridItemCancelEventArgs( this, m_currentEditItem, false );
+      var itemCancelEventArgs = new DataGridItemCancelEventArgs( this, m_currentEditItem, false );
       m_rootDataGridCollectionViewBase.OnCommittingEdit( itemCancelEventArgs );
 
       if( itemCancelEventArgs.Cancel )
@@ -3322,20 +2445,13 @@ namespace Xceed.Wpf.DataGrid
         m_oldValuesBeforeEdition = null;
       }
 
-      DataGridItemEventArgs itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
-      int index = this.IndexOfSourceItem( m_currentEditItem );
-      Debug.Assert( index != -1 );
+      var itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
+      var index = this.IndexOfSourceItem( m_currentEditItem );
 
-      object[] items = new object[] { m_currentEditItem };
+      var items = new object[] { m_currentEditItem };
       m_currentEditItem = null;
 
-      // Only execute or queue a replace operation if the item is not already queued for a remove operation.
-      if( !this.DeferredOperationManager.ContainsItemForRemoveOperation( items[ 0 ] ) )
-      {
-        this.ExecuteOrQueueSourceItemOperation( new DeferredOperation(
-          DeferredOperation.DeferredOperationAction.Replace,
-          -1, index, items, index, items ) );
-      }
+      this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, index, items, index, items ) );
 
       m_rootDataGridCollectionViewBase.OnEditCommitted( itemEventArgs );
     }
@@ -3356,7 +2472,7 @@ namespace Xceed.Wpf.DataGrid
       if( m_currentEditItem == null )
         return;
 
-      DataGridItemHandledEventArgs itemHandleEventArgs = new DataGridItemHandledEventArgs( this, m_currentEditItem );
+      var itemHandleEventArgs = new DataGridItemHandledEventArgs( this, m_currentEditItem );
       m_rootDataGridCollectionViewBase.OnCancelingEdit( itemHandleEventArgs );
 
       if( itemHandleEventArgs.Handled != this.ItemEditionIsManuallyHandled )
@@ -3367,34 +2483,30 @@ namespace Xceed.Wpf.DataGrid
         bool cancelEditCalled;
         this.CancelEditInternal( m_currentEditItem, out cancelEditCalled );
 
-        DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-        int count = itemProperties.Count;
+        var itemProperties = this.ItemProperties;
 
-        if( ( !cancelEditCalled ) && ( count > 0 ) )
+        if( ( !cancelEditCalled ) && ( itemProperties.Count > 0 ) )
         {
           itemProperties.SuspendUnboundItemPropertyChanged( m_currentEditItem );
 
           try
           {
-            for( int i = 0; i < count; i++ )
+            foreach( var itemProperty in itemProperties )
             {
-              DataGridItemPropertyBase itemProperty = itemProperties[ i ];
+              var readOnly = ( ( m_currentEditItem == m_currentAddItem ) && itemProperty.OverrideReadOnlyForInsertion.HasValue && itemProperty.OverrideReadOnlyForInsertion.Value )
+                               ? false
+                               : itemProperty.IsReadOnly;
 
-              bool readOnly = ( ( m_currentEditItem == m_currentAddItem )
-                              && itemProperty.OverrideReadOnlyForInsertion.HasValue
-                              && itemProperty.OverrideReadOnlyForInsertion.Value )
-                ? false : itemProperty.IsReadOnly;
+              if( readOnly )
+                continue;
 
-              if( !readOnly )
+              try
               {
-                try
-                {
-                  itemProperty.SetValue( m_currentEditItem, m_oldValuesBeforeEdition[ i ] );
-                }
-                catch
-                {
-                  // Swallow any Exception, setting a property to is old value should not throw.
-                }
+                ItemsSourceHelper.SetValueForItemProperty( itemProperty, m_currentEditItem, m_oldValuesBeforeEdition[ itemProperty ] );
+              }
+              catch
+              {
+                // Swallow any Exception, setting a property to is old value should not throw.
               }
             }
           }
@@ -3405,7 +2517,7 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      DataGridItemEventArgs itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
+      var itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
       m_currentEditItem = null;
       m_rootDataGridCollectionViewBase.OnEditCanceled( itemEventArgs );
     }
@@ -3515,7 +2627,7 @@ namespace Xceed.Wpf.DataGrid
 
     private NewItemPlaceholderPosition m_newItemPlaceholderPosition = NewItemPlaceholderPosition.None;
 
-    #endregion IEditableCollectionView
+    #endregion
 
     #region IItemProperties Members
 
@@ -3534,22 +2646,8 @@ namespace Xceed.Wpf.DataGrid
 
     internal virtual List<ItemPropertyInfo> GetItemPropertyInfos()
     {
-      List<ItemPropertyInfo> itemPropertyInfos = new List<ItemPropertyInfo>();
-
-      int itemPropertyCount = m_itemProperties.Count;
-
-      for( int i = 0; i < itemPropertyCount; i++ )
-      {
-        DataGridItemPropertyBase dataGridItemPropertyBase = m_itemProperties[ i ];
-
-        itemPropertyInfos.Add(
-          new ItemPropertyInfo(
-            dataGridItemPropertyBase.Name,
-            dataGridItemPropertyBase.DataType,
-            dataGridItemPropertyBase.GetPropertyDescriptorForBinding() ) );
-      }
-
-      return itemPropertyInfos;
+      return ( from item in m_itemProperties
+               select new ItemPropertyInfo( item.Name, item.DataType, item.GetPropertyDescriptorForBinding() ) ).ToList();
     }
 
     #endregion
@@ -3561,43 +2659,37 @@ namespace Xceed.Wpf.DataGrid
 
     private int m_deferRefreshCount;
 
-    private DataGridCollectionViewBase m_rootDataGridCollectionViewBase;
+    private readonly DataGridCollectionViewBase m_rootDataGridCollectionViewBase;
 
     private Type m_itemType;
     private Type m_desiredItemType;
     private object m_modelSource;
     private IEnumerable m_enumeration;
-    private INotifyCollectionChanged m_notifyCollectionChanged;
-    private DataTable m_dataTable;
 
     private int m_currentPosition;
     private object m_currentItem;
     private int m_deferCurrencyEventCount;
 
     private object m_currentEditItem;
-    private object[] m_oldValuesBeforeEdition;
+    private Dictionary<DataGridItemPropertyBase, object> m_oldValuesBeforeEdition;
 
     private object m_currentAddItem;
     private int m_currentAddItemPosition = -1;
 
-    private AutoFilterMode m_autoFilterMode = AutoFilterMode.None;
     private DistinctValuesConstraint m_distinctValuesConstraint = DistinctValuesConstraint.All;
     private DistinctValuesUpdateMode m_distinctValueUpdateMode = DistinctValuesUpdateMode.Manual;
 
-    private FilterCriteriaMode m_filterCriteriaMode = FilterCriteriaMode.And;
     private List<DataGridItemPropertyBase> m_filteredItemProperties;
     private ReadOnlyCollection<DataGridItemPropertyBase> m_readOnlyFilteredItemProperties;
 
     private DataGridDetailDescription m_parentDetailDescription;
 
-    private DataGridItemPropertyCollection m_itemProperties;
-    private List<DataGridItemPropertyBase> m_defaultItemProperties;
-
-    private DataGridDetailDescriptionCollection m_dataGridDetailDescriptions;
-    private List<DataGridDetailDescription> m_defaultDetailDescriptions;
+    private readonly DataGridItemPropertyCollection m_itemProperties;
 
     private DataGridSortDescriptionCollection m_sortDescriptions;
     private ObservableCollection<GroupDescription> m_groupDescriptions;
+    private readonly DataGridDetailDescriptionCollection m_detailDescriptions;
+    private readonly PropertyDescriptionRouteDictionary m_defaultPropertyDescriptions;
 
     private CollectionViewGroup m_rootGroup;
 
@@ -3605,25 +2697,24 @@ namespace Xceed.Wpf.DataGrid
 
     // Containing a DataGridItemProperty key, ObservableCollection<object> values map
     private DistinctValuesDictionary m_distinctValues;
-    private ReadOnlyDictionary<string, IList> m_autoFilterValues;
-    private ObservableCollection<DataGridItemPropertyBase> m_autoFilteredDataGridItemProperties;
     private DataGridItemPropertyBase m_excludedItemPropertyFromDistinctValueCalculation;
 
     [Flags]
     private enum DataGridCollectionViewBaseFlags
     {
-      Loaded = 1,
-      ItemPropertiesCreated = 2,
-      Refreshing = 4,
-      QueueOperationForAddNew = 16,
-      IsRefreshingDistinctValues = 32,
-      IsCurrentAfterLast = 64,
-      IsCurrentBeforeFirst = 128,
-      CreatingNewItemIsManuallyHandled = 256,
-      ItemEditionIsManuallyHandled = 512,
-      AutoCreateItemProperties = 1024,
-      AutoCreateDetailDescriptions = 2048,
-      AutoCreateForeignKeyDescriptions = 4096,
+      Loaded = 1 << 0,
+      Refreshing = 1 << 1,
+      QueueOperationForAddNew = 1 << 2,
+      IsRefreshingDistinctValues = 1 << 3,
+      IsCurrentAfterLast = 1 << 4,
+      IsCurrentBeforeFirst = 1 << 5,
+      CreatingNewItemIsManuallyHandled = 1 << 6,
+      ItemEditionIsManuallyHandled = 1 << 7,
+      AutoCreateItemProperties = 1 << 8,
+      AutoCreateDetailDescriptions = 1 << 9,
+      AutoCreateForeignKeyDescriptions = 1 << 10,
+      DefaultItemPropertiesInitialized = 1 << 11,
+      DefaultPropertyDescriptionsCreated = 1 << 12,
     }
 
     private sealed class DeferRefreshHelper : IDisposable
@@ -3643,10 +2734,9 @@ namespace Xceed.Wpf.DataGrid
 
       private void Dispose( bool disposing )
       {
-        var collectionView = m_collectionView;
-
         // Prevent this method from being invoked more than once by the same IDisposable.
-        if( Interlocked.CompareExchange<DataGridCollectionViewBase>( ref m_collectionView, null, collectionView ) == null )
+        var collectionView = Interlocked.Exchange( ref m_collectionView, null );
+        if( collectionView == null )
           return;
 
         if( collectionView.CheckAccess() )
@@ -3725,10 +2815,9 @@ namespace Xceed.Wpf.DataGrid
 
       private void Dispose( bool disposing )
       {
-        var collectionView = m_collectionView;
-
         // Prevent this method from being invoked more than once by the same IDisposable.
-        if( Interlocked.CompareExchange<DataGridCollectionViewBase>( ref m_collectionView, null, collectionView ) == null )
+        var collectionView = Interlocked.Exchange( ref m_collectionView, null );
+        if( collectionView == null )
           return;
 
         if( collectionView.CheckAccess() )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
index b0a3e4bb..93604b4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
@@ -15,19 +15,15 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
+using System.Diagnostics;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal abstract class DataGridCollectionViewBaseDataProvider : DataSourceProvider, IWeakEventListener
   {
-    #region CONSTRUCTORS
-
     internal DataGridCollectionViewBaseDataProvider( DataGridCollectionViewSourceBase parentSource )
       : base()
     {
@@ -37,38 +33,33 @@ namespace Xceed.Wpf.DataGrid
       m_parentSource = parentSource;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region IWeakEventListener Members
+    #region CurrentView Property
 
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    public DataGridCollectionViewBase CurrentView
     {
-      if( managerType == typeof( DataChangedEventManager ) )
+      get
       {
-        this.Refresh();
-        return true;
+        return m_currentView;
       }
-
-      return false;
     }
 
+    private DataGridCollectionViewBase m_currentView;
+
     #endregion
 
-    #region CurrentView Property
+    #region ParentSource Internal Property
 
-    public DataGridCollectionViewBase CurrentView
+    internal DataGridCollectionViewSourceBase ParentSource
     {
       get
       {
-        return m_currentView;
+        return m_parentSource;
       }
     }
 
-    private DataGridCollectionViewBase m_currentView;
+    private readonly DataGridCollectionViewSourceBase m_parentSource;
 
-    #endregion CurrentView Property
-
-    #region PUBLIC METHODS
+    #endregion
 
     public void DelayRefresh( Dispatcher dispatcher, DispatcherPriority priority )
     {
@@ -77,7 +68,7 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       // Call Refresh on the dispatcher with the specified priority.
-      DispatcherOperation operation = dispatcher.BeginInvoke(
+      var operation = dispatcher.BeginInvoke(
         priority,
         new Action( delegate
         {
@@ -94,13 +85,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PUBLIC METHODS
-
-    #region PROTECTED METHODS
-
     protected override void BeginQuery()
     {
-      Exception queryException = null;
+      var queryException = default( Exception );
 
       try
       {
@@ -114,82 +101,79 @@ namespace Xceed.Wpf.DataGrid
       this.OnQueryFinished( m_currentView, queryException, null, null );
     }
 
-    #endregion PROTECTED METHODS
-
-    #region INTERNAL PROPERTIES
-
-    internal DataGridCollectionViewSourceBase ParentSource
-    {
-      get
-      {
-        return m_parentSource;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region PRIVATE METHODS
-
     internal abstract DataGridCollectionViewBase EnsureDataGridCollectionViewBaseCore();
 
     private void EnsureDataGridCollectionViewBase()
     {
+      var success = false;
+
       try
       {
-        DataGridCollectionViewBase view = this.EnsureDataGridCollectionViewBaseCore();
-
-        if( view == null )
-        {
-          if( m_currentView != null )
-          {
-            m_currentView.ParentCollectionViewSourceBase = null;
-            m_currentView = null;
-          }
-        }
-
-        if( m_currentView != view )
+        var newView = this.EnsureDataGridCollectionViewBaseCore();
+        if( newView != m_currentView )
         {
-          DataGridCollectionViewBase oldView = m_currentView;
+          this.ClearView();
 
-          m_currentView = view;
+          m_currentView = newView;
 
-          if( ( oldView != null ) && ( oldView.ItemProperties != null ) )
+          if( m_currentView != null )
           {
-            // Ensure to unregister the ItemsProperties collection from 
-            // events of the ItemProperties it contains to avoid memory leaks.
-            // The ItemProperties are reused when a new DataGridCollectionViewBase
-            // is generated by the DataGridCollectionViewBaseDataProvider and 
-            // the ItemProperties collection of this new DataGridCollectionViewBase
-            // will also register to those events. 
-            // We can safely unregister from those here wince the old 
-            // DataGridCollectionViewBase will not be reused anywhere else.
-            oldView.ItemProperties.UnregisterDataGridItemPropertiesEvents();
+            m_currentView.ParentCollectionViewSourceBase = m_parentSource;
           }
         }
 
-        if( m_currentView != null )
-          m_currentView.ParentCollectionViewSourceBase = m_parentSource;
+        Debug.Assert( ( m_currentView == null ) || ( m_currentView.ParentCollectionViewSourceBase == m_parentSource ) );
+
+        success = true;
       }
-      catch
+      finally
       {
-        m_currentView.ParentCollectionViewSourceBase = null;
-        m_currentView = null;
-        throw;
+        if( !success )
+        {
+          this.ClearView();
+        }
       }
     }
 
+    private void ClearView()
+    {
+      if( m_currentView == null )
+        return;
+
+      var view = m_currentView;
+      m_currentView = null;
+
+      view.Dispose();
+    }
+
     private void OnDelayedRefreshCompleted( object sender, EventArgs e )
     {
       m_delayedRefreshPending = false;
     }
 
-    #endregion PRIVATE METHODS
+    #region IWeakEventListener Members
 
-    #region PRIVATE FIELDS
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
 
-    private bool m_delayedRefreshPending;
-    private DataGridCollectionViewSourceBase m_parentSource;
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( DataChangedEventManager ) )
+      {
+        this.Refresh();
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
+    }
 
     #endregion
+
+    private bool m_delayedRefreshPending;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
index 5a6ae74f..aeb74be4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
@@ -25,7 +25,6 @@ using System.Globalization;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Stats;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -41,6 +40,7 @@ namespace Xceed.Wpf.DataGrid
     {
       m_nextSubGroupUnsortedIndex = template.m_nextSubGroupUnsortedIndex;
       m_subGroupBy = template.m_subGroupBy;
+      m_groupByName = template.GroupByName;
     }
 
     private DataGridCollectionViewGroup( object name, DataGridCollectionViewGroup parent, int unsortedIndex )
@@ -109,36 +109,44 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region SubGroupBy Property
+    #region GroupByName Property
 
-    internal GroupDescription SubGroupBy
+    internal string GroupByName
     {
       get
       {
-        return m_subGroupBy;
+        return m_groupByName;
+      }
+      set
+      {
+        m_groupByName = value;
       }
     }
 
+    private string m_groupByName;
+
     #endregion
 
-    #region Parent Property
+    #region SubGroupBy Property
 
-    internal DataGridCollectionViewGroup Parent
+    internal GroupDescription SubGroupBy
     {
       get
       {
-        return m_parent;
+        return m_subGroupBy;
       }
     }
 
     #endregion
 
-    #region CalculateAllStats Property
+    #region Parent Property
 
-    internal bool CalculateAllStats
+    internal DataGridCollectionViewGroup Parent
     {
-      get;
-      set;
+      get
+      {
+        return m_parent;
+      }
     }
 
     #endregion
@@ -219,20 +227,23 @@ namespace Xceed.Wpf.DataGrid
 
     internal int GetFirstRawItemGlobalSortedIndex()
     {
-      int index = 0;
-      DataGridCollectionViewGroup group = this;
-      DataGridCollectionViewGroup parent = this.Parent;
-      DataGridCollectionViewGroup currentGroup = null;
+      var index = 0;
+      var group = this;
+      var parent = this.Parent;
+      var currentGroup = default( DataGridCollectionViewGroup );
 
       while( parent != null )
       {
-        foreach( object value in parent.ProtectedItems )
+        var items = parent.ProtectedItems;
+        var count = items.Count;
+
+        for( int i = 0; i < count; i++ )
         {
+          var value = items[ i ];
           if( value == group )
             break;
 
           currentGroup = value as DataGridCollectionViewGroup;
-
           index += currentGroup.GlobalRawItemCount;
         }
 
@@ -297,31 +308,30 @@ namespace Xceed.Wpf.DataGrid
     }
 
     internal void SortItems(
-      SortDescriptionInfo[] sortDescriptionInfos,
+      IList<SortDescriptionInfo> sortDescriptionInfos,
       List<GroupSortComparer> groupSortComparers,
       int level,
       List<RawItem> globalRawItems,
       DataGridCollectionViewGroup newSortedGroup )
     {
-      int itemCount = this.ProtectedItemCount;
-
+      var itemCount = this.ProtectedItemCount;
       if( itemCount == 0 )
         return;
 
       if( this.IsBottomLevel )
       {
-        int[] indexes;
-        indexes = new int[ itemCount + 1 ];
+        var indexes = new int[ itemCount + 1 ];
+
         for( int i = 0; i < itemCount; i++ )
         {
           indexes[ i ] = m_sortedRawItems[ i ].Index;
         }
 
         // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-        DataGridCollectionViewSort collectionViewSort = new DataGridCollectionViewSort( indexes, sortDescriptionInfos );
+        var collectionViewSort = new DataGridCollectionViewSort( indexes, sortDescriptionInfos );
 
         collectionViewSort.Sort( itemCount );
-        int index = 0;
+        var index = 0;
 
         for( int i = 1; i <= itemCount; i++ )
         {
@@ -331,18 +341,18 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        int[] indexes;
-        indexes = new int[ itemCount + 1 ];
+        var indexes = new int[ itemCount + 1 ];
+
         for( int i = 0; i < itemCount; i++ )
         {
           indexes[ i ] = i;
         }
 
-        DataGridCollectionViewGroup[] subGroupsArray = new DataGridCollectionViewGroup[ itemCount ];
+        var subGroupsArray = new DataGridCollectionViewGroup[ itemCount ];
         m_subGroups.Values.CopyTo( subGroupsArray, 0 );
 
         // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-        DataGridCollectionViewGroupSort collectionViewSort = new DataGridCollectionViewGroupSort( indexes, groupSortComparers[ level ], subGroupsArray );
+        var collectionViewSort = new DataGridCollectionViewGroupSort( indexes, groupSortComparers[ level ], subGroupsArray );
 
         collectionViewSort.Sort( itemCount );
         int index = 0;
@@ -604,71 +614,6 @@ namespace Xceed.Wpf.DataGrid
       return ~low;
     }
 
-
-    internal object GetStatFunctionValue( string propertyName )
-    {
-      DataGridCollectionView view = this.GetCollectionView();
-
-      Debug.Assert( view != null );
-
-      if( view == null )
-        return null;
-
-      StatFunction statFunction = view.StatFunctions[ propertyName ];
-
-      Debug.Assert( view != null );
-
-      if( statFunction == null )
-        return null;
-
-      return this.GetStatFunctionResult( statFunction, view ).Value;
-    }
-
-    internal StatResult GetStatFunctionResult( StatFunction statFunction, DataGridCollectionView view )
-    {
-      StatResult result;
-
-      if( !m_statFunctionValues.TryGetValue( statFunction, out result ) )
-      {
-        result = null;
-        m_statFunctionValues[ statFunction ] = result;
-      }
-
-      return result;
-    }
-
-    // This clears the value of all the previously calculated StatFunction Results for  this group.
-    internal void ClearStatFunctionsResult()
-    {
-      m_statFunctionValues.Clear();
-    }
-
-    internal void InvokeStatFunctionsPropertyChanged( DataGridCollectionView collectionView )
-    {
-      if( this.HasPropertyChangedListeners )
-      {
-        if( collectionView.CalculateChangedPropertyStatsOnly && !this.CalculateAllStats )
-        {
-          foreach( StatFunction statFunction in collectionView.InvalidatedStatFunctions )
-          {
-            {
-              this.OnPropertyChanged( new PropertyChangedEventArgs( statFunction.ResultPropertyName ) );
-            }
-          }
-        }
-        else
-        {
-          foreach( PropertyDescriptor statFunctionPropertyDescriptor in collectionView.GetStatFunctionProperties() )
-          {
-            this.OnPropertyChanged( new PropertyChangedEventArgs( statFunctionPropertyDescriptor.Name ) );
-          }
-        }
-      }
-
-      this.CalculateAllStats = false;
-    }
-
-
     private int BinarySearchGroup( DataGridCollectionViewGroup value, IComparer<DataGridCollectionViewGroup> comparer )
     {
       if( comparer == null )
@@ -731,7 +676,13 @@ namespace Xceed.Wpf.DataGrid
                                                         List<GroupSortComparer> groupSortComparers )
     {
       // If sortComparers is null, we are in massive group creation, no order check.
-      DataGridCollectionViewGroup group = new DataGridCollectionViewGroup( groupName, this, m_nextSubGroupUnsortedIndex );
+      var group = new DataGridCollectionViewGroup( groupName, this, m_nextSubGroupUnsortedIndex );
+
+      var dataGridGroupDescription = groupByList[ level ] as DataGridGroupDescription;
+      if( dataGridGroupDescription != null )
+      {
+        group.GroupByName = dataGridGroupDescription.PropertyName;
+      }
 
       unchecked
       {
@@ -866,10 +817,8 @@ namespace Xceed.Wpf.DataGrid
             return TypeDescriptor.GetProperties( typeof( DataGridCollectionViewGroup ) );
 
           PropertyDescriptorCollection classProperties = TypeDescriptor.GetProperties( typeof( DataGridCollectionViewGroup ) );
-          PropertyDescriptorCollection statProperties = view.GetStatFunctionProperties();
-          PropertyDescriptor[] properties = new PropertyDescriptor[ classProperties.Count + statProperties.Count ];
+          PropertyDescriptor[] properties = new PropertyDescriptor[ classProperties.Count ];
           classProperties.CopyTo( properties, 0 );
-          statProperties.CopyTo( properties, classProperties.Count );
 
           m_classProperties = new PropertyDescriptorCollection( properties );
         }
@@ -881,12 +830,6 @@ namespace Xceed.Wpf.DataGrid
         PropertyDescriptorCollection props = TypeDescriptor.GetProperties( this, attributes );
         DataGridCollectionView view = this.GetCollectionView();
 
-        if( view != null )
-        {
-          foreach( PropertyDescriptor property in view.GetStatFunctionProperties() )
-            props.Add( property );
-        }
-
         return props;
       }
     }
@@ -939,7 +882,6 @@ namespace Xceed.Wpf.DataGrid
     #endregion
 
     private PropertyDescriptorCollection m_classProperties;
-    private readonly Dictionary<StatFunction, StatResult> m_statFunctionValues = new Dictionary<StatFunction, StatResult>( StatFunctionComparer.Default );
 
     protected int m_globalRawItemCount;
     protected readonly List<RawItem> m_sortedRawItems;
@@ -1022,7 +964,7 @@ namespace Xceed.Wpf.DataGrid
 
         var storage = ( s_getItems != null ) ? s_getItems.Invoke( source ) : null;
         if( storage == null )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the ObservableCollection<>'s items storage." );
+          throw new InvalidOperationException( "Unable to retrieve the ObservableCollection<>'s items storage." );
 
         return storage;
       }
@@ -1034,7 +976,7 @@ namespace Xceed.Wpf.DataGrid
 
         var collectionChanged = ( s_collectionChanged != null ) ? s_collectionChanged.Invoke( source ) : null;
         if( collectionChanged == null )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the ObservableCollection<>'s collection change method." );
+          throw new InvalidOperationException( "Unable to retrieve the ObservableCollection<>'s collection change method." );
 
         return collectionChanged;
       }
@@ -1043,11 +985,11 @@ namespace Xceed.Wpf.DataGrid
       {
         var propertyInfo = typeof( ObservableCollection<object> ).GetProperty( "Items", BindingFlags.Instance | BindingFlags.NonPublic, null, typeof( IList<object> ), new Type[ 0 ], null );
         if( ( propertyInfo == null ) || !propertyInfo.CanRead )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the ObservableCollection<>.Items property." );
+          throw new InvalidOperationException( "Unable to retrieve the ObservableCollection<>.Items property." );
 
         var methodInfo = propertyInfo.GetGetMethod( true );
         if( ( methodInfo == null ) || !ObservableCollectionHelper.HasCallingConvention( methodInfo.CallingConvention, CallingConventions.HasThis ) )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the ObservableCollection<>.Items property." );
+          throw new InvalidOperationException( "Unable to retrieve the ObservableCollection<>.Items property." );
 
         var methodBuilder = typeBuilder.DefineMethod(
                               ObservableCollectionHelper.GetItemsMethodName,
@@ -1071,11 +1013,11 @@ namespace Xceed.Wpf.DataGrid
       {
         var methodInfo = typeof( ObservableCollection<object> ).GetMethod( "OnCollectionChanged", BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof( NotifyCollectionChangedEventArgs ) }, null );
         if( ( methodInfo == null ) || methodInfo.IsPrivate || !ObservableCollectionHelper.HasCallingConvention( methodInfo.CallingConvention, CallingConventions.HasThis ) )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the ObservableCollection<>.OnCollectionChanged method." );
+          throw new InvalidOperationException( "Unable to retrieve the ObservableCollection<>.OnCollectionChanged method." );
 
         var constructorInfo = typeof( Action<NotifyCollectionChangedEventArgs> ).GetConstructor( new Type[] { typeof( object ), typeof( IntPtr ) } );
         if( ( constructorInfo == null ) || constructorInfo.IsPrivate || !ObservableCollectionHelper.HasCallingConvention( constructorInfo.CallingConvention, CallingConventions.HasThis ) )
-          throw new InvalidOperationException( "TODODOC: Unable to retrieve the Action<>'s constructor." );
+          throw new InvalidOperationException( "Unable to retrieve the Action<>'s constructor." );
 
         var methodBuilder = typeBuilder.DefineMethod(
                               ObservableCollectionHelper.GetCollectionChangedMethodName,
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
index 56b01404..55dde31d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
@@ -39,30 +39,30 @@ namespace Xceed.Wpf.DataGrid
       return m_parentCollectionView;
     }
 
-    internal void SortRootRawItems( SortDescriptionInfo[] sortDescriptionInfos, List<RawItem> globalRawItems )
+    internal void SortRootRawItems( IList<SortDescriptionInfo> sortDescriptionInfos, List<RawItem> globalRawItems )
     {
       Debug.Assert( this.IsBottomLevel );
 
-      int itemCount = m_sortedRawItems.Count;
+      var itemCount = m_sortedRawItems.Count;
       if( itemCount == 0 )
         return;
 
-      int[] indexes;
-      indexes = new int[ itemCount + 1 ];
+      var indexes = new int[ itemCount + 1 ];
+
       for( int i = 0; i < itemCount; i++ )
       {
         indexes[ i ] = m_sortedRawItems[ i ].Index;
       }
 
       // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-      DataGridCollectionViewSort collectionViewSort = new DataGridCollectionViewSort( indexes, sortDescriptionInfos );
+      var collectionViewSort = new DataGridCollectionViewSort( indexes, sortDescriptionInfos );
 
       collectionViewSort.Sort( itemCount );
-      int index = 0;
+      var index = 0;
 
       for( int i = 1; i <= itemCount; i++ )
       {
-        RawItem newRawItem = globalRawItems[ indexes[ i ] ];
+        var newRawItem = globalRawItems[ indexes[ i ] ];
         newRawItem.SetSortedIndex( index );
         m_sortedRawItems[ index ] = newRawItem;
         index++;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
index 180fcdfa..ba3e1704 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
@@ -14,20 +14,15 @@
 
   ***********************************************************************************/
 
-using System;
-using System.ComponentModel;
 using System.Collections.Generic;
-using System.Text;
-
+using System.ComponentModel;
 using Xceed.Utils.Collections;
-using System.Collections;
-using Xceed.Utils.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class DataGridCollectionViewSort : IndexWeakHeapSort
   {
-    public DataGridCollectionViewSort( int[] dataIndexArray, SortDescriptionInfo[] sortDescriptionInfos )
+    public DataGridCollectionViewSort( int[] dataIndexArray, IList<SortDescriptionInfo> sortDescriptionInfos )
       : base( dataIndexArray )
     {
       m_sortDescriptionInfos = sortDescriptionInfos;
@@ -35,41 +30,25 @@ namespace Xceed.Wpf.DataGrid
 
     public override int Compare( int xDataIndex, int yDataIndex )
     {
-      ListSortDirection lastSortDirection = ListSortDirection.Ascending;
+      var lastSortDirection = ListSortDirection.Ascending;
 
       if( m_sortDescriptionInfos != null )
       {
-        int result = 0;
-        int count = m_sortDescriptionInfos.Length;
-
-        for( int i = 0; i < count; i++ )
+        foreach( var sortDescriptionInfo in m_sortDescriptionInfos )
         {
-          SortDescriptionInfo sortDescriptionInfo = m_sortDescriptionInfos[ i ];
-
           lastSortDirection = sortDescriptionInfo.SortDirection;
 
           if( sortDescriptionInfo.Property == null )
             continue;
 
-          IComparer sortComparer = sortDescriptionInfo.SortComparer;
-          DataStore dataStore = sortDescriptionInfo.DataStore;
-
-          if( sortComparer != null )
-          {
-            result = sortComparer.Compare( dataStore.GetData( xDataIndex ), dataStore.GetData( yDataIndex ) );
-          }
-          else
-          {
-            result = dataStore.Compare( xDataIndex, yDataIndex );
-          }
-
-          if( result != 0 )
-          {
-            if( lastSortDirection == ListSortDirection.Descending )
-              result = -result;
-
-            return result;
-          }
+          var sortComparer = sortDescriptionInfo.SortComparer;
+          var dataStore = sortDescriptionInfo.DataStore;
+          var compare = ( sortComparer != null )
+                          ? sortComparer.Compare( dataStore.GetData( xDataIndex ), dataStore.GetData( yDataIndex ) )
+                          : dataStore.Compare( xDataIndex, yDataIndex );
+
+          if( compare != 0 )
+            return ( lastSortDirection == ListSortDirection.Descending ) ? -compare : compare;
         }
       }
 
@@ -79,6 +58,6 @@ namespace Xceed.Wpf.DataGrid
       return xDataIndex - yDataIndex;
     }
 
-    private SortDescriptionInfo[] m_sortDescriptionInfos;
+    private readonly IList<SortDescriptionInfo> m_sortDescriptionInfos;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
index 195bb6db..0c88a205 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
@@ -20,7 +20,6 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Stats;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -38,8 +37,6 @@ namespace Xceed.Wpf.DataGrid
     public DataGridCollectionViewSource()
       : base()
     {
-      m_statFunctions = new StatFunctionCollection();
-      m_statFunctions.CollectionChanged += new NotifyCollectionChangedEventHandler( this.ForwardedCollection_CollectionChanged );
     }
 
     #endregion CONSTRUCTORS
@@ -58,20 +55,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion CollectionViewType Property
 
-    #region StatFunctions Property
-
-    internal ObservableCollection<StatFunction> StatFunctions
-    {
-      get
-      {
-        return m_statFunctions;
-      }
-    }
-
-    private StatFunctionCollection m_statFunctions;
-
-    #endregion StatFunctions Property
-
     #region UpdateChangedPropertyStatsOnly Property
 
     internal bool UpdateChangedPropertyStatsOnly
@@ -106,18 +89,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal override void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
     {
-      base.ApplyExtraPropertiesToView( currentView );
-
-      DataGridCollectionView dataGridCollectionView = currentView as DataGridCollectionView;
-
-      dataGridCollectionView.StatFunctions.Clear();
-
-      foreach( var statFunction in m_statFunctions )
-      {
-        dataGridCollectionView.StatFunctions.Add( statFunction );
-      }
-
-      dataGridCollectionView.UpdateChangedPropertyStatsOnly = this.UpdateChangedPropertyStatsOnly;
+      base.ApplyExtraPropertiesToView( currentView );     
     }
 
     #endregion INTERNAL METHODS
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
index 8900c0c6..3e74c516 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
@@ -15,21 +15,16 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Collections.Specialized;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
   public abstract class DataGridCollectionViewSourceBase : CollectionViewSource
   {
-    #region CONSTRUCTORS
-
     static DataGridCollectionViewSourceBase()
     {
       CollectionViewSource.SourceProperty.OverrideMetadata(
@@ -41,8 +36,8 @@ namespace Xceed.Wpf.DataGrid
     }
 
     public DataGridCollectionViewSourceBase()
-      : base()
     {
+
       m_itemProperties = new ObservableCollection<DataGridItemPropertyBase>();
       m_itemProperties.CollectionChanged += new NotifyCollectionChangedEventHandler( this.ForwardedCollection_CollectionChanged );
       m_dataGridDetailDescriptions = new DataGridDetailDescriptionCollection();
@@ -56,8 +51,6 @@ namespace Xceed.Wpf.DataGrid
       this.Culture = CultureInfo.InvariantCulture;
     }
 
-    #endregion CONSTRUCTORS
-
     #region ItemProperties Property
 
     public ObservableCollection<DataGridItemPropertyBase> ItemProperties
@@ -70,7 +63,7 @@ namespace Xceed.Wpf.DataGrid
 
     private ObservableCollection<DataGridItemPropertyBase> m_itemProperties;
 
-    #endregion ItemProperties Property
+    #endregion
 
     #region DetailDescriptions Property
 
@@ -84,7 +77,7 @@ namespace Xceed.Wpf.DataGrid
 
     private ObservableCollection<DataGridDetailDescription> m_dataGridDetailDescriptions;
 
-    #endregion DetailDescriptions Property
+    #endregion
 
     #region ItemType Property
 
@@ -107,7 +100,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemType Property
+    #endregion
 
     #region CollectionViewType Property
 
@@ -121,7 +114,7 @@ namespace Xceed.Wpf.DataGrid
       base.OnCollectionViewTypeChanged( oldCollectionViewType, newCollectionViewType );
     }
 
-    #endregion CollectionViewType Property
+    #endregion
 
     #region AutoCreateItemProperties Property
 
@@ -142,7 +135,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoCreateItemProperties Property
+    #endregion
 
     #region AutoCreateDetailDescriptions Property
 
@@ -163,28 +156,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoCreateDetailDescriptions Property
-
-    #region AutoFilterMode Property
-
-    internal static readonly DependencyProperty AutoFilterModeProperty = DependencyProperty.Register(
-      "AutoFilterMode", typeof( AutoFilterMode ), typeof( DataGridCollectionViewSourceBase ),
-      new UIPropertyMetadata( AutoFilterMode.None,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    internal AutoFilterMode AutoFilterMode
-    {
-      get
-      {
-        return ( AutoFilterMode )this.GetValue( AutoFilterModeProperty );
-      }
-      set
-      {
-        this.SetValue( AutoFilterModeProperty, value );
-      }
-    }
-
-    #endregion AutoFilterMode Property
+    #endregion
 
     #region DistinctValuesConstraints Property
 
@@ -205,7 +177,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion DistinctValuesConstraints Property
+    #endregion
 
     #region DistinctValuesUpdateMode Property
 
@@ -247,7 +219,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion DefaultCalculateDistinctValues Property
+    #endregion
 
     #region Culture Property
 
@@ -272,39 +244,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Culture Property
-
-    #region FilterCriteriaMode Property
-
-    public static readonly DependencyProperty FilterCriteriaModeProperty = DependencyProperty.Register(
-      "FilterCriteriaMode", typeof( FilterCriteriaMode ), typeof( DataGridCollectionViewSourceBase ),
-      new UIPropertyMetadata( FilterCriteriaMode.And,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public FilterCriteriaMode FilterCriteriaMode
-    {
-      get
-      {
-        return ( FilterCriteriaMode )this.GetValue( DataGridCollectionViewSourceBase.FilterCriteriaModeProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridCollectionViewSourceBase.FilterCriteriaModeProperty, value );
-      }
-    }
-
-    #endregion FilterCriteriaMode Property
-
-    #region AutoFilterValuesChanged Event
-
-    internal event EventHandler<AutoFilterValuesChangedEventArgs> AutoFilterValuesChanged;
-
-    internal void OnAutoFilterValuesChanged( AutoFilterValuesChangedEventArgs e )
-    {
-      if( this.AutoFilterValuesChanged != null )
-        this.AutoFilterValuesChanged( this, e );
-    }
-
     #endregion
 
     #region DistinctValuesRefreshNeeded Event
@@ -358,7 +297,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal abstract DataGridCollectionViewBaseDataProvider CreateDataProvider();
 
-    #endregion Source property
+    #endregion
 
     #region OriginalSource Property
 
@@ -370,7 +309,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion OriginalSource Property
+    #endregion
 
     #region AutoCreateForeignKeyDescriptions Property
 
@@ -395,6 +334,18 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region DataSourceProvider Internal Property
+
+    internal DataGridCollectionViewBaseDataProvider DataSourceProvider
+    {
+      get
+      {
+        return m_dataSourceProvider;
+      }
+    }
+
+    #endregion
+
     #region EVENTS
 
     public event EventHandler<DataGridItemEventArgs> InitializingNewItem;
@@ -519,74 +470,33 @@ namespace Xceed.Wpf.DataGrid
         this.ItemRemoved( this, e );
     }
 
-    #endregion EVENTS
-
-    #region INTERNAL PROPERTIES
-
-    internal DataGridCollectionViewBaseDataProvider DataSourceProvider
-    {
-      get
-      {
-        return m_dataSourceProvider;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
+    #endregion
 
     internal virtual void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
     {
-      DataGridItemPropertyCollection currentViewItemProperties = currentView.ItemProperties;
-      int count = m_itemProperties.Count;
+      var currentViewItemProperties = currentView.ItemProperties;
 
-      for( int i = 0; i < count; i++ )
+      foreach( var itemProperty in m_itemProperties )
       {
-        DataGridItemPropertyBase itemProperty = m_itemProperties[ i ];
-        int index = currentViewItemProperties.IndexOf( itemProperty.Name );
-
-        if( index == -1 )
-        {
-          currentViewItemProperties.Add( itemProperty );
-        }
-        else
-        {
-          currentViewItemProperties[ index ] = itemProperty;
-        }
+        currentViewItemProperties[ itemProperty.Name ] = itemProperty;
       }
 
-      count = currentView.ItemProperties.Count;
-
-      bool defaultCalculateDistinctValues = this.DefaultCalculateDistinctValues;
+      var defaultCalculateDistinctValues = this.DefaultCalculateDistinctValues;
 
-      for( int i = 0; i < count; i++ )
+      foreach( var itemProperty in currentViewItemProperties )
       {
-        DataGridItemPropertyBase dataGridItemProperty = currentView.ItemProperties[ i ];
-
         // Set default value for CalculateDistinctValues if not explicitly set
-        if( !dataGridItemProperty.IsCalculateDistinctValuesInitialized )
-          dataGridItemProperty.CalculateDistinctValues = defaultCalculateDistinctValues;
+        if( !itemProperty.IsCalculateDistinctValuesInitialized )
+        {
+          itemProperty.CalculateDistinctValues = defaultCalculateDistinctValues;
+        }
       }
 
-      count = m_dataGridDetailDescriptions.Count;
+      var autoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
 
-      bool autoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
-      DataGridDetailDescriptionCollection currentViewDetailDescriptions =
-        currentView.DetailDescriptions;
-
-      for( int i = 0; i < count; i++ )
+      for( int i = 0; i < m_dataGridDetailDescriptions.Count; i++ )
       {
         DataGridDetailDescription detailDescription = m_dataGridDetailDescriptions[ i ];
-        int index = currentViewDetailDescriptions.IndexOf( detailDescription.RelationName );
-
-        if( index == -1 )
-        {
-          currentViewDetailDescriptions.Add( detailDescription );
-        }
-        else
-        {
-          currentViewDetailDescriptions[ index ] = detailDescription;
-        }
 
         // We assume we want to auto-create ForeignKeyDescriptions for DetailDescriptions
         // if this.AutoCreateForeignKeyDescriptions is true and it was auto-created
@@ -595,17 +505,8 @@ namespace Xceed.Wpf.DataGrid
           detailDescription.AutoCreateForeignKeyDescriptions = autoCreateForeignKeyDescriptions;
         }
       }
-
-      currentView.AutoFilterMode = this.AutoFilterMode;
-      currentView.DistinctValuesConstraint = this.DistinctValuesConstraint;
-      currentView.DistinctValuesUpdateMode = this.DistinctValuesUpdateMode;
-      currentView.FilterCriteriaMode = this.FilterCriteriaMode;
     }
 
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE METHODS
-
     internal static void OnDataGridCollectionViewSourceBaseDependencyPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
       DataGridCollectionViewSourceBase source = o as DataGridCollectionViewSourceBase;
@@ -639,13 +540,11 @@ namespace Xceed.Wpf.DataGrid
       base.Culture = base.Culture;
     }
 
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
+    #region Private Fields
 
     private DataGridCollectionViewBaseDataProvider m_dataSourceProvider;
     private object m_originalSource;
 
-    #endregion PRIVATE FIELDS
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
index b74e6e1c..7595a6eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
@@ -15,47 +15,37 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using Xceed.Wpf.DataGrid.Stats;
-using System.Data;
-using System.Collections;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows;
-using System.Windows.Data;
 using Xceed.Utils.Collections;
-using System.Collections.Specialized;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal abstract class DataGridDetailDescription : DependencyObject, IWeakEventListener
   {
-    #region Constructor
-
     protected DataGridDetailDescription()
     {
-      m_detailDescriptions = new DataGridDetailDescriptionCollection();
-      m_detailDescriptions.CollectionChanged += this.OnDetailDescriptionsCollectionChanged;
-
       m_itemProperties = new DataGridItemPropertyCollection();
-      m_itemProperties.CollectionChanged += this.OnItemPropertiesCollectionChanged;
+      m_detailDescriptions = new DataGridDetailDescriptionCollection();
+      m_defaultPropertyDescriptions = new PropertyDescriptionRouteDictionary();
 
       m_groupDescriptions = new GroupDescriptionCollection();
-      m_sortDescriptions = new DataGridSortDescriptionCollection();
-      m_statFunctions = new StatFunctionCollection();
-      m_autoFilterValues = new ReadOnlyDictionary<string, IList>();
-      m_autoFilteredItems = new ObservableCollection<DataGridItemPropertyBase>();
-      m_registeredFieldNamesToAutoFilterValues = new Dictionary<string, INotifyCollectionChanged>();
-      m_registeredAutoFilterValuesToFieldNames = new Dictionary<INotifyCollectionChanged, string>();
+      m_sortDescriptions = new DataGridSortDescriptionCollection();    
 
       this.AutoCreateDetailDescriptions = true;
       this.AutoCreateItemProperties = true;
       this.DefaultCalculateDistinctValues = true;
-    }
 
-    #endregion
+      CollectionChangedEventManager.AddListener( m_itemProperties, this );
+      InitializeItemPropertyEventManager.AddListener( m_itemProperties, this );
+      CollectionChangedEventManager.AddListener( m_detailDescriptions, this );
+    }
 
     #region RelationName Public Property
 
@@ -74,6 +64,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private string m_relationName;
+
     #endregion
 
     #region Title Public Property
@@ -90,6 +82,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private object m_title;
+
     #endregion
 
     #region TitleTemplate Public Property
@@ -106,6 +100,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private DataTemplate m_titleTemplate;
+
     #endregion
 
     #region AutoCreateItemProperties Public Property
@@ -156,34 +152,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region AutoFilterValues Public Property
-
-    internal IDictionary<string, IList> AutoFilterValues
-    {
-      get
-      {
-        return m_autoFilterValues;
-      }
-    }
-
-    #endregion
-
-    #region AutoFilterMode Public Property
-
-    internal AutoFilterMode AutoFilterMode
-    {
-      get
-      {
-        return m_autoFilterMode;
-      }
-      set
-      {
-        m_autoFilterMode = value;
-      }
-    }
-
-    #endregion
-
     #region DistinctValuesConstraint Public Property
 
     public DistinctValuesConstraint DistinctValuesConstraint
@@ -198,25 +166,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion
-
-    #region FilterCriteriaMode Public Property
-
-    public FilterCriteriaMode FilterCriteriaMode
-    {
-      get
-      {
-        return m_filterCriteriaMode;
-      }
-      set
-      {
-        m_filterCriteriaMode = value;
-      }
-    }
+    private DistinctValuesConstraint m_distinctValuesConstraint = DistinctValuesConstraint.All;
 
     #endregion
 
-    #region ItemProperty Public Property
+    #region ItemProperties Public Property
 
     public DataGridItemPropertyCollection ItemProperties
     {
@@ -226,6 +180,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private readonly DataGridItemPropertyCollection m_itemProperties;
+
     #endregion
 
     #region DefaultCalculateDistinctValues Public Property
@@ -244,7 +200,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DetailDesctiptions Public Property
+    #region DetailDescriptions Public Property
 
     public DataGridDetailDescriptionCollection DetailDescriptions
     {
@@ -254,17 +210,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion
-
-    #region StatFunctions Public Property
-
-    internal StatFunctionCollection StatFunctions
-    {
-      get
-      {
-        return m_statFunctions;
-      }
-    }
+    private readonly DataGridDetailDescriptionCollection m_detailDescriptions;
 
     #endregion
 
@@ -278,6 +224,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private readonly GroupDescriptionCollection m_groupDescriptions;
+
     #endregion
 
     #region SortDescriptions Public Propertiy
@@ -290,6 +238,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private readonly DataGridSortDescriptionCollection m_sortDescriptions;
+
     #endregion
 
     #region AutoCreateItemPropertiesCompleted Internal Property
@@ -324,18 +274,52 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region AutoFilteredItems Internal Property
+    #region DefaultItemPropertiesInitialized Internal Property
 
-    internal ObservableCollection<DataGridItemPropertyBase> AutoFilteredItems
+    internal bool DefaultItemPropertiesInitialized
     {
       get
       {
-        return m_autoFilteredItems;
+        return m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultItemPropertiesInitialized ];
+      }
+      set
+      {
+        m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultItemPropertiesInitialized ] = value;
       }
     }
 
     #endregion
 
+    #region DefaultPropertyDescriptionsCreated Internal Property
+
+    internal bool DefaultPropertyDescriptionsCreated
+    {
+      get
+      {
+        return m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultPropertyDescriptionsCreated ];
+      }
+      set
+      {
+        m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultPropertyDescriptionsCreated ] = value;
+      }
+    }
+
+    #endregion
+
+    #region DefaultPropertyDescriptions Internal Property
+
+    internal PropertyDescriptionRouteDictionary DefaultPropertyDescriptions
+    {
+      get
+      {
+        return m_defaultPropertyDescriptions;
+      }
+    }
+
+    private readonly PropertyDescriptionRouteDictionary m_defaultPropertyDescriptions;
+
+    #endregion
+
     #region IsAutoCreated Internal Property
 
     internal bool IsAutoCreated
@@ -384,36 +368,45 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DataGridSortDescriptions Internal Property
+    #region ItemType Internal Property
 
-    internal DataGridSortDescriptionCollection DataGridSortDescriptions
+    internal Type ItemType
     {
       get
       {
-        return m_sortDescriptions;
+        return m_itemType;
+      }
+      set
+      {
+        if( value == m_itemType )
+          return;
+
+        m_itemType = value;
       }
     }
 
+    private Type m_itemType; //null
+
     #endregion
 
-    #region AutoFilterValuesChanged Internal Property
+    #region DataGridSortDescriptions Internal Property
 
-    internal Action<AutoFilterValuesChangedEventArgs> DetailDescriptionAutoFilterValuesChanged;
+    internal DataGridSortDescriptionCollection DataGridSortDescriptions
+    {
+      get
+      {
+        return m_sortDescriptions;
+      }
+    }
 
     #endregion
 
-    #region Protected Methods
-
     protected internal virtual void Initialize( DataGridCollectionViewBase parentCollectionView )
     {
     }
 
     protected internal abstract IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem );
 
-    #endregion
-
-    #region Internal Methods
-
     internal void Seal()
     {
       this.InternalIsSealed = true;
@@ -427,212 +420,88 @@ namespace Xceed.Wpf.DataGrid
       this.Initialize( parentCollectionView );
     }
 
-    internal virtual void OnDetailDescriptionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnItemPropertiesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      // Set the AutoFilterValuesChanged event for each
-      // newly added DataGridDetailDescription added to 
-      // collection
-      int newItemsCount = ( e.NewItems != null )
-       ? e.NewItems.Count
-       : 0;
-
-      int oldItemsCount = ( e.OldItems != null )
-      ? e.OldItems.Count
-      : 0;
+      var removedItems = default( IEnumerable<DataGridItemPropertyBase> );
 
-      for( int i = 0; i < oldItemsCount; i++ )
-      {
-        DataGridDetailDescription description = e.OldItems[ i ] as DataGridDetailDescription;
-
-        if( description == null )
-          continue;
-
-        description.UnregisterAllAutoFilterValuesChangedEvent();
-      }
-
-      for( int i = 0; i < newItemsCount; i++ )
-      {
-        DataGridDetailDescription description = e.NewItems[ i ] as DataGridDetailDescription;
-
-        if( description == null )
-          continue;
-
-        description.DetailDescriptionAutoFilterValuesChanged = this.RaiseDetailDescriptionAutoFilterValuesChangedEvent;
-      }
-    }
-
-    internal virtual void OnItemPropertiesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
       switch( e.Action )
       {
         case NotifyCollectionChangedAction.Replace:
-          Debug.Assert( false, "The replace of an ItemProperty is not supported." );
+          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
           break;
-        case NotifyCollectionChangedAction.Remove:
-
-          int oldItemsCount = ( e.OldItems != null )
-            ? e.OldItems.Count
-            : 0;
-
-          for( int i = 0; i < oldItemsCount; i++ )
-          {
-            DataGridItemPropertyBase dataGridItemProperty = e.OldItems[ i ] as DataGridItemPropertyBase;
-            Debug.Assert( dataGridItemProperty != null );
 
-            this.UnregisterAutoFilterValuesChangedEvent( dataGridItemProperty.Name );
-          }
+        case NotifyCollectionChangedAction.Remove:
+          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
           break;
-        case NotifyCollectionChangedAction.Reset:
 
-          this.UnregisterAllAutoFilterValuesChangedEvent();
-          break;
+        case NotifyCollectionChangedAction.Reset:
+          throw new NotSupportedException();
       }
     }
 
-    internal void RegisterAutoFilterValuesChangedEvent( string fieldName, INotifyCollectionChanged autoFilterValues )
-    {
-      if( this.DetailDescriptionAutoFilterValuesChanged == null )
-        return;
-
-      if( m_registeredFieldNamesToAutoFilterValues.ContainsKey( fieldName ) )
-        return;
-
-      m_registeredFieldNamesToAutoFilterValues.Add( fieldName, autoFilterValues );
-      m_registeredAutoFilterValuesToFieldNames.Add( autoFilterValues, fieldName );
-
-      CollectionChangedEventManager.AddListener( autoFilterValues, this );
-    }
-
-    internal void UnregisterAllAutoFilterValuesChangedEvent()
-    {
-      foreach( INotifyCollectionChanged autoFilterValues in m_registeredAutoFilterValuesToFieldNames.Keys )
-        CollectionChangedEventManager.RemoveListener( autoFilterValues, this );
-
-      m_registeredAutoFilterValuesToFieldNames.Clear();
-      m_registeredFieldNamesToAutoFilterValues.Clear();
-      this.DetailDescriptionAutoFilterValuesChanged = null;
-    }
-
-
-    #endregion
-
-    #region Private Methods
-
-    private void UnregisterAutoFilterValuesChangedEvent( string fieldName )
-    {
-      if( string.IsNullOrEmpty( fieldName ) )
-        return;
-
-      INotifyCollectionChanged collectionChanged = null;
-
-      if( !m_registeredFieldNamesToAutoFilterValues.TryGetValue( fieldName, out collectionChanged ) )
-        return;
-
-      CollectionChangedEventManager.RemoveListener( collectionChanged, this );
-
-      m_registeredFieldNamesToAutoFilterValues.Remove( fieldName );
-      m_registeredAutoFilterValuesToFieldNames.Remove( collectionChanged );
-    }
+    #region IWeakEventListener Members
 
-    private void RaiseDetailDescriptionAutoFilterValuesChangedEvent( AutoFilterValuesChangedEventArgs e )
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      // Forward this change notification to the root CollectionView
-      // or CollectionViewSource
-      if( this.DetailDescriptionAutoFilterValuesChanged != null )
-        this.DetailDescriptionAutoFilterValuesChanged( e );
+      return this.OnReceiveWeakEvent( managerType, sender, e );
     }
 
-    private void OnAutoFilterValuesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      if( this.AutoFilterMode == AutoFilterMode.None )
-        return;
-
-      ObservableHashList hashList = sender as ObservableHashList;
-
-      if( hashList == null )
-        return;
+      if( ( managerType == null ) || ( sender == null ) || ( e == null ) )
+        return false;
 
-      string fieldName = m_registeredAutoFilterValuesToFieldNames[ hashList ];
+      if( managerType == typeof( CollectionChangedEventManager ) )
+      {
+        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
 
-      if( string.IsNullOrEmpty( fieldName ) )
-        return;
+        if( m_itemProperties == sender )
+        {
+          this.OnItemPropertiesCollectionChanged( sender, eventArgs );
+        }
+        else if( m_detailDescriptions == sender )
+        {
+        }
+      }
+      else if( managerType == typeof( InitializeItemPropertyEventManager ) )
+      {
+        var eventArgs = ( InitializeItemPropertyEventArgs )e;
 
-      DataGridItemPropertyBase itemProperty = this.ItemProperties[ fieldName ];
+        if( m_itemProperties == sender )
+        {
+          var itemProperty = eventArgs.ItemProperty;
+          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
 
-      if( itemProperty == null )
-        return;
+          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, null, null, m_itemType, itemPropertyRoute );
+          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
+        }
+      }
+      else
+      {
+        return false;
+      }
 
-      this.DetailDescriptionAutoFilterValuesChanged( new AutoFilterValuesChangedEventArgs( this, itemProperty, hashList, e ) );
+      return true;
     }
 
     #endregion
 
-    #region Private Fields
-
-    private string m_relationName;
-    private object m_title;
-    private DataTemplate m_titleTemplate;
-    private DataGridItemPropertyCollection m_itemProperties;
-    private DataGridDetailDescriptionCollection m_detailDescriptions;
-    private DistinctValuesConstraint m_distinctValuesConstraint = DistinctValuesConstraint.All;
-    private StatFunctionCollection m_statFunctions;
-    private GroupDescriptionCollection m_groupDescriptions;
-    private DataGridSortDescriptionCollection m_sortDescriptions;
-    private ReadOnlyDictionary<string, IList> m_autoFilterValues;
-    private ObservableCollection<DataGridItemPropertyBase> m_autoFilteredItems;
-    private AutoFilterMode m_autoFilterMode = AutoFilterMode.None;
-    private FilterCriteriaMode m_filterCriteriaMode = FilterCriteriaMode.And;
     private BitVector32 m_flags = new BitVector32();
-    private Dictionary<string, INotifyCollectionChanged> m_registeredFieldNamesToAutoFilterValues;
-    private Dictionary<INotifyCollectionChanged, string> m_registeredAutoFilterValuesToFieldNames;
-
-    #endregion
-
-    #region DataGridDetailDescriptionFlags Private Classes
 
     [Flags]
     private enum DataGridDetailDescriptionFlags
     {
-      IsSealed = 1,
-      DefaultCalculateDistinctValues = 2,
-      IsInitialized = 4,
-      AutoCreateItemProperties = 8,
-      AutoCreateDetailDescriptions = 16,
-      AutoCreateForeignKeyDescriptions = 32,
-      IsAutoCreated = 64,
-      AutoCreateItemPropertiesCompleted = 128,
-      AutoCreateDetailDescriptionsCompleted = 256,
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
+      IsSealed = 1 << 0,
+      DefaultCalculateDistinctValues = 1 << 1,
+      IsInitialized = 1 << 2,
+      AutoCreateItemProperties = 1 << 3,
+      AutoCreateDetailDescriptions = 1 << 4,
+      AutoCreateForeignKeyDescriptions = 1 << 5,
+      IsAutoCreated = 1 << 6,
+      AutoCreateItemPropertiesCompleted = 1 << 7,
+      AutoCreateDetailDescriptionsCompleted = 1 << 8,
+      DefaultItemPropertiesInitialized = 1 << 9,
+      DefaultPropertyDescriptionsCreated = 1 << 10,
     }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( ( managerType == null )
-          || ( sender == null )
-          || ( e == null ) )
-        return false;
-
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs =
-          e as NotifyCollectionChangedEventArgs;
-
-        this.OnAutoFilterValuesCollectionChanged( sender, notifyCollectionChangedEventArgs );
-
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
index c0574da2..218d3575 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
@@ -16,7 +16,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.ObjectModel;
 
 namespace Xceed.Wpf.DataGrid
@@ -37,9 +36,8 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        int index = this.IndexOf( relationName );
-
-        if( index == -1 )
+        var index = this.IndexOf( relationName );
+        if( index < 0 )
           return null;
 
         return this.Items[ index ];
@@ -48,8 +46,8 @@ namespace Xceed.Wpf.DataGrid
 
     public int IndexOf( string relationName )
     {
-      IList<DataGridDetailDescription> items = this.Items;
-      int count = items.Count;
+      var items = this.Items;
+      var count = items.Count;
 
       for( int i = 0; i < count; i++ )
       {
@@ -60,20 +58,6 @@ namespace Xceed.Wpf.DataGrid
       return -1;
     }
 
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly" )]
-    internal ICollection<DataGridDetailDescription> DefaultDetailDescriptions
-    {
-      get
-      {
-        return m_defaultDetailDescriptions;
-      }
-      set
-      {
-        if( m_defaultDetailDescriptions == null )
-          m_defaultDetailDescriptions = value;
-      }
-    }
-
     protected override void SetItem( int index, DataGridDetailDescription item )
     {
       if( string.IsNullOrEmpty( item.RelationName ) )
@@ -89,22 +73,5 @@ namespace Xceed.Wpf.DataGrid
 
       base.InsertItem( index, item );
     }
-
-    private DataGridDetailDescription FindDefaultDetailDescription( string name )
-    {
-      if( m_defaultDetailDescriptions != null )
-      {
-        foreach( DataGridDetailDescription detailDescription in m_defaultDetailDescriptions )
-        {
-          if( string.Equals( detailDescription.RelationName, name ) )
-            return detailDescription;
-        }
-      }
-
-      return null;
-    }
-
-    private ICollection<DataGridDetailDescription> m_defaultDetailDescriptions;
-
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
index c930c2a2..1bd2b380 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
@@ -14,13 +14,10 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Data;
-using System.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -91,7 +88,7 @@ namespace Xceed.Wpf.DataGrid
     protected object GetPropertyValue( object item )
     {
       if( m_contextProperty != null )
-        return m_contextProperty.GetValue( item );
+        return ItemsSourceHelper.GetValueFromItemProperty( m_contextProperty, item );
 
       return m_propertyGroupDescription.GroupNameFromItem( item, 0, CultureInfo.InvariantCulture );
     }
@@ -104,7 +101,7 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        string propertyName = m_propertyGroupDescription.PropertyName;
+        var propertyName = m_propertyGroupDescription.PropertyName;
 
         if( string.IsNullOrEmpty( propertyName ) )
         {
@@ -112,7 +109,7 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          m_contextProperty = collectionView.ItemProperties[ propertyName ];
+          m_contextProperty = ItemsSourceHelper.GetItemPropertyFromProperty( collectionView.ItemProperties, propertyName );
         }
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
index a3797db3..7e4ebe1a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
@@ -15,29 +15,17 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
-using System.Windows.Data;
-using System.Globalization;
+using System.Data;
 using System.Diagnostics;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Windows;
-using System.Xml;
-using System.Data;
-
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.FilterCriteria;
 
 namespace Xceed.Wpf.DataGrid
 {
+  [DebuggerDisplay( "Name = {Name}" )]
   public partial class DataGridItemProperty : DataGridItemPropertyBase
   {
-
-    #region CONSTRUCTORS
-
     public DataGridItemProperty()
     {
     }
@@ -66,6 +54,7 @@ namespace Xceed.Wpf.DataGrid
         null,
         null,
         null,
+        null,
         null );
     }
 
@@ -93,6 +82,7 @@ namespace Xceed.Wpf.DataGrid
         isReadOnly,
         null,
         null,
+        null,
         null );
     }
 
@@ -120,6 +110,7 @@ namespace Xceed.Wpf.DataGrid
         null,
         null,
         null,
+        null,
         null );
     }
 
@@ -147,6 +138,7 @@ namespace Xceed.Wpf.DataGrid
         isReadOnly,
         overrideReadOnlyForInsertion,
         null,
+        null,
         null );
     }
 
@@ -169,6 +161,7 @@ namespace Xceed.Wpf.DataGrid
         null,
         null,
         null,
+        null,
         null );
     }
 
@@ -188,6 +181,7 @@ namespace Xceed.Wpf.DataGrid
         null,
         null,
         null,
+        null,
         null );
     }
 
@@ -201,6 +195,7 @@ namespace Xceed.Wpf.DataGrid
       bool isAutoCreated,
       Nullable<bool> isReadOnly,
       Nullable<bool> overrideReadOnlyForInsertion,
+      Nullable<bool> isDisplayable,
       Nullable<bool> isASubRelationship,
       DataGridForeignKeyDescription foreignKeyDescription )
     {
@@ -220,17 +215,17 @@ namespace Xceed.Wpf.DataGrid
         isAutoCreated,
         isReadOnly,
         overrideReadOnlyForInsertion,
+        isDisplayable,
         isASubRelationship,
         foreignKeyDescription );
     }
 
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
     protected DataGridItemProperty( DataGridItemProperty template )
-      : base( template )
     {
-      // this.IsAutoCreated = false, after a clone, we consider the ItemProperty not AutoCreated.
-      m_propertyDescriptor = template.m_propertyDescriptor;
-      m_valueXPath = template.m_valueXPath;
-      m_valuePath = template.m_valuePath;
+      throw new NotSupportedException();
     }
 
     private void Initialize(
@@ -243,6 +238,7 @@ namespace Xceed.Wpf.DataGrid
       bool isAutoCreated,
       Nullable<bool> isReadOnly,
       Nullable<bool> overrideReadOnlyForInsertion,
+      Nullable<bool> isDisplayable,
       Nullable<bool> isASubRelationship,
       DataGridForeignKeyDescription foreignKeyDescription )
     {
@@ -259,7 +255,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( m_propertyDescriptor != null )
       {
-        this.Browsable = m_propertyDescriptor.IsBrowsable;
+        this.IsBrowsable = m_propertyDescriptor.IsBrowsable;
 
         if( m_propertyDescriptor.IsReadOnly )
           isReadOnly = m_propertyDescriptor.IsReadOnly;
@@ -291,11 +287,9 @@ namespace Xceed.Wpf.DataGrid
 
       this.ForeignKeyDescription = foreignKeyDescription;
 
-      base.Initialize( name, title, dataType, isReadOnly, overrideReadOnlyForInsertion, isASubRelationship );
+      base.Initialize( name, title, dataType, isReadOnly, overrideReadOnlyForInsertion, isDisplayable, isASubRelationship );
     }
 
-    #endregion CONSTRUCTORS
-
     #region ValuePath Property
 
     public string ValuePath
@@ -306,7 +300,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the ValuePath of a property already added to a containing collection." );
 
         this.SetValuePath( value );
@@ -322,7 +316,7 @@ namespace Xceed.Wpf.DataGrid
 
     private string m_valuePath;
 
-    #endregion ValuePath Property
+    #endregion
 
     #region ValueXPath Property
 
@@ -334,7 +328,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the ValueXPath of a property already added to a containing collection." );
 
         this.SetValueXPath( value );
@@ -350,7 +344,7 @@ namespace Xceed.Wpf.DataGrid
 
     private string m_valueXPath;
 
-    #endregion ValueXPath Property
+    #endregion
 
     #region PropertyDescriptor Property
 
@@ -362,7 +356,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the PropertyDescriptor of a property already added to a containing collection." );
 
         this.SetPropertyDescriptor( value );
@@ -374,7 +368,9 @@ namespace Xceed.Wpf.DataGrid
       m_propertyDescriptor = propertyDescriptor;
 
       if( ( m_propertyDescriptor != null ) && ( !this.IsReadOnly ) )
+      {
         this.SetIsReadOnly( propertyDescriptor.IsReadOnly );
+      }
 
       m_bindingPathValueExtractorForRead = null;
       m_bindingPathValueExtractorForWrite = null;
@@ -382,7 +378,7 @@ namespace Xceed.Wpf.DataGrid
 
     private PropertyDescriptor m_propertyDescriptor;
 
-    #endregion PropertyDescriptor Property
+    #endregion
 
     #region IsAutoCreated Property
 
@@ -392,23 +388,23 @@ namespace Xceed.Wpf.DataGrid
       private set;
     }
 
-    #endregion IsAutoCreated Property
+    #endregion
 
-    #region PUBLIC METHODS
+    #region FieldName Internal Property
 
-    public override object Clone()
+    internal override string FieldName
     {
-      Type type = this.GetType();
-
-      if( type == typeof( DataGridItemProperty ) )
-        return new DataGridItemProperty( this );
+      get
+      {
+        var descriptor = this.PropertyDescriptor;
+        if( descriptor != null )
+          return descriptor.Name;
 
-      return base.Clone();
+        return base.FieldName;
+      }
     }
 
-    #endregion PUBLIC METHODS
-
-    #region PROTECTED METHODS
+    #endregion
 
     protected override object GetValueCore( object component )
     {
@@ -422,20 +418,19 @@ namespace Xceed.Wpf.DataGrid
         }
         catch( DataException )
         {
-          // We have to return null if the datarow is deleted from the DataTable.
-          // When the System.Data.DataRow have RowState == detached, it can be because it has been deleted
-          // or it being inserted, nothing special found to differentiate that 2 state.  So doing a try catch.
+          // We have to return null if the datarow is deleted from the DataTable.  When the System.Data.DataRow has RowState == detached,
+          // it can be because it has been deleted or it being inserted, nothing special found to differentiate that 2 state.  So doing a try catch.
           value = null;
         }
 
         CultureInfo converterCulture = this.ConverterCulture;
 
         if( converterCulture == null )
+        {
           converterCulture = CultureInfo.InvariantCulture;
+        }
 
-        return this.GetBindingConverter( component ).Convert(
-          value, this.DataType,
-          this.ConverterParameter, converterCulture );
+        return this.GetBindingConverter( component ).Convert( value, this.DataType, this.ConverterParameter, converterCulture );
       }
 
       if( m_bindingPathValueExtractorForRead == null )
@@ -443,18 +438,19 @@ namespace Xceed.Wpf.DataGrid
         CultureInfo converterCulture = this.ConverterCulture;
 
         if( converterCulture == null )
+        {
           converterCulture = CultureInfo.InvariantCulture;
+        }
 
         PropertyPath propertyPath = null;
 
         if( !string.IsNullOrEmpty( this.ValuePath ) )
+        {
           propertyPath = new PropertyPath( this.ValuePath, BindingPathValueExtractor.EmptyObjectArray );
+        }
 
-        m_bindingPathValueExtractorForRead = new BindingPathValueExtractor(
-          this.ValueXPath, propertyPath, false,
-          this.DataType,
-          this.GetBindingConverter( component ),
-          this.ConverterParameter, converterCulture );
+        m_bindingPathValueExtractorForRead = new BindingPathValueExtractor( this.ValueXPath, propertyPath, false, this.DataType,
+                                                                            this.GetBindingConverter( component ), this.ConverterParameter, converterCulture );
       }
 
       return m_bindingPathValueExtractorForRead.GetValueFromItem( component );
@@ -467,13 +463,11 @@ namespace Xceed.Wpf.DataGrid
         CultureInfo converterCulture = this.ConverterCulture;
 
         if( converterCulture == null )
+        {
           converterCulture = CultureInfo.InvariantCulture;
+        }
 
-        object convertedValue = this.GetBindingConverter( component ).ConvertBack(
-          value,
-          m_propertyDescriptor.PropertyType,
-          this.ConverterParameter,
-          converterCulture );
+        object convertedValue = this.GetBindingConverter( component ).ConvertBack( value, m_propertyDescriptor.PropertyType, this.ConverterParameter, converterCulture );
 
         m_propertyDescriptor.SetValue( component, convertedValue );
       }
@@ -484,17 +478,19 @@ namespace Xceed.Wpf.DataGrid
           CultureInfo converterCulture = this.ConverterCulture;
 
           if( converterCulture == null )
+          {
             converterCulture = CultureInfo.InvariantCulture;
+          }
 
           PropertyPath propertyPath = null;
 
           if( !string.IsNullOrEmpty( this.ValuePath ) )
+          {
             propertyPath = new PropertyPath( this.ValuePath, BindingPathValueExtractor.EmptyObjectArray );
+          }
 
-          m_bindingPathValueExtractorForWrite = new BindingPathValueExtractor(
-            this.ValueXPath, propertyPath, true,
-            this.DataType,
-            this.GetBindingConverter( component ), this.ConverterParameter, converterCulture );
+          m_bindingPathValueExtractorForWrite = new BindingPathValueExtractor( this.ValueXPath, propertyPath, true, this.DataType,
+                                                                               this.GetBindingConverter( component ), this.ConverterParameter, converterCulture );
         }
 
         m_bindingPathValueExtractorForWrite.SetValueToItem( component, value );
@@ -503,40 +499,27 @@ namespace Xceed.Wpf.DataGrid
       base.SetValueCore( component, value );
     }
 
-    #endregion PROTECTED METHODS
-
-    #region INTERNAL METHODS
-
     internal override PropertyDescriptorFromItemPropertyBase GetPropertyDescriptorForBindingCore()
     {
       return new PropertyDescriptorFromItemProperty( this );
     }
 
-    internal override void SetUnspecifiedPropertiesValues( DataGridItemPropertyCollection itemPropertyCollection )
+    internal override void SetUnspecifiedPropertiesValues(
+      PropertyDescription description,
+      Type itemType,
+      bool defaultItemPropertiesCreated )
     {
-      // ContainingCollection.ItemType and ContainingCollection.DefaultItemProperties can be null at first when this is 
-      // the ItemProperties of a DetailGrid.
-      // the SetUnspecifiedPropertiesValues will be recall when both this.ItemType and this.DefaultItemProperties are affected.
+      var itemIsXceedDataRow = ( itemType != null ) ? typeof( DataRow ).IsAssignableFrom( itemType ) : false;
 
-      if( itemPropertyCollection == null )
-        return;
-
-      DataGridItemProperty defaultItemProperty = null;
-      bool itemIsXceedDataRow = ( itemPropertyCollection.ItemType != null ) ? typeof( DataRow ).IsAssignableFrom( itemPropertyCollection.ItemType ) : false;
-
-      if( ( string.IsNullOrEmpty( this.ValueXPath ) )
-        && ( string.IsNullOrEmpty( this.ValuePath ) )
-        && ( this.PropertyDescriptor == null ) )
+      if( ( this.PropertyDescriptor == null ) && string.IsNullOrEmpty( this.ValuePath ) && string.IsNullOrEmpty( this.ValueXPath ) )
       {
         if( itemIsXceedDataRow )
         {
-          this.PropertyDescriptor = new UnboundDataRowPropertyDescriptor( this.Name, this.DataType );
+          this.SetPropertyDescriptor( new UnboundDataRowPropertyDescriptor( this.Name, this.DataType ) );
         }
         else
         {
-          defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-          if( defaultItemProperty == null )
+          if( description == null )
           {
             if( this.Name == "." )
             {
@@ -545,91 +528,71 @@ namespace Xceed.Wpf.DataGrid
               this.SetIsReadOnly( true );
               this.SetOverrideReadOnlyForInsertion( false );
             }
-            else if( itemPropertyCollection.DefaultItemProperties != null )
-            {
-              // I have to add this particular exception case to make sure that when the ItemProperty is "re-normalized" when the first DataGridCollectionView
-              // is created for it, then the ValuePath is still null or empty (allowing it to be re-normalized)
-              this.SetValuePath( this.Name );
-            }
           }
           else
           {
-            this.SetPropertyDescriptor( defaultItemProperty.PropertyDescriptor );
-            this.SetValuePath( defaultItemProperty.ValuePath );
-            this.SetValueXPath( defaultItemProperty.ValueXPath );
+            this.SetPropertyDescriptor( description.PropertyDescriptor );
+            this.SetValuePath( description.Path );
+            this.SetValueXPath( description.XPath );
           }
         }
+
+        if( defaultItemPropertiesCreated && ( this.PropertyDescriptor == null ) && string.IsNullOrEmpty( this.ValuePath ) && string.IsNullOrEmpty( this.ValueXPath ) )
+        {
+          // I have to add this particular exception case to make sure that when the ItemProperty is "re-normalized" when the first DataGridCollectionView
+          // is created for it, then the ValuePath is still null or empty (allowing it to be re-normalized)
+          this.SetValuePath( this.Name );
+        }
       }
 
       if( this.DataType == null )
       {
-        //only try to affect the DataType if the DefaultItemProperties were set. (will not be the case when XAML parsing DetailDescriptions)
-        if( itemPropertyCollection.DefaultItemProperties != null )
+        //only try to affect the DataType if the DefaultPropertyDescriptions were set. (will not be the case when XAML parsing DetailDescriptions)
+        if( defaultItemPropertiesCreated )
         {
-          if( defaultItemProperty == null )
-            defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-          if( defaultItemProperty == null )
-          {
+          if( description == null )
             throw new InvalidOperationException( "An attempt was made to add an item (" + this.Name + ") without specifying its data type." );
-          }
 
-          this.SetDataType( defaultItemProperty.DataType );
+          this.SetDataType( description.DataType );
         }
       }
 
       if( string.IsNullOrEmpty( this.Title ) )
       {
-        if( itemIsXceedDataRow )
+        if( !itemIsXceedDataRow && ( description != null ) && !string.IsNullOrEmpty( description.DisplayName ) )
         {
-          this.Title = this.Name;
+          this.Title = description.DisplayName;
         }
         else
         {
-          if( defaultItemProperty == null )
-            defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-          if( defaultItemProperty == null )
-          {
-            this.Title = this.Name;
-          }
-          else
-          {
-            this.Title = defaultItemProperty.Title;
-          }
+          this.Title = this.Name;
         }
       }
 
       if( !this.IsReadOnly )
       {
-        if( defaultItemProperty == null )
-          defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-        if( defaultItemProperty != null )
+        if( description != null )
         {
-          this.SetIsReadOnly( defaultItemProperty.IsReadOnly );
+          this.SetIsReadOnly( description.IsReadOnly );
         }
       }
 
       if( this.OverrideReadOnlyForInsertion == null )
       {
         //only try to affect the DataType if the DefaultItemProperties were set. (will not be the case when XAML parsing DetailDescriptions)
-        if( itemPropertyCollection.DefaultItemProperties != null )
+        if( defaultItemPropertiesCreated )
         {
-          if( defaultItemProperty == null )
-            defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-          this.SetOverrideReadOnlyForInsertion( ( defaultItemProperty != null ) && ( defaultItemProperty.OverrideReadOnlyForInsertion.HasValue )
-            ? defaultItemProperty.OverrideReadOnlyForInsertion.Value
-            : false );
+          this.SetOverrideReadOnlyForInsertion( ( description != null ) ? description.OverrideReadOnlyForInsertion : false );
         }
       }
 
       if( ( !string.IsNullOrEmpty( this.ValueXPath ) ) && ( string.IsNullOrEmpty( this.ValuePath ) ) )
+      {
         this.SetValuePath( "InnerText" );
+      }
 
-      bool foreignKeyDescriptionIsNull = ( this.ForeignKeyDescription == null );
-      bool foreignKeyDescriptionItemsSourceIsNull = false;
+      var foreignKeyDescriptionIsNull = ( this.ForeignKeyDescription == null );
+      var foreignKeyDescriptionItemsSourceIsNull = false;
 
       if( !foreignKeyDescriptionIsNull )
       {
@@ -639,33 +602,28 @@ namespace Xceed.Wpf.DataGrid
       // Update the ForeignKeyDescription if not set
       if( foreignKeyDescriptionIsNull || foreignKeyDescriptionItemsSourceIsNull )
       {
-        if( defaultItemProperty == null )
-          defaultItemProperty = itemPropertyCollection.FindDefaultItemProperty( this.Name ) as DataGridItemProperty;
-
-        if( ( defaultItemProperty != null ) && ( defaultItemProperty.ForeignKeyDescription != null ) )
+        if( ( description != null ) && ( description.ForeignKeyDescription != null ) )
         {
           if( foreignKeyDescriptionIsNull )
           {
-            this.SetForeignKeyDescription( defaultItemProperty.ForeignKeyDescription );
+            this.SetForeignKeyDescription( description.ForeignKeyDescription );
           }
           else
           {
             if( foreignKeyDescriptionItemsSourceIsNull )
             {
-              this.ForeignKeyDescription.ItemsSource = defaultItemProperty.ForeignKeyDescription.ItemsSource;
+              this.ForeignKeyDescription.ItemsSource = description.ForeignKeyDescription.ItemsSource;
             }
           }
         }
       }
     }
 
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
+    #region Private Fields
 
     private BindingPathValueExtractor m_bindingPathValueExtractorForRead;
     private BindingPathValueExtractor m_bindingPathValueExtractorForWrite;
 
-    #endregion PRIVATE FIELDS
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
index 75dcb025..dff6b4ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
@@ -15,10 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -27,7 +23,7 @@ namespace Xceed.Wpf.DataGrid
     internal class PropertyDescriptorFromItemPropertyBase : EmptyDataItemSafePropertyDescriptor
     {
       public PropertyDescriptorFromItemPropertyBase( DataGridItemPropertyBase dataGridItemProperty )
-        : base( dataGridItemProperty.Name )
+        : base( dataGridItemProperty.FieldName )
       {
         m_dataGridItemProperty = new WeakReference( dataGridItemProperty );
         m_propertyType = dataGridItemProperty.DataType;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
index 1637c45f..a2a3707b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
@@ -19,47 +19,43 @@ using System.Collections;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.Threading;
 using System.Windows.Data;
 using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.FilterCriteria;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
+  [DebuggerDisplay( "Name = {Name}" )]
   public abstract partial class DataGridItemPropertyBase : INotifyPropertyChanged, ICloneable
   {
+    #region Static Fields
+
+    internal static readonly string CalculateDistinctValuesPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.CalculateDistinctValues );
+    internal static readonly string ContainingCollectionPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ContainingCollection );
+    internal static readonly string ForeignKeyDescriptionPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ForeignKeyDescription );
+    internal static readonly string GroupSortStatResultPropertyNamePropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.GroupSortStatResultPropertyName );
+    internal static readonly string IsNameSealedPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.IsNameSealed );
+    internal static readonly string IsSealedPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.IsSealed );
+    internal static readonly string ItemPropertiesInternalPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ItemPropertiesInternal );
+    internal static readonly string MaxDistinctValuesPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.MaxDistinctValues );
+    internal static readonly string SynonymPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.Synonym );
+
+    #endregion
 
     protected DataGridItemPropertyBase()
     {
-      this.Browsable = true;
+      this.SetIsDisplayable( true );
+      this.IsBrowsable = true;
     }
 
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
     protected DataGridItemPropertyBase( DataGridItemPropertyBase template )
       : this()
     {
-      m_name = template.m_name;
-      m_dataType = template.m_dataType;
-      m_title = template.m_title;
-      m_synonym = template.m_synonym;
-      m_flags[ DataGridItemPropertyBaseFlags.IsReadOnly ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsReadOnly ];
-      m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertionSet ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertionSet ];
-      m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertion ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertion ];
-      m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ];
-      m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ];
-      m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ] = template.m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ];
-      m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ] = template.m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ];
-      m_converter = template.m_converter;
-      m_converterCulture = template.m_converterCulture;
-      m_converterParameter = template.m_converterParameter;
-      this.FilterCriterion = template.m_filterCriterion;
-      m_foreignKeyDescription = template.m_foreignKeyDescription;
-      m_maxDistinctValues = template.m_maxDistinctValues;
-      m_sortComparer = template.m_sortComparer;
-      this.DistinctValuesEqualityComparer = template.DistinctValuesEqualityComparer;
-      this.DistinctValuesSortComparer = template.DistinctValuesSortComparer;
-
-      // FilterCriterionChanged is not cloned since only used after the clone occurs
-      this.PropertyChanged += template.PropertyChanged;
-      this.QueryDistinctValue += template.m_queryDistinctValue;
+      throw new NotSupportedException();
     }
 
     protected void Initialize(
@@ -68,6 +64,7 @@ namespace Xceed.Wpf.DataGrid
       Type dataType,
       Nullable<bool> isReadOnly,
       Nullable<bool> overrideReadOnlyForInsertion,
+      Nullable<bool> isDisplayable,
       Nullable<bool> isASubRelationship )
     {
       if( string.IsNullOrEmpty( name ) )
@@ -92,6 +89,11 @@ namespace Xceed.Wpf.DataGrid
       this.SetOverrideReadOnlyForInsertion( overrideReadOnlyForInsertion );
       m_dataType = dataType;
 
+      if( isDisplayable.HasValue )
+      {
+        this.SetIsDisplayable( isDisplayable.Value );
+      }
+
       if( isASubRelationship != null )
       {
         this.SetIsASubRelationship( isASubRelationship );
@@ -112,7 +114,7 @@ namespace Xceed.Wpf.DataGrid
         if( string.IsNullOrEmpty( value ) )
           throw new ArgumentException( "Name is null (Nothing in Visual Basic) or empty.", "Name" );
 
-        if( this.Initialized )
+        if( this.IsNameSealed || this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the name of a property already added to a containing collection." );
 
         m_name = value;
@@ -121,7 +123,7 @@ namespace Xceed.Wpf.DataGrid
 
     private string m_name;
 
-    #endregion Name Property
+    #endregion
 
     #region DataType Property
 
@@ -134,7 +136,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the DataType of a property already added to a containing collection." );
 
         this.SetDataType( value );
@@ -151,7 +153,7 @@ namespace Xceed.Wpf.DataGrid
 
     private Type m_dataType;
 
-    #endregion DataType Property
+    #endregion
 
     #region IsReadOnly Property
 
@@ -163,7 +165,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the IsReadOnly property of a DataGridItemProperty already added to a containing collection." );
 
         this.SetIsReadOnly( value );
@@ -175,7 +177,7 @@ namespace Xceed.Wpf.DataGrid
       m_flags[ DataGridItemPropertyBaseFlags.IsReadOnly ] = isReadOnly;
     }
 
-    #endregion IsReadOnly Property
+    #endregion
 
     #region OverrideReadOnlyForInsertion Property
 
@@ -190,7 +192,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the OverrideReadOnlyForInsertion property of a DataGridItemProperty already added to a containing collection." );
 
         this.SetOverrideReadOnlyForInsertion( value );
@@ -211,47 +213,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion OverrideReadOnlyForInsertion Property
-
-    #region IsASubRelationship Property
-
-    internal bool IsASubRelationship
-    {
-      get
-      {
-        if( m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] )
-          return m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ];
-
-        if( m_dataType == null )
-          return false;
-
-        bool isASubRelationship = ItemsSourceHelper.IsASubRelationship( m_dataType );
-
-        if( this.Initialized )
-        {
-          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship;
-          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
-        }
-
-        return isASubRelationship;
-      }
-    }
-
-    private void SetIsASubRelationship( Nullable<bool> isASubRelationship )
-    {
-      if( isASubRelationship.HasValue )
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship.Value;
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
-      }
-      else
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet
-               | DataGridItemPropertyBaseFlags.IsASubRelationship ] = false;
-      }
-    }
-
-    #endregion IsASubRelationship Property
+    #endregion
 
     #region Title Property
 
@@ -273,7 +235,7 @@ namespace Xceed.Wpf.DataGrid
 
     private string m_title;
 
-    #endregion Title Property
+    #endregion
 
     #region Synonym Property
 
@@ -286,7 +248,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the Synonym of a property already added to a containing collection." );
 
         this.SetSynonym( value );
@@ -295,12 +257,21 @@ namespace Xceed.Wpf.DataGrid
 
     internal void SetSynonym( string value )
     {
+      if( value == m_synonym )
+        return;
+
+      var wasSealed = this.IsSealed;
+      this.IsSealed = false;
+
       m_synonym = value;
+
+      this.IsSealed = wasSealed;
+      this.OnPropertyChanged( DataGridItemPropertyBase.SynonymPropertyName );
     }
 
     private string m_synonym;
 
-    #endregion Synonym Property
+    #endregion
 
     #region SortComparer Property
 
@@ -318,7 +289,7 @@ namespace Xceed.Wpf.DataGrid
 
     private IComparer m_sortComparer;
 
-    #endregion SortComparer Property
+    #endregion
 
     #region Converter Property
 
@@ -330,7 +301,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the Converter property of a DataGridItemProperty already added to a containing collection." );
 
         m_converter = value;
@@ -339,7 +310,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal IValueConverter GetBindingConverter( object sourceItem )
     {
-      if( !this.Initialized )
+      if( !this.IsSealed )
         throw new InvalidOperationException( "An attempt was made to apply a binding to a DataGridItemProperty that has not be added to the ItemProperties collection." );
 
       if( m_bindingConverter == null )
@@ -350,9 +321,7 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          m_bindingConverter = new SourceDataConverter(
-            ItemsSourceHelper.IsItemSupportingDBNull( sourceItem ),
-            CultureInfo.InvariantCulture );
+          m_bindingConverter = new SourceDataConverter( ItemsSourceHelper.IsItemSupportingDBNull( sourceItem ), CultureInfo.InvariantCulture );
         }
       }
 
@@ -362,7 +331,7 @@ namespace Xceed.Wpf.DataGrid
     private IValueConverter m_converter;
     private IValueConverter m_bindingConverter;
 
-    #endregion Converter Property
+    #endregion
 
     #region ConverterCulture Property
 
@@ -374,7 +343,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the ConverterCulture property of a DataGridItemProperty already added to a containing collection." );
 
         m_converterCulture = value;
@@ -383,7 +352,7 @@ namespace Xceed.Wpf.DataGrid
 
     private CultureInfo m_converterCulture;
 
-    #endregion ConverterCulture Property
+    #endregion
 
     #region ConverterParameter Property
 
@@ -395,7 +364,7 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( this.Initialized )
+        if( this.IsSealed )
           throw new InvalidOperationException( "An attempt was made to change the ConverterParameter property of a DataGridItemProperty already added to a containing collection." );
 
         m_converterParameter = value;
@@ -404,56 +373,7 @@ namespace Xceed.Wpf.DataGrid
 
     private object m_converterParameter;
 
-    #endregion ConverterParameter Property
-
-    #region FilterCriterion Property
-
-    public FilterCriterion FilterCriterion
-    {
-      get
-      {
-        return m_filterCriterion;
-      }
-
-      set
-      {
-        if( value != m_filterCriterion )
-        {
-          if( m_filterCriterion != null )
-            m_filterCriterion.PropertyChanged -= new PropertyChangedEventHandler( FilterCriterion_PropertyChanged );
-
-          m_filterCriterion = value;
-
-          this.RaiseFilterCriterionChanged();
-
-          if( m_filterCriterion != null )
-            m_filterCriterion.PropertyChanged += new PropertyChangedEventHandler( FilterCriterion_PropertyChanged );
-
-          this.OnPropertyChanged( "FilterCriterion" );
-        }
-      }
-    }
-
-    private void FilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaiseFilterCriterionChanged();
-    }
-
-    private void RaiseFilterCriterionChanged()
-    {
-      if( this.FilterCriterionChanged != null )
-        this.FilterCriterionChanged( this, EventArgs.Empty );
-    }
-
-
-    // Triggered if the instance of FilterCriterion changes, if a property of the 
-    // FilterCriterion changes or if a property of one of the child FilterCriterion
-    // changes.
-    internal event EventHandler FilterCriterionChanged;
-
-    private FilterCriterion m_filterCriterion; // = null;
-
-    #endregion FilterCriterion Property
+    #endregion
 
     #region CalculateDistinctValues Property
 
@@ -472,7 +392,7 @@ namespace Xceed.Wpf.DataGrid
         if( value != m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ] )
         {
           m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ] = value;
-          this.OnPropertyChanged( "CalculateDistinctValues" );
+          this.OnPropertyChanged( DataGridItemPropertyBase.CalculateDistinctValuesPropertyName );
         }
 
         this.IsCalculateDistinctValuesInitialized = true;
@@ -491,7 +411,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CalculateDistinctValues Property
+    #endregion
 
     #region MaxDistinctValues Property
 
@@ -506,14 +426,14 @@ namespace Xceed.Wpf.DataGrid
         if( m_maxDistinctValues != value )
         {
           m_maxDistinctValues = value;
-          this.OnPropertyChanged( "MaxDistinctValues" );
+          this.OnPropertyChanged( DataGridItemPropertyBase.MaxDistinctValuesPropertyName );
         }
       }
     }
 
     private int m_maxDistinctValues = -1; // -1 ==> no maximum
 
-    #endregion MaxDistinctValues Property
+    #endregion
 
     #region DistinctValuesSortComparer Property
 
@@ -535,115 +455,281 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Initialized Property
+    #region ForeignKeyDescription Property
 
-    internal bool Initialized
+    public DataGridForeignKeyDescription ForeignKeyDescription
     {
       get
       {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsInitialized ];
+        return m_foreignKeyDescription;
       }
       set
       {
-        Debug.Assert( value );
+        this.SetForeignKeyDescription( value );
+      }
+    }
 
-        m_flags[ DataGridItemPropertyBaseFlags.IsInitialized ] = value;
+    internal void SetForeignKeyDescription( DataGridForeignKeyDescription description )
+    {
+      if( m_foreignKeyDescription != description )
+      {
+        m_foreignKeyDescription = description;
+        this.OnPropertyChanged( DataGridItemPropertyBase.ForeignKeyDescriptionPropertyName );
       }
     }
 
-    #endregion Initialized Property
+    private DataGridForeignKeyDescription m_foreignKeyDescription; // = null;
 
-    #region Browsable Property
+    #endregion
 
-    // That property only indicate for the DefaultProperties generated if
-    // the property should take place in the real property list by default.
-    internal bool Browsable
+    #region GroupSortStatResultPropertyName Property
+
+    public string GroupSortStatResultPropertyName
     {
       get
       {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ];
+        return m_groupSortStatResultPropertyName;
       }
       set
       {
-        m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ] = value;
+        if( value == m_groupSortStatResultPropertyName )
+          return;
+
+        m_groupSortStatResultPropertyName = value;
+
+        this.OnPropertyChanged( DataGridItemPropertyBase.GroupSortStatResultPropertyNamePropertyName );
       }
     }
 
-    #endregion Browsable Property
+    private string m_groupSortStatResultPropertyName;
 
-    #region ForeignKeyDescription Property
+    #endregion
 
-    public DataGridForeignKeyDescription ForeignKeyDescription
+    #region GroupSortStatResultComparer Property
+
+    public IComparer GroupSortStatResultComparer
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
+    #region IsDisplayable Property
+
+    public bool IsDisplayable
     {
       get
       {
-        return m_foreignKeyDescription;
+        return m_flags[ DataGridItemPropertyBaseFlags.IsDisplayable ];
       }
       set
       {
-        this.SetForeignKeyDescription( value );
+        if( this.IsSealed )
+          throw new InvalidOperationException( "An attempt was made to change the IsDisplayable property of a DataGridItemProperty already added to a containing collection." );
+
+        this.SetIsDisplayable( value );
       }
     }
 
-    internal void SetForeignKeyDescription( DataGridForeignKeyDescription description )
+    internal void SetIsDisplayable( bool value )
     {
-      if( m_foreignKeyDescription != description )
+      m_flags[ DataGridItemPropertyBaseFlags.IsDisplayable ] = value;
+    }
+
+    #endregion
+
+    #region ItemProperties Property
+
+    public DataGridItemPropertyCollection ItemProperties
+    {
+      get
       {
-        m_foreignKeyDescription = description;
-        this.OnPropertyChanged( "ForeignKeyDescription" );
+        if( m_itemProperties == null )
+        {
+          Interlocked.CompareExchange( ref m_itemProperties, new DataGridItemPropertyCollection( this ), null );
+          Debug.Assert( m_itemProperties != null );
+
+          this.OnPropertyChanged( DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
+        }
+
+        return m_itemProperties;
       }
     }
 
-    private DataGridForeignKeyDescription m_foreignKeyDescription; // = null;
+    internal DataGridItemPropertyCollection ItemPropertiesInternal
+    {
+      get
+      {
+        return m_itemProperties;
+      }
+    }
 
-    #endregion ForeignKeyDescription Property
+    private DataGridItemPropertyCollection m_itemProperties;
 
-    #region GroupSortStatResultPropertyName Property
+    #endregion
 
-    public string GroupSortStatResultPropertyName
+    #region FieldName Internal Property
+
+    internal virtual string FieldName
     {
       get
       {
-        return m_groupSortStatResultPropertyName;
+        return this.Name;
+      }
+    }
+
+    #endregion
+
+    #region IsNameSealed Internal Property
+
+    internal bool IsNameSealed
+    {
+      get
+      {
+        return m_flags[ DataGridItemPropertyBaseFlags.IsNameSealed ];
       }
       set
       {
-        if( m_groupSortStatResultPropertyName != value )
-        {
-          m_groupSortStatResultPropertyName = value;
+        if( value == this.IsNameSealed )
+          return;
+
+        m_flags[ DataGridItemPropertyBaseFlags.IsNameSealed ] = value;
+
+        this.OnPropertyChanged( DataGridItemPropertyBase.IsNameSealedPropertyName );
+      }
+    }
+
+    #endregion
+
+    #region IsSealed Internal Property
+
+    internal bool IsSealed
+    {
+      get
+      {
+        return m_flags[ DataGridItemPropertyBaseFlags.IsSealed ];
+      }
+      set
+      {
+        if( value == this.IsSealed )
+          return;
+
+        m_flags[ DataGridItemPropertyBaseFlags.IsSealed ] = value;
+
+        this.OnPropertyChanged( DataGridItemPropertyBase.IsSealedPropertyName );
+      }
+    }
+
+    #endregion
+
+    #region IsBrowsable Internal Property
+
+    // That property only indicates for the DefaultProperties generated if the property should take place in the real property list by default.
+    internal bool IsBrowsable
+    {
+      get
+      {
+        return m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ];
+      }
+      set
+      {
+        m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsASubRelationship Internal Property
+
+    internal bool IsASubRelationship
+    {
+      get
+      {
+        if( m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] )
+          return m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ];
 
-          this.OnPropertyChanged( "GroupSortStatResultPropertyName" );
+        if( m_dataType == null )
+          return false;
+
+        bool isASubRelationship = ItemsSourceHelper.IsASubRelationship( m_dataType );
+
+        if( this.IsSealed )
+        {
+          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship;
+          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
         }
+
+        return isASubRelationship;
       }
     }
 
-    private string m_groupSortStatResultPropertyName;
+    private void SetIsASubRelationship( Nullable<bool> isASubRelationship )
+    {
+      if( isASubRelationship.HasValue )
+      {
+        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship.Value;
+        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
+      }
+      else
+      {
+        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet
+               | DataGridItemPropertyBaseFlags.IsASubRelationship ] = false;
+      }
+    }
 
-    #endregion GroupSortStatResultPropertyName Property
+    #endregion
 
-    #region GroupSortStatResultComparer Property
+    #region IsSortingOnForeignKeyDescription Internal Property
 
-    public IComparer GroupSortStatResultComparer
+    internal bool IsSortingOnForeignKeyDescription
     {
       get;
       set;
     }
 
-    #endregion GroupSortStatResultComparer Property
+    #endregion
 
-    #region ValueChanged Event
+    #region ContainingCollection Internal Property
 
-    private void OnValueChanged( ValueChangedEventArgs e )
+    internal DataGridItemPropertyCollection ContainingCollection
     {
-      if( this.ValueChanged != null )
+      get
       {
-        this.ValueChanged( this, e );
+        return m_containingCollection;
+      }
+      private set
+      {
+        if( value == m_containingCollection )
+          return;
+
+        if( ( value != null ) && ( m_containingCollection != null ) )
+          throw new InvalidOperationException( "The property is already assigned to a DataGridItemPropertyCollection." );
+
+        m_containingCollection = value;
+
+        this.OnPropertyChanged( DataGridItemPropertyBase.ContainingCollectionPropertyName );
       }
     }
 
+    private DataGridItemPropertyCollection m_containingCollection; //null
+
+    #endregion
+
+    #region ValueChanged Internal Event
+
     internal event EventHandler<ValueChangedEventArgs> ValueChanged;
 
-    #endregion ComponentValueChanged Event
+    private void OnValueChanged( ValueChangedEventArgs e )
+    {
+      var handler = this.ValueChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    #endregion
 
     #region DistinctValueSelector Event
 
@@ -677,68 +763,47 @@ namespace Xceed.Wpf.DataGrid
 
     public object GetValue( object component )
     {
-      // Since EmptyDataItemSafePropertyDescriptor ensure
-      // to return null to avoid Binding exceptions when a 
-      // CollectionView other than the DataGridCollectionView
-      // is used, we must return null to avoid calling 
-      // GetValueCore using null as component
-      if( ( component == null )
-          || ( component is EmptyDataItem ) )
-        return null;
-
-      UnboundDataItem unboundDataItem = component as UnboundDataItem;
-
+      var unboundDataItem = component as UnboundDataItem;
       if( unboundDataItem != null )
+      {
         component = unboundDataItem.DataItem;
+      }
+
+      // Since EmptyDataItemSafePropertyDescriptor ensures to return null to avoid Binding exceptions when a CollectionView other
+      // than the DataGridCollectionView is used, we must return null to avoid calling GetValueCore using null as component.
+      if( ( component == null ) || ( component is EmptyDataItem ) )
+        return null;
 
       return this.GetValueCore( component );
     }
 
     public void SetValue( object component, object value )
     {
-      if( component is EmptyDataItem )
-        throw new InvalidOperationException( "An attempt was made to set a value on an empty data item." );
-
-      UnboundDataItem unboundDataItem = component as UnboundDataItem;
-
+      var unboundDataItem = component as UnboundDataItem;
       if( unboundDataItem != null )
       {
         component = unboundDataItem.DataItem;
       }
 
-      bool isReadOnly = ( this.OverrideReadOnlyForInsertion.HasValue && this.OverrideReadOnlyForInsertion.Value ) ? false : this.IsReadOnly;
+      if( component == null )
+        throw new InvalidOperationException( "An attempt was made to set a value on a null data item." );
+
+      if( component is EmptyDataItem )
+        throw new InvalidOperationException( "An attempt was made to set a value on an empty data item." );
 
-      if( isReadOnly )
+      if( this.IsReadOnly && !this.OverrideReadOnlyForInsertion.GetValueOrDefault( false ) )
         throw new InvalidOperationException( "An attempt was made to set a read-only property." );
 
       this.SetValueCore( component, value );
     }
 
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    [Obsolete( "The ICloneable interface is no longer supported.", true )]
     public virtual object Clone()
     {
-      try
-      {
-        return Activator.CreateInstance( this.GetType(), this );
-      }
-      catch( Exception exception )
-      {
-        throw new NotImplementedException( "An attempt was made to Clone an instance of type " + this.GetType().ToString() + " that does not override the Clone() method.", exception );
-      }
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      if( this.Name != null )
-      {
-        return this.GetType() + ": " + this.Name;
-      }
-      else
-      {
-        return this.GetType().ToString();
-      }
+      throw new NotSupportedException();
     }
-#endif
 
     protected abstract object GetValueCore( object component );
 
@@ -750,7 +815,9 @@ namespace Xceed.Wpf.DataGrid
     internal PropertyDescriptorFromItemPropertyBase GetPropertyDescriptorForBinding()
     {
       if( m_propertyDescriptorFromItemProperty == null )
+      {
         m_propertyDescriptorFromItemProperty = this.GetPropertyDescriptorForBindingCore();
+      }
 
       return m_propertyDescriptorFromItemProperty;
     }
@@ -760,18 +827,34 @@ namespace Xceed.Wpf.DataGrid
       return new PropertyDescriptorFromItemPropertyBase( this );
     }
 
-    internal virtual void SetUnspecifiedPropertiesValues( DataGridItemPropertyCollection itemPropertyCollection )
+    internal virtual void SetUnspecifiedPropertiesValues( PropertyDescription description, Type itemType, bool defaultItemPropertiesCreated )
     {
     }
 
+    internal void AttachToContainingCollection( DataGridItemPropertyCollection collection )
+    {
+      if( collection == null )
+        throw new ArgumentNullException( "collection" );
+
+      this.ContainingCollection = collection;
+    }
+
+    internal void DetachFromContainingCollection()
+    {
+      this.ContainingCollection = null;
+    }
+
     #region INotifyPropertyChanged Members
 
     public event PropertyChangedEventHandler PropertyChanged;
 
     private void OnPropertyChanged( string propertyName )
     {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
     }
 
     #endregion
@@ -779,6 +862,8 @@ namespace Xceed.Wpf.DataGrid
     private PropertyDescriptorFromItemPropertyBase m_propertyDescriptorFromItemProperty;
     private BitFlags m_flags;
 
+    #region ValueChangedEventArgs Internal Class
+
     internal class ValueChangedEventArgs : EventArgs
     {
       public ValueChangedEventArgs( object component )
@@ -793,6 +878,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region BitFlags Private Struct
+
     private struct BitFlags
     {
       internal bool this[ DataGridItemPropertyBaseFlags flag ]
@@ -841,6 +930,10 @@ namespace Xceed.Wpf.DataGrid
       private DataGridItemPropertyBaseFlags m_data;
     }
 
+    #endregion
+
+    #region DataGridItemPropertyBaseFlags Private Enum
+
     [Flags]
     private enum DataGridItemPropertyBaseFlags : ushort
     {
@@ -851,8 +944,12 @@ namespace Xceed.Wpf.DataGrid
       IsASubRelationship = 0x0010,
       CalculateDistinctValues = 0x0020,
       IsCalculateDistinctValuesInitialized = 0x0040,
-      IsInitialized = 0x0080,
-      IsBrowsable = 0x0100,
+      IsNameSealed = 0x0080,
+      IsSealed = 0x0100,
+      IsBrowsable = 0x0200,
+      IsDisplayable = 0x0400,
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
index cf3c2069..16793294 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
@@ -15,430 +15,964 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Collections;
+using System.Linq;
+using System.Threading;
+using Xceed.Utils.Wpf;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
-  public class DataGridItemPropertyCollection : ObservableCollection<DataGridItemPropertyBase>
+  [DebuggerDisplay( "Count = {Count}" )]
+  public sealed class DataGridItemPropertyCollection :
+    IList<DataGridItemPropertyBase>,
+    IList,
+    ICollection<DataGridItemPropertyBase>,
+    ICollection,
+    IEnumerable<DataGridItemPropertyBase>,
+    IEnumerable,
+    INotifyCollectionChanged,
+    INotifyPropertyChanged
   {
+    #region Static Fields
+
+    private static readonly string CountPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyCollection c ) => c.Count );
+    private static readonly string ItemsPropertyName = "Item[]";
+
+    #endregion
+
     internal DataGridItemPropertyCollection()
-      : base()
+      : this( null )
     {
     }
 
+    internal DataGridItemPropertyCollection( DataGridItemPropertyBase owner )
+    {
+      m_owner = owner;
+    }
+
+    #region [] Property
+
     public DataGridItemPropertyBase this[ string name ]
     {
       get
       {
-        int index = this.IndexOf( name );
+        if( !string.IsNullOrEmpty( name ) )
+        {
+          DataGridItemPropertyBase item;
+          if( m_nameToItem.TryGetValue( name, out item ) )
+            return item;
+        }
+
+        return null;
+      }
+      set
+      {
+        if( value == null )
+          throw new ArgumentNullException( "value" );
+
+        if( string.IsNullOrEmpty( value.Name ) )
+          throw new ArgumentException( "An attempt was made to add an item that does not have a name.", "value" );
 
-        if( index == -1 )
-          return null;
+        if( value.Name != name )
+          throw new ArgumentException( "The item's name is not the same as the parameter.", "name" );
 
-        return this.Items[ index ];
+        var oldItem = this[ name ];
+        if( oldItem == null )
+        {
+          this.InsertItemAndNotify( m_collection.Count, value );
+        }
+        else
+        {
+          if( value == oldItem )
+            return;
+
+          var index = this.IndexOf( oldItem );
+          Debug.Assert( index >= 0 );
+
+          this.ReplaceItemAndNotify( index, oldItem, value );
+        }
       }
     }
 
-    public int IndexOf( string name )
+    #endregion
+
+    #region DataGridItemPropertyBase Internal Owner
+
+    internal DataGridItemPropertyBase Owner
     {
-      IList<DataGridItemPropertyBase> items = this.Items;
-      int count = items.Count;
+      get
+      {
+        return m_owner;
+      }
+    }
+
+    private readonly DataGridItemPropertyBase m_owner;
 
-      for( int i = 0; i < count; i++ )
+    #endregion
+
+    #region SyncRoot Private Property
+
+    private object SyncRoot
+    {
+      get
       {
-        if( string.Equals( items[ i ].Name, name ) )
-          return i;
+        return ( ( ICollection )this ).SyncRoot;
       }
+    }
 
-      return -1;
+    #endregion
+
+    #region ItemPropertyGroupSortStatNameChanged Internal Event
+
+    internal event EventHandler ItemPropertyGroupSortStatNameChanged;
+
+    private void OnItemPropertyGroupSortStatNameChanged()
+    {
+      var handler = this.ItemPropertyGroupSortStatNameChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
     }
 
-    public event EventHandler FilterCriterionChanged;
+    #endregion
+
+    #region InitializeItemProperty Internal Event
+
+    internal event EventHandler<InitializeItemPropertyEventArgs> InitializeItemProperty;
 
-    protected override void ClearItems()
+    private void OnInitializeItemProperty( DataGridItemPropertyBase itemProperty )
     {
-      DataGridItemPropertyBase[] oldItems = new DataGridItemPropertyBase[ this.Count ];
-      this.CopyTo( oldItems, 0 );
+      var handler = this.InitializeItemProperty;
+      if( handler == null )
+        return;
 
-      m_unboundItemPropertyCount = 0;
-      base.ClearItems();
+      handler.Invoke( this, new InitializeItemPropertyEventArgs( itemProperty ) );
+    }
 
-      for( int i = 0; i < oldItems.Length; i++ )
-      {
-        DataGridItemPropertyBase oldItem = oldItems[ i ];
-        oldItem.FilterCriterionChanged -= new EventHandler( DataGridItemProperty_FilterCriterionChanged );
-        oldItem.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-      }
+    private void RelayInitializeItemProperty( InitializeItemPropertyEventArgs e )
+    {
+      var handler = this.InitializeItemProperty;
+      if( handler == null )
+        return;
+
+      Debug.Assert( e != null );
+
+      handler.Invoke( this, e );
     }
 
-    protected override void RemoveItem( int index )
+    #endregion
+
+    internal IDisposable DeferCollectionChanged()
     {
-      DataGridItemPropertyBase oldItem = null;
+      return new DeferredDisposable( new DeferState( this ) );
+    }
 
-      if( index < this.Count )
-      {
-        oldItem = this[ index ];
-      }
+    internal bool Contains( string name )
+    {
+      if( string.IsNullOrEmpty( name ) )
+        return false;
+
+      return m_nameToItem.ContainsKey( name );
+    }
+
+    internal DataGridItemPropertyBase GetForSynonym( string name )
+    {
+      if( string.IsNullOrEmpty( name ) )
+        return null;
+
+      DataGridItemPropertyBase[] synonyms;
+      if( !m_synonymToItem.TryGetValue( name, out synonyms ) )
+        return null;
+
+      Debug.Assert( synonyms.Length > 0 );
+      if( synonyms.Length <= 0 )
+        return null;
+
+      return synonyms[ 0 ];
+    }
 
-      base.RemoveItem( index );
+    internal void RefreshUnboundItemProperty( object component )
+    {
+      if( m_unboundItems.Count <= 0 || ( component == null ) )
+        return;
 
-      if( oldItem != null )
+      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
+      if( unboundDataItem == null )
+        return;
+
+      var dataItem = unboundDataItem.DataItem;
+      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
+        return;
+
+      State state;
+      if( m_dataItems.TryGetValue( dataItem, out state ) && ( state.Refreshing || state.Suspended ) )
+        return;
+
+      m_dataItems.Add( dataItem, new State( true, false ) );
+
+      try
       {
-        if( oldItem is DataGridUnboundItemProperty )
+        foreach( var item in m_unboundItems )
         {
-          m_unboundItemPropertyCount--;
+          item.Refresh( unboundDataItem );
         }
+      }
+      finally
+      {
+        state = m_dataItems[ dataItem ];
 
-        oldItem.FilterCriterionChanged -= new EventHandler( DataGridItemProperty_FilterCriterionChanged );
-        oldItem.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-        oldItem.PropertyChanged -= new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
+        if( state.Suspended )
+        {
+          m_dataItems[ dataItem ] = new State( false, true );
+        }
+        else
+        {
+          m_dataItems.Remove( dataItem );
+        }
       }
     }
 
-    protected override void SetItem( int index, DataGridItemPropertyBase item )
+    internal void SuspendUnboundItemPropertyChanged( object component )
     {
-      if( string.IsNullOrEmpty( item.Name ) )
-        throw new InvalidOperationException( "An attempt was made to add an item that does not have a name." );
+      if( component == null )
+        return;
 
-      DataGridItemPropertyBase oldItem = null;
+      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
+      if( unboundDataItem == null )
+        return;
+
+      var dataItem = unboundDataItem.DataItem;
+      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
+        return;
 
-      if( index < this.Count )
+      State state;
+      bool refreshing = false;
+
+      if( m_dataItems.TryGetValue( dataItem, out state ) )
       {
-        oldItem = this[ index ];
+        if( state.Suspended )
+          return;
+
+        refreshing = state.Refreshing;
       }
 
-      if( item == oldItem )
+      m_dataItems[ dataItem ] = new State( refreshing, true );
+    }
+
+    internal void ResumeUnboundItemPropertyChanged( object component )
+    {
+      if( component == null )
+        return;
+
+      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
+      if( unboundDataItem == null )
+        return;
+
+      var dataItem = unboundDataItem.DataItem;
+      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
+        return;
+
+      State state;
+      if( !m_dataItems.TryGetValue( dataItem, out state ) || !state.Suspended )
       {
-        base.SetItem( index, item );
+        Debug.Fail( "The item is not suspended." );
         return;
       }
 
-      item.ValueChanged += new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-      item.PropertyChanged += new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
-      item.SetUnspecifiedPropertiesValues( this );
-
-      try
+      if( state.Refreshing )
       {
-        base.SetItem( index, item );
+        m_dataItems[ dataItem ] = new State( true, false );
       }
-      catch
+      else
       {
-        item.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-        item.PropertyChanged -= new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
-        throw;
+        m_dataItems.Remove( dataItem );
+
+        this.RefreshUnboundItemProperty( dataItem );
       }
+    }
+
+    private static NotifyCollectionChangedEventArgs Combine( NotifyCollectionChangedEventArgs x, NotifyCollectionChangedEventArgs y )
+    {
+      if( x == null )
+        return y;
+
+      if( y == null )
+        return x;
+
+      var addedItems = DataGridItemPropertyCollection.GetAddedItems( x ).ToList();
+      var removedItems = DataGridItemPropertyCollection.GetRemovedItems( x ).ToList();
 
-      if( item is DataGridUnboundItemProperty )
+      foreach( var item in DataGridItemPropertyCollection.GetAddedItems( y ) )
       {
-        m_unboundItemPropertyCount++;
+        if( !removedItems.Remove( item ) )
+        {
+          Debug.Assert( !addedItems.Contains( item ) );
+          addedItems.Add( item );
+        }
       }
 
-      if( oldItem != null )
+      foreach( var item in DataGridItemPropertyCollection.GetRemovedItems( y ) )
       {
-        if( oldItem is DataGridUnboundItemProperty )
+        if( !addedItems.Remove( item ) )
         {
-          m_unboundItemPropertyCount--;
+          Debug.Assert( !removedItems.Contains( item ) );
+          removedItems.Add( item );
         }
+      }
 
-        oldItem.FilterCriterionChanged -= new EventHandler( DataGridItemProperty_FilterCriterionChanged );
-        oldItem.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-        oldItem.PropertyChanged -= new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
+      var addedItemsCount = addedItems.Count;
+      var removedItemsCount = removedItems.Count;
+
+      if( ( addedItemsCount > 0 ) && ( removedItemsCount > 0 ) )
+      {
+        if( ( x.Action != NotifyCollectionChangedAction.Replace ) || ( y.Action != NotifyCollectionChangedAction.Replace ) || ( addedItemsCount != removedItemsCount ) )
+          throw new NotSupportedException();
+
+        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, addedItems, removedItems );
       }
 
-      item.FilterCriterionChanged += new EventHandler( DataGridItemProperty_FilterCriterionChanged );
-      item.Initialized = true;
+      if( addedItemsCount > 0 )
+        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, addedItems );
+
+      if( removedItemsCount > 0 )
+        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItems );
+
+      return null;
+    }
+
+    private static IEnumerable<DataGridItemPropertyBase> GetAddedItems( NotifyCollectionChangedEventArgs source )
+    {
+      if( ( source != null ) && ( source.NewItems != null ) )
+        return source.NewItems.Cast<DataGridItemPropertyBase>();
+
+      return Enumerable.Empty<DataGridItemPropertyBase>();
+    }
+
+    private static IEnumerable<DataGridItemPropertyBase> GetRemovedItems( NotifyCollectionChangedEventArgs source )
+    {
+      if( ( source != null ) && ( source.OldItems != null ) )
+        return source.OldItems.Cast<DataGridItemPropertyBase>();
+
+      return Enumerable.Empty<DataGridItemPropertyBase>();
+    }
+
+    private void InsertItemAndNotify( int index, DataGridItemPropertyBase item )
+    {
+      this.InsertItem( index, item );
+
+      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
+      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, index ) );
+    }
+
+    private void ReplaceItemAndNotify( int index, DataGridItemPropertyBase oldItem, DataGridItemPropertyBase newItem )
+    {
+      this.RemoveItem( index, oldItem );
+      this.InsertItem( index, newItem );
+
+      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, newItem, oldItem, index ) );
+    }
+
+    private void RemoveItemAndNotify( int index, DataGridItemPropertyBase item )
+    {
+      this.RemoveItem( index, item );
+
+      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
+      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, item, index ) );
     }
 
-    protected override void InsertItem( int index, DataGridItemPropertyBase item )
+    private void InsertItem( int index, DataGridItemPropertyBase item )
     {
-      string itemName = item.Name;
+      Debug.Assert( ( index >= 0 ) && ( index <= m_collection.Count ) );
+      Debug.Assert( item != null );
+      Debug.Assert( !string.IsNullOrEmpty( item.Name ) );
+
+      var name = item.Name;
+      if( m_nameToItem.ContainsKey( name ) )
+        throw new InvalidOperationException( "An item with the same name is already in the collection." );
+
+      if( item.ContainingCollection != null )
+        throw new InvalidOperationException( "The item is already contained in a collection." );
+
+      item.IsNameSealed = true;
 
-      if( string.IsNullOrEmpty( itemName ) )
-        throw new InvalidOperationException( "An attempt was made to add an item that does not have a name." );
+      m_collection.Insert( index, item );
+      m_nameToItem.Add( name, item );
 
-      int count = this.Count;
-      for( int i = 0; i < count; i++ )
+      var unboundItem = item as DataGridUnboundItemProperty;
+      if( unboundItem != null )
       {
-        if( String.Equals( itemName, this[ i ].Name ) )
-          throw new InvalidOperationException( "An attempt was made to add an item that has the same name (" + itemName + ") as another item currently contained in the collection." );
+        m_unboundItems.Add( unboundItem );
       }
 
-      item.ValueChanged += new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-      item.PropertyChanged += new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
-      item.SetUnspecifiedPropertiesValues( this );
-      item.Initialized = true;
+      item.AttachToContainingCollection( this );
+
+      this.OnInitializeItemProperty( item );
+      this.RegisterEvents( item );
+
+      item.IsSealed = true;
+    }
 
-      if( item is DataGridUnboundItemProperty )
+    private void RemoveItem( int index, DataGridItemPropertyBase item )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_collection.Count ) );
+      Debug.Assert( item != null );
+      Debug.Assert( object.ReferenceEquals( item, m_collection[ index ] ) );
+
+      this.UnregisterEvents( item );
+
+      m_collection.RemoveAt( index );
+      m_nameToItem.Remove( item.Name );
+
+      var unboundItem = item as DataGridUnboundItemProperty;
+      if( unboundItem != null )
       {
-        m_unboundItemPropertyCount++;
+        m_unboundItems.Remove( unboundItem );
       }
 
-      try
+      this.RemoveSynonym( item );
+      this.ClearItem( item );
+    }
+
+    private void AddSynonym( DataGridItemPropertyBase item )
+    {
+      Debug.Assert( item != null );
+
+      var synonym = item.Synonym;
+      if( string.IsNullOrEmpty( synonym ) )
+        return;
+
+      DataGridItemPropertyBase[] synonyms;
+      if( m_synonymToItem.TryGetValue( synonym, out synonyms ) )
       {
-        base.InsertItem( index, item );
+        Array.Resize( ref synonyms, synonyms.Length + 1 );
       }
-      catch
+      else
       {
-        item.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( DataGridItemProperty_ValueChanged );
-        item.PropertyChanged -= new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
-        item.Initialized = false;
+        Array.Resize( ref synonyms, 1 );
+      }
+
+      synonyms[ synonyms.Length - 1 ] = item;
+      m_synonymToItem[ synonym ] = synonyms;
+    }
+
+    private void RemoveSynonym( DataGridItemPropertyBase item )
+    {
+      Debug.Assert( item != null );
+
+      var synonym = item.Synonym;
+      if( string.IsNullOrEmpty( synonym ) )
+        return;
+
+      DataGridItemPropertyBase[] synonyms;
+      if( !m_synonymToItem.TryGetValue( synonym, out synonyms ) )
+        return;
+
+      var removeAt = Array.IndexOf( synonyms, item );
+      Debug.Assert( removeAt >= 0 );
 
-        if( item is DataGridUnboundItemProperty )
+      if( removeAt < 0 )
+        return;
+
+      if( synonyms.Length > 1 )
+      {
+        for( int i = removeAt + 1; i < synonyms.Length; i++ )
         {
-          m_unboundItemPropertyCount--;
+          synonyms[ i - 1 ] = synonyms[ i ];
         }
 
-        throw;
+        Array.Resize( ref synonyms, synonyms.Length - 1 );
+
+        m_synonymToItem[ synonym ] = synonyms;
+      }
+      else
+      {
+        m_synonymToItem.Remove( synonym );
       }
+    }
 
-      item.FilterCriterionChanged += new EventHandler( DataGridItemProperty_FilterCriterionChanged );
+    private void ClearItem( DataGridItemPropertyBase item )
+    {
+      Debug.Assert( item != null );
+
+      item.IsNameSealed = false;
+      item.IsSealed = false;
+      item.DetachFromContainingCollection();
     }
 
-    internal List<DataGridItemPropertyBase> DefaultItemProperties
+    private void RegisterEvents( DataGridItemPropertyBase item )
     {
-      get
+      Debug.Assert( item != null );
+
+      item.PropertyChanged += new PropertyChangedEventHandler( this.OnItemPropertyChanged );
+      item.ValueChanged += new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( this.OnItemValueChanged );
+
+      if( item.ItemPropertiesInternal != null )
       {
-        return m_defaultItemProperties;
+        item.ItemPropertiesInternal.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
       }
-      set
+    }
+
+    private void UnregisterEvents( DataGridItemPropertyBase item )
+    {
+      Debug.Assert( item != null );
+
+      item.PropertyChanged -= new PropertyChangedEventHandler( this.OnItemPropertyChanged );
+      item.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( this.OnItemValueChanged );
+
+      if( item.ItemPropertiesInternal != null )
       {
-        if( m_defaultItemProperties == null )
-        {
-          m_defaultItemProperties = value;
-
-          //if the default item properties were just set...
-          //then go through all pre-existing DataGridItemProperty and try to give them the PropertyDescriptor, ValuePath or Title for matching default item property
-          if( m_itemType != null )
-          {
-            //but only do it if the ItemType is set as well
-            foreach( DataGridItemPropertyBase itemProperty in this )
-            {
-              itemProperty.SetUnspecifiedPropertiesValues( this );
-            }
-          }
-        }
+        item.ItemPropertiesInternal.InitializeItemProperty -= new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
       }
     }
 
-    internal Type ItemType
+    private void OnItemPropertyChanged( object sender, PropertyChangedEventArgs e )
     {
-      get
+      var item = ( DataGridItemPropertyBase )sender;
+      var propertyName = e.PropertyName;
+
+      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.GroupSortStatResultPropertyNamePropertyName ) )
       {
-        return m_itemType;
+        this.OnItemPropertyGroupSortStatNameChanged();
       }
-      set
+
+      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
+      {
+        this.OnItemItemPropertiesInternalChanged( ( DataGridItemPropertyBase )sender );
+      }
+
+      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.IsSealedPropertyName ) )
       {
-        if( m_itemType == null )
+        if( item.IsSealed )
         {
-          m_itemType = value;
-
-          //if the item type were just set...
-          //then go through all pre-existing DataGridItemProperty and try to give then the PropertyDescriptor, ValuePath or Title for matching default item property
-          if( m_defaultItemProperties != null )
-          {
-            //but only do it if the DefaultItemProperties is set as well
-            foreach( DataGridItemPropertyBase itemProperty in this )
-            {
-              itemProperty.SetUnspecifiedPropertiesValues( this );
-            }
-          }
+          this.AddSynonym( item );
+        }
+        else
+        {
+          this.RemoveSynonym( item );
         }
       }
     }
 
-    internal void UnregisterDataGridItemPropertiesEvents()
+    private void OnItemValueChanged( object sender, DataGridItemPropertyBase.ValueChangedEventArgs e )
     {
-      int count = this.Count;
+      this.RefreshUnboundItemProperty( e.Component );
+    }
 
-      for( int i = 0; i < count; i++ )
-      {
-        DataGridItemPropertyBase item = this[ i ];
+    private void OnItemItemPropertiesInternalChanged( DataGridItemPropertyBase itemProperty )
+    {
+      if( ( itemProperty == null ) || ( itemProperty.ItemPropertiesInternal == null ) )
+        return;
 
-        item.FilterCriterionChanged -= this.DataGridItemProperty_FilterCriterionChanged;
-        item.ValueChanged -= this.DataGridItemProperty_ValueChanged;
-        item.PropertyChanged -= new PropertyChangedEventHandler( OnDataGridItemProperty_PropertyChanged );
-      }
+      itemProperty.ItemPropertiesInternal.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
     }
 
-    internal DataGridItemPropertyBase FindDefaultItemProperty( string name )
+    private void OnItemInitializeItemProperty( object sender, InitializeItemPropertyEventArgs e )
     {
-      if( m_defaultItemProperties != null )
-      {
-        foreach( DataGridItemPropertyBase itemProperty in m_defaultItemProperties )
-        {
-          if( string.Equals( itemProperty.Name, name ) )
-            return itemProperty;
-        }
-      }
+      var itemProperties = sender as DataGridItemPropertyCollection;
+      if( itemProperties == null )
+        return;
 
-      return null;
+      this.RelayInitializeItemProperty( e );
     }
 
-    internal void RefreshUnboundItemProperty( object component )
+    #region IList<> Members
+
+    public DataGridItemPropertyBase this[ int index ]
     {
-      if( m_unboundItemPropertyCount > 0 )
+      get
       {
-        if( this.IsUnboundItemPropertyInRefresh( component ) )
-          return;
+        if( ( index < 0 ) || ( index >= m_collection.Count ) )
+          throw new ArgumentOutOfRangeException( "index" );
 
-        if( this.IsUnboundItemPropertyChangedSuspended( component ) )
-          return;
+        return m_collection[ index ];
+      }
+      set
+      {
+        if( ( index < 0 ) || ( index > m_collection.Count ) )
+          throw new ArgumentOutOfRangeException( "index" );
 
-        this.AddUnboundItemPropertyInRefresh( component );
-        UnboundDataItem unboundDataItem;
-        UnboundDataItem.GetUnboundDataItemNode( component, out unboundDataItem );
+        if( value == null )
+          throw new ArgumentNullException( "value" );
 
-        try
+        if( string.IsNullOrEmpty( value.Name ) )
+          throw new ArgumentException( "The item must have a non empty name.", "value" );
+
+        if( index < m_collection.Count )
         {
-          foreach( DataGridItemPropertyBase itemProperty in this )
-          {
-            DataGridUnboundItemProperty unboundItemProperty = itemProperty as DataGridUnboundItemProperty;
-
-            if( unboundItemProperty != null )
-            {
-              unboundItemProperty.Refresh( unboundDataItem );
-            }
-          }
+          var oldItem = m_collection[ index ];
+          if( value == oldItem )
+            return;
+
+          this.ReplaceItemAndNotify( index, oldItem, value );
         }
-        finally
+        else
         {
-          this.RemoveUnboundItemPropertyInRefresh( component );
+          this.InsertItemAndNotify( index, value );
         }
       }
     }
 
-    internal void SuspendUnboundItemPropertyChanged( object component )
+    public int IndexOf( DataGridItemPropertyBase item )
+    {
+      if( !this.Contains( item ) )
+        return -1;
+
+      return m_collection.IndexOf( item );
+    }
+
+    public void Insert( int index, DataGridItemPropertyBase item )
     {
-      if( m_unboundItemPropertyChangedSuspended == null )
+      if( ( index < 0 ) || ( index > m_collection.Count ) )
+        throw new ArgumentOutOfRangeException( "index" );
+
+      if( item == null )
+        throw new ArgumentNullException( "item" );
+
+      if( string.IsNullOrEmpty( item.Name ) )
+        throw new ArgumentException( "The item must have a non empty name.", "item" );
+
+      this.InsertItemAndNotify( index, item );
+    }
+
+    public void RemoveAt( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_collection.Count ) )
+        throw new ArgumentOutOfRangeException( "index" );
+
+      this.RemoveItemAndNotify( index, m_collection[ index ] );
+    }
+
+    #endregion
+
+    #region IList Members
+
+    bool IList.IsFixedSize
+    {
+      get
       {
-        m_unboundItemPropertyChangedSuspended = new Hashtable( 1 );
+        return false;
       }
+    }
 
-      m_unboundItemPropertyChangedSuspended[ component ] = DBNull.Value;
+    bool IList.IsReadOnly
+    {
+      get
+      {
+        return ( ( ICollection<DataGridItemPropertyBase> )this ).IsReadOnly;
+      }
     }
 
-    internal void ResumeUnboundItemPropertyChanged( object component )
+    object IList.this[ int index ]
     {
-      if( m_unboundItemPropertyChangedSuspended == null )
+      get
       {
-        Debug.Assert( false, "Not suppose to resume when nothing is in the UnboundItemPropertyChangedSuspended list." );
-        return;
+        return this[ index ];
       }
+      set
+      {
+        this[ index ] = ( DataGridItemPropertyBase )value;
+      }
+    }
+
+    int IList.Add( object value )
+    {
+      var item = value as DataGridItemPropertyBase;
+      if( item == null )
+        return -1;
+
+      this.Add( item );
+
+      return m_collection.Count - 1;
+    }
+
+    bool IList.Contains( object value )
+    {
+      return this.Contains( value as DataGridItemPropertyBase );
+    }
+
+    int IList.IndexOf( object value )
+    {
+      var item = value as DataGridItemPropertyBase;
+      if( !this.Contains( item ) )
+        return -1;
 
-      m_unboundItemPropertyChangedSuspended.Remove( component );
+      return m_collection.IndexOf( item );
+    }
+
+    void IList.Insert( int index, object value )
+    {
+      this.Insert( index, ( DataGridItemPropertyBase )value );
+    }
+
+    void IList.Remove( object value )
+    {
+      this.Remove( value as DataGridItemPropertyBase );
+    }
+
+    void IList.RemoveAt( int index )
+    {
+      this.RemoveAt( index );
+    }
+
+    #endregion
+
+    #region ICollection<> Members
 
-      if( m_unboundItemPropertyChangedSuspended.Count == 0 )
+    bool ICollection<DataGridItemPropertyBase>.IsReadOnly
+    {
+      get
       {
-        m_unboundItemPropertyChangedSuspended = null;
+        return false;
       }
+    }
 
-      this.RefreshUnboundItemProperty( component );
+    public void Add( DataGridItemPropertyBase item )
+    {
+      this.Insert( m_collection.Count, item );
     }
 
-    private bool IsUnboundItemPropertyChangedSuspended( object component )
+    public void Clear()
     {
-      if( m_unboundItemPropertyChangedSuspended == null )
-        return false;
+      if( m_collection.Count == 0 )
+        return;
+
+      var removedItems = m_collection.ToList();
+
+      m_collection.Clear();
+      m_nameToItem.Clear();
+      m_synonymToItem.Clear();
+      m_unboundItems.Clear();
+
+      foreach( var item in removedItems )
+      {
+        this.UnregisterEvents( item );
+        this.ClearItem( item );
+      }
 
-      return m_unboundItemPropertyChangedSuspended.Contains( component );
+      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
+      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItems ) );
     }
 
-    private void DataGridItemProperty_FilterCriterionChanged( object sender, EventArgs e )
+    public bool Contains( DataGridItemPropertyBase item )
     {
-      if( this.FilterCriterionChanged != null )
-        this.FilterCriterionChanged( this, EventArgs.Empty );
+      if( item == null )
+        return false;
+
+      var name = item.Name;
+      if( string.IsNullOrEmpty( name ) )
+        return false;
+
+      DataGridItemPropertyBase stored;
+      if( !m_nameToItem.TryGetValue( name, out stored ) )
+        return false;
+
+      return ( item == stored );
     }
 
-    private void DataGridItemProperty_ValueChanged( object sender, DataGridItemPropertyBase.ValueChangedEventArgs e )
+    void ICollection<DataGridItemPropertyBase>.CopyTo( DataGridItemPropertyBase[] array, int index )
     {
-      this.RefreshUnboundItemProperty( e.Component );
+      m_collection.CopyTo( array, index );
     }
 
-    private bool IsUnboundItemPropertyInRefresh( object component )
+    public bool Remove( DataGridItemPropertyBase item )
     {
-      if( m_unboundItemPropertyInRefresh == null )
+      if( !this.Contains( item ) )
         return false;
 
-      return m_unboundItemPropertyInRefresh.Contains( component );
+      var index = m_collection.IndexOf( item );
+      Debug.Assert( index >= 0 );
+
+      this.RemoveItemAndNotify( index, item );
+
+      return true;
     }
 
-    private void AddUnboundItemPropertyInRefresh( object component )
-    {
-      if( m_unboundItemPropertyInRefresh == null )
-        m_unboundItemPropertyInRefresh = new Hashtable( 1 );
+    #endregion
 
-      object count = m_unboundItemPropertyInRefresh[ component ];
+    #region ICollection Members
 
-      if( count == null )
+    public int Count
+    {
+      get
       {
-        m_unboundItemPropertyInRefresh[ component ] = 1;
+        return m_collection.Count;
       }
-      else
+    }
+
+    bool ICollection.IsSynchronized
+    {
+      get
       {
-        m_unboundItemPropertyInRefresh[ component ] = ( ( int )count ) + 1;
+        return false;
       }
     }
 
-    private void RemoveUnboundItemPropertyInRefresh( object component )
+    object ICollection.SyncRoot
     {
-      if( m_unboundItemPropertyInRefresh == null )
+      get
       {
-        Debug.Assert( false, "Not suppose to remove when nothing is in the UnboundItemPropertyInRefresh list." );
+        return ( ( ICollection )m_collection ).SyncRoot;
+      }
+    }
+
+    void ICollection.CopyTo( Array array, int index )
+    {
+      ( ( ICollection )m_collection ).CopyTo( array, index );
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<DataGridItemPropertyBase> GetEnumerator()
+    {
+      return m_collection.GetEnumerator();
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    #region INotifyCollectionChanged Members
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
+    {
+      if( e.Action == NotifyCollectionChangedAction.Reset )
+        throw new NotSupportedException();
+
+      var handler = this.CollectionChanged;
+      if( handler == null )
         return;
+
+      lock( this.SyncRoot )
+      {
+        if( m_deferCollectionChangedCount != 0 )
+        {
+          m_deferCollectionChangedEventArgs = DataGridItemPropertyCollection.Combine( m_deferCollectionChangedEventArgs, e );
+          return;
+        }
       }
 
-      object count = m_unboundItemPropertyInRefresh[ component ];
+      handler.Invoke( this, e );
+    }
+
+    #endregion
 
-      if( count != null )
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    private void OnPropertyChanged( string propertyName )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    #endregion
+
+    private int m_deferCollectionChangedCount; //0
+    private NotifyCollectionChangedEventArgs m_deferCollectionChangedEventArgs; //null
+
+    private readonly List<DataGridItemPropertyBase> m_collection = new List<DataGridItemPropertyBase>();
+    private readonly Dictionary<string, DataGridItemPropertyBase> m_nameToItem = new Dictionary<string, DataGridItemPropertyBase>();
+    private readonly Dictionary<string, DataGridItemPropertyBase[]> m_synonymToItem = new Dictionary<string, DataGridItemPropertyBase[]>();
+    private readonly HashSet<DataGridUnboundItemProperty> m_unboundItems = new HashSet<DataGridUnboundItemProperty>();
+    private readonly Dictionary<object, State> m_dataItems = new Dictionary<object, State>( 0 );
+
+    #region DeferState Private Class
+
+    private sealed class DeferState : DeferredDisposableState
+    {
+      internal DeferState( DataGridItemPropertyCollection target )
       {
-        int intCount = ( int )count;
+        Debug.Assert( target != null );
+        m_target = target;
+      }
 
-        if( intCount <= 1 )
+      protected override object SyncRoot
+      {
+        get
         {
-          if( m_unboundItemPropertyInRefresh.Count == 1 )
-          {
-            m_unboundItemPropertyInRefresh = null;
-          }
-          else
-          {
-            m_unboundItemPropertyInRefresh.Remove( component );
-          }
+          return m_target.SyncRoot;
         }
-        else
+      }
+
+      protected override bool IsDeferred
+      {
+        get
         {
-          m_unboundItemPropertyInRefresh[ component ] = intCount - 1;
+          return ( m_target.m_deferCollectionChangedCount != 0 );
         }
       }
-    }
 
-    #region ItemPropertyGroupSortStatNameChanged Event
+      protected override void Increment()
+      {
+        m_target.m_deferCollectionChangedCount++;
+      }
 
-    internal event EventHandler ItemPropertyGroupSortStatNameChanged;
+      protected override void Decrement()
+      {
+        m_target.m_deferCollectionChangedCount--;
+      }
 
-    private void OnDataGridItemProperty_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName != "GroupSortStatResultPropertyName" )
-        return;
+      protected override void OnDeferEnding( bool disposing )
+      {
+        m_eventArgs = m_target.m_deferCollectionChangedEventArgs;
+        m_target.m_deferCollectionChangedEventArgs = null;
 
-      var handler = this.ItemPropertyGroupSortStatNameChanged;
+        base.OnDeferEnding( disposing );
+      }
 
-      if( handler == null )
-        return;
+      protected override void OnDeferEnded( bool disposing )
+      {
+        if( m_eventArgs == null )
+          return;
 
-      handler.Invoke( this, e );
+        m_target.OnCollectionChanged( m_eventArgs );
+      }
+
+      private readonly DataGridItemPropertyCollection m_target;
+      private NotifyCollectionChangedEventArgs m_eventArgs;
     }
 
     #endregion
 
-    private List<DataGridItemPropertyBase> m_defaultItemProperties;
-    private Type m_itemType;
-    private int m_unboundItemPropertyCount;
-    private Hashtable m_unboundItemPropertyInRefresh;
-    private Hashtable m_unboundItemPropertyChangedSuspended;
+    #region State Private Struct
+
+    private struct State
+    {
+      internal State( bool refreshing, bool suspended )
+      {
+        this.Refreshing = refreshing;
+        this.Suspended = suspended;
+      }
+
+      internal readonly bool Refreshing;
+      internal readonly bool Suspended;
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs
new file mode 100644
index 00000000..c6874223
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs
@@ -0,0 +1,625 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+using Xceed.Utils.Wpf;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class DataGridItemPropertyMap : IWeakEventListener
+  {
+    #region MasterItemProperties Property
+
+    internal DataGridItemPropertyCollection MasterItemProperties
+    {
+      get
+      {
+        return m_masterItemProperties;
+      }
+      set
+      {
+        if( value == m_masterItemProperties )
+          return;
+
+        using( this.DeferMappingChanged() )
+        {
+          this.UnregisterItemProperties( m_masterItemProperties );
+          this.UnmapItemProperties();
+
+          m_masterItemProperties = value;
+
+          this.MapItemProperties();
+          this.RegisterItemProperties( m_masterItemProperties );
+        }
+      }
+    }
+
+    private DataGridItemPropertyCollection m_masterItemProperties;
+
+    #endregion
+
+    #region DetailItemProperties Property
+
+    internal DataGridItemPropertyCollection DetailItemProperties
+    {
+      get
+      {
+        return m_detailItemProperties;
+      }
+      set
+      {
+        if( value == m_detailItemProperties )
+          return;
+
+        using( this.DeferMappingChanged() )
+        {
+          this.UnregisterItemProperties( m_detailItemProperties );
+          this.UnmapItemProperties();
+
+          m_detailItemProperties = value;
+
+          this.MapItemProperties();
+          this.RegisterItemProperties( m_detailItemProperties );
+        }
+      }
+    }
+
+    private DataGridItemPropertyCollection m_detailItemProperties;
+
+    #endregion
+
+    #region IsMapping Property
+
+    internal bool IsMapping
+    {
+      get
+      {
+        return ( m_masterItemProperties != null )
+            && ( m_detailItemProperties != null );
+      }
+    }
+
+    #endregion
+
+    #region MappingChanged Event
+
+    internal event EventHandler MappingChanged;
+
+    private void OnMappingChanged()
+    {
+      if( m_deferRaiseMappingChangedCount != 0 )
+      {
+        m_raiseMappingChanged = true;
+      }
+      else
+      {
+        m_raiseMappingChanged = false;
+
+        var handler = this.MappingChanged;
+        if( handler == null )
+          return;
+
+        handler.Invoke( this, EventArgs.Empty );
+      }
+    }
+
+    #endregion
+
+    internal IDisposable DeferMappingChanged()
+    {
+      return new DeferredDisposable( new DeferMappingChangedEvent( this ) );
+    }
+
+    internal bool TryGetMasterItemProperty( DataGridItemPropertyBase detailItemProperty, out DataGridItemPropertyBase masterItemProperty )
+    {
+      return DataGridItemPropertyMap.TryGetTargetItemProperty( m_detailToMaster, detailItemProperty, out masterItemProperty );
+    }
+
+    internal bool TryGetDetailItemProperty( DataGridItemPropertyBase masterItemProperty, out DataGridItemPropertyBase detailItemProperty )
+    {
+      return DataGridItemPropertyMap.TryGetTargetItemProperty( m_masterToDetail, masterItemProperty, out detailItemProperty );
+    }
+
+    private static bool TryGetTargetItemProperty( Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> collection, DataGridItemPropertyBase sourceItemProperty, out DataGridItemPropertyBase targetItemProperty )
+    {
+      if( ( collection != null ) && ( sourceItemProperty != null ) && collection.TryGetValue( sourceItemProperty, out targetItemProperty ) )
+        return true;
+
+      targetItemProperty = default( DataGridItemPropertyBase );
+
+      return false;
+    }
+
+    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      CollectionChangedEventManager.AddListener( itemProperties, this );
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.RegisterItemProperty( itemProperty );
+      }
+    }
+
+    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.UnregisterItemProperty( itemProperty );
+      }
+
+      CollectionChangedEventManager.RemoveListener( itemProperties, this );
+    }
+
+    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      if( !m_listeningToPropertyChanged.Add( itemProperty ) )
+        return;
+
+      PropertyChangedEventManager.AddListener( itemProperty, this, string.Empty );
+      this.RegisterItemProperties( itemProperty.ItemPropertiesInternal );
+    }
+
+    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      if( !m_listeningToPropertyChanged.Remove( itemProperty ) )
+        return;
+
+      this.UnregisterItemProperties( itemProperty.ItemPropertiesInternal );
+      PropertyChangedEventManager.RemoveListener( itemProperty, this, string.Empty );
+    }
+
+    private void MapItemProperties()
+    {
+      this.MapItemProperties( m_masterItemProperties, m_detailItemProperties );
+    }
+
+    private void MapItemProperties( DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyCollection detailItemProperties )
+    {
+      if( ( masterItemProperties == null ) || ( masterItemProperties.Count <= 0 ) )
+        return;
+
+      foreach( var masterItemProperty in masterItemProperties )
+      {
+        this.MapMasterItemProperty( masterItemProperty );
+      }
+    }
+
+    private void MapItemProperties( DataGridItemPropertyBase masterItemProperty, DataGridItemPropertyBase detailItemProperty )
+    {
+      if( ( masterItemProperty == null ) || ( detailItemProperty == null ) )
+        return;
+
+      DataGridItemPropertyBase mappedItemProperty;
+      if( m_masterToDetail.TryGetValue( masterItemProperty, out mappedItemProperty ) )
+      {
+        if( mappedItemProperty == detailItemProperty )
+          return;
+
+        this.UnmapMasterItemProperty( masterItemProperty );
+      }
+
+      this.UnmapDetailItemProperty( detailItemProperty );
+
+      m_masterToDetail[ masterItemProperty ] = detailItemProperty;
+      m_detailToMaster[ detailItemProperty ] = masterItemProperty;
+
+      this.OnMappingChanged();
+      this.MapItemProperties( masterItemProperty.ItemPropertiesInternal, detailItemProperty.ItemPropertiesInternal );
+    }
+
+    private void MapMasterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        return;
+
+      DataGridItemPropertyCollection mappedItemProperties;
+      DataGridItemPropertyBase mappedItemProperty;
+
+      var owner = collection.Owner;
+      if( owner == null )
+      {
+        Debug.Assert( collection == m_masterItemProperties );
+        if( collection != m_masterItemProperties )
+          return;
+
+        mappedItemProperties = m_detailItemProperties;
+      }
+      else
+      {
+        if( !m_masterToDetail.TryGetValue( owner, out mappedItemProperty ) )
+          return;
+
+        mappedItemProperties = mappedItemProperty.ItemPropertiesInternal;
+      }
+
+      if( mappedItemProperties == null )
+        return;
+
+      mappedItemProperty = mappedItemProperties.GetForSynonym( itemProperty.Name );
+
+      if( mappedItemProperty != null )
+      {
+        this.MapItemProperties( itemProperty, mappedItemProperty );
+      }
+      else
+      {
+        this.UnmapMasterItemProperty( itemProperty );
+      }
+    }
+
+    private void MapDetailItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        return;
+
+      DataGridItemPropertyCollection mappedItemProperties;
+      DataGridItemPropertyBase mappedItemProperty;
+
+      var owner = collection.Owner;
+      if( owner == null )
+      {
+        Debug.Assert( collection == m_detailItemProperties );
+        if( collection != m_detailItemProperties )
+          return;
+
+        mappedItemProperties = m_masterItemProperties;
+      }
+      else
+      {
+        if( !m_detailToMaster.TryGetValue( owner, out mappedItemProperty ) )
+          return;
+
+        mappedItemProperties = mappedItemProperty.ItemPropertiesInternal;
+      }
+
+      if( mappedItemProperties == null )
+        return;
+
+      mappedItemProperty = ( !string.IsNullOrEmpty( itemProperty.Synonym ) ) ? mappedItemProperties[ itemProperty.Synonym ] : null;
+
+      if( mappedItemProperty != null )
+      {
+        this.MapItemProperties( mappedItemProperty, itemProperty );
+      }
+      else
+      {
+        this.UnmapDetailItemProperty( itemProperty );
+      }
+    }
+
+    private void UnmapItemProperties()
+    {
+      if( ( m_masterItemProperties == null ) || ( m_detailItemProperties == null ) )
+        return;
+
+      while( m_masterToDetail.Count > 0 )
+      {
+        var entry = m_masterToDetail.First();
+
+        this.UnmapItemProperties( entry.Key, entry.Value, false );
+      }
+
+      Debug.Assert( m_masterToDetail.Count == 0 );
+      Debug.Assert( m_detailToMaster.Count == 0 );
+
+      while( m_detailToMaster.Count > 0 )
+      {
+        var entry = m_detailToMaster.First();
+
+        this.UnmapItemProperties( entry.Value, entry.Key, false );
+      }
+
+      m_masterToDetail.Clear();
+      m_detailToMaster.Clear();
+    }
+
+    private void UnmapItemProperties( DataGridItemPropertyBase masterItemProperty, DataGridItemPropertyBase detailItemProperty, bool recursive )
+    {
+      if( ( masterItemProperty == null ) || ( detailItemProperty == null ) )
+        return;
+
+      DataGridItemPropertyBase mappedItemProperty;
+      if( !m_masterToDetail.TryGetValue( masterItemProperty, out mappedItemProperty ) || ( mappedItemProperty != detailItemProperty ) )
+        throw new InvalidOperationException();
+
+      if( !m_detailToMaster.TryGetValue( detailItemProperty, out mappedItemProperty ) || ( mappedItemProperty != masterItemProperty ) )
+        throw new InvalidOperationException();
+
+      m_masterToDetail.Remove( masterItemProperty );
+      m_detailToMaster.Remove( detailItemProperty );
+
+      this.OnMappingChanged();
+
+      if( recursive )
+      {
+        this.UnmapMasterItemProperties( masterItemProperty.ItemPropertiesInternal );
+        this.UnmapDetailItemProperties( detailItemProperty.ItemPropertiesInternal );
+      }
+    }
+
+    private void UnmapMasterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.UnmapMasterItemProperty( itemProperty );
+      }
+    }
+
+    private void UnmapDetailItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.UnmapDetailItemProperty( itemProperty );
+      }
+    }
+
+    private void UnmapMasterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      DataGridItemPropertyBase mappedItemProperty;
+      if( !m_masterToDetail.TryGetValue( itemProperty, out mappedItemProperty ) )
+        return;
+
+      Debug.Assert( mappedItemProperty != null );
+
+      this.UnmapItemProperties( itemProperty, mappedItemProperty, true );
+    }
+
+    private void UnmapDetailItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      DataGridItemPropertyBase mappedItemProperty;
+      if( !m_detailToMaster.TryGetValue( itemProperty, out mappedItemProperty ) )
+        return;
+
+      Debug.Assert( mappedItemProperty != null );
+
+      this.UnmapItemProperties( mappedItemProperty, itemProperty, true );
+    }
+
+    private void OnItemPropertyCollectionChanged( DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e )
+    {
+      var rootCollection = ItemsSourceHelper.GetRootCollection( collection );
+      if( rootCollection == null )
+        return;
+
+      if( rootCollection == m_masterItemProperties )
+      {
+        if( e.Action == NotifyCollectionChangedAction.Reset )
+          throw new NotSupportedException();
+
+        if( e.Action == NotifyCollectionChangedAction.Move )
+          return;
+
+        using( this.DeferMappingChanged() )
+        {
+          if( e.OldItems != null )
+          {
+            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
+            {
+              this.UnregisterItemProperty( itemProperty );
+              this.UnmapMasterItemProperty( itemProperty );
+            }
+          }
+
+          if( e.NewItems != null )
+          {
+            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
+            {
+              this.RegisterItemProperty( itemProperty );
+              this.MapMasterItemProperty( itemProperty );
+            }
+          }
+        }
+      }
+      else if( rootCollection == m_detailItemProperties )
+      {
+        if( e.Action == NotifyCollectionChangedAction.Reset )
+          throw new NotSupportedException();
+
+        if( e.Action == NotifyCollectionChangedAction.Move )
+          return;
+
+        using( this.DeferMappingChanged() )
+        {
+          if( e.OldItems != null )
+          {
+            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
+            {
+              this.UnregisterItemProperty( itemProperty );
+              this.UnmapDetailItemProperty( itemProperty );
+            }
+          }
+
+          if( e.NewItems != null )
+          {
+            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
+            {
+              this.RegisterItemProperty( itemProperty );
+              this.MapDetailItemProperty( itemProperty );
+            }
+          }
+        }
+      }
+      else
+      {
+        Debug.Fail( "The collection should have been either for the master or the detail item properties." );
+        CollectionChangedEventManager.RemoveListener( collection, this );
+      }
+    }
+
+    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
+    {
+      var rootCollection = ItemsSourceHelper.GetRootCollection( itemProperty );
+      if( rootCollection == null )
+        return;
+
+      using( this.DeferMappingChanged() )
+      {
+        if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.SynonymPropertyName ) )
+        {
+          if( rootCollection == m_detailItemProperties )
+          {
+            this.MapDetailItemProperty( itemProperty );
+          }
+        }
+
+        if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
+        {
+          var itemProperties = itemProperty.ItemPropertiesInternal;
+          if( itemProperties != null )
+          {
+            this.UnregisterItemProperties( itemProperties );
+            this.RegisterItemProperties( itemProperties );
+
+            if( rootCollection == m_masterItemProperties )
+            {
+              foreach( var childItemProperty in itemProperties )
+              {
+                this.MapMasterItemProperty( childItemProperty );
+              }
+            }
+            else if( rootCollection == m_detailItemProperties )
+            {
+              foreach( var childItemProperty in itemProperties )
+              {
+                this.MapDetailItemProperty( childItemProperty );
+              }
+            }
+          }
+        }
+      }
+    }
+
+    #region IWeakEventListener Members
+
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( CollectionChangedEventManager ) )
+      {
+        this.OnItemPropertyCollectionChanged( ( DataGridItemPropertyCollection )sender, ( NotifyCollectionChangedEventArgs )e );
+      }
+      else if( managerType == typeof( PropertyChangedEventManager ) )
+      {
+        this.OnItemPropertyPropertyChanged( ( DataGridItemPropertyBase )sender, ( PropertyChangedEventArgs )e );
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
+    }
+
+    #endregion
+
+    private readonly Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> m_masterToDetail = new Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase>();
+    private readonly Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> m_detailToMaster = new Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase>();
+    private readonly HashSet<DataGridItemPropertyBase> m_listeningToPropertyChanged = new HashSet<DataGridItemPropertyBase>();
+    private int m_deferRaiseMappingChangedCount;
+    private bool m_raiseMappingChanged; //false
+
+    #region DeferMappingChangedEvent Private Class
+
+    private sealed class DeferMappingChangedEvent : DeferredDisposableState
+    {
+      internal DeferMappingChangedEvent( DataGridItemPropertyMap target )
+      {
+        if( target == null )
+          throw new ArgumentNullException( "target" );
+
+        m_target = target;
+      }
+
+      protected override object SyncRoot
+      {
+        get
+        {
+          return m_target.m_listeningToPropertyChanged;
+        }
+      }
+
+      protected override bool IsDeferred
+      {
+        get
+        {
+          return ( m_target.m_deferRaiseMappingChangedCount != 0 );
+        }
+      }
+
+      protected override void Increment()
+      {
+        m_target.m_deferRaiseMappingChangedCount++;
+      }
+
+      protected override void Decrement()
+      {
+        m_target.m_deferRaiseMappingChangedCount--;
+      }
+
+      protected override void OnDeferEnded( bool disposing )
+      {
+        if( !disposing )
+          return;
+
+        if( m_target.m_raiseMappingChanged )
+        {
+          m_target.OnMappingChanged();
+        }
+      }
+
+      private readonly DataGridItemPropertyMap m_target;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs
new file mode 100644
index 00000000..1a6e4563
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs
@@ -0,0 +1,118 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class DataGridItemPropertyMapHelper
+  {
+    internal static bool TryGetMasterColumnName( DataGridItemPropertyMap itemPropertyMap, string detailColumnName, out string masterColumnName )
+    {
+      masterColumnName = default( string );
+
+      if( itemPropertyMap == null )
+        return false;
+
+      var detailItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemPropertyMap.DetailItemProperties, detailColumnName );
+      if( detailItemProperty == null )
+        return false;
+
+      DataGridItemPropertyBase masterItemProperty;
+      if( !itemPropertyMap.TryGetMasterItemProperty( detailItemProperty, out masterItemProperty ) )
+        return false;
+
+      masterColumnName = PropertyRouteParser.Parse( masterItemProperty );
+
+      return !string.IsNullOrEmpty( masterColumnName );
+    }
+
+    internal static bool TryGetDetailColumnName( DataGridItemPropertyMap itemPropertyMap, string masterColumnName, out string detailColumnName )
+    {
+      detailColumnName = default( string );
+
+      if( itemPropertyMap == null )
+        return false;
+
+      var masterItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemPropertyMap.MasterItemProperties, masterColumnName );
+      if( masterItemProperty == null )
+        return false;
+
+      DataGridItemPropertyBase detailItemProperty;
+      if( !itemPropertyMap.TryGetDetailItemProperty( masterItemProperty, out detailItemProperty ) )
+        return false;
+
+      detailColumnName = PropertyRouteParser.Parse( detailItemProperty );
+
+      return !string.IsNullOrEmpty( detailColumnName );
+    }
+
+    internal static bool TryGetMasterColumn( DataGridContext detailContext, ColumnBase detailColumn, out ColumnBase masterColumn )
+    {
+      if( detailContext != null )
+      {
+        var masterContext = detailContext.RootDataGridContext;
+        if( masterContext != null )
+          return DataGridItemPropertyMapHelper.TryGetMasterColumn( detailContext.ItemPropertyMap, masterContext.Columns, detailColumn, out masterColumn );
+      }
+
+      masterColumn = default( ColumnBase );
+
+      return false;
+    }
+
+    internal static bool TryGetDetailColumn( DataGridContext detailContext, ColumnBase masterColumn, out ColumnBase detailColumn )
+    {
+      if( detailContext != null )
+        return DataGridItemPropertyMapHelper.TryGetDetailColumn( detailContext.ItemPropertyMap, detailContext.Columns, masterColumn, out detailColumn );
+
+      detailColumn = default( ColumnBase );
+
+      return false;
+    }
+
+    internal static bool TryGetMasterColumn( DataGridItemPropertyMap itemPropertyMap, ColumnCollection masterColumns, ColumnBase detailColumn, out ColumnBase masterColumn )
+    {
+      masterColumn = default( ColumnBase );
+
+      if( ( masterColumns == null ) || ( detailColumn == null ) )
+        return false;
+
+      string masterColumnName;
+      if( !DataGridItemPropertyMapHelper.TryGetMasterColumnName( itemPropertyMap, detailColumn.FieldName, out masterColumnName ) )
+        return false;
+
+      masterColumn = masterColumns[ masterColumnName ];
+
+      return ( masterColumn != null );
+    }
+
+    internal static bool TryGetDetailColumn( DataGridItemPropertyMap itemPropertyMap, ColumnCollection detailColumns, ColumnBase masterColumn, out ColumnBase detailColumn )
+    {
+      detailColumn = default( ColumnBase );
+
+      if( ( detailColumns == null ) || ( masterColumn == null ) )
+        return false;
+
+      string detailColumnName;
+      if( !DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, masterColumn.FieldName, out detailColumnName ) )
+        return false;
+
+      detailColumn = detailColumns[ detailColumnName ];
+
+      return ( detailColumn != null );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs
new file mode 100644
index 00000000..1e094a81
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs
@@ -0,0 +1,97 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class DataGridItemPropertyRoute
+  {
+    private DataGridItemPropertyRoute( DataGridItemPropertyBase itemProperty )
+      : this( itemProperty, null )
+    {
+    }
+
+    private DataGridItemPropertyRoute( DataGridItemPropertyBase itemProperty, DataGridItemPropertyRoute parent )
+    {
+      Debug.Assert( itemProperty != null );
+
+      m_itemProperty = itemProperty;
+      m_parent = parent;
+    }
+
+    #region Current Property
+
+    internal DataGridItemPropertyBase Current
+    {
+      get
+      {
+        return m_itemProperty;
+      }
+    }
+
+    private readonly DataGridItemPropertyBase m_itemProperty;
+
+    #endregion
+
+    #region Parent Property
+
+    internal DataGridItemPropertyRoute Parent
+    {
+      get
+      {
+        return m_parent;
+      }
+    }
+
+    private readonly DataGridItemPropertyRoute m_parent;
+
+    #endregion
+
+    internal static DataGridItemPropertyRoute Create( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return null;
+
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        return new DataGridItemPropertyRoute( itemProperty );
+
+      return new DataGridItemPropertyRoute(
+                   itemProperty,
+                   DataGridItemPropertyRoute.Create( collection.Owner ) );
+    }
+
+    internal static DataGridItemPropertyRoute Combine( DataGridItemPropertyBase itemProperty, DataGridItemPropertyRoute ancestors )
+    {
+      if( itemProperty == null )
+        return ancestors;
+
+      if( ancestors == null )
+        return DataGridItemPropertyRoute.Create( itemProperty );
+
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        throw new InvalidOperationException();
+
+      if( collection.Owner != ancestors.Current )
+        throw new InvalidOperationException();
+
+      return new DataGridItemPropertyRoute( itemProperty, ancestors );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
index dd240e68..4505d0ec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
@@ -150,7 +150,7 @@ namespace Xceed.Wpf.DataGrid
       try
       {
         if( items.Count() != requestedItemCount )
-          throw new InvalidOperationException( "TODODOC : The number of non-null items return by the source must be equal to the provided item count" );
+          throw new InvalidOperationException( "The number of non-null items returned by the source must be equal to the provided item count." );
       }
       catch
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
index 38942c0c..abf7aa6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
@@ -15,12 +15,12 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
 {
+  [DebuggerDisplay( "Name = {Name}" )]
   public class DataGridUnboundItemProperty : DataGridItemPropertyBase
   {
     public DataGridUnboundItemProperty()
@@ -35,7 +35,7 @@ namespace Xceed.Wpf.DataGrid
       if( dataType == null )
         throw new ArgumentNullException( "dataType" );
 
-      this.Initialize( name, null, dataType, null, null, null );
+      this.Initialize( name, null, dataType, null, null, null, null );
     }
 
     public DataGridUnboundItemProperty( string name, Type dataType, bool isReadOnly )
@@ -46,7 +46,7 @@ namespace Xceed.Wpf.DataGrid
       if( dataType == null )
         throw new ArgumentNullException( "dataType" );
 
-      this.Initialize( name, null, dataType, isReadOnly, null, null );
+      this.Initialize( name, null, dataType, isReadOnly, null, null, null );
     }
 
     public DataGridUnboundItemProperty( string name, Type dataType, bool isReadOnly, bool overrideReadOnlyForInsertion )
@@ -57,24 +57,15 @@ namespace Xceed.Wpf.DataGrid
       if( dataType == null )
         throw new ArgumentNullException( "dataType" );
 
-      this.Initialize( name, null, dataType, isReadOnly, overrideReadOnlyForInsertion, null );
+      this.Initialize( name, null, dataType, isReadOnly, overrideReadOnlyForInsertion, null, null );
     }
 
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
     protected DataGridUnboundItemProperty( DataGridUnboundItemProperty template )
-      : base( template )
     {
-      this.QueryValue += template.QueryValue;
-      this.CommittingValue += template.CommittingValue;
-    }
-
-    public override object Clone()
-    {
-      Type type = this.GetType();
-
-      if( type == typeof( DataGridUnboundItemProperty ) )
-        return new DataGridUnboundItemProperty( this );
-
-      return base.Clone();
+      throw new NotSupportedException();
     }
 
     public event EventHandler<DataGridItemPropertyQueryValueEventArgs> QueryValue;
@@ -82,21 +73,23 @@ namespace Xceed.Wpf.DataGrid
 
     protected override object GetValueCore( object component )
     {
-      if( this.QueryValue != null )
-      {
-        DataGridItemPropertyQueryValueEventArgs gettingValueEventArgs = new DataGridItemPropertyQueryValueEventArgs( component );
-        this.QueryValue( this, gettingValueEventArgs );
-        return gettingValueEventArgs.Value;
-      }
+      var handler = this.QueryValue;
+      if( handler == null )
+        return null;
+
+      var e = new DataGridItemPropertyQueryValueEventArgs( component );
+
+      handler.Invoke( this, e );
 
-      return null;
+      return e.Value;
     }
 
     protected override void SetValueCore( object component, object value )
     {
-      if( this.CommittingValue != null )
+      var handler = this.CommittingValue;
+      if( handler != null )
       {
-        this.CommittingValue( this, new DataGridItemPropertyCommittingValueEventArgs( component, value ) );
+        handler.Invoke( this, new DataGridItemPropertyCommittingValueEventArgs( component, value ) );
       }
 
       base.SetValueCore( component, value );
@@ -104,20 +97,20 @@ namespace Xceed.Wpf.DataGrid
 
     internal void Refresh( object component )
     {
-      PropertyDescriptorFromItemPropertyBase propertyDescriptor = this.GetPropertyDescriptorForBinding();
-
+      var propertyDescriptor = this.GetPropertyDescriptorForBinding();
       if( propertyDescriptor == null )
         return;
 
       propertyDescriptor.RaiseValueChanged( component );
     }
 
-    internal override void SetUnspecifiedPropertiesValues( DataGridItemPropertyCollection itemPropertyCollection )
+    internal override void SetUnspecifiedPropertiesValues(
+      PropertyDescription description,
+      Type itemType,
+      bool defaultItemPropertiesCreated )
     {
       if( this.DataType == null )
-      {
         throw new InvalidOperationException( "An attempt was made to add an item without specifying its data type." );
-      }
 
       if( string.IsNullOrEmpty( this.Title ) )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
index 4c68ec3d..17d68113 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
@@ -138,20 +138,6 @@ namespace Xceed.Wpf.DataGrid
         source.OnQueryItems( e );
     }
 
-
-    internal event EventHandler<QueryAutoFilterDistinctValuesEventArgs> QueryAutoFilterDistinctValues;
-
-    internal void OnQueryAutoFilterDistinctValues( QueryAutoFilterDistinctValuesEventArgs e )
-    {
-      if( this.QueryAutoFilterDistinctValues != null )
-        this.QueryAutoFilterDistinctValues( this, e );
-
-      DataGridVirtualizingCollectionViewSource source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSource;
-
-      if( source != null )
-        source.OnQueryAutoFilterDistinctValues( e );
-    }
-
     #endregion DATA VIRTUALIZATION
 
     internal override IEnumerator GetVirtualEnumerator()
@@ -159,48 +145,6 @@ namespace Xceed.Wpf.DataGrid
       return ( ( DataGridVirtualizingCollectionViewGroupRoot )this.RootGroup ).GetVirtualPageManager().GetEnumerator();
     }
 
-    internal override void RefreshDistinctValuesForField( DataGridItemPropertyBase dataGridItemProperty )
-    {
-      if( dataGridItemProperty == null )
-        return;
-
-      if( dataGridItemProperty.CalculateDistinctValues == false )
-        return;
-
-      // List containing current column distinct values
-      HashSet<object> currentColumnDistinctValues = new HashSet<object>();
-
-      ReadOnlyObservableHashList readOnlyColumnDistinctValues = null;
-
-      // If the key is not set in DistinctValues yet, do not calculate distinct values for this field
-      if( !( ( DistinctValuesDictionary )this.DistinctValues ).InternalTryGetValue( dataGridItemProperty.Name, out readOnlyColumnDistinctValues ) )
-        return;
-
-      ObservableHashList columnDistinctValues = readOnlyColumnDistinctValues.InnerObservableHashList;
-
-      // We use the DistinctValuesSortComparer if present, else the SortComparer for the DataGridItemProperty, else, 
-      // the Comparer used is the one of the base class.
-      IComparer distinctValuesSortComparer = dataGridItemProperty.DistinctValuesSortComparer;
-
-      if( distinctValuesSortComparer == null )
-        distinctValuesSortComparer = dataGridItemProperty.SortComparer;
-
-      using( columnDistinctValues.DeferINotifyCollectionChanged() )
-      {
-        QueryAutoFilterDistinctValuesEventArgs e = new QueryAutoFilterDistinctValuesEventArgs( dataGridItemProperty );
-        this.OnQueryAutoFilterDistinctValues( e );
-
-        foreach( object distinctValue in e.DistinctValues )
-        {
-          // Compute current value to be able to remove unused values
-          currentColumnDistinctValues.Add( distinctValue );
-        }
-
-        DataGridCollectionViewBase.RemoveUnusedDistinctValues( 
-          distinctValuesSortComparer, currentColumnDistinctValues, columnDistinctValues, null );
-      }
-    }
-
     internal override DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup()
     {
       bool rootIsBottomLevel = ( this.GroupDescriptions == null ) ? true : ( this.GroupDescriptions.Count == 0 );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
index 33d4d67e..81ba31c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
@@ -38,7 +38,9 @@ namespace Xceed.Wpf.DataGrid
       : base( sourceModel, null, itemType, autoCreateItemProperties, false, false )
     {
       if( itemType == null )
+      {
         itemType = typeof( object );
+      }
 
       if( pageSize < 1 )
         throw new ArgumentOutOfRangeException( "pageSize", pageSize, "pageSize must be greater than zero." );
@@ -47,7 +49,9 @@ namespace Xceed.Wpf.DataGrid
         throw new ArgumentOutOfRangeException( "maxRealizedItemCount", maxRealizedItemCount, "maxRealizedItemCount must be greater than zero." );
 
       if( maxRealizedItemCount < pageSize )
+      {
         maxRealizedItemCount = pageSize;
+      }
 
       m_pageSize = pageSize;
       m_maxRealizedItemCount = maxRealizedItemCount;
@@ -62,7 +66,7 @@ namespace Xceed.Wpf.DataGrid
       throw new NotImplementedException();
     }
 
-    #endregion CONSTRUCTORS
+    #endregion
 
     #region CollectionView Members
 
@@ -70,8 +74,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        bool canGroup = true;
-        return canGroup;
+        return true;
       }
     }
 
@@ -308,10 +311,6 @@ namespace Xceed.Wpf.DataGrid
 
     private void ResetDistinctValues()
     {
-      DistinctValuesDictionary distinctValues = this.DistinctValues as DistinctValuesDictionary;
-
-      if( distinctValues != null )
-        distinctValues.InternalClear();
     }
 
     #endregion
@@ -507,8 +506,7 @@ namespace Xceed.Wpf.DataGrid
       if( currentAddItem == null )
         return;
 
-      DataGridCommittingNewItemEventArgs committingNewItemEventArgs =
-        new DataGridCommittingNewItemEventArgs( this, currentAddItem, false );
+      DataGridCommittingNewItemEventArgs committingNewItemEventArgs = new DataGridCommittingNewItemEventArgs( this, currentAddItem, false );
 
       this.RootDataGridCollectionViewBase.OnCommittingNewItem( committingNewItemEventArgs );
 
@@ -525,6 +523,51 @@ namespace Xceed.Wpf.DataGrid
       this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null ) );
     }
 
+    public override bool MoveCurrentTo( object item )
+    {
+      m_canSynchronizeSelectionWithCurrent = true;
+      bool ret = base.MoveCurrentTo( item );
+      m_canSynchronizeSelectionWithCurrent = false;
+
+      return ret;
+    }
+
+    public override bool MoveCurrentToFirst()
+    {
+      m_canSynchronizeSelectionWithCurrent = true;
+      bool ret = base.MoveCurrentToFirst();
+      m_canSynchronizeSelectionWithCurrent = false;
+
+      return ret;
+    }
+
+    public override bool MoveCurrentToLast()
+    {
+      m_canSynchronizeSelectionWithCurrent = true;
+      bool ret = base.MoveCurrentToLast();
+      m_canSynchronizeSelectionWithCurrent = false;
+
+      return ret;
+    }
+
+    public override bool MoveCurrentToNext()
+    {
+      m_canSynchronizeSelectionWithCurrent = true;
+      bool ret = base.MoveCurrentToNext();
+      m_canSynchronizeSelectionWithCurrent = false;
+
+      return ret;
+    }
+
+    public override bool MoveCurrentToPrevious()
+    {
+      m_canSynchronizeSelectionWithCurrent = true;
+      bool ret = base.MoveCurrentToPrevious();
+      m_canSynchronizeSelectionWithCurrent = false;
+
+      return ret;
+    }
+
     #endregion PUBLIC METHODS
 
     internal override void SetCurrentItemAndPositionCore( object currentItem, int currentPosition, bool isCurrentBeforeFirst, bool isCurrentAfterLast )
@@ -673,17 +716,20 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    internal bool CanSynchronizeSelectionWithCurrent
+    {
+      get
+      {
+        return m_canSynchronizeSelectionWithCurrent;
+      }
+    }
+
     #endregion INTERNAL PROPERTIES
 
     #region INTERNAL METHODS
 
     internal abstract DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup();
 
-    internal override bool CanCreateDetailDescriptions()
-    {
-      return false;
-    }
-
     internal override void OnBeginningEdit( DataGridItemCancelEventArgs e )
     {
       object item = e.Item;
@@ -702,24 +748,24 @@ namespace Xceed.Wpf.DataGrid
 
     internal override void OnEditBegun( DataGridItemEventArgs e )
     {
-      object item = e.Item;
-
-      DataGridPageManagerBase pageManager = this.RootGroup.GetVirtualPageManager();
+      var item = e.Item;
+      var pageManager = this.RootGroup.GetVirtualPageManager();
 
       if( !pageManager.IsItemDirty( item ) )
       {
         // First time we enter edit on this item.
-        DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-        int count = itemProperties.Count;
+        var itemProperties = this.ItemProperties;
+        var count = itemProperties.Count;
 
-        string[] propertyNames = new string[ count ];
-        object[] cachedValues = new object[ count ];
+        var propertyNames = new string[ count ];
+        var cachedValues = new object[ count ];
 
         for( int i = 0; i < count; i++ )
         {
-          DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-          propertyNames[ i ] = itemProperty.Name;
-          cachedValues[ i ] = itemProperty.GetValue( item );
+          var itemProperty = itemProperties[ i ];
+
+          propertyNames[ i ] = PropertyRouteParser.Parse( itemProperty );
+          cachedValues[ i ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
         }
 
         // Cache the values of the never edited before row.  This will help the developer find the corresponding row
@@ -732,23 +778,22 @@ namespace Xceed.Wpf.DataGrid
 
     internal override void OnEditCommitted( DataGridItemEventArgs e )
     {
-      object item = e.Item;
-
-      DataGridPageManagerBase pageManager = this.RootGroup.GetVirtualPageManager();
+      var item = e.Item;
+      var pageManager = this.RootGroup.GetVirtualPageManager();
 
       // Compare cached values with current values.  If they are the same, we can clear the old values which in turn will
       // make the item non dirty.
-      bool clearIsDirty = true;
+      var clearIsDirty = true;
 
-      VirtualizedItemValueCollection cachedValues = pageManager.GetCachedValuesForItem( item );
+      var cachedValues = pageManager.GetCachedValuesForItem( item );
 
       Debug.Assert( cachedValues != null );
 
-      DataGridItemPropertyCollection itemProperties = this.ItemProperties;
+      var itemProperties = this.ItemProperties;
 
-      foreach( DataGridItemPropertyBase itemProperty in itemProperties )
+      foreach( var itemProperty in itemProperties )
       {
-        object currentValue = itemProperty.GetValue( item );
+        var currentValue = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
 
         if( !( object.Equals( currentValue, cachedValues[ itemProperty.Name ] ) ) )
         {
@@ -772,24 +817,24 @@ namespace Xceed.Wpf.DataGrid
 
     internal override void OnEditCanceled( DataGridItemEventArgs e )
     {
-      object item = e.Item;
-
-      DataGridPageManagerBase pageManager = this.RootGroup.GetVirtualPageManager();
+      var item = e.Item;
+      var pageManager = this.RootGroup.GetVirtualPageManager();
 
       // Compare cached values with current values.  If they are the same, we can clear the old values which in turn will
       // make the item non dirty.
-      bool clearIsDirty = true;
+      var clearIsDirty = true;
 
-      VirtualizedItemValueCollection cachedValues = pageManager.GetCachedValuesForItem( item );
+      var cachedValues = pageManager.GetCachedValuesForItem( item );
 
       Debug.Assert( cachedValues != null );
 
-      DataGridItemPropertyCollection itemProperties = this.ItemProperties;
-      foreach( DataGridItemPropertyBase itemProperty in itemProperties )
+      var itemProperties = this.ItemProperties;
+
+      foreach( var itemProperty in itemProperties )
       {
-        object currentValue = itemProperty.GetValue( item );
+        var currentValue = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
 
-        if( !( object.Equals( currentValue, cachedValues[ itemProperty.Name ] ) ) )
+        if( !( object.Equals( currentValue, cachedValues[ PropertyRouteParser.Parse( itemProperty ) ] ) ) )
         {
           clearIsDirty = false;
           break;
@@ -797,7 +842,9 @@ namespace Xceed.Wpf.DataGrid
       }
 
       if( clearIsDirty )
+      {
         pageManager.ClearCachedValuesForItem( item );
+      }
 
       base.OnEditCanceled( e );
     }
@@ -836,6 +883,8 @@ namespace Xceed.Wpf.DataGrid
     private object m_connectionError;
     private DataGridConnectionState m_connectionState;
 
+    private bool m_canSynchronizeSelectionWithCurrent;
+
     #endregion PRIVATE FIELDS
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
index 46fba19b..95c64d4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
@@ -14,46 +14,39 @@
 
   ***********************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
 using System.Collections.ObjectModel;
-using System.Collections;
-using System.Windows.Data;
+using System.ComponentModel;
 using System.Diagnostics;
-using System.Windows.Documents;
-using System.Collections.Specialized;
 using System.Windows;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class DataGridVirtualizingCollectionViewGroup : DataGridVirtualizingCollectionViewGroupBase, IWeakEventListener
   {
-    #region STATIC MEMBERS
-
     private static List<DataGridGroupInfo> EmptyDataGridInfoList = new List<DataGridGroupInfo>( 0 );
 
-    #endregion STATIC MEMBERS
-
-
-    #region CONSTRUCTORS
-
-    internal DataGridVirtualizingCollectionViewGroup(
-      object name,
-      int initialItemsCount,
-      int startGlobalIndex,
-      DataGridVirtualizingCollectionViewGroup parent,
-      int level,
-      bool isBottomLevel )
+    internal DataGridVirtualizingCollectionViewGroup( object name, int initialItemsCount, int startGlobalIndex, DataGridVirtualizingCollectionViewGroup parent, int level, bool isBottomLevel )
       : base( name, initialItemsCount, startGlobalIndex, parent, level, isBottomLevel )
     {
     }
 
-    #endregion CONSTRUCTORS
+    #region GroupPath Property
+
+    internal List<DataGridGroupInfo> GroupPath
+    {
+      get
+      {
+        if( m_groupPath == null )
+        {
+          m_groupPath = this.BuildGroupPath();
+        }
+
+        return m_groupPath;
+      }
+    }
 
-    #region DATA VIRTUALIZATION
+    #endregion
 
     internal override int QueryItemCount()
     {
@@ -79,8 +72,7 @@ namespace Xceed.Wpf.DataGrid
         object subGroupName = subGroupInfos[ i ].Name;
         int subGroupItemCount = subGroupInfos[ i ].ItemCount;
 
-        subCollectionViewGroupList.Add(
-          new DataGridVirtualizingCollectionViewGroup( subGroupName, subGroupItemCount, runningCount, this, nextLevel, nextLevelIsBottom ) );
+        subCollectionViewGroupList.Add( new DataGridVirtualizingCollectionViewGroup( subGroupName, subGroupItemCount, runningCount, this, nextLevel, nextLevelIsBottom ) );
 
         runningCount += subGroupItemCount;
       }
@@ -88,27 +80,6 @@ namespace Xceed.Wpf.DataGrid
       return subCollectionViewGroupList;
     }
 
-    #endregion DATA VIRTUALIZATION
-
-
-    #region INTERNAL PROPERTIES
-
-    internal List<DataGridGroupInfo> GroupPath
-    {
-      get
-      {
-        if( m_groupPath == null )
-          m_groupPath = this.BuildGroupPath();
-
-        return m_groupPath;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-
-    #region PRIVATE METHODS
-
     private List<DataGridGroupInfo> BuildGroupPath()
     {
       DataGridVirtualizingCollectionViewGroup parent = this.Parent as DataGridVirtualizingCollectionViewGroup;
@@ -129,17 +100,13 @@ namespace Xceed.Wpf.DataGrid
       Debug.Assert( groupDescriptions.Count > level );
 
       if( groupDescriptions.Count > level )
+      {
         groupPath.Add( new DataGridGroupInfo( groupDescriptions[ level ], this ) );
+      }
 
       return groupPath;
     }
 
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
     private List<DataGridGroupInfo> m_groupPath;
-
-    #endregion PRIVATE FIELDS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
index bb2b4b55..bdad311d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
@@ -16,21 +16,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Data;
-using System.Diagnostics;
-using System.Collections.Specialized;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal abstract class DataGridVirtualizingCollectionViewGroupBase : CollectionViewGroup, IWeakEventListener, IDisposable
   {
-    #region CONSTRUCTORS
-
     internal DataGridVirtualizingCollectionViewGroupBase(
       object name,
       int initialItemsCount,
@@ -47,25 +43,7 @@ namespace Xceed.Wpf.DataGrid
       m_startGlobalIndex = startGlobalIndex;
     }
 
-    #endregion CONSTRUCTORS
-
-
-    #region DO NOT USE THOSE
-
-    #region Items PROPERTY
-
-    [Obsolete( "The Items property is obsolete and has been replaced by the VirtualItems property. When referencing through a CollectionViewGroup, the CollectionViewGroupExtensions.GetItems extension method can be used.", true )]
-    public new ReadOnlyObservableCollection<object> Items
-    {
-      get
-      {
-        return base.Items;
-      }
-    }
-
-    #endregion Items PROPERTY
-
-    #region ItemCount PROPERTY
+    #region ItemCount (Obselete) Property
 
     [Obsolete( "The ItemCount property is obsolete and has been replaced by the VirtualItemCount property. When referencing through a CollectionViewGroup, the CollectionViewGroupExtensions.GetItemCount extension method can be used.", true )]
     public new int ItemCount
@@ -76,25 +54,22 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemCount PROPERTY
-
-    #endregion DO NOT USE THOSE
-
+    #endregion
 
-    #region IsBottomLevel PROPERTY
+    #region Items (Obselete) Property
 
-    public override bool IsBottomLevel
+    [Obsolete( "The Items property is obsolete and has been replaced by the VirtualItems property. When referencing through a CollectionViewGroup, the CollectionViewGroupExtensions.GetItems extension method can be used.", true )]
+    public new ReadOnlyObservableCollection<object> Items
     {
       get
       {
-        return m_isBottomLevel;
+        return base.Items;
       }
     }
 
-    #endregion IsBottomLevel PROPERTY
-
+    #endregion
 
-    #region DATA VIRTUALIZATION
+    #region VirtualItemCount Property
 
     public int VirtualItemCount
     {
@@ -120,7 +95,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal abstract int QueryItemCount();
+    #endregion
+
+    #region VirtualItems Property
 
     public IList<object> VirtualItems
     {
@@ -130,14 +107,12 @@ namespace Xceed.Wpf.DataGrid
         {
           this.EnsureProtectedVirtualItems();
 
+          ObservableCollection<object> observableProtectedItems = m_protectedVirtualItems as ObservableCollection<object>;
 
-          ObservableCollection<object> obserableProtectedItems =
-            m_protectedVirtualItems as ObservableCollection<object>;
-
-          if( obserableProtectedItems != null )
+          if( observableProtectedItems != null )
           {
             Debug.Assert( !m_isBottomLevel );
-            m_virtualItems = new ReadOnlyObservableCollection<object>( obserableProtectedItems );
+            m_virtualItems = new ReadOnlyObservableCollection<object>( observableProtectedItems );
           }
           else
           {
@@ -150,80 +125,68 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void EnsureProtectedVirtualItems()
-    {
-      if( m_protectedVirtualItems != null )
-        return;
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
+    #endregion
 
-      Debug.Assert( collectionView != null );
+    #region IsBottomLevel Property
 
-      if( m_isBottomLevel )
+    public override bool IsBottomLevel
+    {
+      get
       {
-        m_protectedVirtualItems = this.CreateNewVirtualList();
+        return m_isBottomLevel;
       }
-      else
-      {
-        ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-        int groupDescriptionCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
-
-        int nextLevel = m_level + 1;
-
-        if( nextLevel > ( groupDescriptionCount - 1 ) )
-          throw new DataGridInternalException( "At attempt was made to retrieve child groups for a non-existing group description." );
-
-        GroupDescription subGroupBy = groupDescriptions[ nextLevel ];
+    }
 
-        if( subGroupBy == null )
-          throw new InvalidOperationException( "TODDOOC: " );
+    #endregion
 
-        bool nextLevelIsBottom = ( nextLevel == ( groupDescriptionCount - 1 ) );
+    #region Parent Property
 
-        m_protectedVirtualItems = this.QuerySubCollectionViewGroupList( subGroupBy, nextLevel, nextLevelIsBottom );
+    internal DataGridVirtualizingCollectionViewGroupBase Parent
+    {
+      get
+      {
+        return m_parent;
       }
     }
 
-    private VirtualList CreateNewVirtualList()
-    {
-      Debug.Assert( m_isBottomLevel );
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      DataGridPageManagerBase virtualPageManagerBase = collectionView.RootGroup.GetVirtualPageManager();
+    #endregion
 
-      VirtualList virtualItemList = new VirtualList( virtualPageManagerBase, m_virtualItemCount );
-      virtualPageManagerBase.LinkVirtualListAndCollectionViewGroup( virtualItemList, this );
+    #region Level Property
 
-      return virtualItemList;
+    internal int Level
+    {
+      get
+      {
+        return m_level;
+      }
     }
 
-    internal abstract ObservableCollection<object> QuerySubCollectionViewGroupList( GroupDescription subGroupBy, int nextLevel, bool nextLevelIsBottom );
+    #endregion
 
+    #region StartGlobalIndex Property
 
-    private int GetSubLevelCount()
+    internal int StartGlobalIndex
     {
-      CollectionView collectionView = this.GetCollectionView();
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      int groupDescriptionsCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
-
-      DataGridVirtualizingCollectionViewGroupBase parentCollectionViewGroup = this.Parent;
-
-      int level = 0;
-      while( parentCollectionViewGroup != null )
+      get
       {
-        level++;
-        parentCollectionViewGroup = parentCollectionViewGroup.Parent;
+        return m_startGlobalIndex;
       }
+    }
 
-      Debug.Assert( groupDescriptionsCount >= level );
+    #endregion
 
-      return ( groupDescriptionsCount - level );
+    protected virtual DataGridVirtualizingCollectionViewBase GetCollectionView()
+    {
+      if( m_parent != null )
+        return m_parent.GetCollectionView();
+
+      return null;
     }
 
+    internal abstract int QueryItemCount();
+
+    internal abstract ObservableCollection<object> QuerySubCollectionViewGroupList( GroupDescription subGroupBy, int nextLevel, bool nextLevelIsBottom );
+
     internal virtual GroupDescription GetSubGroupBy()
     {
       CollectionView collectionView = this.GetCollectionView();
@@ -235,7 +198,6 @@ namespace Xceed.Wpf.DataGrid
       if( groupDescriptionsCount == 0 )
         return null;
 
-
       DataGridVirtualizingCollectionViewGroupBase parentCollectionViewGroup = this.Parent;
 
       int level = 0;
@@ -254,87 +216,26 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    #endregion DATA VIRTUALIZATION
-
-
-    #region PROTECTED METHODS
-
-    protected virtual DataGridVirtualizingCollectionViewBase GetCollectionView()
-    {
-      if( m_parent != null )
-        return m_parent.GetCollectionView();
-
-      return null;
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region INTERNAL PROPERTIES
-
-    internal DataGridVirtualizingCollectionViewGroupBase Parent
-    {
-      get
-      {
-        return m_parent;
-      }
-    }
-
-    internal int Level
+    internal virtual void DisposeCore()
     {
-      get
-      {
-        return m_level;
-      }
+      m_protectedVirtualItems = new List<object>();
+      m_virtualItems = m_protectedVirtualItems;
+      m_parent = null;
     }
 
-    internal int StartGlobalIndex
+    internal virtual int GetGlobalIndexOf( object item )
     {
-      get
-      {
-        return m_startGlobalIndex;
-      }
+      return m_parent.GetGlobalIndexOf( item );
     }
 
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    private object OperateOnGlobalIndex( int index, Func<int, DataGridVirtualizingCollectionViewGroupBase, object> function )
+    internal virtual DataGridPageManagerBase GetVirtualPageManager()
     {
-      this.EnsureProtectedVirtualItems();
-
-      if( this.IsBottomLevel )
-      {
-        return function( index, this );
-      }
-      else
-      {
-        // The Count property of the virtualItems collection will return the sub-group count since this is not the bottom level.
-        int count = m_protectedVirtualItems.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          DataGridVirtualizingCollectionViewGroupBase subGroup = m_protectedVirtualItems[ i ] as DataGridVirtualizingCollectionViewGroupBase;
-
-          if( subGroup == null )
-            throw new InvalidOperationException( "Sub-group cannot be null (Nothing in Visual Basic)." );
-
-          // VirtualItemCount will return the sum of data items contained in this group and its possible subgroups.
-          int subGroupItemCount = subGroup.VirtualItemCount;
-
-          if( index < subGroupItemCount )
-            return subGroup.OperateOnGlobalIndex( index, function );
-
-          index -= subGroupItemCount;
-        }
-      }
-
-      throw new ArgumentOutOfRangeException( "index" );
+      return m_parent.GetVirtualPageManager();
     }
 
     internal object GetItemAtGlobalIndex( int globalIndex )
     {
-      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> getItemFunction = ( localIndex, cvg ) => 
+      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> getItemFunction = ( localIndex, cvg ) =>
       {
         return cvg.m_protectedVirtualItems[ localIndex ];
       };
@@ -344,7 +245,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal void LockGlobalIndex( int globalIndex )
     {
-      Func<int,DataGridVirtualizingCollectionViewGroupBase,object> lockingAction = ( localIndex, cvg ) => 
+      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> lockingAction = ( localIndex, cvg ) =>
       {
         VirtualList virtualItemList = cvg.VirtualItems as VirtualList;
 
@@ -367,16 +268,12 @@ namespace Xceed.Wpf.DataGrid
       {
         var rootGroup = collectionView.RootGroup;
 
-        if( ( rootGroup != null ) 
-          && ( ( globalIndex >= rootGroup.m_virtualItemCount ) ) )
-        {
-          // This can happen when refreshing a CollectionView and the record count has changed in such a way that the global index
-          // to unlock is out of range of the new count.
+        // This can happen when refreshing a CollectionView and the record count has changed in such a way that the global index to unlock is out of range of the new count.
+        if( ( rootGroup != null ) && ( ( globalIndex >= rootGroup.m_virtualItemCount ) ) )
           return;
-        }
       }
 
-      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> unlockingAction = ( localIndex, cvg ) => 
+      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> unlockingAction = ( localIndex, cvg ) =>
       {
         VirtualList virtualItemList = cvg.VirtualItems as VirtualList;
 
@@ -391,44 +288,111 @@ namespace Xceed.Wpf.DataGrid
       this.OperateOnGlobalIndex( globalIndex, unlockingAction );
     }
 
-    internal virtual void DisposeCore()
+    private void EnsureProtectedVirtualItems()
     {
-      m_protectedVirtualItems = new List<object>();
-      m_virtualItems = m_protectedVirtualItems;
-      m_parent = null;
+      if( m_protectedVirtualItems != null )
+        return;
+
+      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
+
+      Debug.Assert( collectionView != null );
+
+      if( m_isBottomLevel )
+      {
+        m_protectedVirtualItems = this.CreateNewVirtualList();
+      }
+      else
+      {
+        ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
+
+        int groupDescriptionCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
+
+        int nextLevel = m_level + 1;
+
+        if( nextLevel > ( groupDescriptionCount - 1 ) )
+          throw new DataGridInternalException( "At attempt was made to retrieve child groups for a non-existing group description." );
+
+        GroupDescription subGroupBy = groupDescriptions[ nextLevel ];
+
+        if( subGroupBy == null )
+          throw new InvalidOperationException( "TODDOOC: " );
+
+        bool nextLevelIsBottom = ( nextLevel == ( groupDescriptionCount - 1 ) );
+
+        m_protectedVirtualItems = this.QuerySubCollectionViewGroupList( subGroupBy, nextLevel, nextLevelIsBottom );
+      }
     }
 
-    internal virtual int GetGlobalIndexOf( object item )
+    private VirtualList CreateNewVirtualList()
     {
-      return m_parent.GetGlobalIndexOf( item );
+      Debug.Assert( m_isBottomLevel );
+
+      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
+
+      DataGridPageManagerBase virtualPageManagerBase = collectionView.RootGroup.GetVirtualPageManager();
+
+      VirtualList virtualItemList = new VirtualList( virtualPageManagerBase, m_virtualItemCount );
+      virtualPageManagerBase.LinkVirtualListAndCollectionViewGroup( virtualItemList, this );
+
+      return virtualItemList;
     }
 
-    internal virtual DataGridPageManagerBase GetVirtualPageManager()
+    private int GetSubLevelCount()
     {
-      return m_parent.GetVirtualPageManager();
-    }
+      CollectionView collectionView = this.GetCollectionView();
 
-    #endregion INTERNAL METHODS
+      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
 
-    #region PRIVATE FIELDS
+      int groupDescriptionsCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
 
-    private bool m_isBottomLevel;
-    private int m_level;
+      DataGridVirtualizingCollectionViewGroupBase parentCollectionViewGroup = this.Parent;
 
-    private int m_startGlobalIndex;
-    private int m_virtualItemCount;
+      int level = 0;
+      while( parentCollectionViewGroup != null )
+      {
+        level++;
+        parentCollectionViewGroup = parentCollectionViewGroup.Parent;
+      }
 
-    private IList<object> m_protectedVirtualItems;
-    private IList<object> m_virtualItems;
+      Debug.Assert( groupDescriptionsCount >= level );
 
-    private DataGridVirtualizingCollectionViewGroupBase m_parent;
+      return ( groupDescriptionsCount - level );
+    }
+
+    private object OperateOnGlobalIndex( int index, Func<int, DataGridVirtualizingCollectionViewGroupBase, object> function )
+    {
+      this.EnsureProtectedVirtualItems();
+
+      if( this.IsBottomLevel )
+      {
+        return function( index, this );
+      }
+      else
+      {
+        // The Count property of the virtualItems collection will return the sub-group count since this is not the bottom level.
+        int count = m_protectedVirtualItems.Count;
+
+        for( int i = 0; i < count; i++ )
+        {
+          DataGridVirtualizingCollectionViewGroupBase subGroup = m_protectedVirtualItems[ i ] as DataGridVirtualizingCollectionViewGroupBase;
+
+          if( subGroup == null )
+            throw new InvalidOperationException( "Sub-group cannot be null (Nothing in Visual Basic)." );
 
-    #endregion PRIVATE FIELDS
+          // VirtualItemCount will return the sum of data items contained in this group and its possible subgroups.
+          int subGroupItemCount = subGroup.VirtualItemCount;
+
+          if( index < subGroupItemCount )
+            return subGroup.OperateOnGlobalIndex( index, function );
 
+          index -= subGroupItemCount;
+        }
+      }
 
-    #region WEAK EVENT HANDLER
+      throw new ArgumentOutOfRangeException( "index" );
+    }
 
-    private void VirtualItemList_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnVirtualItemListCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
       DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
 
@@ -440,21 +404,14 @@ namespace Xceed.Wpf.DataGrid
         {
           case NotifyCollectionChangedAction.Replace:
             {
-              deferredOperation = new DeferredOperation(
-                DeferredOperation.DeferredOperationAction.Replace, -1,
-                e.NewStartingIndex + m_startGlobalIndex,
-                e.NewItems,
-                e.OldStartingIndex + m_startGlobalIndex,
-                e.OldItems );
-
+              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, e.NewStartingIndex + m_startGlobalIndex,
+                                                         e.NewItems, e.OldStartingIndex + m_startGlobalIndex, e.OldItems );
               break;
             }
 
           case NotifyCollectionChangedAction.Reset:
             {
-              deferredOperation = new DeferredOperation(
-                DeferredOperation.DeferredOperationAction.Refresh, -1, null );
-
+              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null );
               break;
             }
 
@@ -463,19 +420,24 @@ namespace Xceed.Wpf.DataGrid
         }
 
         if( deferredOperation != null )
+        {
           collectionView.ExecuteOrQueueSourceItemOperation( deferredOperation );
+        }
       }
     }
 
-    #endregion WEAK EVENT HANDLER
-
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        this.VirtualItemList_CollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+        this.OnVirtualItemListCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
         return true;
       }
 
@@ -484,7 +446,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion IWeakEventListener Members
 
-
     #region IDisposable Members
 
     public void Dispose()
@@ -493,5 +454,16 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    private bool m_isBottomLevel;
+    private int m_level;
+
+    private int m_startGlobalIndex;
+    private int m_virtualItemCount;
+
+    private IList<object> m_protectedVirtualItems;
+    private IList<object> m_virtualItems;
+
+    private DataGridVirtualizingCollectionViewGroupBase m_parent;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
index 1b5cbc84..23038be3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
@@ -14,21 +14,10 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-
 namespace Xceed.Wpf.DataGrid
 {
   internal class DataGridVirtualizingCollectionViewGroupRoot : DataGridVirtualizingCollectionViewGroup
   {
-    #region CONSTRUCTORS
-
     internal DataGridVirtualizingCollectionViewGroupRoot( DataGridVirtualizingCollectionView collectionView, bool isBottomLevel )
       : base( null, -1, 0, null, -1, isBottomLevel )
     {
@@ -36,9 +25,10 @@ namespace Xceed.Wpf.DataGrid
       m_virtualPageManager = new DataGridPageManager( collectionView );
     }
 
-    #endregion CONSTRUCTORS
-
-    #region INTERNAL METHODS
+    protected override DataGridVirtualizingCollectionViewBase GetCollectionView()
+    {
+      return m_parentCollectionView;
+    }
 
     internal override int GetGlobalIndexOf( object item )
     {
@@ -57,23 +47,8 @@ namespace Xceed.Wpf.DataGrid
       base.DisposeCore();
     }
 
-    #endregion
-
-    #region PROTECTED METHODS
-
-    protected override DataGridVirtualizingCollectionViewBase GetCollectionView()
-    {
-      return m_parentCollectionView;
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE FILEDS
-
     private DataGridVirtualizingCollectionView m_parentCollectionView;
     private DataGridPageManager m_virtualPageManager;
-
-    #endregion PRIVATE FIELDS
   }
 
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
index de68918e..52a9e952 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
@@ -75,14 +75,6 @@ namespace Xceed.Wpf.DataGrid
         this.QueryItems( this, e );
     }
 
-    internal event EventHandler<QueryAutoFilterDistinctValuesEventArgs> QueryAutoFilterDistinctValues;
-
-    internal void OnQueryAutoFilterDistinctValues( QueryAutoFilterDistinctValuesEventArgs e )
-    {
-      if( this.QueryAutoFilterDistinctValues != null )
-        this.QueryAutoFilterDistinctValues( this, e );
-    }
-
     #endregion DATA VIRTUALIZATION EVENTS
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
index 152a0a94..eba1b266 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
@@ -15,12 +15,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Windows;
-using System.Globalization;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -80,7 +75,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion MaxRealizedItemCount
 
-
     #region PreemptivePageQueryRatio
 
     public static readonly DependencyProperty PreemptivePageQueryRatioProperty = DependencyProperty.Register(
@@ -90,8 +84,14 @@ namespace Xceed.Wpf.DataGrid
 
     public double PreemptivePageQueryRatio
     {
-      get { return ( double )GetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty ); }
-      set { this.SetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty, value ); }
+      get
+      {
+        return ( double )GetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty );
+      }
+      set
+      {
+        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty, value );
+      }
     }
 
     #endregion PreemptivePageQueryRatio
@@ -105,8 +105,14 @@ namespace Xceed.Wpf.DataGrid
 
     public CommitMode CommitMode
     {
-      get { return ( CommitMode )GetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty ); }
-      set { this.SetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty, value ); }
+      get
+      {
+        return ( CommitMode )GetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty );
+      }
+      set
+      {
+        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty, value );
+      }
     }
 
     #endregion CommitMode
@@ -123,7 +129,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion DATA VIRTUALIZATION EVENTS
 
-
     #region INTERNAL PROPERTIES
 
     internal bool IsInitialized
@@ -136,7 +141,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion INTERNAL PROPERTIES
 
-
     #region INTERNAL METHODS
 
     internal override void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
@@ -151,12 +155,10 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion INTERNAL METHODS
 
-
     #region PRIVATE FIELDS
 
     private bool m_isInitialized;
 
     #endregion PRIVATE FIELDS
-
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
index 138a2ab4..9f9f979c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
@@ -14,21 +14,16 @@
 
   ***********************************************************************************/
 
-using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Data;
 using System.Diagnostics;
-using System.Collections;
+using System.Linq;
 using Xceed.Utils.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
   public sealed class DataGridVirtualizingQueryableCollectionView : DataGridVirtualizingCollectionViewBase
   {
-    #region CONSTRUCTORS
-
     public DataGridVirtualizingQueryableCollectionView()
       : this( null, true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
     {
@@ -45,8 +40,6 @@ namespace Xceed.Wpf.DataGrid
       m_pageManagerSyncRoot = new object();
     }
 
-    #endregion CONSTRUCTORS
-
     #region QueryableSource PROPERTY
 
     public IQueryable QueryableSource
@@ -59,7 +52,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion QueryableSource PROPERTY
 
-
     #region INTERNAL METHODS
 
     internal override DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup()
@@ -74,51 +66,6 @@ namespace Xceed.Wpf.DataGrid
       return ( ( DataGridVirtualizingQueryableCollectionViewGroupRoot )this.RootGroup ).GetVirtualPageManager().GetEnumerator();
     }
 
-    internal override void RefreshDistinctValuesForField( DataGridItemPropertyBase dataGridItemProperty )
-    {
-      if( dataGridItemProperty == null )
-        return;
-
-      if( dataGridItemProperty.CalculateDistinctValues == false )
-        return;
-
-      // List containing current column distinct values
-      HashSet<object> currentColumnDistinctValues = new HashSet<object>();
-
-      ReadOnlyObservableHashList readOnlyColumnDistinctValues = null;
-
-      // If the key is not set in DistinctValues yet, do not calculate distinct values for this field
-      if( !( ( DistinctValuesDictionary )this.DistinctValues ).InternalTryGetValue( dataGridItemProperty.Name, out readOnlyColumnDistinctValues ) )
-        return;
-
-      ObservableHashList columnDistinctValues = readOnlyColumnDistinctValues.InnerObservableHashList;
-
-      // We use the DistinctValuesSortComparer if present, else the SortComparer for the DataGridItemProperty, else, 
-      // the Comparer used is the one of the base class.
-      IComparer distinctValuesSortComparer = dataGridItemProperty.DistinctValuesSortComparer;
-
-      if( distinctValuesSortComparer == null )
-        distinctValuesSortComparer = dataGridItemProperty.SortComparer;
-
-      using( columnDistinctValues.DeferINotifyCollectionChanged() )
-      {
-        DataGridVirtualizingQueryableCollectionViewGroupRoot rootGroup = this.RootGroup as DataGridVirtualizingQueryableCollectionViewGroupRoot;
-
-        Debug.Assert( rootGroup != null );
-
-        object[] distinctValues = rootGroup.GetItemPropertyDistinctValues( dataGridItemProperty );
-
-        foreach( object distinctValue in distinctValues )
-        {
-          // Compute current value to be able to remove unused values
-          currentColumnDistinctValues.Add( distinctValue );
-        }
-
-        DataGridCollectionViewBase.RemoveUnusedDistinctValues( 
-          distinctValuesSortComparer, currentColumnDistinctValues, columnDistinctValues, null );
-      }
-    }
-
     #endregion
 
     #region PRIVATE FIELDS
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
index 94061488..7b2d2522 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
@@ -22,7 +22,6 @@ using System.Diagnostics;
 using System.ComponentModel;
 using System.Collections;
 using System.Linq.Expressions;
-using Xceed.Wpf.DataGrid.FilterCriteria;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -78,165 +77,6 @@ namespace Xceed.Wpf.DataGrid
 
     #region INTERNAL METHODS
 
-    internal override IQueryable CreateUnsortedFilteredQueryable()
-    {
-      if( m_unsortedFilteredQueryableSource == null )
-      {
-        if( m_queryableSource != null )
-        {
-          ParameterExpression sharedParameterExpression = m_queryableSource.CreateParameterExpression();
-
-          Expression filterCriterionsExpression = this.GetFilterCriterionsExpression( m_queryableSource, sharedParameterExpression );
-          Expression autoFilterValuesExpression = this.GetAutoFilterValuesExpression( m_queryableSource, sharedParameterExpression );
-
-          Expression completeFilterExpression = null;
-
-          if( filterCriterionsExpression != null )
-            completeFilterExpression = filterCriterionsExpression;
-
-          if( autoFilterValuesExpression != null )
-          {
-            if( completeFilterExpression == null )
-            {
-              completeFilterExpression = autoFilterValuesExpression;
-            }
-            else
-            {
-              completeFilterExpression = Expression.And( completeFilterExpression, autoFilterValuesExpression );
-            }
-          }
-
-          // Apply the complete filter expression, or if null, set the root source.
-          if( completeFilterExpression == null )
-          {
-            m_unsortedFilteredQueryableSource = m_queryableSource;
-          }
-          else
-          {
-            m_unsortedFilteredQueryableSource = m_queryableSource.WhereFilter( sharedParameterExpression, completeFilterExpression );
-          }
-        }
-      }
-
-      return m_unsortedFilteredQueryableSource;
-    }
-
-    private Expression GetFilterCriterionsExpression( IQueryable queryable, ParameterExpression sharedParameterExpression )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      FilterCriteriaMode filterCriteriaMode = m_parentCollectionView.FilterCriteriaMode;
-
-      if( filterCriteriaMode == FilterCriteriaMode.None )
-        return null;
-
-
-      DataGridItemPropertyCollection itemProperties = m_parentCollectionView.ItemProperties;
-      int itemPropertiesCount = itemProperties.Count;
-
-      Expression filterCriterionsExpression = null;
-
-      for( int i = 0; i < itemPropertiesCount; i++ )
-      {
-        DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-        string itemPropertyName = itemProperty.Name;
-
-        FilterCriterion filterCriterion = itemProperty.FilterCriterion;
-
-        if( filterCriterion == null )
-          continue;
-
-        Expression propertyFilterCriterionExpression = filterCriterion.ToLinqExpression( queryable, sharedParameterExpression, itemPropertyName );
-
-        if( propertyFilterCriterionExpression == null )
-          continue;
-
-        if( filterCriterionsExpression == null )
-        {
-          filterCriterionsExpression = propertyFilterCriterionExpression;
-        }
-        else
-        {
-          Debug.Assert( ( filterCriteriaMode == FilterCriteriaMode.And ) || ( filterCriteriaMode == FilterCriteriaMode.Or ) );
-
-          // Merge this DataGridItemProperty FilterCriterionExpressions
-          if( filterCriteriaMode == FilterCriteriaMode.And )
-          {
-            filterCriterionsExpression = Expression.And( filterCriterionsExpression, propertyFilterCriterionExpression );
-          }
-          else
-          {
-            filterCriterionsExpression = Expression.Or( filterCriterionsExpression, propertyFilterCriterionExpression );
-          }
-        }
-
-        // Loop to next DataGridItemProperty.
-      }
-
-      return filterCriterionsExpression;
-    }
-
-    private Expression GetAutoFilterValuesExpression( IQueryable queryable, ParameterExpression sharedParameterExpression )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      AutoFilterMode autoFilterMode = m_parentCollectionView.AutoFilterMode;
-
-      if( autoFilterMode == AutoFilterMode.None )
-        return null;
-
-      DataGridItemPropertyCollection itemProperties = m_parentCollectionView.ItemProperties;
-      int itemPropertiesCount = itemProperties.Count;
-
-      Expression autoFilterValuesExpression = null;
-
-      for( int i = 0; i < itemPropertiesCount; i++ )
-      {
-        DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-        string itemPropertyName = itemProperty.Name;
-
-        IList itemPropertyAutoFilterValues;
-
-        if( m_parentCollectionView.AutoFilterValues.TryGetValue( itemPropertyName, out itemPropertyAutoFilterValues ) )
-        {
-          int itemPropertyAutoFilterValuesCount = itemPropertyAutoFilterValues.Count;
-
-          if( itemPropertyAutoFilterValuesCount == 0 )
-            continue;
-
-
-          object[] itemPropertyAutoFilterValuesArray = new object[ itemPropertyAutoFilterValuesCount ];
-          itemPropertyAutoFilterValues.CopyTo( itemPropertyAutoFilterValuesArray, 0 );
-
-          Expression itemPropertyAutoFilterExpression = queryable.CreateEqualExpression( sharedParameterExpression, itemPropertyName, itemPropertyAutoFilterValuesArray );
-
-          if( autoFilterValuesExpression == null )
-          {
-            autoFilterValuesExpression = itemPropertyAutoFilterExpression;
-          }
-          else
-          {
-            Debug.Assert( ( autoFilterMode == AutoFilterMode.And ) || ( autoFilterMode == AutoFilterMode.Or ) );
-
-            // Merge this DataGridItemProperty AutoFilterExpressions
-            if( autoFilterMode == AutoFilterMode.And )
-            {
-              autoFilterValuesExpression = Expression.And( autoFilterValuesExpression, itemPropertyAutoFilterExpression );
-            }
-            else
-            {
-              autoFilterValuesExpression = Expression.Or( autoFilterValuesExpression, itemPropertyAutoFilterExpression );
-            }
-          }
-        }
-        // Loop to next DataGridItemProperty.
-      }
-
-      return autoFilterValuesExpression;
-    }
-
     internal override int GetGlobalIndexOf( object item )
     {
       return m_virtualPageManager.GetGlobalIndexOf( item );
@@ -280,7 +120,6 @@ namespace Xceed.Wpf.DataGrid
     {
       m_parentCollectionView = null;
       m_queryableSource = null;
-      m_unsortedFilteredQueryableSource = null;
       m_virtualPageManager = null;
       base.DisposeCore();
     }
@@ -292,7 +131,6 @@ namespace Xceed.Wpf.DataGrid
     private DataGridVirtualizingQueryableCollectionView m_parentCollectionView;
 
     private IQueryable m_queryableSource;
-    private IQueryable m_unsortedFilteredQueryableSource;
 
     private string[] m_primaryKeyPropertyNames;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
index 8f394774..42fb6592 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
@@ -14,19 +14,15 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid
 {
   public class DataGridVirtualizingQueryableCollectionViewSource : DataGridVirtualizingCollectionViewSourceBase
   {
-    #region CONSTRUCTORS
-
     static DataGridVirtualizingQueryableCollectionViewSource()
     {
       CollectionViewSource.CollectionViewTypeProperty.OverrideMetadata(
@@ -34,49 +30,48 @@ namespace Xceed.Wpf.DataGrid
         new FrameworkPropertyMetadata( typeof( DataGridVirtualizingQueryableCollectionView ) ) );
     }
 
-    public DataGridVirtualizingQueryableCollectionViewSource()
-      : base()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region QueryableSource
+    #region QueryableSource Property
 
     public static readonly DependencyProperty QueryableSourceProperty = DependencyProperty.Register(
-      "QueryableSource", typeof( IQueryable ), typeof( DataGridVirtualizingQueryableCollectionViewSource ),
+      "QueryableSource",
+      typeof( IQueryable ),
+      typeof( DataGridVirtualizingQueryableCollectionViewSource ),
       new FrameworkPropertyMetadata(
         null,
         new PropertyChangedCallback( DataGridVirtualizingQueryableCollectionViewSource.OnQueryableSourcePropertyChanged ) ) );
 
     public IQueryable QueryableSource
     {
-      get { return ( IQueryable )GetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty ); }
-      set { this.SetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty, value ); }
+      get
+      {
+        return ( IQueryable )GetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty );
+      }
+      set
+      {
+        this.SetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty, value );
+      }
     }
 
     private static void OnQueryableSourcePropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridCollectionViewSourceBase source = sender as DataGridCollectionViewSourceBase;
-
+      var source = sender as DataGridCollectionViewSourceBase;
       if( source == null )
         return;
 
       source.AdviseForwardedPropertyChanged();
 
-      if( source.DataSourceProvider != null )
-        source.DataSourceProvider.DelayRefresh( source.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
+      var provider = source.DataSourceProvider;
+      if( provider != null )
+      {
+        provider.DelayRefresh( source.Dispatcher, DispatcherPriority.DataBind );
+      }
     }
 
-    #endregion QueryableSource
-
-    #region OVERRIDES
+    #endregion
 
     internal override DataGridCollectionViewBaseDataProvider CreateDataProvider()
     {
       return new DataGridVirtualizingQueryableCollectionViewDataProvider( this );
     }
-
-    #endregion OVERRIDES
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
index 3c7c19e9..5fc2db7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
@@ -15,11 +15,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Data;
-using System.Diagnostics;
 using System.Collections;
+using System.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -40,6 +37,8 @@ namespace Xceed.Wpf.DataGrid
       m_userAssignedDataRelation = true;
     }
 
+    #region DataRelation Property
+
     [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
     public DataRelation DataRelation
     {
@@ -61,6 +60,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
     protected internal override void Initialize( DataGridCollectionViewBase parentCollectionView )
     {
       base.Initialize( parentCollectionView );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
index 23926f64..2abf397e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
@@ -15,44 +15,44 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections;
 using System.ComponentModel;
 using System.Data;
-using System.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class DataRowColumnPropertyDescriptor : PropertyDescriptor
+  internal sealed class DataRowColumnPropertyDescriptor : PropertyDescriptor
   {
-    public DataRowColumnPropertyDescriptor( System.Data.DataColumn column )
+    internal DataRowColumnPropertyDescriptor( DataColumn column )
       : base( column.ColumnName, null )
     {
       if( column == null )
         throw new ArgumentNullException( "column" );
 
-      m_columnName = column.ColumnName;
-      m_columnDataType = ItemsSourceHelper.GetColumnDataType( column );
-      m_columnCaption = column.Caption;
-      m_columnReadOnly = column.ReadOnly;
-      m_columnHidden = ( column.ColumnMapping == MappingType.Hidden );
+      m_column = column;
     }
 
+    #region DisplayName Property
+
     public override string DisplayName
     {
       get
       {
-        return m_columnCaption;
+        return m_column.Caption;
       }
     }
 
+    #endregion
+
+    #region Attributes Property
+
     public override AttributeCollection Attributes
     {
       get
       {
         if( typeof( IList ).IsAssignableFrom( this.PropertyType ) )
         {
-          Attribute[] array = new Attribute[ base.Attributes.Count + 1 ];
+          var array = new Attribute[ base.Attributes.Count + 1 ];
           base.Attributes.CopyTo( array, 0 );
           array[ array.Length - 1 ] = new ListBindableAttribute( false );
           return new AttributeCollection( array );
@@ -62,6 +62,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region ComponentType Property
+
     public override Type ComponentType
     {
       get
@@ -70,51 +74,64 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region IsBrowsable Property
+
     public override bool IsBrowsable
     {
       get
       {
-        if( m_columnHidden )
-          return false;
-
-        return base.IsBrowsable;
+        return ( m_column.ColumnMapping != MappingType.Hidden )
+            && ( base.IsBrowsable );
       }
     }
 
+    #endregion
+
+    #region IsReadOnly Property
+
     public override bool IsReadOnly
     {
       get
       {
-        return m_columnReadOnly;
+        return m_column.ReadOnly;
       }
     }
 
+    #endregion
+
+    #region PropertyType Property
+
     public override Type PropertyType
     {
       get
       {
-        return m_columnDataType;
+        return ItemsSourceHelper.GetColumnDataType( m_column );
       }
     }
 
+    #endregion
+
     public override bool CanResetValue( object component )
     {
-      object value = this.GetValue( component );
-      return ( value != null ) && ( value != DBNull.Value );
+      var value = this.GetValue( component );
+
+      return ( value != null )
+          && ( value != DBNull.Value );
     }
 
     public override object GetValue( object component )
     {
-      System.Data.DataRow dataRow = component as System.Data.DataRow;
-
+      var dataRow = component as System.Data.DataRow;
       if( dataRow == null )
         return null;
 
-      object value = null;
+      var value = default( object );
 
       try
       {
-        value = dataRow[ m_columnName ];
+        value = dataRow[ m_column ];
       }
       catch
       {
@@ -133,15 +150,14 @@ namespace Xceed.Wpf.DataGrid
 
     public override void SetValue( object component, object value )
     {
-      System.Data.DataRow dataRow = component as System.Data.DataRow;
-
+      var dataRow = component as System.Data.DataRow;
       if( dataRow == null )
         throw new InvalidOperationException( "An attempt was made to set a value on a DataRow that does not exist." );
 
       if( this.IsReadOnly )
         throw new InvalidOperationException( "An attempt was made to set a value on a read-only field." );
 
-      object oldValue = dataRow[ m_columnName ];
+      var oldValue = dataRow[ m_column ];
 
       if( ( oldValue == null ) || ( oldValue == DBNull.Value ) )
       {
@@ -156,11 +172,11 @@ namespace Xceed.Wpf.DataGrid
 
       if( value == null )
       {
-        dataRow[ m_columnName ] = DBNull.Value;
+        dataRow[ m_column ] = DBNull.Value;
       }
       else
       {
-        dataRow[ m_columnName ] = value;
+        dataRow[ m_column ] = value;
       }
 
       this.OnValueChanged( component, EventArgs.Empty );
@@ -171,10 +187,6 @@ namespace Xceed.Wpf.DataGrid
       return false;
     }
 
-    private string m_columnName;
-    private Type m_columnDataType;
-    private string m_columnCaption;
-    private bool m_columnReadOnly;
-    private bool m_columnHidden;
+    private readonly DataColumn m_column;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
index 5acc863e..4db22b8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
@@ -53,7 +53,7 @@ namespace Xceed.Wpf.DataGrid
       {
         lock( this )
         {
-          return ( m_pendingFlags.Data != 0 ) || ( !m_isProcessingOperations && m_deferredOperations.Count > 0 );
+          return ( m_pendingFlags.Data != 0 ) || ( m_deferredOperations.Count > 0 );
         }
       }
     }
@@ -153,7 +153,7 @@ namespace Xceed.Wpf.DataGrid
         lock( this )
         {
           //Make sure that stats calculation that have been defer are processed before defering again!
-          if( value && m_deferredOperationsToProcess > 0 )
+          if( value && ( m_deferredOperationsToProcess > 0 ) )
           {
             m_forceProcessOfInvalidatedGroupStats = true;
           }
@@ -203,24 +203,24 @@ namespace Xceed.Wpf.DataGrid
     {
       if( m_deferredOperations.Count >= 2 )
       {
-        DeferredOperation addOperation = m_deferredOperations[ 0 ];
+        var addOperation = m_deferredOperations[ 0 ];
 
         if( addOperation.Action != DeferredOperation.DeferredOperationAction.Add )
           return;
 
-        int addIndex = addOperation.NewStartingIndex;
-        int addCount = addOperation.NewItems.Count;
+        var addIndex = addOperation.NewStartingIndex;
+        var addCount = addOperation.NewItems.Count;
 
-        int firstIndexToRemove = 1;
-        int lastIndexToRemove = -1;
+        var firstIndexToRemove = 1;
+        var lastIndexToRemove = -1;
 
-        int count = m_deferredOperations.Count;
+        var count = m_deferredOperations.Count;
         for( int i = 1; i < count; i++ )
         {
-          DeferredOperation operation = m_deferredOperations[ i ];
+          var operation = m_deferredOperations[ i ];
 
-          bool replaced = ( operation.Action == DeferredOperation.DeferredOperationAction.Replace );
-          bool removed = ( operation.Action == DeferredOperation.DeferredOperationAction.Remove );
+          var replaced = ( operation.Action == DeferredOperation.DeferredOperationAction.Replace );
+          var removed = ( operation.Action == DeferredOperation.DeferredOperationAction.Remove );
 
           if( replaced || removed )
           {
@@ -230,8 +230,7 @@ namespace Xceed.Wpf.DataGrid
               return;
             }
 
-            if( ( addIndex == operation.OldStartingIndex )
-              && ( addCount == operation.OldItems.Count ) )
+            if( ( addIndex == operation.OldStartingIndex ) && ( addCount == operation.OldItems.Count ) )
             {
               lastIndexToRemove = i;
 
@@ -248,8 +247,7 @@ namespace Xceed.Wpf.DataGrid
           }
           else
           {
-            // Can be normal, we can receive 2 add for the same item and same position
-            // when we are bound to an IBindingList ( like a DataView )
+            // Can be normal, we can receive 2 adds for the same item and same position when we are bound to an IBindingList ( like a DataView )
             return;
           }
         }
@@ -358,7 +356,7 @@ namespace Xceed.Wpf.DataGrid
       this.Process( true );
     }
 
-    public void InvalidateGroupStats( DataGridCollectionViewGroup group, bool calculateAllStats = false )
+    public void InvalidateGroupStats( DataGridCollectionViewGroup group, bool calculateAllStats = false, bool resortGroups = true )
     {
       if( group == null )
         return;
@@ -368,8 +366,11 @@ namespace Xceed.Wpf.DataGrid
         if( this.RefreshPending )
           return;
 
-        DataGridCollectionViewGroup parent = group;
+        // When set to false, this will prevent group resorting when the DataGridCollectionView.ProcessInvalidatedGroupStats() is called through the disptached call below.
+        // If the current method is called again and this variable is set to true before groups are processed, it will be fine, as the grid is now in a state that will support group resorting.
+        m_resortGroups = resortGroups;
 
+        var parent = group;
         while( parent != null )
         {
           if( !m_invalidatedGroups.Contains( parent ) )
@@ -377,8 +378,6 @@ namespace Xceed.Wpf.DataGrid
             m_invalidatedGroups.Add( parent );
           }
 
-          parent.ClearStatFunctionsResult();
-          parent.CalculateAllStats = calculateAllStats;
           parent = parent.Parent;
         }
 
@@ -397,37 +396,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public bool ContainsItemForRemoveOperation( object item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( m_deferredOperations.Count == 0 )
-        return false;
-
-      int deferredOperationsCount = m_deferredOperations.Count;
-
-      for( int i = 0; i < deferredOperationsCount; i++ )
-      {
-        DeferredOperation deferredOperation = m_deferredOperations[ i ];
-
-        if( deferredOperation.Action == DeferredOperation.DeferredOperationAction.Remove )
-        {
-          int oldItemsCount = ( deferredOperation.OldItems == null ) ? 0 : deferredOperation.OldItems.Count;
-
-          for( int j = 0; j < oldItemsCount; j++ )
-          {
-            object oldItem = deferredOperation.OldItems[ j ];
-
-            if( object.Equals( oldItem, item ) )
-              return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
     private object Dispatched_Process( object e )
     {
       this.Process( false );
@@ -472,9 +440,12 @@ namespace Xceed.Wpf.DataGrid
             m_hasNewOperationsSinceStartTime = false;
           }
 
-          // The fact of processing a deferredOperations can cause other DeferRefresh on the CollectionView that will finaly call this Process() again even if not yet completed.
-          // So we must cache all the flags in local variable to prevent double execution of the operation, except for m_deferredOperation which has its own flag is set.
-          m_isProcessingOperations = true;
+          // A deferredOperation can cause a DeferRefresh to be disposed of, hence provoking a re-entry in this method.
+          // As a result, all variables must be cached to prevent re-executing the same deferredOperation.
+
+          List<DeferredOperation> deferredOperations = m_deferredOperations;
+          //Set a new list in case new operations are added while processing the current operations. 
+          m_deferredOperations = new List<DeferredOperation>( 10 );
           bool refreshDistincValuesWithFilteredItemChangedPending = this.RefreshDistincValuesWithFilteredItemChangedPending;
           this.RefreshDistincValuesWithFilteredItemChangedPending = false;
           bool refreshDistincValuesPending = this.RefreshDistincValuesPending;
@@ -504,35 +475,48 @@ namespace Xceed.Wpf.DataGrid
             m_collectionView.ExecuteSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Resort, -1, null ), out refreshForced );
           }
 
-          if( ( m_deferredOperations.Count > 0 ) && ( !refreshForced ) )
+          if( ( deferredOperations.Count > 0 ) && ( !refreshForced ) )
           {
-            int count = m_deferredOperations.Count;
+            int count = deferredOperations.Count;
             int operationIndex = 0;
 
             while( ( operationIndex < count ) && ( !refreshForced ) && ( processAll || ( DateTime.UtcNow.Subtract( startTime ) < DeferredOperationManager.MaxProcessDuration ) ) )
             {
-              m_collectionView.ExecuteSourceItemOperation( m_deferredOperations[ operationIndex ], out refreshForced );
+              m_collectionView.ExecuteSourceItemOperation( deferredOperations[ operationIndex ], out refreshForced );
               operationIndex++;
             }
 
             if( ( operationIndex < count ) && ( !refreshForced ) )
             {
-              m_deferredOperations.RemoveRange( 0, operationIndex );
+              deferredOperations.RemoveRange( 0, operationIndex );
               m_deferredOperationsToProcess -= operationIndex;
             }
             else
             {
-              m_deferredOperations.Clear();
+              deferredOperations.Clear();
               m_deferredOperationsToProcess = 0;
             }
           }
 
-          m_isProcessingOperations = false;
+          if( m_deferredOperations.Count == 0 )
+          {
+            m_deferredOperations = deferredOperations;
+          }
+          else
+          {
+            // When this method is re-entered, the processAll parameter should be true, which means all deferredOperations should have been processed. When assigning it back to m_deferredOperations,
+            // it's count should be 0.  Thus in the previous call on the stack, the "if" condition should always be true, hence this assert.
+            Debug.Assert( false, "Should never get there." );
+
+            //To be GC friendly, keep the original list, which at one point is the one created with a capacity of a 1000 items.
+            deferredOperations.InsertRange( deferredOperations.Count, m_deferredOperations );
+            m_deferredOperations = deferredOperations;
+          }
 
           // The recalculation of the StatFunctions is performed last.
           if( ( m_deferredOperationsToProcess <= 0 || m_forceProcessOfInvalidatedGroupStats ) && ( m_invalidatedGroups.Count != 0 ) )
           {
-            m_collectionView.ProcessInvalidatedGroupStats( m_invalidatedGroups );
+            m_collectionView.ProcessInvalidatedGroupStats( m_invalidatedGroups, m_resortGroups );
             m_invalidatedGroups.Clear();
             m_forceProcessOfInvalidatedGroupStats = false;
           }
@@ -594,8 +578,8 @@ namespace Xceed.Wpf.DataGrid
     private HashSet<DataGridCollectionViewGroup> m_invalidatedGroups;
     private int m_deferredOperationsToProcess;
     private BitVector32 m_pendingFlags;
-    private bool m_isProcessingOperations;
     private bool m_forceProcessOfInvalidatedGroupStats;
+    private bool m_resortGroups;
 
     private readonly Dispatcher m_dispatcher;
     private DispatcherOperation m_dispatcherOperation;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
index a71e2d08..000071d4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
@@ -62,7 +62,6 @@ namespace Xceed.Wpf.DataGrid
       {
         value = new ReadOnlyObservableHashList();
         this.InternalAdd( key, value );
-        m_dataGridCollectionViewBase.ForceRefreshDistinctValuesForFieldName( key );
       }
 
       Debug.Assert( value != null );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs
index 983f7c35..f9423cce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs
@@ -74,14 +74,10 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void StartListening( object source )
     {
-      var target = ( DataGridCollectionViewBase )source;
-      target.DistinctValuesRefreshNeeded += new EventHandler( this.DeliverEvent );
     }
 
     protected override void StopListening( object source )
     {
-      var target = ( DataGridCollectionViewBase )source;
-      target.DistinctValuesRefreshNeeded -= new EventHandler( this.DeliverEvent );
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
index 4515e31f..da4dc938 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
@@ -15,24 +15,16 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Collections;
-using System.Data.Objects;
+using System.ComponentModel;
 using System.Data.Objects.DataClasses;
 using System.Reflection;
-using System.Windows;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class EntityDetailDescription : DataGridDetailDescription
   {
-    #region CONSTRUCTORS
-
     public EntityDetailDescription()
-      : base()
     {
     }
 
@@ -45,21 +37,20 @@ namespace Xceed.Wpf.DataGrid
       this.RelationName = propertyName;
     }
 
-    #endregion CONSTRUCTORS
-
     #region QueryDetails Event
 
     public event EventHandler<QueryEntityDetailsEventArgs> QueryDetails;
 
     protected virtual void OnQueryDetails( QueryEntityDetailsEventArgs e )
     {
-      if( this.QueryDetails != null )
-        this.QueryDetails( this, e );
-    }
+      var handler = this.QueryDetails;
+      if( handler == null )
+        return;
 
-    #endregion QueryDetails Event
+      handler.Invoke( this, e );
+    }
 
-    #region DataGridDetailDescription Overrides
+    #endregion
 
     protected internal override IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem )
     {
@@ -94,8 +85,8 @@ namespace Xceed.Wpf.DataGrid
           {
             // Make sure that the details are loaded 
             // except if the user already handled it.
-            if( !relatedEnd.IsLoaded 
-              && !args.Handled 
+            if( !relatedEnd.IsLoaded
+              && !args.Handled
               && entityObjectLoadable )
             {
               relatedEnd.Load();
@@ -112,7 +103,5 @@ namespace Xceed.Wpf.DataGrid
 
       return null;
     }
-
-    #endregion DataGridDetailDescription Overrides
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
index 0232f6ed..4483ee7d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
@@ -54,25 +54,22 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      ListSortDirection sortDirection = ListSortDirection.Ascending;
+      var sortDirection = ListSortDirection.Ascending;
       int result;
 
       foreach( SortInfo sortInfo in m_sortInfos )
-      //for( int i = 0; i < sortInfoCount; i++ )
       {
-        string statResultPropertyName = sortInfo.StatResultPropertyName;
-        IComparer sortComparer = sortInfo.SortComparer;
+        var foreignKeyDescription = sortInfo.ForeignKeyDescription;
+        var sortComparer = sortInfo.SortComparer;
         sortDirection = sortInfo.SortDirection;
 
-        if( statResultPropertyName == null )
+        if( foreignKeyDescription != null )
         {
-          result = sortComparer.Compare( xGroup.Name, yGroup.Name );
+          result = sortComparer.Compare( foreignKeyDescription.GetDisplayValue( xGroup.Name ), foreignKeyDescription.GetDisplayValue( yGroup.Name ) );
         }
         else
         {
-          result = sortComparer.Compare(
-            xGroup.GetStatFunctionValue( statResultPropertyName ),
-            yGroup.GetStatFunctionValue( statResultPropertyName ) );
+          result = sortComparer.Compare( xGroup.Name, yGroup.Name );
         }
 
         if( result != 0 )
@@ -96,33 +93,55 @@ namespace Xceed.Wpf.DataGrid
 
     public class SortInfo
     {
-      public SortInfo( string statResultPropertyName, ListSortDirection sortDirection, IComparer sortComparer )
+      public SortInfo( ListSortDirection sortDirection, IComparer sortComparer )
       {
         if( sortComparer == null )
           throw new ArgumentNullException( "sortComparer" );
 
-        this.StatResultPropertyName = statResultPropertyName;
         this.SortDirection = sortDirection;
         this.SortComparer = sortComparer;
       }
 
-      public string StatResultPropertyName
+      public SortInfo( DataGridForeignKeyDescription foreignKeyDescription, ListSortDirection sortDirection, IComparer sortComparer )
+      {
+        if( sortComparer == null )
+          throw new ArgumentNullException( "sortComparer" );
+
+        this.ForeignKeyDescription = foreignKeyDescription;
+        this.SortDirection = sortDirection;
+        this.SortComparer = sortComparer;
+      }
+
+
+      #region ForeignKeyDescription Property
+
+      internal DataGridForeignKeyDescription ForeignKeyDescription
       {
         get;
         private set;
       }
 
+      #endregion
+
+      #region SortDirection Property
+
       public ListSortDirection SortDirection
       {
         get;
         private set;
       }
 
+      #endregion
+
+      #region SortComparer Property
+
       public IComparer SortComparer
       {
         get;
         private set;
       }
+
+      #endregion
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
index 11f4171c..3f6fd826 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
@@ -15,10 +15,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
 using System.Collections;
+using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -38,6 +36,8 @@ namespace Xceed.Wpf.DataGrid
       this.PropertyDescriptor = relation;
     }
 
+    #region PropertyDescriptor Property
+
     [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
     public PropertyDescriptor PropertyDescriptor
     {
@@ -60,6 +60,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private PropertyDescriptor m_propertyDescriptor;
+
+    #endregion
+
     protected internal override void Initialize( DataGridCollectionViewBase parentCollectionView )
     {
       base.Initialize( parentCollectionView );
@@ -72,56 +76,31 @@ namespace Xceed.Wpf.DataGrid
       if( String.IsNullOrEmpty( relationName ) == true )
         throw new InvalidOperationException( "An attempt was made to initialize a PropertyDetailDescription whose Name property has not been set." );
 
-      foreach( DataGridDetailDescription detailDescription in parentCollectionView.DetailDescriptions.DefaultDetailDescriptions )
+      var enumeration = parentCollectionView as IEnumerable;
+      if( enumeration != null )
       {
-        PropertyDetailDescription propertyDetailDescription = detailDescription as PropertyDetailDescription;
-        if( propertyDetailDescription != null )
+        // Try to get it from the first item in the DataGridCollectionView
+        var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( enumeration );
+        if( firstItem != null )
         {
-          if( propertyDetailDescription.RelationName == relationName )
+          var propertyDescriptor = this.GetPropertyDescriptorFromFirstItem( firstItem );
+          if( propertyDescriptor != null )
           {
-            this.PropertyDescriptor = propertyDetailDescription.PropertyDescriptor;
+            this.PropertyDescriptor = propertyDescriptor;
             return;
           }
         }
       }
 
-      // The DetailDescription for RelationName was not found in DefaultDetailDescription
-      // and may not have the PropertyDetailDescriptionAttribute
-      if( this.PropertyDescriptor == null )
+      // If the list is empty, check if the SourceCollection is ITypedList
+      var typedList = parentCollectionView.SourceCollection as ITypedList;
+      if( typedList != null )
       {
-        PropertyDescriptor relationDescriptor = null;
-
-        IEnumerable enumeration = parentCollectionView as IEnumerable;
-
-        if( enumeration != null )
-        {
-          // Try to get it from the first item in the DataGridCollectionView
-          object firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( enumeration );
-
-          if( firstItem != null )
-          {
-            relationDescriptor = this.GetPropertyDescriptorFromFirstItem( firstItem );
-
-            if( relationDescriptor != null )
-            {
-              this.PropertyDescriptor = relationDescriptor;
-              return;
-            }
-          }
-        }
-
-        // If the list is empty, check if the SourceCollection is ITypedList
-        ITypedList iTypedList = parentCollectionView.SourceCollection as ITypedList;
-
-        if( iTypedList != null )
+        var propertyDescriptor = this.GetPropertyDescriptorFromITypedList( typedList );
+        if( propertyDescriptor != null )
         {
-          relationDescriptor = this.GetPropertyDescriptorFromITypedList( iTypedList );
-
-          if( relationDescriptor != null )
-          {
-            this.PropertyDescriptor = relationDescriptor;
-            return;
-          }
+          this.PropertyDescriptor = propertyDescriptor;
+          return;
         }
       }
 
@@ -133,9 +112,7 @@ namespace Xceed.Wpf.DataGrid
       if( string.IsNullOrEmpty( this.RelationName ) || ( typedList == null ) )
         return null;
 
-      PropertyDescriptorCollection properties;
-
-      properties = typedList.GetItemProperties( null );
+      var properties = typedList.GetItemProperties( null );
       if( ( properties != null ) && ( properties.Count > 0 ) )
         return properties[ this.RelationName ];
 
@@ -167,7 +144,7 @@ namespace Xceed.Wpf.DataGrid
       if( string.IsNullOrEmpty( this.RelationName ) || ( firstItem == null ) )
         return null;
 
-      var descriptor = ItemsSourceHelper.GetCustomTypeDescriptor( firstItem, firstItem.GetType() );
+      var descriptor = ItemsSourceHelper.GetCustomTypeDescriptorFromItem( firstItem, firstItem.GetType() );
       if( descriptor == null )
         return null;
 
@@ -185,16 +162,14 @@ namespace Xceed.Wpf.DataGrid
 
       this.Seal();
 
-      object value = this.PropertyDescriptor.GetValue( parentItem );
-
+      var value = this.PropertyDescriptor.GetValue( parentItem );
       if( value == null )
         return null;
 
-      IEnumerable enumeration = value as IEnumerable;
-
+      var enumeration = value as IEnumerable;
       if( enumeration == null )
       {
-        IListSource listSource = value as IListSource;
+        var listSource = value as IListSource;
         if( listSource != null )
         {
           enumeration = listSource.GetList();
@@ -203,7 +178,5 @@ namespace Xceed.Wpf.DataGrid
 
       return enumeration;
     }
-
-    private PropertyDescriptor m_propertyDescriptor;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyApplyingFilterCriteriasEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyApplyingFilterCriteriasEventManager.cs
deleted file mode 100644
index c0e4e805..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyApplyingFilterCriteriasEventManager.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ProxyApplyingFilterCriteriasEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ProxyApplyingFilterCriteriasEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ProxyApplyingFilterCriteriasEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ProxyApplyingFilterCriteriasEventManager );
-        var currentManager = ( ProxyApplyingFilterCriteriasEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ProxyApplyingFilterCriteriasEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyApplyingFilterCriterias += new EventHandler( this.DeliverEvent );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyApplyingFilterCriterias -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyAutoFilterValuesChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyAutoFilterValuesChangedEventManager.cs
deleted file mode 100644
index 2e6760a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyAutoFilterValuesChangedEventManager.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ProxyAutoFilterValuesChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ProxyAutoFilterValuesChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ProxyAutoFilterValuesChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ProxyAutoFilterValuesChangedEventManager );
-        var currentManager = ( ProxyAutoFilterValuesChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ProxyAutoFilterValuesChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyAutoFilterValuesChanged += new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyAutoFilterValuesChanged -= new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs
deleted file mode 100644
index c721f970..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class QueryAutoFilterDistinctValuesEventArgs : EventArgs
-  {
-    internal QueryAutoFilterDistinctValuesEventArgs( DataGridItemPropertyBase itemProperty )
-    {
-      m_itemProperty = itemProperty;
-      m_distinctValues = new List<object>();
-    }
-
-    public DataGridItemPropertyBase ItemProperty
-    {
-      get
-      {
-        return m_itemProperty;
-      }
-    }
-
-    public List<object> DistinctValues
-    {
-      get
-      {
-        return m_distinctValues;
-      }
-    }
-
-    #region PRIVATE FIELDS
-
-    private DataGridItemPropertyBase m_itemProperty;
-    private List<object> m_distinctValues;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
index 3a007edc..a3decd05 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
@@ -14,10 +14,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 using Xceed.Utils.Data;
@@ -36,61 +33,60 @@ namespace Xceed.Wpf.DataGrid
     public int Compare( RawItem xRawItem, RawItem yRawItem )
     {
       if( xRawItem == null )
-      {
-        if( yRawItem == null )
-        {
-          return 0;
-        }
-        else
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( yRawItem == null )
-        {
-          return 1;
-        }
-      }
+        return ( yRawItem == null ) ? 0 : -1;
 
-      ListSortDirection lastSortDirection = ListSortDirection.Ascending;
-      SortDescriptionCollection sortDescriptions = m_collectionView.SortDescriptions;
-      int sortDescriptionCount = sortDescriptions.Count;
+      if( yRawItem == null )
+        return 1;
+
+      var lastSortDirection = ListSortDirection.Ascending;
+      var sortDescriptions = m_collectionView.SortDescriptions;
+      var sortDescriptionCount = sortDescriptions.Count;
 
       if( sortDescriptionCount > 0 )
       {
-        int result;
-        DataGridItemPropertyCollection itemProperties = m_collectionView.ItemProperties;
+        var result = default( int );
+        var itemProperties = m_collectionView.ItemProperties;
 
         for( int i = 0; i < sortDescriptionCount; i++ )
         {
-          SortDescription sortDescription = sortDescriptions[ i ];
+          var sortDescription = sortDescriptions[ i ];
           lastSortDirection = sortDescription.Direction;
-          DataGridItemPropertyBase dataProperty = itemProperties[ sortDescription.PropertyName ];
 
-          if( dataProperty == null )
+          var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemProperties, sortDescription.PropertyName );
+          if( itemProperty == null )
             continue;
 
-          ISupportInitialize supportInitialize = dataProperty as ISupportInitialize;
-          object xData = null;
-          object yData = null;
+          var supportInitialize = itemProperty as ISupportInitialize;
+          var xData = default( object );
+          var yData = default( object );
 
           if( supportInitialize != null )
+          {
             supportInitialize.BeginInit();
+          }
 
           try
           {
-            xData = dataProperty.GetValue( xRawItem.DataItem );
-            yData = dataProperty.GetValue( yRawItem.DataItem );
+            xData = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, xRawItem.DataItem );
+            yData = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, yRawItem.DataItem );
+
+            if( itemProperty.IsSortingOnForeignKeyDescription )
+            {
+              var foreignKeyDescription = itemProperty.ForeignKeyDescription;
+
+              xData = foreignKeyDescription.GetDisplayValue( xData );
+              yData = foreignKeyDescription.GetDisplayValue( yData );
+            }
           }
           finally
           {
             if( supportInitialize != null )
+            {
               supportInitialize.EndInit();
+            }
           }
 
-          IComparer sortComparer = dataProperty.SortComparer;
+          var sortComparer = itemProperty.SortComparer;
 
           if( sortComparer != null )
           {
@@ -104,7 +100,7 @@ namespace Xceed.Wpf.DataGrid
           if( result != 0 )
           {
             if( lastSortDirection == ListSortDirection.Descending )
-              result = - result;
+              return -result;
 
             return result;
           }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RootGroupChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RootGroupChangedEventManager.cs
deleted file mode 100644
index 48f4843f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RootGroupChangedEventManager.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class RootGroupChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private RootGroupChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static RootGroupChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( RootGroupChangedEventManager );
-        var currentManager = ( RootGroupChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new RootGroupChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionView source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionView source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionView )source;
-      target.RootGroupChanged += new EventHandler( this.DeliverEvent );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionView )source;
-      target.RootGroupChanged -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
index bbd9f796..46a87291 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
@@ -25,14 +25,14 @@ namespace Xceed.Wpf.DataGrid
 {
   internal class SortDescriptionInfo
   {
-    public SortDescriptionInfo(
-      DataGridItemPropertyBase property,
-      ListSortDirection direction )
+    public SortDescriptionInfo( DataGridItemPropertyBase property, ListSortDirection direction )
     {
       m_property = property;
       m_direction = direction;
     }
 
+    #region SortDirection Property
+
     public ListSortDirection SortDirection
     {
       get
@@ -41,6 +41,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region Property Property
+
     public DataGridItemPropertyBase Property
     {
       get
@@ -49,6 +53,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region DataStore Property
+
     public DataStore DataStore
     {
       get
@@ -61,6 +69,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region SortComparer Property
+
     public IComparer SortComparer
     {
       get
@@ -72,6 +84,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
     public bool IsReverseOf( SortDescriptionInfo sortDescriptionInfo )
     {
       if( sortDescriptionInfo.m_property == m_property )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
index 298de0f3..aff4b0a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
@@ -14,228 +14,79 @@
 
   ***********************************************************************************/
 
-using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Diagnostics;
+using Xceed.Utils.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class UnboundDataItem
+  internal sealed class UnboundDataItem
   {
-    #region CONSTRUCTORS
+    #region Static Fields
 
-    private UnboundDataItem( object dataItem )
-    {
-      if( dataItem == null )
-      {
-        m_weakDataItem = null;
-      }
-      else
-      {
-        m_weakDataItem = new WeakReference( dataItem );
-      }
-    }
+    private static readonly WeakDictionary<object, UnboundDataItem> s_collection = new WeakDictionary<object, UnboundDataItem>( 0, new Comparer() );
+    private static readonly UnboundDataItem s_empty = new UnboundDataItem( null );
 
-    #endregion CONSTRUCTORS
+    #endregion
 
-    public static void FreeUnboundDataItem( UnboundDataItemNode unboundDataItemNode )
+    private UnboundDataItem( object dataItem )
     {
-      lock( UnboundDataItem.UnboundDataItems )
-      {
-        UnboundDataItems.Remove( unboundDataItemNode );
-      }
+      m_dataItem = dataItem;
     }
 
-    public static UnboundDataItemNode GetUnboundDataItemNode( object dataItem, out UnboundDataItem unboundDataItem )
-    {
-      lock( UnboundDataItem.UnboundDataItems )
-      {
-        UnboundDataItemNode current = UnboundDataItem.UnboundDataItems.FirstNode;
-
-        while( current != null )
-        {
-          object currentDataItem = current.DataItem;
-          unboundDataItem = current.UnboundDataItem;
-
-          if( !current.IsAlive )
-          {
-            UnboundDataItemNode next = current.Next;
-            UnboundDataItem.UnboundDataItems.Remove( current );
-            current = next;
-            continue;
-          }
+    #region DataItem Property
 
-          if( object.Equals( currentDataItem, dataItem ) )
-            return current;
-
-          current = current.Next;
-        }
-
-        unboundDataItem = new UnboundDataItem( dataItem );
-        UnboundDataItemNode unboundDataItemNode = new UnboundDataItemNode( unboundDataItem );
-        UnboundDataItem.UnboundDataItems.Add( unboundDataItemNode );
-        return unboundDataItemNode;
-      }
-    }
-
-    public object DataItem
+    internal object DataItem
     {
       get
       {
-        return ( m_weakDataItem == null ) ? null : m_weakDataItem.Target;
+        return m_dataItem;
       }
     }
 
-    private WeakReference m_weakDataItem;
+    private readonly object m_dataItem;
 
-    private static UnboundDataItemList UnboundDataItems = new UnboundDataItemList();
+    #endregion
 
-    internal class UnboundDataItemNode
+    internal static UnboundDataItem GetUnboundDataItem( object dataItem )
     {
-      public UnboundDataItemNode( UnboundDataItem unboundDataItem )
-      {
-        if( unboundDataItem == null )
-          throw new ArgumentNullException( "unboundDataItem" );
-
-        m_weakUnboundDataItem = new WeakReference( unboundDataItem );
-      }
-
-      public object DataItem
-      {
-        get
-        {
-          UnboundDataItem unboundDataItem = m_weakUnboundDataItem.Target as UnboundDataItem;
-
-          if( unboundDataItem == null )
-            return null;
+      if( dataItem == null )
+        return s_empty;
 
-          return unboundDataItem.DataItem;
-        }
-      }
+      var value = dataItem as UnboundDataItem;
+      if( value != null )
+        return value;
 
-      public UnboundDataItem UnboundDataItem
+      lock( ( ( ICollection )s_collection ).SyncRoot )
       {
-        get
+        if( !s_collection.TryGetValue( dataItem, out value ) )
         {
-          if( m_weakUnboundDataItem == null )
-            return null;
-
-          return m_weakUnboundDataItem.Target as UnboundDataItem;
+          value = new UnboundDataItem( dataItem );
+          s_collection.Add( dataItem, value );
         }
-      }
-
-      public UnboundDataItemNode Next
-      {
-        get;
-        set;
-      }
 
-      public UnboundDataItemNode Previous
-      {
-        get;
-        set;
+        return value;
       }
-
-      public bool IsAlive
-      {
-        get
-        {
-          UnboundDataItem unboundDataItem = m_weakUnboundDataItem.Target as UnboundDataItem;
-
-          if( unboundDataItem == null )
-            return false;
-
-          WeakReference weakDataItem = unboundDataItem.m_weakDataItem;
-
-          return ( ( weakDataItem == null ) || ( weakDataItem.IsAlive ) )
-            && ( m_weakUnboundDataItem.IsAlive );
-        }
-      }
-
-      private WeakReference m_weakUnboundDataItem;
     }
 
-    private class UnboundDataItemList
-    {
-      public void Add( UnboundDataItemNode newNode )
-      {
-        newNode.Next = this.FirstNode;
-
-        if( this.FirstNode != null )
-          this.FirstNode.Previous = newNode;
-
-        this.FirstNode = newNode;
-
-        if( this.LastNode == null )
-          this.LastNode = this.FirstNode;
-
-        m_count++;
-      }
-
-      public void Remove( UnboundDataItemNode unboundDataItemNode )
-      {
-        bool removed = false;
-
-        if( this.LastNode == unboundDataItemNode )
-        {
-          this.LastNode = unboundDataItemNode.Previous;
-          removed = true;
-        }
-
-        if( this.FirstNode == unboundDataItemNode )
-        {
-          this.FirstNode = unboundDataItemNode.Next;
-          removed = true;
-        }
-
-        UnboundDataItemNode previous = unboundDataItemNode.Previous;
-
-        if( previous != null )
-        {
-          previous.Next = unboundDataItemNode.Next;
-          removed = true;
-        }
-
-        UnboundDataItemNode next = unboundDataItemNode.Next;
-
-        if( next != null )
-        {
-          next.Previous = unboundDataItemNode.Previous;
-          removed = true;
-        }
-
-        if( removed )
-        {
-          unboundDataItemNode.Previous = null;
-          unboundDataItemNode.Next = null;
-          m_count--;
-        }
-      }
+    #region Comparer Private Class
 
-      public UnboundDataItemNode FirstNode
+    private sealed class Comparer : IEqualityComparer<object>
+    {
+      int IEqualityComparer<object>.GetHashCode( object obj )
       {
-        get;
-        private set;
-      }
+        if( obj == null )
+          return 0;
 
-      public UnboundDataItemNode LastNode
-      {
-        get;
-        private set;
+        return obj.GetHashCode();
       }
 
-      public int Count
+      bool IEqualityComparer<object>.Equals( object x, object y )
       {
-        get
-        {
-          return m_count;
-        }
+        return object.Equals( x, y );
       }
-
-      private int m_count;
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs
similarity index 92%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs
index 96749574..54ee691c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs
@@ -1,47 +1,45 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.InsertingNewItem and InitializingNewItem events.", false )]
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public class AddingNewDataItemEventArgs : EventArgs
-  {
-    public AddingNewDataItemEventArgs()
-    {
-    }
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-      set
-      {
-        m_dataItem = value;
-      }
-    }
-
-    private object m_dataItem;
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.DataGrid
+{
+  [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.InsertingNewItem and InitializingNewItem events.", false )]
+  [Browsable( false )]
+  [EditorBrowsable( EditorBrowsableState.Never )]
+  public class AddingNewDataItemEventArgs : EventArgs
+  {
+    public AddingNewDataItemEventArgs()
+    {
+    }
+
+    public object DataItem
+    {
+      get
+      {
+        return m_dataItem;
+      }
+      set
+      {
+        m_dataItem = value;
+      }
+    }
+
+    private object m_dataItem;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs
similarity index 88%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs
index 19df22da..97ee3092 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs
@@ -1,100 +1,94 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class AllowDetailToggleChangedEventManager : WeakEventManager
-  {
-    private AllowDetailToggleChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static AllowDetailToggleChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( AllowDetailToggleChangedEventManager );
-        AllowDetailToggleChangedEventManager currentManager = ( AllowDetailToggleChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new AllowDetailToggleChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnAllowDetailToggleChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class AllowDetailToggleChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    private static AllowDetailToggleChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( AllowDetailToggleChangedEventManager );
+        AllowDetailToggleChangedEventManager currentManager = ( AllowDetailToggleChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new AllowDetailToggleChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnAllowDetailToggleChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs
similarity index 53%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs
index ec8b4dc8..972f097d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs
@@ -1,44 +1,59 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public delegate void QueryHelpTextRoutedEventHandler( object sender, QueryHelpTextRoutedEventArgs e );
-
-  public class QueryHelpTextRoutedEventArgs : RoutedEventArgs
-  {
-    public QueryHelpTextRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region HelpText Property
-
-    public string HelpText
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void CancelRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+  public class CancelRoutedEventArgs : RoutedEventArgs
+  {
+    public CancelRoutedEventArgs()
+      : base()
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent )
+      : base( routedEvent )
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent, object source )
+      : base( routedEvent, source )
+    {
+    }
+
+    #region Cancel PROPERTY
+
+    public bool Cancel
+    {
+      get
+      {
+        return m_cancel;
+      }
+
+      set
+      {
+        m_cancel = value;
+      }
+    }
+
+    private bool m_cancel;
+
+    #endregion Cancel PROPERTY
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidatingEventArgs.cs
similarity index 88%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidatingEventArgs.cs
index ad840462..0ce4b2d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidatingEventArgs.cs
@@ -1,83 +1,81 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellValidatingEventArgs : EventArgs
-  {
-    public CellValidatingEventArgs( 
-      object value, 
-      CultureInfo culture, 
-      CellValidationContext context )
-    {
-      m_value = value;
-      m_culture = culture;
-      m_context = context;
-    }
-
-    public object Value
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    public CultureInfo Culture
-    {
-      get
-      {
-        return m_culture;
-      }
-    }
-
-    public CellValidationContext Context
-    {
-      get
-      {
-        return m_context;
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public ValidationResult Result
-    {
-      get
-      {
-        return m_validationResult;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "Result" );
-
-        m_validationResult = value;
-      }
-    }
-
-    object m_value;
-    CultureInfo m_culture;
-    CellValidationContext m_context;
-    ValidationResult m_validationResult = ValidationResult.ValidResult;
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public class CellValidatingEventArgs : EventArgs
+  {
+    public CellValidatingEventArgs(
+      object value,
+      CultureInfo culture,
+      CellValidationContext context )
+    {
+      m_value = value;
+      m_culture = culture;
+      m_context = context;
+    }
+
+    public object Value
+    {
+      get
+      {
+        return m_value;
+      }
+    }
+
+    public CultureInfo Culture
+    {
+      get
+      {
+        return m_culture;
+      }
+    }
+
+    public CellValidationContext Context
+    {
+      get
+      {
+        return m_context;
+      }
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
+    public ValidationResult Result
+    {
+      get
+      {
+        return m_validationResult;
+      }
+
+      set
+      {
+        if( value == null )
+          throw new ArgumentNullException( "Result" );
+
+        m_validationResult = value;
+      }
+    }
+
+    object m_value;
+    CultureInfo m_culture;
+    CellValidationContext m_context;
+    ValidationResult m_validationResult = ValidationResult.ValidResult;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs
similarity index 95%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs
index b361e3ee..51376a50 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs
@@ -1,68 +1,67 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void CellValidationErrorRoutedEventHandler( object sender, CellValidationErrorRoutedEventArgs e );
-
-  public class CellValidationErrorRoutedEventArgs : RoutedEventArgs
-  {
-    public CellValidationErrorRoutedEventArgs( CellValidationError cellValidationError )
-      : base()
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, CellValidationError cellValidationError )
-      : base( routedEvent )
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, CellValidationError cellValidationError )
-      : base( routedEvent, source )
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    #region CellValidationError PROPERTY
-
-    public CellValidationError CellValidationError
-    {
-      get
-      {
-        return m_cellValidationError;
-      }
-    }
-
-    private CellValidationError m_cellValidationError;
-
-    #endregion CellValidationError PROPERTY
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void CellValidationErrorRoutedEventHandler( object sender, CellValidationErrorRoutedEventArgs e );
+
+  public class CellValidationErrorRoutedEventArgs : RoutedEventArgs
+  {
+    public CellValidationErrorRoutedEventArgs( CellValidationError cellValidationError )
+      : base()
+    {
+      if( cellValidationError == null )
+        throw new ArgumentNullException( "cellValidationError" );
+
+      m_cellValidationError = cellValidationError;
+    }
+
+    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, CellValidationError cellValidationError )
+      : base( routedEvent )
+    {
+      if( cellValidationError == null )
+        throw new ArgumentNullException( "cellValidationError" );
+
+      m_cellValidationError = cellValidationError;
+    }
+
+    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, CellValidationError cellValidationError )
+      : base( routedEvent, source )
+    {
+      if( cellValidationError == null )
+        throw new ArgumentNullException( "cellValidationError" );
+
+      m_cellValidationError = cellValidationError;
+    }
+
+    #region CellValidationError PROPERTY
+
+    public CellValidationError CellValidationError
+    {
+      get
+      {
+        return m_cellValidationError;
+      }
+    }
+
+    private CellValidationError m_cellValidationError;
+
+    #endregion CellValidationError PROPERTY
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs
similarity index 72%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs
index 25f13c97..4df0ddf5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs
@@ -1,63 +1,60 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnActualWidthChangedEventArgs : EventArgs
-  {
-    public ColumnActualWidthChangedEventArgs( ColumnBase column , double oldValue, double newValue )
-    {
-      m_column = column;
-      m_oldValue = oldValue;
-      m_newValue = newValue;
-    }
-
-    public ColumnBase Column
-    {
-      get
-      {
-        return m_column;
-      }
-    }
-
-    public double NewValue
-    {
-      get
-      {
-        return m_newValue;
-      }
-    }
-
-    public double OldValue
-    {
-      get
-      {
-        return m_oldValue;
-      }
-    }
-
-    private ColumnBase m_column;
-    private double m_oldValue;
-    private double m_newValue;
-  }
-
-  internal delegate void ColumnActualWidthChangedHandler( object sender, ColumnActualWidthChangedEventArgs e );
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ColumnActualWidthChangedEventArgs : EventArgs
+  {
+    internal ColumnActualWidthChangedEventArgs( ColumnBase column, double oldValue, double newValue )
+    {
+      m_column = column;
+      m_oldValue = oldValue;
+      m_newValue = newValue;
+    }
+
+    internal ColumnBase Column
+    {
+      get
+      {
+        return m_column;
+      }
+    }
+
+    internal double NewValue
+    {
+      get
+      {
+        return m_newValue;
+      }
+    }
+
+    internal double OldValue
+    {
+      get
+      {
+        return m_oldValue;
+      }
+    }
+
+    private ColumnBase m_column;
+    private double m_oldValue;
+    private double m_newValue;
+  }
+
+  internal delegate void ColumnActualWidthChangedEventHandler( object sender, ColumnActualWidthChangedEventArgs e );
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs
similarity index 81%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs
index 396dcd11..b06c6463 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs
@@ -1,74 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnActualWidthEventManager : WeakEventManager
-  {
-    private ColumnActualWidthEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.ActualWidthChanged += new ColumnActualWidthChangedHandler( this.OnActualWidthChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.ActualWidthChanged -= new ColumnActualWidthChangedHandler( this.OnActualWidthChanged );
-    }
-
-    private static ColumnActualWidthEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ColumnActualWidthEventManager );
-        ColumnActualWidthEventManager currentManager = ( ColumnActualWidthEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ColumnActualWidthEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ColumnActualWidthEventManager : WeakEventManager
+  {
+    internal static void AddListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.ActualWidthChanged += new ColumnActualWidthChangedEventHandler( this.OnActualWidthChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.ActualWidthChanged -= new ColumnActualWidthChangedEventHandler( this.OnActualWidthChanged );
+    }
+
+    private static ColumnActualWidthEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ColumnActualWidthEventManager );
+        ColumnActualWidthEventManager currentManager = ( ColumnActualWidthEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ColumnActualWidthEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs
new file mode 100644
index 00000000..f89fe7ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs
@@ -0,0 +1,98 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void ColumnSortDirectionChangingEventHandler( object sender, ColumnSortDirectionChangingEventArgs e );
+
+  public class ColumnSortDirectionChangingEventArgs : RoutedEventArgs
+  {
+    public ColumnSortDirectionChangingEventArgs( RoutedEvent routedEvent, ColumnBase column, DataGridContext dataGridContext, SortDirection currentSortDirection, SortDirection nextSortDirection )
+      : base( routedEvent, column )
+    {
+      if( column == null )
+        throw new ArgumentNullException( "column" );
+
+      if( dataGridContext == null )
+        throw new ArgumentNullException( "dataGridContext" );
+
+      m_dataGridContext = dataGridContext;
+      m_current = currentSortDirection;
+      m_next = nextSortDirection;
+    }
+
+    #region Column Property
+
+    public ColumnBase Column
+    {
+      get
+      {
+        return ( ColumnBase )this.OriginalSource;
+      }
+    }
+
+    #endregion
+
+    #region DataGridContext Property
+
+    public DataGridContext DataGridContext
+    {
+      get
+      {
+        return m_dataGridContext;
+      }
+    }
+
+    private DataGridContext m_dataGridContext;
+
+    #endregion
+
+    #region CurrentSortDirection Property
+
+    public SortDirection CurrentSortDirection
+    {
+      get
+      {
+        return m_current;
+      }
+    }
+
+    private SortDirection m_current;
+
+    #endregion
+
+    #region NextSortDirection Property
+
+    public SortDirection NextSortDirection
+    {
+      get
+      {
+        return m_next;
+      }
+      set
+      {
+        m_next = value;
+      }
+    }
+
+    private SortDirection m_next;
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs
similarity index 72%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs
index b7c73ddd..bc121bd9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs
@@ -1,64 +1,50 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnVisiblePositionChangedEventArgs : EventArgs
-  {
-    #region PUBLIC CONTRUCTORS
-
-    public ColumnVisiblePositionChangedEventArgs( ColumnBase triggeringColumn, int oldPosition, int newPosition )
-    {
-      m_triggeringColumn = triggeringColumn;
-      m_newPosition = newPosition;
-      m_oldPosition = oldPosition;
-    }
-
-    #endregion
-
-    #region PUBLIC PROPERTIES
-
-    public ColumnBase TriggeringColumn
-    {
-      get
-      {
-        return m_triggeringColumn;
-      }
-    }
-
-    public int PositionDelta
-    {
-      get
-      {
-        return m_newPosition - m_oldPosition;
-      }
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private ColumnBase m_triggeringColumn;
-    private int m_newPosition;
-    private int m_oldPosition;
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ColumnVisiblePositionChangedEventArgs : EventArgs
+  {
+    internal ColumnVisiblePositionChangedEventArgs( ColumnBase triggeringColumn, int oldPosition, int newPosition )
+    {
+      m_triggeringColumn = triggeringColumn;
+      m_newPosition = newPosition;
+      m_oldPosition = oldPosition;
+    }
+
+    internal ColumnBase TriggeringColumn
+    {
+      get
+      {
+        return m_triggeringColumn;
+      }
+    }
+
+    internal int PositionDelta
+    {
+      get
+      {
+        return m_newPosition - m_oldPosition;
+      }
+    }
+
+    private ColumnBase m_triggeringColumn;
+    private int m_newPosition;
+    private int m_oldPosition;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs
new file mode 100644
index 00000000..7245ae74
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs
@@ -0,0 +1,66 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class ColumnsLayoutChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( ColumnHierarchyManager source, IWeakEventListener listener )
+    {
+      ColumnsLayoutChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( ColumnHierarchyManager source, IWeakEventListener listener )
+    {
+      ColumnsLayoutChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ( ( ColumnHierarchyManager )source ).LayoutChanged += new EventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ( ( ColumnHierarchyManager )source ).LayoutChanged -= new EventHandler( this.OnEventRaised );
+    }
+
+    private static ColumnsLayoutChangedEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( ColumnsLayoutChangedEventManager );
+        var currentManager = ( ColumnsLayoutChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ColumnsLayoutChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, EventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs
new file mode 100644
index 00000000..1446319b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs
@@ -0,0 +1,66 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class ColumnsLayoutChangingEventManager : WeakEventManager
+  {
+    internal static void AddListener( ColumnHierarchyManager source, IWeakEventListener listener )
+    {
+      ColumnsLayoutChangingEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( ColumnHierarchyManager source, IWeakEventListener listener )
+    {
+      ColumnsLayoutChangingEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ( ( ColumnHierarchyManager )source ).LayoutChanging += new EventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ( ( ColumnHierarchyManager )source ).LayoutChanging -= new EventHandler( this.OnEventRaised );
+    }
+
+    private static ColumnsLayoutChangingEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( ColumnsLayoutChangingEventManager );
+        var currentManager = ( ColumnsLayoutChangingEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ColumnsLayoutChangingEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, EventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs
similarity index 81%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs
index 7567acf3..3f7fe457 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs
@@ -1,74 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CurrentColumnChangedEventManager: WeakEventManager
-  {
-    private CurrentColumnChangedEventManager()
-    {
-    }
-
-    public static void AddListener( DetailConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DetailConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DetailConfiguration detailConfig = ( DetailConfiguration )source;
-      detailConfig.CurrentColumnChanged += new EventHandler( this.OnCurrentColumnChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DetailConfiguration detailConfig = ( DetailConfiguration )source;
-      detailConfig.CurrentColumnChanged -= new EventHandler( this.OnCurrentColumnChanged );
-    }
-
-    private static CurrentColumnChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( CurrentColumnChangedEventManager );
-        CurrentColumnChangedEventManager currentManager = ( CurrentColumnChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CurrentColumnChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCurrentColumnChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class CurrentColumnChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DetailConfiguration source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DetailConfiguration source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DetailConfiguration detailConfig = ( DetailConfiguration )source;
+      detailConfig.CurrentColumnChanged += new EventHandler( this.OnCurrentColumnChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DetailConfiguration detailConfig = ( DetailConfiguration )source;
+      detailConfig.CurrentColumnChanged -= new EventHandler( this.OnCurrentColumnChanged );
+    }
+
+    private static CurrentColumnChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( CurrentColumnChangedEventManager );
+        CurrentColumnChangedEventManager currentManager = ( CurrentColumnChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new CurrentColumnChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnCurrentColumnChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs
new file mode 100644
index 00000000..c9fc90c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs
@@ -0,0 +1,66 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class CurrentItemChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridContext source, IWeakEventListener listener )
+    {
+      CurrentItemChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridContext source, IWeakEventListener listener )
+    {
+      CurrentItemChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ( ( DataGridContext )source ).CurrentItemChanged += new EventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ( ( DataGridContext )source ).CurrentItemChanged -= new EventHandler( this.OnEventRaised );
+    }
+
+    private static CurrentItemChangedEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( CurrentItemChangedEventManager );
+        var currentManager = ( CurrentItemChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new CurrentItemChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, EventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs
similarity index 67%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs
index e7c795d2..783432d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs
@@ -1,80 +1,73 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridControlSelectionChangedWeakEventManager : WeakEventManager
-  {
-    private DataGridControlSelectionChangedWeakEventManager()
-    {
-    }
-
-    public static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-
-      if( dataGridControl != null )
-        dataGridControl.SelectionChanged += this.DataGridControl_SelectionChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-
-      if( dataGridControl != null )
-        dataGridControl.SelectionChanged -= this.DataGridControl_SelectionChanged;
-    }
-
-    private static DataGridControlSelectionChangedWeakEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DataGridControlSelectionChangedWeakEventManager );
-        DataGridControlSelectionChangedWeakEventManager currentManager =
-          ( DataGridControlSelectionChangedWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DataGridControlSelectionChangedWeakEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void DataGridControl_SelectionChanged( object sender, DataGridSelectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DataGridControlSelectionChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+
+      if( dataGridControl != null )
+        dataGridControl.SelectionChanged += this.DataGridControl_SelectionChanged;
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+
+      if( dataGridControl != null )
+        dataGridControl.SelectionChanged -= this.DataGridControl_SelectionChanged;
+    }
+
+    private static DataGridControlSelectionChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( DataGridControlSelectionChangedEventManager );
+        DataGridControlSelectionChangedEventManager currentManager =
+          ( DataGridControlSelectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new DataGridControlSelectionChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void DataGridControl_SelectionChanged( object sender, DataGridSelectionChangedEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs
similarity index 86%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs
index 59b4f515..7c26c53f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs
@@ -1,87 +1,80 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridControlTemplateChangedEventManager : WeakEventManager
-  {
-    private DataGridControlTemplateChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.TemplateApplied += new EventHandler( this.OnTemplateApplied );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.TemplateApplied -= new EventHandler( this.OnTemplateApplied );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
-    }
-
-    private static DataGridControlTemplateChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DataGridControlTemplateChangedEventManager );
-        DataGridControlTemplateChangedEventManager currentManager = ( DataGridControlTemplateChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DataGridControlTemplateChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnTemplateApplied( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DataGridControlTemplateChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.TemplateApplied += new EventHandler( this.OnTemplateApplied );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.TemplateApplied -= new EventHandler( this.OnTemplateApplied );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
+    }
+
+    private static DataGridControlTemplateChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( DataGridControlTemplateChangedEventManager );
+        DataGridControlTemplateChangedEventManager currentManager = ( DataGridControlTemplateChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new DataGridControlTemplateChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnTemplateApplied( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs
similarity index 91%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs
index ecb0e508..1d9de1ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs
@@ -1,62 +1,58 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridCurrentChangedEventHandler( object sender, DataGridCurrentChangedEventArgs e );
-
-  public class DataGridCurrentChangedEventArgs : RoutedEventArgs
-  {
-    internal DataGridCurrentChangedEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent )
-      : base( DataGridControl.CurrentChangedEvent )
-    {
-      this.OldDataGridContext = oldDataGridContext;
-      this.OldCurrent = oldCurrent;
-      this.NewDataGridContext = newDataGridContext;
-      this.NewCurrent = newCurrent;
-    }
-
-    public DataGridContext OldDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object OldCurrent
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext NewDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object NewCurrent
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DataGridCurrentChangedEventHandler( object sender, DataGridCurrentChangedEventArgs e );
+
+  public class DataGridCurrentChangedEventArgs : RoutedEventArgs
+  {
+    internal DataGridCurrentChangedEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent )
+      : base( DataGridControl.CurrentChangedEvent )
+    {
+      this.OldDataGridContext = oldDataGridContext;
+      this.OldCurrent = oldCurrent;
+      this.NewDataGridContext = newDataGridContext;
+      this.NewCurrent = newCurrent;
+    }
+
+    public DataGridContext OldDataGridContext
+    {
+      get;
+      private set;
+    }
+
+    public object OldCurrent
+    {
+      get;
+      private set;
+    }
+
+    public DataGridContext NewDataGridContext
+    {
+      get;
+      private set;
+    }
+
+    public object NewCurrent
+    {
+      get;
+      private set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs
similarity index 90%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs
index 1d6eaf2f..2c828e7a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs
@@ -1,69 +1,63 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridCurrentChangingEventHandler( object sender, DataGridCurrentChangingEventArgs e );
-
-  public class DataGridCurrentChangingEventArgs : CancelRoutedEventArgs
-  {
-    internal DataGridCurrentChangingEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent, bool isCancelable )
-      : base( DataGridControl.CurrentChangingEvent )
-    {
-      this.IsCancelable = isCancelable;
-      this.OldDataGridContext = oldDataGridContext;
-      this.OldCurrent = oldCurrent;
-      this.NewDataGridContext = newDataGridContext;
-      this.NewCurrent = newCurrent;
-    }
-
-    public bool IsCancelable
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext OldDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object OldCurrent
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext NewDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object NewCurrent
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DataGridCurrentChangingEventHandler( object sender, DataGridCurrentChangingEventArgs e );
+
+  public class DataGridCurrentChangingEventArgs : CancelRoutedEventArgs
+  {
+    internal DataGridCurrentChangingEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent, bool isCancelable )
+      : base( DataGridControl.CurrentChangingEvent )
+    {
+      this.IsCancelable = isCancelable;
+      this.OldDataGridContext = oldDataGridContext;
+      this.OldCurrent = oldCurrent;
+      this.NewDataGridContext = newDataGridContext;
+      this.NewCurrent = newCurrent;
+    }
+
+    public bool IsCancelable
+    {
+      get;
+      private set;
+    }
+
+    public DataGridContext OldDataGridContext
+    {
+      get;
+      private set;
+    }
+
+    public object OldCurrent
+    {
+      get;
+      private set;
+    }
+
+    public DataGridContext NewDataGridContext
+    {
+      get;
+      private set;
+    }
+
+    public object NewCurrent
+    {
+      get;
+      private set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs
similarity index 95%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs
index 4c17ee17..13f6576e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs
@@ -1,39 +1,38 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridSelectionChangedEventHandler( object sender, DataGridSelectionChangedEventArgs e );
-
-  public class DataGridSelectionChangedEventArgs : RoutedEventArgs
-  {
-    internal DataGridSelectionChangedEventArgs( IList<SelectionInfo> selectionInfos )
-      : base( DataGridControl.SelectionChangedEvent )
-    {
-      this.SelectionInfos = selectionInfos;
-    }
-
-    public IList<SelectionInfo> SelectionInfos
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DataGridSelectionChangedEventHandler( object sender, DataGridSelectionChangedEventArgs e );
+
+  public class DataGridSelectionChangedEventArgs : RoutedEventArgs
+  {
+    internal DataGridSelectionChangedEventArgs( IList<SelectionInfo> selectionInfos )
+      : base( DataGridControl.SelectionChangedEvent )
+    {
+      this.SelectionInfos = selectionInfos;
+    }
+
+    public IList<SelectionInfo> SelectionInfos
+    {
+      get;
+      private set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs
similarity index 91%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs
index 8e2734f6..c2cd8b0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs
@@ -1,47 +1,44 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridSelectionChangingEventHandler( object sender, DataGridSelectionChangingEventArgs e );
-
-  public class DataGridSelectionChangingEventArgs : CancelRoutedEventArgs
-  {
-    internal DataGridSelectionChangingEventArgs( IList<SelectionInfo> selectionInfos, bool isCancelable )
-      : base( DataGridControl.SelectionChangingEvent )
-    {
-      this.SelectionInfos = selectionInfos;
-      this.IsCancelable = isCancelable;
-    }
-
-    public bool IsCancelable
-    {
-      get;
-      private set;
-    }
-
-    public IList<SelectionInfo> SelectionInfos
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DataGridSelectionChangingEventHandler( object sender, DataGridSelectionChangingEventArgs e );
+
+  public class DataGridSelectionChangingEventArgs : CancelRoutedEventArgs
+  {
+    internal DataGridSelectionChangingEventArgs( IList<SelectionInfo> selectionInfos, bool isCancelable )
+      : base( DataGridControl.SelectionChangingEvent )
+    {
+      this.SelectionInfos = selectionInfos;
+      this.IsCancelable = isCancelable;
+    }
+
+    public bool IsCancelable
+    {
+      get;
+      private set;
+    }
+
+    public IList<SelectionInfo> SelectionInfos
+    {
+      get;
+      private set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs
similarity index 92%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs
index db57f500..ce6f8975 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs
@@ -1,102 +1,99 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DeletingSelectedItemErrorRoutedEventHandler( object sender, DeletingSelectedItemErrorRoutedEventArgs e );
-
-  public class DeletingSelectedItemErrorRoutedEventArgs : RoutedEventArgs
-  {
-    #region CONSTRUCTORS
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception )
-      : base()
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent )
-      : base( routedEvent )
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region Item Property
-
-    public object Item
-    {
-      get
-      {
-        return m_item;
-      }
-    }
-
-    #endregion Item Property
-
-    #region Exception Property
-
-    public Exception Exception
-    {
-      get
-      {
-        return m_exception;
-      }
-    }
-
-    #endregion Exception Property
-
-    #region Action Property
-
-    public DeletingSelectedItemErrorAction Action
-    {
-      get
-      {
-        return m_action;
-      }
-      set
-      {
-        m_action = value;
-      }
-    }
-
-    #endregion Action Property
-
-    #region PRIVATE FIELDS
-
-    private object m_item;
-    private Exception m_exception;
-    private DeletingSelectedItemErrorAction m_action = DeletingSelectedItemErrorAction.Skip;
-
-    #endregion PRIVATE FIELDS
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DeletingSelectedItemErrorRoutedEventHandler( object sender, DeletingSelectedItemErrorRoutedEventArgs e );
+
+  public class DeletingSelectedItemErrorRoutedEventArgs : RoutedEventArgs
+  {
+    #region CONSTRUCTORS
+
+    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception )
+      : base()
+    {
+      m_item = item;
+      m_exception = exception;
+    }
+
+    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent )
+      : base( routedEvent )
+    {
+      m_item = item;
+      m_exception = exception;
+    }
+
+    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent, object source )
+      : base( routedEvent, source )
+    {
+      m_item = item;
+      m_exception = exception;
+    }
+
+    #endregion CONSTRUCTORS
+
+    #region Item Property
+
+    public object Item
+    {
+      get
+      {
+        return m_item;
+      }
+    }
+
+    #endregion Item Property
+
+    #region Exception Property
+
+    public Exception Exception
+    {
+      get
+      {
+        return m_exception;
+      }
+    }
+
+    #endregion Exception Property
+
+    #region Action Property
+
+    public DeletingSelectedItemErrorAction Action
+    {
+      get
+      {
+        return m_action;
+      }
+      set
+      {
+        m_action = value;
+      }
+    }
+
+    #endregion Action Property
+
+    #region PRIVATE FIELDS
+
+    private object m_item;
+    private Exception m_exception;
+    private DeletingSelectedItemErrorAction m_action = DeletingSelectedItemErrorAction.Skip;
+
+    #endregion PRIVATE FIELDS
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs
similarity index 87%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs
index de159e5a..336162ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs
@@ -1,96 +1,89 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DetailVisibilityChangedEventManager : WeakEventManager
-  {
-    private DetailVisibilityChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        detailConfig.VisibilityChanged += new EventHandler( this.OnVisibilityChanged );
-        return;
-      }
-
-      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
-      if( detailConfigCollection != null )
-      {
-        detailConfigCollection.DetailVisibilityChanged += new EventHandler( this.OnVisibilityChanged );
-      }
-
-    }
-
-    protected override void StopListening( object source )
-    {
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        detailConfig.VisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
-        return;
-      }
-
-      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
-      if( detailConfigCollection != null )
-      {
-        detailConfigCollection.DetailVisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
-      }
-    }
-
-    private static DetailVisibilityChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DetailVisibilityChangedEventManager );
-        DetailVisibilityChangedEventManager currentManager = ( DetailVisibilityChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DetailVisibilityChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVisibilityChanged( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DetailVisibilityChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DetailConfiguration detailConfig = source as DetailConfiguration;
+      if( detailConfig != null )
+      {
+        detailConfig.VisibilityChanged += new EventHandler( this.OnVisibilityChanged );
+        return;
+      }
+
+      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
+      if( detailConfigCollection != null )
+      {
+        detailConfigCollection.DetailVisibilityChanged += new EventHandler( this.OnVisibilityChanged );
+      }
+
+    }
+
+    protected override void StopListening( object source )
+    {
+      DetailConfiguration detailConfig = source as DetailConfiguration;
+      if( detailConfig != null )
+      {
+        detailConfig.VisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
+        return;
+      }
+
+      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
+      if( detailConfigCollection != null )
+      {
+        detailConfigCollection.DetailVisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
+      }
+    }
+
+    private static DetailVisibilityChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( DetailVisibilityChangedEventManager );
+        DetailVisibilityChangedEventManager currentManager = ( DetailVisibilityChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new DetailVisibilityChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnVisibilityChanged( object sender, EventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs
similarity index 88%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs
index 958a9c6a..aa10bd11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs
@@ -1,104 +1,98 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DetailsChangedEventManager : WeakEventManager
-  {
-    private DetailsChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.DetailsChanged += this.OnDetailsChanged;
-        return;
-      }
-      else
-      {
-        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
-        if( generator != null )
-        {
-          generator.DetailsChanged += this.OnDetailsChanged;
-          return;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.DetailsChanged -= this.OnDetailsChanged;
-        return;
-      }
-      else
-      {
-        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
-        if( generator != null )
-        {
-          generator.DetailsChanged -= this.OnDetailsChanged;
-          return;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
-    }
-
-    private static DetailsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DetailsChangedEventManager );
-        DetailsChangedEventManager currentManager = ( DetailsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DetailsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnDetailsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DetailsChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.DetailsChanged += this.OnDetailsChanged;
+        return;
+      }
+      else
+      {
+        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
+        if( generator != null )
+        {
+          generator.DetailsChanged += this.OnDetailsChanged;
+          return;
+        }
+      }
+
+      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.DetailsChanged -= this.OnDetailsChanged;
+        return;
+      }
+      else
+      {
+        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
+        if( generator != null )
+        {
+          generator.DetailsChanged -= this.OnDetailsChanged;
+          return;
+        }
+      }
+
+      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
+    }
+
+    private static DetailsChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( DetailsChangedEventManager );
+        DetailsChangedEventManager currentManager = ( DetailsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new DetailsChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnDetailsChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs
new file mode 100644
index 00000000..3a5a9618
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs
@@ -0,0 +1,63 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DetailsExpansionChangedEventHandler( object sender, DetailsExpansionChangedEventArgs e );
+
+  public class DetailsExpansionChangedEventArgs : RoutedEventArgs
+  {
+    public DetailsExpansionChangedEventArgs( RoutedEvent routedEvent, object dataItem, DataGridContext dataGridContext, bool isExpanded )
+      : base( routedEvent )
+    {
+      this.DataGridContext = dataGridContext;
+      this.IsExpanded = isExpanded;
+      this.MasterItem = dataItem;
+    }
+
+    #region DataGridContext Property
+
+    public DataGridContext DataGridContext
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region IsExpanded Property 
+
+    public bool IsExpanded
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region MasterItem Property
+
+    public object MasterItem
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs
new file mode 100644
index 00000000..b79426a0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs
@@ -0,0 +1,73 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void DetailsExpansionChangingEventHandler( object sender, DetailsExpansionChangingEventArgs e );
+
+  public class DetailsExpansionChangingEventArgs : RoutedEventArgs
+  {
+    public DetailsExpansionChangingEventArgs( RoutedEvent routedEvent, object dataItem, DataGridContext dataGridContext, bool isExpanding )
+      : base( routedEvent )
+    {
+      this.DataGridContext = dataGridContext;
+      this.IsExpanding = isExpanding;
+      this.MasterItem = dataItem;
+    }
+
+    #region Cancel Property
+
+    public bool Cancel
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
+    #region DataGridContext Property
+
+    public DataGridContext DataGridContext
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region IsExpanding Property 
+
+    public bool IsExpanding
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region MasterItem Property
+
+    public object MasterItem
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs
similarity index 80%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs
index 79139bcd..d0609a22 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs
@@ -1,53 +1,50 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xceed.Utils.Collections;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DistinctValuesRequestedEventArgs : EventArgs
-  {
-    public DistinctValuesRequestedEventArgs( string autoFilterColumnFieldName )
-    {
-      m_autoFilterColumnFieldName = autoFilterColumnFieldName;
-    }
-
-    public string AutoFilterColumnFieldName
-    {
-      get
-      {
-        return m_autoFilterColumnFieldName;
-      }
-    }
-
-    public HashSet<object> DistinctValues
-    {
-      get
-      {
-        return m_distinctValues;
-      }
-    }
-
-    private string m_autoFilterColumnFieldName;
-    private HashSet<object> m_distinctValues = new HashSet<object>();
-  }
-
-  internal delegate void DistinctValuesRequestedEventHandler( object sender, DistinctValuesRequestedEventArgs e );
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DistinctValuesRequestedEventArgs : EventArgs
+  {
+    internal DistinctValuesRequestedEventArgs( string autoFilterColumnFieldName )
+    {
+      m_autoFilterColumnFieldName = autoFilterColumnFieldName;
+    }
+
+    internal string AutoFilterColumnFieldName
+    {
+      get
+      {
+        return m_autoFilterColumnFieldName;
+      }
+    }
+
+    internal HashSet<object> DistinctValues
+    {
+      get
+      {
+        return m_distinctValues;
+      }
+    }
+
+    private string m_autoFilterColumnFieldName;
+    private HashSet<object> m_distinctValues = new HashSet<object>();
+  }
+
+  internal delegate void DistinctValuesRequestedEventHandler( object sender, DistinctValuesRequestedEventArgs e );
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs
similarity index 84%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs
index f0b59f00..2f0e026b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs
@@ -1,74 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DistinctValuesRequestedEventManager: WeakEventManager
-  {
-    private DistinctValuesRequestedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.DistinctValuesRequested += this.OnDistinctValuesRequested;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.DistinctValuesRequested -= this.OnDistinctValuesRequested;
-    }
-
-    private static DistinctValuesRequestedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DistinctValuesRequestedEventManager );
-        DistinctValuesRequestedEventManager currentManager = ( DistinctValuesRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DistinctValuesRequestedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DistinctValuesRequestedEventManager: WeakEventManager
+  {
+    internal static void AddListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.DistinctValuesRequested += this.OnDistinctValuesRequested;
+    }
+
+    protected override void StopListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.DistinctValuesRequested -= this.OnDistinctValuesRequested;
+    }
+
+    private static DistinctValuesRequestedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( DistinctValuesRequestedEventManager );
+        DistinctValuesRequestedEventManager currentManager = ( DistinctValuesRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new DistinctValuesRequestedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FittedWidthRequestedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FittedWidthRequestedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs
index 7a0843c0..359e8dd6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FittedWidthRequestedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs
@@ -1,51 +1,51 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class FittedWidthRequestedEventArgs : EventArgs
-  {
-    #region Value Internal Read-Only Property
-
-    internal Nullable<double> Value
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    internal void SetValue( double value )
-    {
-      if( m_value.HasValue )
-      {
-        // We keep the highest of the two values.
-        if( m_value.Value >= value )
-          return;
-      }
-
-      m_value = value;
-    }
-
-    private Nullable<double> m_value;
-
-    #endregion
-  }
-
-  internal delegate void FittedWidthRequestedEventHandler( object sender, FittedWidthRequestedEventArgs e );
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class FittedWidthRequestedEventArgs : EventArgs
+  {
+    #region Value Internal Read-Only Property
+
+    internal Nullable<double> Value
+    {
+      get
+      {
+        return m_value;
+      }
+    }
+
+    internal void SetValue( double value )
+    {
+      if( m_value.HasValue )
+      {
+        // We keep the highest of the two values.
+        if( m_value.Value >= value )
+          return;
+      }
+
+      m_value = value;
+    }
+
+    private Nullable<double> m_value;
+
+    #endregion
+  }
+
+  internal delegate void FittedWidthRequestedEventHandler( object sender, FittedWidthRequestedEventArgs e );
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs
new file mode 100644
index 00000000..664a7244
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs
@@ -0,0 +1,88 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class FrameworkElementUnloadedEventManager : WeakEventManager
+  {
+    internal static void AddListener( FrameworkElement source, IWeakEventListener listener )
+    {
+      FrameworkElementUnloadedEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
+    {
+      FrameworkElementUnloadedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      var fe = source as FrameworkElement;
+      if( fe == null )
+        return;
+
+      fe.Unloaded += new RoutedEventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      var fe = source as FrameworkElement;
+      if( fe == null )
+        return;
+
+      var dispatcher = fe.Dispatcher;
+      if( dispatcher.CheckAccess() )
+      {
+        this.StopListening( fe );
+      }
+      else
+      {
+        dispatcher.BeginInvoke( new Action<FrameworkElement>( this.StopListening ), DispatcherPriority.Send, fe );
+      }
+    }
+
+    private static FrameworkElementUnloadedEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( FrameworkElementUnloadedEventManager );
+        var currentManager = ( FrameworkElementUnloadedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new FrameworkElementUnloadedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void StopListening( FrameworkElement fe )
+    {
+      fe.Unloaded -= new RoutedEventHandler( this.OnEventRaised );
+    }
+
+    private void OnEventRaised( object sender, RoutedEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs
similarity index 90%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs
index 91f38f28..4e7de696 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs
@@ -1,116 +1,110 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GroupConfigurationSelectorChangedEventManager : WeakEventManager
-  {
-    private GroupConfigurationSelectorChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener)
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridContext context = source as DataGridContext;
-
-      if (context != null)
-      {
-        context.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DataGridControl dataGridControl = source as DataGridControl;
-      if (dataGridControl != null)
-      {
-        dataGridControl.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if (detailConfig != null)
-      {
-        detailConfig.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      throw new InvalidOperationException("An attempt was made to register an item other than a DataGridContext, DataGridControl, or DetailConfiguration to the GroupConfigurationSelectorChangedEventManager.");
-    }
-
-    protected override void StopListening(object source)
-    {
-      DataGridContext context = source as DataGridContext;
-
-      if (context != null)
-      {
-        context.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DataGridControl dataGridControl = source as DataGridControl;
-      if (dataGridControl != null)
-      {
-        dataGridControl.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if (detailConfig != null)
-      {
-        detailConfig.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      throw new InvalidOperationException( "An attempt was made to unregister an item other than a DataGridContext, DataGridControl, or DetailConfiguration from the GroupConfigurationSelectorChangedEventManager." );
-    }
-
-    private static GroupConfigurationSelectorChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( GroupConfigurationSelectorChangedEventManager );
-        GroupConfigurationSelectorChangedEventManager currentManager = ( GroupConfigurationSelectorChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new GroupConfigurationSelectorChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnGroupConfigurationSelectorChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class GroupConfigurationSelectorChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridContext context = source as DataGridContext;
+
+      if (context != null)
+      {
+        context.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      DataGridControl dataGridControl = source as DataGridControl;
+      if (dataGridControl != null)
+      {
+        dataGridControl.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      DetailConfiguration detailConfig = source as DetailConfiguration;
+      if (detailConfig != null)
+      {
+        detailConfig.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      throw new InvalidOperationException("An attempt was made to register an item other than a DataGridContext, DataGridControl, or DetailConfiguration to the GroupConfigurationSelectorChangedEventManager.");
+    }
+
+    protected override void StopListening(object source)
+    {
+      DataGridContext context = source as DataGridContext;
+
+      if (context != null)
+      {
+        context.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      DataGridControl dataGridControl = source as DataGridControl;
+      if (dataGridControl != null)
+      {
+        dataGridControl.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      DetailConfiguration detailConfig = source as DetailConfiguration;
+      if (detailConfig != null)
+      {
+        detailConfig.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
+        return;
+      }
+
+      throw new InvalidOperationException( "An attempt was made to unregister an item other than a DataGridContext, DataGridControl, or DetailConfiguration from the GroupConfigurationSelectorChangedEventManager." );
+    }
+
+    private static GroupConfigurationSelectorChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( GroupConfigurationSelectorChangedEventManager );
+        GroupConfigurationSelectorChangedEventManager currentManager = ( GroupConfigurationSelectorChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new GroupConfigurationSelectorChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnGroupConfigurationSelectorChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs
new file mode 100644
index 00000000..9cac5769
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs
@@ -0,0 +1,75 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void GroupExpansionChangedEventHandler( object sender, GroupExpansionChangedEventArgs e );
+
+  public class GroupExpansionChangedEventArgs : RoutedEventArgs
+  {
+    public GroupExpansionChangedEventArgs( RoutedEvent routedEvent, Group group, CollectionViewGroup collectionViewGroup, DataGridContext dataGridContext, bool isExpanded )
+      : base( routedEvent )
+    {
+      this.CollectionViewGroup = collectionViewGroup;
+      this.DataGridContext = dataGridContext;
+      this.Group = group;
+      this.IsExpanded = isExpanded;
+    }
+
+    #region CollectionViewGroup Property
+
+    public CollectionViewGroup CollectionViewGroup
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region DataGridContext Property
+
+    public DataGridContext DataGridContext
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region Group Property
+
+    public Group Group
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region IsExpanded Property 
+
+    public bool IsExpanded
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs
new file mode 100644
index 00000000..bae3a76b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs
@@ -0,0 +1,85 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void GroupExpansionChangingEventHandler( object sender, GroupExpansionChangingEventArgs e );
+
+  public class GroupExpansionChangingEventArgs : RoutedEventArgs
+  {
+    public GroupExpansionChangingEventArgs( RoutedEvent routedEvent, Group group, CollectionViewGroup collectionViewGroup, DataGridContext dataGridContext, bool isExpanding )
+      : base( routedEvent )
+    {
+      this.CollectionViewGroup = collectionViewGroup;
+      this.DataGridContext = dataGridContext;
+      this.Group = group;
+      this.IsExpanding = isExpanding;
+    }
+
+    #region Cancel Property
+
+    public bool Cancel
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
+    #region CollectionViewGroup Property
+
+    public CollectionViewGroup CollectionViewGroup
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region DataGridContext Property
+
+    public DataGridContext DataGridContext
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region Group Property
+
+    public Group Group
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region IsExpanding Property 
+
+    public bool IsExpanding
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs
similarity index 63%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs
index 2878b5bb..b9317115 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs
@@ -1,42 +1,41 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VisibleColumnsUpdatedEventArgs : EventArgs
-  {
-    internal VisibleColumnsUpdatedEventArgs( bool onlyIncrementFlag )
-    {
-      m_onlyIncrementFlag = onlyIncrementFlag;
-    }
-
-    #region OnlyIncrementFlag Property
-
-    internal bool OnlyIncrementFlag
-    {
-      get
-      {
-        return m_onlyIncrementFlag;
-      }
-    }
-
-    private bool m_onlyIncrementFlag;
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class InitializeItemPropertyEventArgs : EventArgs
+  {
+    internal InitializeItemPropertyEventArgs( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        throw new ArgumentNullException( "itemProperty" );
+
+      m_itemProperty = itemProperty;
+    }
+
+    internal DataGridItemPropertyBase ItemProperty
+    {
+      get
+      {
+        return m_itemProperty;
+      }
+    }
+
+    private readonly DataGridItemPropertyBase m_itemProperty;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangingEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs
similarity index 51%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangingEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs
index 819e8582..14145220 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangingEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs
@@ -1,72 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VisibilityChangingEventManager : WeakEventManager
-  {
-    private VisibilityChangingEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var columnCollection = ( ColumnCollection )source;
-      columnCollection.ColumnVisibilityChanging += new EventHandler( this.OnColumnVisibilityChanging );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var columnCollection = ( ColumnCollection )source;
-      columnCollection.ColumnVisibilityChanging -= new EventHandler( this.OnColumnVisibilityChanging );
-    }
-
-    private static VisibilityChangingEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( VisibilityChangingEventManager );
-        var currentManager = ( VisibilityChangingEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new VisibilityChangingEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnColumnVisibilityChanging( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class InitializeItemPropertyEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      var target = ( DataGridItemPropertyCollection )source;
+      target.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      var target = ( DataGridItemPropertyCollection )source;
+      target.InitializeItemProperty -= new EventHandler<InitializeItemPropertyEventArgs>( this.OnEventRaised );
+    }
+
+    private static InitializeItemPropertyEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( InitializeItemPropertyEventManager );
+        var currentManager = ( InitializeItemPropertyEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new InitializeItemPropertyEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, InitializeItemPropertyEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs
similarity index 86%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs
index 8bc403a4..a75070b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs
@@ -1,72 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ItemsSourceChangeCompletedEventManager : WeakEventManager
-  {
-    private ItemsSourceChangeCompletedEventManager()
-    {
-    }
-
-    public static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ItemsSourceChangeCompleted += new EventHandler( this.OnItemsSourceChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ItemsSourceChangeCompleted -= new EventHandler( this.OnItemsSourceChanged );
-    }
-
-    private static ItemsSourceChangeCompletedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ItemsSourceChangeCompletedEventManager );
-        ItemsSourceChangeCompletedEventManager currentManager = ( ItemsSourceChangeCompletedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ItemsSourceChangeCompletedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnItemsSourceChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ItemsSourceChangeCompletedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ItemsSourceChangeCompleted += new EventHandler( this.OnItemsSourceChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ItemsSourceChangeCompleted -= new EventHandler( this.OnItemsSourceChanged );
+    }
+
+    private static ItemsSourceChangeCompletedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ItemsSourceChangeCompletedEventManager );
+        ItemsSourceChangeCompletedEventManager currentManager = ( ItemsSourceChangeCompletedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ItemsSourceChangeCompletedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnItemsSourceChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs
similarity index 83%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs
index 52c20ba2..77528b36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs
@@ -1,75 +1,69 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.ComponentModel;
-
-namespace Xceed.Utils.Collections
-{
-  internal class ListChangedEventManager : WeakEventManager
-  {
-    private ListChangedEventManager()
-    {
-    }
-
-    public static void AddListener( IBindingList source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( IBindingList source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      IBindingList list = ( IBindingList )source;
-      list.ListChanged += new ListChangedEventHandler( this.OnListChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      IBindingList list = ( IBindingList )source;
-      list.ListChanged -= new ListChangedEventHandler( this.OnListChanged );
-    }
-
-    private static ListChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ListChangedEventManager );
-        ListChangedEventManager currentManager = ( ListChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ListChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnListChanged( object sender, ListChangedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ListChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( IBindingList source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( IBindingList source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      IBindingList list = ( IBindingList )source;
+      list.ListChanged += new ListChangedEventHandler( this.OnListChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      IBindingList list = ( IBindingList )source;
+      list.ListChanged -= new ListChangedEventHandler( this.OnListChanged );
+    }
+
+    private static ListChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ListChangedEventManager );
+        ListChangedEventManager currentManager = ( ListChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ListChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnListChanged( object sender, ListChangedEventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs
new file mode 100644
index 00000000..9abbaea8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs
@@ -0,0 +1,66 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class MappingChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridItemPropertyMap source, IWeakEventListener listener )
+    {
+      MappingChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridItemPropertyMap source, IWeakEventListener listener )
+    {
+      MappingChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ( ( DataGridItemPropertyMap )source ).MappingChanged += new EventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ( ( DataGridItemPropertyMap )source ).MappingChanged -= new EventHandler( this.OnEventRaised );
+    }
+
+    private static MappingChangedEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( MappingChangedEventManager );
+        var currentManager = ( MappingChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new MappingChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, EventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs
similarity index 88%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs
index cfe94f64..4274cbe0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs
@@ -1,100 +1,94 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class MaxGroupLevelsChangedEventManager : WeakEventManager
-  {
-    private MaxGroupLevelsChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static MaxGroupLevelsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( MaxGroupLevelsChangedEventManager );
-        MaxGroupLevelsChangedEventManager currentManager = ( MaxGroupLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new MaxGroupLevelsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnMaxGroupLevelsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class MaxGroupLevelsChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    private static MaxGroupLevelsChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( MaxGroupLevelsChangedEventManager );
+        MaxGroupLevelsChangedEventManager currentManager = ( MaxGroupLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new MaxGroupLevelsChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnMaxGroupLevelsChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs
similarity index 88%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs
index edc9fe8b..d6bf7273 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs
@@ -1,100 +1,94 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class MaxSortLevelsChangedEventManager : WeakEventManager
-  {
-    private MaxSortLevelsChangedEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static MaxSortLevelsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( MaxSortLevelsChangedEventManager );
-        MaxSortLevelsChangedEventManager currentManager = ( MaxSortLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new MaxSortLevelsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnMaxSortLevelsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class MaxSortLevelsChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = source as DataGridControl;
+      if( dataGridControl != null )
+      {
+        dataGridControl.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
+        return;
+      }
+
+      DetailConfiguration detailConfiguration = source as DetailConfiguration;
+      if( detailConfiguration != null )
+      {
+        detailConfiguration.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
+        return;
+      }
+
+      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
+    }
+
+    private static MaxSortLevelsChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( MaxSortLevelsChangedEventManager );
+        MaxSortLevelsChangedEventManager currentManager = ( MaxSortLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new MaxSortLevelsChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnMaxSortLevelsChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs
new file mode 100644
index 00000000..43066596
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs
@@ -0,0 +1,349 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class NotifyBatchCollectionChangedEventArgs : NotifyCollectionChangedEventArgs
+  {
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action )
+      : base( action )
+    {
+    }
+
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems )
+      : base( action, changedItems )
+    {
+    }
+
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems, int startingIndex )
+      : base( action, changedItems, startingIndex )
+    {
+    }
+
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex )
+      : base( action, changedItems, index, oldIndex )
+    {
+    }
+
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList newItems, IList oldItems )
+      : base( action, newItems, oldItems )
+    {
+    }
+
+    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex )
+      : base( action, newItems, oldItems, startingIndex )
+    {
+    }
+
+    #region Replacements Property
+
+    internal IDictionary<object, object> Replacements
+    {
+      get
+      {
+        if( m_fromTo == null )
+        {
+          m_fromTo = new Dictionary<object, object>( 0 );
+          m_toFrom = new Dictionary<object, object>( 0 );
+        }
+
+        return m_fromTo;
+      }
+    }
+
+    #endregion
+
+    internal static NotifyBatchCollectionChangedEventArgs Combine( NotifyCollectionChangedEventArgs x, NotifyCollectionChangedEventArgs y )
+    {
+      return NotifyBatchCollectionChangedEventArgs.Combine(
+               NotifyBatchCollectionChangedEventArgs.Create( x ),
+               NotifyBatchCollectionChangedEventArgs.Create( y ) );
+    }
+
+    private static NotifyBatchCollectionChangedEventArgs Combine( NotifyBatchCollectionChangedEventArgs x, NotifyBatchCollectionChangedEventArgs y )
+    {
+      if( x == null )
+        return y;
+
+      if( y == null )
+        return x;
+
+      var replacements = default( BiMap );
+      var result = default( NotifyBatchCollectionChangedEventArgs );
+
+      if( x.Action == y.Action )
+      {
+        switch( x.Action )
+        {
+          case NotifyCollectionChangedAction.Replace:
+            {
+              replacements = NotifyBatchCollectionChangedEventArgs.Merge(
+                               NotifyBatchCollectionChangedEventArgs.Map( x.OldItems, x.NewItems ),
+                               NotifyBatchCollectionChangedEventArgs.Map( y.OldItems, y.NewItems ) );
+              if( replacements == null )
+                return null;
+
+              result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
+            }
+            break;
+
+          case NotifyCollectionChangedAction.Add:
+          case NotifyCollectionChangedAction.Remove:
+          case NotifyCollectionChangedAction.Move:
+            result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
+            break;
+
+          case NotifyCollectionChangedAction.Reset:
+            result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
+            replacements = NotifyBatchCollectionChangedEventArgs.Merge( x.m_fromTo, y.m_fromTo );
+            break;
+
+          default:
+            throw new NotSupportedException();
+        }
+      }
+      else
+      {
+        if( x.Action == NotifyCollectionChangedAction.Replace )
+        {
+          replacements = NotifyBatchCollectionChangedEventArgs.Merge( NotifyBatchCollectionChangedEventArgs.Map( x.OldItems, x.NewItems ), null );
+        }
+        else if( ( x.Action == NotifyCollectionChangedAction.Reset ) && ( x.m_fromTo != null ) )
+        {
+          replacements = new BiMap( x.m_fromTo, x.m_toFrom );
+        }
+
+        switch( y.Action )
+        {
+          case NotifyCollectionChangedAction.Add:
+            {
+              if( replacements != null )
+              {
+                var fromTo = replacements.FromTo;
+                var toFrom = replacements.ToFrom;
+
+                foreach( var item in y.NewItems )
+                {
+                  object to;
+
+                  if( fromTo.TryGetValue( item, out to ) )
+                  {
+                    fromTo.Remove( item );
+                    toFrom.Remove( to );
+                  }
+                }
+              }
+            }
+            break;
+
+          case NotifyCollectionChangedAction.Remove:
+            {
+              if( replacements != null )
+              {
+                var fromTo = replacements.FromTo;
+                var toFrom = replacements.ToFrom;
+
+                foreach( var item in y.OldItems )
+                {
+                  object from;
+
+                  if( toFrom.TryGetValue( item, out from ) )
+                  {
+                    fromTo.Remove( from );
+                    toFrom.Remove( item );
+                  }
+                }
+              }
+            }
+            break;
+
+          case NotifyCollectionChangedAction.Replace:
+            {
+              var mapping = NotifyBatchCollectionChangedEventArgs.Map( y.OldItems, y.NewItems );
+
+              if( replacements != null )
+              {
+                replacements = NotifyBatchCollectionChangedEventArgs.Merge( replacements.FromTo, mapping );
+              }
+              else
+              {
+                replacements = NotifyBatchCollectionChangedEventArgs.Merge( mapping, null );
+              }
+            }
+            break;
+
+          case NotifyCollectionChangedAction.Move:
+            break;
+
+          case NotifyCollectionChangedAction.Reset:
+            {
+              if( replacements != null )
+              {
+                replacements = NotifyBatchCollectionChangedEventArgs.Merge( replacements.FromTo, y.m_fromTo );
+              }
+              else
+              {
+                replacements = NotifyBatchCollectionChangedEventArgs.Merge( y.m_fromTo, null );
+              }
+            }
+            break;
+
+          default:
+            throw new NotSupportedException();
+        }
+
+        result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
+      }
+
+      if( ( result != null ) && ( replacements != null ) )
+      {
+        result.m_fromTo = replacements.FromTo;
+        result.m_toFrom = replacements.ToFrom;
+      }
+
+      return result;
+    }
+
+    private static NotifyBatchCollectionChangedEventArgs Create( NotifyCollectionChangedEventArgs e )
+    {
+      if( e == null )
+        return null;
+
+      var batch = e as NotifyBatchCollectionChangedEventArgs;
+      if( batch != null )
+        return batch;
+
+      switch( e.Action )
+      {
+        case NotifyCollectionChangedAction.Add:
+          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.NewItems, e.NewStartingIndex );
+
+        case NotifyCollectionChangedAction.Remove:
+          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.OldItems, e.OldStartingIndex );
+
+        case NotifyCollectionChangedAction.Move:
+          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.OldItems, e.NewStartingIndex, e.OldStartingIndex );
+
+        case NotifyCollectionChangedAction.Replace:
+          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.NewItems, e.OldItems, e.OldStartingIndex );
+
+        case NotifyCollectionChangedAction.Reset:
+          return new NotifyBatchCollectionChangedEventArgs( e.Action );
+
+        default:
+          throw new NotSupportedException();
+      }
+    }
+
+    private static BiMap Merge( IDictionary<object, object> x, IDictionary<object, object> y )
+    {
+      var fromTo = new Dictionary<object, object>();
+      var toFrom = new Dictionary<object, object>();
+
+      if( x != null )
+      {
+        foreach( var entry in x )
+        {
+          if( object.ReferenceEquals( entry.Key, entry.Value ) )
+            continue;
+
+          fromTo.Add( entry.Key, entry.Value );
+          toFrom.Add( entry.Value, entry.Key );
+        }
+      }
+
+      if( y != null )
+      {
+        foreach( var entry in y )
+        {
+          if( object.ReferenceEquals( entry.Key, entry.Value ) )
+            continue;
+
+          // Keep only the initial and final value.  For example, (A -> B -> C) becomes (A -> C).
+          var from = default( object );
+          if( toFrom.TryGetValue( entry.Key, out from ) )
+          {
+            toFrom.Remove( entry.Key );
+
+            if( object.ReferenceEquals( from, entry.Value ) )
+            {
+              fromTo.Remove( from );
+            }
+            else
+            {
+              fromTo[ from ] = entry.Value;
+              toFrom[ entry.Value ] = from;
+            }
+          }
+          else
+          {
+            // There is no need to check if the entry exists, since it should not or the same instance
+            // is use multiple time in the data source, which is not supported by the grid.
+            fromTo.Add( entry.Key, entry.Value );
+            toFrom.Add( entry.Value, entry.Key );
+          }
+        }
+      }
+
+      if( fromTo.Count <= 0 )
+        return null;
+
+      return new BiMap( fromTo, toFrom );
+    }
+
+    private static IDictionary<object, object> Map( IList oldItems, IList newItems )
+    {
+      Debug.Assert( oldItems != null );
+      Debug.Assert( newItems != null );
+      Debug.Assert( oldItems.Count == newItems.Count );
+
+      var items = new Dictionary<object, object>();
+      var count = oldItems.Count;
+
+      for( int i = 0; i < count; i++ )
+      {
+        items.Add( oldItems[ i ], newItems[ i ] );
+      }
+
+      return items;
+    }
+
+    private IDictionary<object, object> m_fromTo;
+    private IDictionary<object, object> m_toFrom;
+
+    #region BiMap Private Class
+
+    private sealed class BiMap
+    {
+      internal BiMap( IDictionary<object, object> fromTo, IDictionary<object, object> toFrom )
+      {
+        this.FromTo = fromTo;
+        this.ToFrom = toFrom;
+      }
+
+      internal readonly IDictionary<object, object> FromTo;
+      internal readonly IDictionary<object, object> ToFrom;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyCollectionChangedEventArgsExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs
similarity index 55%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyCollectionChangedEventArgsExtensions.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs
index 26ee117f..8ac11222 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyCollectionChangedEventArgsExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs
@@ -1,36 +1,72 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class NotifyCollectionChangedEventArgsExtensions
-  {
-    internal static NotifyCollectionChangedEventArgs GetRangeActionOrSelf( this NotifyCollectionChangedEventArgs source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var rangeEventArgs = source as NotifyRangeCollectionChangedEventArgs;
-      if( rangeEventArgs != null )
-        return rangeEventArgs.OriginalEventArgs;
-
-      return source;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Specialized;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class NotifyCollectionChangedEventArgsExtensions
+  {
+    internal static NotifyCollectionChangedEventArgs GetRangeActionOrSelf( this NotifyCollectionChangedEventArgs source )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      var rangeEventArgs = source as NotifyRangeCollectionChangedEventArgs;
+      if( rangeEventArgs != null )
+        return rangeEventArgs.OriginalEventArgs;
+
+      return source;
+    }
+
+    internal static object GetReplacement( this NotifyCollectionChangedEventArgs source, object item )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      var result = default( object );
+
+      if( item != null )
+      {
+        var batch = source as NotifyBatchCollectionChangedEventArgs;
+        if( batch != null )
+        {
+          if( !batch.Replacements.TryGetValue( item, out result ) )
+          {
+            result = null;
+          }
+        }
+        else if( source.Action == NotifyCollectionChangedAction.Replace )
+        {
+          var oldItems = source.OldItems;
+          var newItems = source.NewItems;
+
+          if( ( oldItems != null ) && ( newItems != null ) )
+          {
+            var index = oldItems.IndexOf( item );
+            if( index >= 0 )
+            {
+              result = newItems[ index ];
+            }
+          }
+        }
+      }
+
+      return result;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyRangeCollectionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyRangeCollectionChangedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs
index 4292c81a..5482024d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NotifyRangeCollectionChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs
@@ -1,51 +1,51 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class NotifyRangeCollectionChangedEventArgs : NotifyCollectionChangedEventArgs
-  {
-    #region Constructor
-
-    internal NotifyRangeCollectionChangedEventArgs( NotifyCollectionChangedEventArgs args )
-      : base( NotifyCollectionChangedAction.Reset )
-    {
-      if( args == null )
-        throw new ArgumentNullException( "args" );
-
-      m_originalEventArgs = args;
-    }
-
-    #endregion
-
-    #region OriginalEventArgs Property
-
-    internal NotifyCollectionChangedEventArgs OriginalEventArgs
-    {
-      get
-      {
-        return m_originalEventArgs;
-      }
-    }
-
-    private readonly NotifyCollectionChangedEventArgs m_originalEventArgs;
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Specialized;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class NotifyRangeCollectionChangedEventArgs : NotifyCollectionChangedEventArgs
+  {
+    #region Constructor
+
+    internal NotifyRangeCollectionChangedEventArgs( NotifyCollectionChangedEventArgs args )
+      : base( NotifyCollectionChangedAction.Reset )
+    {
+      if( args == null )
+        throw new ArgumentNullException( "args" );
+
+      m_originalEventArgs = args;
+    }
+
+    #endregion
+
+    #region OriginalEventArgs Property
+
+    internal NotifyCollectionChangedEventArgs OriginalEventArgs
+    {
+      get
+      {
+        return m_originalEventArgs;
+      }
+    }
+
+    private readonly NotifyCollectionChangedEventArgs m_originalEventArgs;
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs
index e10c43a6..ccef5ae2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs
@@ -1,37 +1,37 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RealizedContainersRequestedEventArgs: EventArgs
-  {
-    public List<object> RealizedContainers
-    {
-      get
-      {
-        return m_realizedContainers;
-      }
-    }
-
-    private List<object> m_realizedContainers = new List<object>();
-  }
-
-  internal delegate void RealizedContainersRequestedEventHandler( object sender, RealizedContainersRequestedEventArgs e );
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class RealizedContainersRequestedEventArgs: EventArgs
+  {
+    public List<object> RealizedContainers
+    {
+      get
+      {
+        return m_realizedContainers;
+      }
+    }
+
+    private List<object> m_realizedContainers = new List<object>();
+  }
+
+  internal delegate void RealizedContainersRequestedEventHandler( object sender, RealizedContainersRequestedEventArgs e );
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs
similarity index 97%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs
index b932c4cc..d3783e53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs
@@ -1,74 +1,74 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RealizedContainersRequestedEventManager: WeakEventManager
-  {
-    private RealizedContainersRequestedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.RealizedContainersRequested += this.OnRealizedContainersRequested;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.RealizedContainersRequested -= this.OnRealizedContainersRequested;
-    }
-
-    private static RealizedContainersRequestedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( RealizedContainersRequestedEventManager );
-        RealizedContainersRequestedEventManager currentManager = ( RealizedContainersRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new RealizedContainersRequestedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class RealizedContainersRequestedEventManager: WeakEventManager
+  {
+    private RealizedContainersRequestedEventManager()
+    {
+    }
+
+    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.RealizedContainersRequested += this.OnRealizedContainersRequested;
+    }
+
+    protected override void StopListening( object source )
+    {
+      ColumnCollection columns = ( ColumnCollection )source;
+      columns.RealizedContainersRequested -= this.OnRealizedContainersRequested;
+    }
+
+    private static RealizedContainersRequestedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( RealizedContainersRequestedEventManager );
+        RealizedContainersRequestedEventManager currentManager = ( RealizedContainersRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new RealizedContainersRequestedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestBringIntoViewWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs
similarity index 85%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestBringIntoViewWeakEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs
index 5b689afe..858670ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestBringIntoViewWeakEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs
@@ -1,81 +1,73 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RequestBringIntoViewWeakEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private RequestBringIntoViewWeakEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Static Property
-
-    private static RequestBringIntoViewWeakEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( RequestBringIntoViewWeakEventManager );
-        var currentManager = ( RequestBringIntoViewWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new RequestBringIntoViewWeakEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var fe = ( FrameworkElement )source;
-
-      fe.RequestBringIntoView += new RequestBringIntoViewEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var fe = ( FrameworkElement )source;
-
-      fe.RequestBringIntoView -= new RequestBringIntoViewEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, RequestBringIntoViewEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class RequestBringIntoViewWeakEventManager : WeakEventManager
+  {
+    #region CurrentManager Static Property
+
+    private static RequestBringIntoViewWeakEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( RequestBringIntoViewWeakEventManager );
+        var currentManager = ( RequestBringIntoViewWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new RequestBringIntoViewWeakEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    #endregion
+
+    internal static void AddListener( FrameworkElement source, IWeakEventListener listener )
+    {
+      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
+    {
+      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      var fe = ( FrameworkElement )source;
+
+      fe.RequestBringIntoView += new RequestBringIntoViewEventHandler( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      var fe = ( FrameworkElement )source;
+
+      fe.RequestBringIntoView -= new RequestBringIntoViewEventHandler( this.OnEventRaised );
+    }
+
+    private void OnEventRaised( object sender, RequestBringIntoViewEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
index 0134c4e6..6ee4f79a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
@@ -1,42 +1,42 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RequestingDelayBringIntoViewAndFocusCurrentEventArgs : EventArgs
-  {
-    internal RequestingDelayBringIntoViewAndFocusCurrentEventArgs( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      m_trigger = trigger;
-    }
-
-    #region Trigger Property
-
-    internal AutoScrollCurrentItemSourceTriggers Trigger
-    {
-      get
-      {
-        return m_trigger;
-      }
-    }
-
-    private readonly AutoScrollCurrentItemSourceTriggers m_trigger;
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class RequestingDelayBringIntoViewAndFocusCurrentEventArgs : EventArgs
+  {
+    internal RequestingDelayBringIntoViewAndFocusCurrentEventArgs( AutoScrollCurrentItemSourceTriggers trigger )
+    {
+      m_trigger = trigger;
+    }
+
+    #region Trigger Property
+
+    internal AutoScrollCurrentItemSourceTriggers Trigger
+    {
+      get
+      {
+        return m_trigger;
+      }
+    }
+
+    private readonly AutoScrollCurrentItemSourceTriggers m_trigger;
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs
similarity index 95%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs
index 49ce8f3c..4385a741 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs
@@ -1,68 +1,67 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void RowValidationErrorRoutedEventHandler( object sender, RowValidationErrorRoutedEventArgs e );
-
-  public class RowValidationErrorRoutedEventArgs : RoutedEventArgs
-  {
-    public RowValidationErrorRoutedEventArgs( RowValidationError rowValidationError )
-      : base()
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, RowValidationError rowValidationError )
-      : base( routedEvent )
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, RowValidationError rowValidationError )
-      : base( routedEvent, source )
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    #region ValidationError PROPERTY
-
-    public RowValidationError RowValidationError
-    {
-      get
-      {
-        return m_rowValidationError;
-      }
-    }
-
-    private RowValidationError m_rowValidationError;
-
-    #endregion ValidationError PROPERTY
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public delegate void RowValidationErrorRoutedEventHandler( object sender, RowValidationErrorRoutedEventArgs e );
+
+  public class RowValidationErrorRoutedEventArgs : RoutedEventArgs
+  {
+    public RowValidationErrorRoutedEventArgs( RowValidationError rowValidationError )
+      : base()
+    {
+      if( rowValidationError == null )
+        throw new ArgumentNullException( "rowValidationError" );
+
+      m_rowValidationError = rowValidationError;
+    }
+
+    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, RowValidationError rowValidationError )
+      : base( routedEvent )
+    {
+      if( rowValidationError == null )
+        throw new ArgumentNullException( "rowValidationError" );
+
+      m_rowValidationError = rowValidationError;
+    }
+
+    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, RowValidationError rowValidationError )
+      : base( routedEvent, source )
+    {
+      if( rowValidationError == null )
+        throw new ArgumentNullException( "rowValidationError" );
+
+      m_rowValidationError = rowValidationError;
+    }
+
+    #region ValidationError PROPERTY
+
+    public RowValidationError RowValidationError
+    {
+      get
+      {
+        return m_rowValidationError;
+      }
+    }
+
+    private RowValidationError m_rowValidationError;
+
+    #endregion ValidationError PROPERTY
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs
similarity index 84%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs
index 379745a2..3d713888 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs
@@ -1,81 +1,74 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ScrollChangedWeakEventManager : WeakEventManager
-  {
-    private ScrollChangedWeakEventManager()
-    {
-    }
-
-    public static void AddListener( ScrollViewer source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ScrollViewer source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ScrollViewer scrollViewer = source as ScrollViewer;
-
-      if( scrollViewer != null )
-        scrollViewer.ScrollChanged += this.ScrollViewer_ScrollChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ScrollViewer scrollViewer = source as ScrollViewer;
-
-      if( scrollViewer != null )
-        scrollViewer.ScrollChanged -= this.ScrollViewer_ScrollChanged;
-    }
-
-    private static ScrollChangedWeakEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ScrollChangedWeakEventManager );
-        ScrollChangedWeakEventManager currentManager =
-          ( ScrollChangedWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ScrollChangedWeakEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void ScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ScrollChangedWeakEventManager : WeakEventManager
+  {
+    internal static void AddListener( ScrollViewer source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( ScrollViewer source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ScrollViewer scrollViewer = source as ScrollViewer;
+
+      if( scrollViewer != null )
+        scrollViewer.ScrollChanged += this.ScrollViewer_ScrollChanged;
+    }
+
+    protected override void StopListening( object source )
+    {
+      ScrollViewer scrollViewer = source as ScrollViewer;
+
+      if( scrollViewer != null )
+        scrollViewer.ScrollChanged -= this.ScrollViewer_ScrollChanged;
+    }
+
+    private static ScrollChangedWeakEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ScrollChangedWeakEventManager );
+        ScrollChangedWeakEventManager currentManager =
+          ( ScrollChangedWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ScrollChangedWeakEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void ScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs
similarity index 87%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs
index 5c229dc9..5c5ab821 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs
@@ -1,78 +1,74 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectionChangedEventManager : WeakEventManager
-  {
-    private SelectionChangedEventManager()
-    {
-    }
-
-    public static void AddListener( Selector source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( Selector source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      Selector selector = ( Selector )source;
-
-      if( selector != null )
-        selector.SelectionChanged += new SelectionChangedEventHandler( this.Selector_SelectionChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      Selector selector = ( Selector )source;
-
-      if( selector != null )
-        selector.SelectionChanged -= new SelectionChangedEventHandler( this.Selector_SelectionChanged );
-    }
-
-    private static SelectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( SelectionChangedEventManager );
-        SelectionChangedEventManager currentManager = ( SelectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new SelectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void Selector_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class SelectionChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( Selector source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( Selector source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      Selector selector = ( Selector )source;
+
+      if( selector != null )
+        selector.SelectionChanged += new SelectionChangedEventHandler( this.Selector_SelectionChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      Selector selector = ( Selector )source;
+
+      if( selector != null )
+        selector.SelectionChanged -= new SelectionChangedEventHandler( this.Selector_SelectionChanged );
+    }
+
+    private static SelectionChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( SelectionChangedEventManager );
+        SelectionChangedEventManager currentManager = ( SelectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new SelectionChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void Selector_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedInternalEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs
similarity index 78%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedInternalEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs
index 128258f1..247f799f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedInternalEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs
@@ -1,38 +1,35 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectionChangedInternalEventArgs : EventArgs
-  {
-
-    public SelectionChangedInternalEventArgs(SelectionInfo selectionInfo)
-    {
-      this.SelectionInfo = selectionInfo;
-    }
-
-    public SelectionInfo SelectionInfo
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class SelectionChangedInternalEventArgs : EventArgs
+  {
+
+    internal SelectionChangedInternalEventArgs( SelectionInfo selectionInfo )
+    {
+      this.SelectionInfo = selectionInfo;
+    }
+
+    internal SelectionInfo SelectionInfo
+    {
+      get;
+      private set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs
new file mode 100644
index 00000000..fbd32012
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs
@@ -0,0 +1,67 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class SelectionChangedInternalEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridContext source, IWeakEventListener listener )
+    {
+      SelectionChangedInternalEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridContext source, IWeakEventListener listener )
+    {
+      SelectionChangedInternalEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      ( ( DataGridContext )source ).SelectionChangedInternal += new EventHandler<SelectionChangedInternalEventArgs>( this.OnEventRaised );
+    }
+
+    protected override void StopListening( object source )
+    {
+      ( ( DataGridContext )source ).SelectionChangedInternal -= new EventHandler<SelectionChangedInternalEventArgs>( this.OnEventRaised );
+    }
+
+    private static SelectionChangedInternalEventManager CurrentManager
+    {
+      get
+      {
+        var managerType = typeof( SelectionChangedInternalEventManager );
+        var currentManager = ( SelectionChangedInternalEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new SelectionChangedInternalEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnEventRaised( object sender, SelectionChangedInternalEventArgs e )
+    {
+      this.DeliverEvent( sender, e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs
similarity index 83%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs
index 719e0dba..cdf6af77 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs
@@ -1,75 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ThemeChangedEventManager : WeakEventManager
-  {
-    private ThemeChangedEventManager()
-    {
-    }
-
-    public static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ThemeChanged += new EventHandler( this.OnThemeChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ThemeChanged -= new EventHandler( this.OnThemeChanged );
-    }
-
-    private static ThemeChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ThemeChangedEventManager );
-        ThemeChangedEventManager currentManager = ( ThemeChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ThemeChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnThemeChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ThemeChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ThemeChanged += new EventHandler( this.OnThemeChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ThemeChanged -= new EventHandler( this.OnThemeChanged );
+    }
+
+    private static ThemeChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ThemeChangedEventManager );
+        ThemeChangedEventManager currentManager = ( ThemeChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ThemeChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnThemeChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs
similarity index 86%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs
index 543df4e3..18730990 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs
@@ -1,72 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ViewChangedEventManager : WeakEventManager
-  {
-    private ViewChangedEventManager()
-    {
-    }
-
-    public static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ViewChanged += new EventHandler( this.OnViewChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ViewChanged -= new EventHandler( this.OnViewChanged );
-    }
-
-    private static ViewChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ViewChangedEventManager );
-        ViewChangedEventManager currentManager = ( ViewChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ViewChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnViewChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ViewChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ViewChanged += new EventHandler( this.OnViewChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      DataGridControl dataGridControl = ( DataGridControl )source;
+      dataGridControl.ViewChanged -= new EventHandler( this.OnViewChanged );
+    }
+
+    private static ViewChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ViewChangedEventManager );
+        ViewChangedEventManager currentManager = ( ViewChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ViewChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnViewChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs
similarity index 94%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs
index a70e02b5..f82d3ef9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs
@@ -1,81 +1,78 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualizingCellCollectionChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( VirtualizingCellCollection source, IWeakEventListener listener )
-    {
-      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( VirtualizingCellCollection source, IWeakEventListener listener )
-    {
-      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
-      if( source == null )
-      {
-        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
-      }
-
-      virtualizingCellCollection.CollectionChanged += this.OnVirtualizingCellCollectionChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
-      if( source == null )
-      {
-        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
-      }
-
-      virtualizingCellCollection.CollectionChanged -= this.OnVirtualizingCellCollectionChanged;
-    }
-
-    private static VirtualizingCellCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VirtualizingCellCollectionChangedEventManager );
-        VirtualizingCellCollectionChangedEventManager currentManager = WeakEventManager.GetCurrentManager( managerType ) as VirtualizingCellCollectionChangedEventManager;
-
-        if( currentManager == null )
-        {
-          currentManager = new VirtualizingCellCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVirtualizingCellCollectionChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class VirtualizingCellCollectionChangedEventManager : WeakEventManager
+  {
+    internal static void AddListener( VirtualizingCellCollection source, IWeakEventListener listener )
+    {
+      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    internal static void RemoveListener( VirtualizingCellCollection source, IWeakEventListener listener )
+    {
+      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
+      if( source == null )
+      {
+        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
+      }
+
+      virtualizingCellCollection.CollectionChanged += this.OnVirtualizingCellCollectionChanged;
+    }
+
+    protected override void StopListening( object source )
+    {
+      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
+      if( source == null )
+      {
+        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
+      }
+
+      virtualizingCellCollection.CollectionChanged -= this.OnVirtualizingCellCollectionChanged;
+    }
+
+    private static VirtualizingCellCollectionChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( VirtualizingCellCollectionChangedEventManager );
+        VirtualizingCellCollectionChangedEventManager currentManager = WeakEventManager.GetCurrentManager( managerType ) as VirtualizingCellCollectionChangedEventManager;
+
+        if( currentManager == null )
+        {
+          currentManager = new VirtualizingCellCollectionChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnVirtualizingCellCollectionChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs
new file mode 100644
index 00000000..da972812
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs
@@ -0,0 +1,141 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public class DataGridForeignKeyConverter : ForeignKeyConverter
+  {
+    public DataGridForeignKeyConverter()
+    {
+    }
+
+    public override object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
+    {
+      var itemsSource = configuration.ItemsSource;
+      if( itemsSource == null )
+        return key;
+
+      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
+        return new DataTableForeignKeyConverter().GetValueFromKey( key, configuration );
+
+      return this.GetValueFromKeyCore( key, itemsSource, configuration.ValuePath, configuration.DisplayMemberPath );
+    }
+
+    public override object GetKeyFromValue( object value, ForeignKeyConfiguration configuration )
+    {
+      if( value == null )
+        return null;
+
+      var displayMemberPath = configuration.DisplayMemberPath;
+      if( string.IsNullOrWhiteSpace( displayMemberPath ) )
+        return value;
+
+      var valuePath = configuration.ValuePath;
+      if( string.IsNullOrWhiteSpace( valuePath ) )
+        return value;
+
+      var itemsSource = configuration.ItemsSource;
+      if( itemsSource == null )
+        return value;
+
+      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
+        return new DataTableForeignKeyConverter().GetKeyFromValue( value, configuration );
+
+      try
+      {
+        var enumerator = itemsSource.GetEnumerator();
+        enumerator.MoveNext();
+        var firstItem = enumerator.Current;
+        var itemType = firstItem.GetType();
+        var propertyInfo = itemType.GetProperty( displayMemberPath );
+
+        foreach( object item in itemsSource )
+        {
+          if( item == null )
+            continue;
+
+          var displayValue = propertyInfo.GetValue( item, null );
+
+          if( value.Equals( displayValue ) )
+            return itemType.GetProperty( valuePath ).GetValue( item, null );
+        }
+      }
+      catch
+      {
+        //Swallow the exception, no need to terminate the application, just return the original value.
+      }
+
+      return value;
+    }
+
+    public override object GetValueFromKey( object key, DataGridForeignKeyDescription description )
+    {
+      var itemsSource = description.ItemsSource;
+      if( itemsSource == null )
+        return key;
+
+      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
+        return new DataTableForeignKeyConverter().GetValueFromKey( key, description );
+
+      return this.GetValueFromKeyCore( key, itemsSource, description.ValuePath, description.DisplayMemberPath );
+    }
+
+    private object GetValueFromKeyCore( object key, IEnumerable itemsSource, string valuePath, string displayMemberPath )
+    {
+      if( key == null )
+        return null;
+
+      if( string.IsNullOrWhiteSpace( displayMemberPath ) )
+        return key;
+
+      if( string.IsNullOrWhiteSpace( valuePath ) )
+        return key;
+
+      try
+      {
+        var enumerator = itemsSource.GetEnumerator();
+        enumerator.MoveNext();
+        var firstItem = enumerator.Current;
+        var itemType = firstItem.GetType();
+        var propertyInfo = itemType.GetProperty( valuePath );
+
+        foreach( object item in itemsSource )
+        {
+          if( item == null )
+            continue;
+
+          var value = propertyInfo.GetValue( item, null );
+
+          if( key.Equals( value ) )
+            return itemType.GetProperty( displayMemberPath ).GetValue( item, null );
+        }
+      }
+      catch
+      {
+        //Swallow the exception, no need to terminate the application, just return the original value.
+      }
+
+      return key;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
index 5e8812b3..0ed005c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
@@ -19,6 +19,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using System.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -28,14 +29,17 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
+    public override object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
+    {
+      return this.GetValueFromKeyCore( key, configuration.ItemsSource, configuration.ValuePath, configuration.DisplayMemberPath, true );
+    }
+
     public override object GetKeyFromValue( object value, ForeignKeyConfiguration configuration )
     {
-      // When the Key changes, try to find the data row that has the new key.
-      // If it is not found, return null.
-      DataView dataView = configuration.ItemsSource as DataView;
+      var dataView = configuration.ItemsSource as DataView;
       if( dataView == null )
       {
-        DataTable dataTable = configuration.ItemsSource as DataTable;
+        var dataTable = configuration.ItemsSource as DataTable;
         if( dataTable != null )
         {
           dataView = dataTable.DefaultView;
@@ -47,7 +51,7 @@ namespace Xceed.Wpf.DataGrid
         return value;
       }
 
-      DataRowView dataRow = value as DataRowView;
+      var dataRow = value as DataRowView;
 
       if( dataRow == null )
       {
@@ -59,14 +63,17 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public override object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
+    public override object GetValueFromKey( object key, DataGridForeignKeyDescription description )
     {
-      // When the Key changes, try to find the data row that has the new key.
-      // If it is not found, return null.
-      DataView dataView = configuration.ItemsSource as DataView;
+      return this.GetValueFromKeyCore( key, description.ItemsSource, description.ValuePath, description.DisplayMemberPath, false );
+    }
+
+    private object GetValueFromKeyCore( object key, IEnumerable itemsSource, string valuePath, string displayMemberPath, bool isConfiguration )
+    {
+      var dataView = itemsSource as DataView;
       if( dataView == null )
       {
-        DataTable dataTable = configuration.ItemsSource as DataTable;
+        var dataTable = itemsSource as DataTable;
         if( dataTable != null )
         {
           dataView = dataTable.DefaultView;
@@ -78,8 +85,6 @@ namespace Xceed.Wpf.DataGrid
         return key;
       }
 
-      string valuePath = configuration.ValuePath;
-
       if( string.IsNullOrEmpty( valuePath ) )
       {
         return key;
@@ -111,18 +116,19 @@ namespace Xceed.Wpf.DataGrid
         dataRow = dataView[ index ];
       }
 
-      object value = dataRow;
-
       // Use the DisplayMemberPath if defined
       if( dataRow != null )
       {
-        if( !string.IsNullOrEmpty( configuration.DisplayMemberPath ) )
+        if( !string.IsNullOrEmpty( displayMemberPath ) )
         {
-          value = dataRow[ configuration.DisplayMemberPath ];
+          return dataRow[ displayMemberPath ];
         }
       }
 
-      return value;
+      if( isConfiguration )
+        return dataRow;
+
+      return key;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigNotifyCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
similarity index 97%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
index a30082b8..0adf06c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
@@ -1,68 +1,68 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyConfigNotifyCollectionChangedEventManager : WeakEventManager
-  {
-    public static void AddListener( ForeignKeyConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ForeignKeyConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var configuration = ( ForeignKeyConfiguration )source;
-      configuration.NotifiyCollectionChanged += new EventHandler( this.OnNotifiyCollectionChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var configuration = ( ForeignKeyConfiguration )source;
-      configuration.NotifiyCollectionChanged -= new EventHandler( this.OnNotifiyCollectionChanged );
-    }
-
-    private static ForeignKeyConfigNotifyCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ForeignKeyConfigNotifyCollectionChangedEventManager );
-        var currentManager = ( ForeignKeyConfigNotifyCollectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ForeignKeyConfigNotifyCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnNotifiyCollectionChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ForeignKeyConfigNotifyCollectionChangedEventManager : WeakEventManager
+  {
+    public static void AddListener( ForeignKeyConfiguration source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    public static void RemoveListener( ForeignKeyConfiguration source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      var configuration = ( ForeignKeyConfiguration )source;
+      configuration.NotifiyCollectionChanged += new EventHandler( this.OnNotifiyCollectionChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      var configuration = ( ForeignKeyConfiguration )source;
+      configuration.NotifiyCollectionChanged -= new EventHandler( this.OnNotifiyCollectionChanged );
+    }
+
+    private static ForeignKeyConfigNotifyCollectionChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ForeignKeyConfigNotifyCollectionChangedEventManager );
+        var currentManager = ( ForeignKeyConfigNotifyCollectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ForeignKeyConfigNotifyCollectionChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnNotifiyCollectionChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
index 883c6dfb..1e3327aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
@@ -16,7 +16,6 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Data;
@@ -24,7 +23,6 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using Xceed.Utils.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -538,7 +536,7 @@ namespace Xceed.Wpf.DataGrid
         {
           foreach( object item in itemsSource )
           {
-            DataRowView dataRowView = item as DataRowView;
+            var dataRowView = item as DataRowView;
             if( dataRowView != null )
             {
               var value = dataRowView[ valuePath ];
@@ -567,76 +565,97 @@ namespace Xceed.Wpf.DataGrid
       return fieldValue;
     }
 
-    internal static void UpdateColumnsForeignKeyConfigurations( Dictionary<string, ColumnBase> columns, IEnumerable itemsSourceCollection,
-                                                                Dictionary<string, ItemsSourceHelper.FieldDescriptor> fieldDescriptors, bool autoCreateForeignKeyConfigurations )
+    internal static void UpdateColumnsForeignKeyConfigurations(
+      ObservableColumnCollection columns,
+      IEnumerable itemsSourceCollection,
+      PropertyDescriptionRouteDictionary propertyDescriptions,
+      bool autoCreateForeignKeyConfigurations )
     {
-      DataGridCollectionViewBase collectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-
+      var collectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
       if( collectionViewBase != null )
       {
         ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView( columns, collectionViewBase.ItemProperties, autoCreateForeignKeyConfigurations );
       }
       else
       {
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromFieldDescriptors( columns, fieldDescriptors, autoCreateForeignKeyConfigurations );
+        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromPropertyDescriptions( columns, propertyDescriptions, autoCreateForeignKeyConfigurations );
       }
     }
 
     // If a DataGridCollectionViewBase is used, get the ItemProperties it defines to be able to retreive DataGridForeignKeyDescription for each of them
     // to get the auto-detected ForeignKey ItemsSource (if any).
     // If a DataGridCollectionViewBase is not used, the ItemsSource must be manually specified on each Column in order to correctly display/edit the Data
-    internal static void UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView( Dictionary<string, ColumnBase> columns, DataGridItemPropertyCollection itemProperties,
-                                                                                          bool autoCreateForeignKeyConfigurations )
+    internal static void UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
+      ObservableColumnCollection columns,
+      DataGridItemPropertyCollection itemProperties,
+      bool autoCreateForeignKeyConfigurations )
     {
       if( itemProperties == null )
         return;
 
-      foreach( DataGridItemPropertyBase itemProperty in itemProperties )
+      foreach( var itemProperty in itemProperties )
       {
-        DataGridForeignKeyDescription description = itemProperty.ForeignKeyDescription;
-
-        if( description == null )
-          continue;
+        var description = itemProperty.ForeignKeyDescription;
+        if( description != null )
+        {
+          var columnName = PropertyRouteParser.Parse( itemProperty );
+          var column = ( columnName != null ) ? columns[ columnName ] as Column : null;
 
-        ColumnBase column;
-        columns.TryGetValue( itemProperty.Name, out column );
+          if( column != null )
+          {
+            ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( column, description, autoCreateForeignKeyConfigurations );
+          }
+        }
 
-        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( column as Column, description, autoCreateForeignKeyConfigurations );
+        if( itemProperty.ItemPropertiesInternal != null )
+        {
+          ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
+            columns,
+            itemProperty.ItemPropertiesInternal,
+            autoCreateForeignKeyConfigurations );
+        }
       }
     }
 
-    private static void UpdateColumnsForeignKeyConfigurationsFromFieldDescriptors( Dictionary<string, ColumnBase> columns,
-                                                                                   Dictionary<string, ItemsSourceHelper.FieldDescriptor> fieldDescriptors,
-                                                                                   bool autoCreateForeignKeyConfigurations )
+    private static void UpdateColumnsForeignKeyConfigurationsFromPropertyDescriptions(
+      ObservableColumnCollection columns,
+      PropertyDescriptionRouteDictionary propertyDescriptions,
+      bool autoCreateForeignKeyConfigurations )
     {
-      if( columns == null )
-        return;
-
-      if( fieldDescriptors == null )
+      if( ( columns == null ) || ( propertyDescriptions == null ) )
         return;
 
-      foreach( ItemsSourceHelper.FieldDescriptor fieldDescriptor in fieldDescriptors.Values )
+      foreach( var column in columns )
       {
-        DataGridForeignKeyDescription description = fieldDescriptor.ForeignKeyDescription;
+        var targetColumn = column as Column;
+        if( targetColumn == null )
+          continue;
+
+        var key = PropertyRouteParser.Parse( targetColumn.FieldName );
+        if( key == null )
+          continue;
 
-        if( description == null )
+        var propertyDescription = propertyDescriptions[ key ];
+        if( propertyDescription == null )
           continue;
 
-        ColumnBase column;
-        columns.TryGetValue( fieldDescriptor.Name, out column );
+        var foreignKeyDescription = propertyDescription.Current.ForeignKeyDescription;
+        if( foreignKeyDescription == null )
+          continue;
 
-        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( column as Column, description, autoCreateForeignKeyConfigurations );
+        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( targetColumn, foreignKeyDescription, autoCreateForeignKeyConfigurations );
       }
     }
 
-    internal static void SynchronizeForeignKeyConfigurationFromForeignKeyDescription( Column column, DataGridForeignKeyDescription description,
-                                                                                      bool autoCreateForeignKeyConfigurations )
+    internal static void SynchronizeForeignKeyConfigurationFromForeignKeyDescription(
+      Column column,
+      DataGridForeignKeyDescription description,
+      bool autoCreateForeignKeyConfigurations )
     {
       if( ( description == null ) || ( column == null ) )
         return;
 
-      ForeignKeyConfiguration configuration = column.ForeignKeyConfiguration;
-
+      var configuration = column.ForeignKeyConfiguration;
       if( configuration == null )
       {
         if( !autoCreateForeignKeyConfigurations )
@@ -677,14 +696,22 @@ namespace Xceed.Wpf.DataGrid
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( ( managerType == typeof( CollectionChangedEventManager ) ) || ( managerType == typeof( ListChangedEventManager ) ) )
       {
         this.OnNotifiyCollectionChanged();
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs
similarity index 97%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs
index f4c64c5d..10db6557 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs
@@ -1,72 +1,72 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyConfigurationChangedEventManager : WeakEventManager
-  {
-    private ForeignKeyConfigurationChangedEventManager()
-    {
-    }
-
-    public static void AddListener( Column source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( Column source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      Column column = ( Column )source;
-      column.ForeignKeyConfigurationChanged += new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      Column column = ( Column )source;
-      column.ForeignKeyConfigurationChanged -= new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
-    }
-
-    private static ForeignKeyConfigurationChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ForeignKeyConfigurationChangedEventManager );
-        ForeignKeyConfigurationChangedEventManager currentManager = ( ForeignKeyConfigurationChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ForeignKeyConfigurationChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnForeignKeyConfigurationChangedChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ForeignKeyConfigurationChangedEventManager : WeakEventManager
+  {
+    private ForeignKeyConfigurationChangedEventManager()
+    {
+    }
+
+    public static void AddListener( Column source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    public static void RemoveListener( Column source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      Column column = ( Column )source;
+      column.ForeignKeyConfigurationChanged += new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
+    }
+
+    protected override void StopListening( object source )
+    {
+      Column column = ( Column )source;
+      column.ForeignKeyConfigurationChanged -= new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
+    }
+
+    private static ForeignKeyConfigurationChangedEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( ForeignKeyConfigurationChangedEventManager );
+        ForeignKeyConfigurationChangedEventManager currentManager = ( ForeignKeyConfigurationChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new ForeignKeyConfigurationChangedEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnForeignKeyConfigurationChangedChanged( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
index e0980bdb..aea26416 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
@@ -24,16 +24,10 @@ namespace Xceed.Wpf.DataGrid
 {
   public abstract class ForeignKeyConverter
   {
-    #region Constructors
-
     public ForeignKeyConverter()
     {
     }
 
-    #endregion
-
-    #region Public Virtual Methods
-
     public virtual object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
     {
       return key;
@@ -44,6 +38,9 @@ namespace Xceed.Wpf.DataGrid
       return value;
     }
 
-    #endregion
+    public virtual object GetValueFromKey( object key, DataGridForeignKeyDescription description )
+    {
+      return key;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs
new file mode 100644
index 00000000..a0e5eca2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs
@@ -0,0 +1,154 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ForeignKeyDistinctValueItemContentControl : ForeignKeyContentControl
+  {
+    #region Static Fields
+
+    private static Binding ParentAutoFilterControlBinding;
+
+    #endregion
+
+    #region Constructors
+
+    static ForeignKeyDistinctValueItemContentControl()
+    {
+      ForeignKeyDistinctValueItemContentControl.ParentAutoFilterControlBinding = new Binding();
+      ForeignKeyDistinctValueItemContentControl.ParentAutoFilterControlBinding.Mode = BindingMode.OneWay;
+    }
+
+    public ForeignKeyDistinctValueItemContentControl()
+    {
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    #endregion
+
+    #region DefaultCellContentTemplateBinding Private Static Property
+
+    private static Binding DefaultCellContentTemplateBinding
+    {
+      get
+      {
+        if( ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache == null )
+        {
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache = new Binding();
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.Mode = BindingMode.OneWay;
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
+
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.Path = 
+            new PropertyPath( "(0).(1).(2)", 
+              Cell.ParentCellProperty, 
+              Cell.ParentColumnProperty, 
+              ColumnBase.CellContentTemplateProperty );
+        }
+
+        return ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache;
+      }
+    }
+
+    private static Binding DefaultCellContentTemplateBindingCache; // = null;
+
+    #endregion
+
+    #region DefaultCellContentTemplateSelectorBinding Private Static Property
+
+    private static Binding DefaultCellContentTemplateSelectorBinding
+    {
+      get
+      {
+        if( ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache == null )
+        {
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache = new Binding();
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.Mode = BindingMode.OneWay;
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
+
+          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.Path =
+            new PropertyPath( "(0).(1).(2)",
+              Cell.ParentCellProperty,
+              Cell.ParentColumnProperty,
+              ColumnBase.CellContentTemplateSelectorProperty );
+        }
+
+        return ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache;
+      }
+    }
+
+    private static Binding DefaultCellContentTemplateSelectorBindingCache;
+
+    #endregion
+
+    #region DistinctValueItemTemplateBinding Private Static Property
+
+    private static Binding DistinctValueItemTemplateBinding
+    {
+      get
+      {
+        if( ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache == null )
+        {
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache = new Binding();
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache.Mode = BindingMode.OneWay;
+
+
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache.Path =
+            new PropertyPath( "DistinctValueItemTemplate" );
+        }
+
+        return ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache;
+      }
+    }
+
+    private static Binding DistinctValueItemTemplateBindingCache; // = null;
+
+    #endregion
+
+    #region DefaultCellContentTemplateSelectorBinding Private Static Property
+
+    private static Binding DistinctValueItemTemplateSelectorBinding
+    {
+      get
+      {
+        if( ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache == null )
+        {
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache = new Binding();
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache.Mode = BindingMode.OneWay;
+
+
+          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache.Path =
+            new PropertyPath( "DistinctValueItemTemplateSelector" );
+        }
+
+        return ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache;
+      }
+    }
+
+    private static Binding DistinctValueItemTemplateSelectorBindingCache;
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
index 4cf75fea..0e9589eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
@@ -14,12 +14,9 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Data;
+using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -106,7 +103,7 @@ namespace Xceed.Wpf.DataGrid
 
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      Xceed.Wpf.DataGrid.Views.UIViewBase uiViewBase = null;
+      UIViewBase uiViewBase = null;
 
       if( dataGridContext != null )
       {
@@ -114,7 +111,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( dataGridControl != null )
         {
-          uiViewBase = dataGridControl.GetView() as Xceed.Wpf.DataGrid.Views.UIViewBase;
+          uiViewBase = dataGridControl.GetView() as UIViewBase;
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs
index 69e0071b..bdf27017 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs
@@ -1,48 +1,48 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void ContainersRemovedEventHandler( object sender, ContainersRemovedEventArgs e );
-
-  internal class ContainersRemovedEventArgs : EventArgs
-  {
-    public ContainersRemovedEventArgs( IList<DependencyObject> removedContainers )
-    {
-      if( removedContainers == null )
-        throw new ArgumentNullException( "removedContainers" );
-
-      m_removedContainers = removedContainers;
-    }
-
-    public IList<DependencyObject> RemovedContainers
-    {
-      get
-      {
-        return m_removedContainers;
-      }
-    }
-
-    private IList<DependencyObject> m_removedContainers;
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Collections.Specialized;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal delegate void ContainersRemovedEventHandler( object sender, ContainersRemovedEventArgs e );
+
+  internal class ContainersRemovedEventArgs : EventArgs
+  {
+    public ContainersRemovedEventArgs( IList<DependencyObject> removedContainers )
+    {
+      if( removedContainers == null )
+        throw new ArgumentNullException( "removedContainers" );
+
+      m_removedContainers = removedContainers;
+    }
+
+    public IList<DependencyObject> RemovedContainers
+    {
+      get
+      {
+        return m_removedContainers;
+      }
+    }
+
+    private IList<DependencyObject> m_removedContainers;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs
new file mode 100644
index 00000000..9016ccfc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs
@@ -0,0 +1,78 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal delegate void CustomGeneratorChangedEventHandler( object sender, CustomGeneratorChangedEventArgs e );
+
+  internal sealed class CustomGeneratorChangedEventArgs : EventArgs
+  {
+    private CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction action, int count, IList<DependencyObject> containers )
+    {
+      m_action = action;
+      m_count = count;
+      m_containers = containers;
+    }
+
+    internal NotifyCollectionChangedAction Action
+    {
+      get
+      {
+        return m_action;
+      }
+    }
+
+    internal int Count
+    {
+      get
+      {
+        return m_count;
+      }
+    }
+
+    internal IList<DependencyObject> Containers
+    {
+      get
+      {
+        return m_containers;
+      }
+    }
+
+    internal static CustomGeneratorChangedEventArgs Add( int count )
+    {
+      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Add, count, null );
+    }
+
+    internal static CustomGeneratorChangedEventArgs Remove( int count, IList<DependencyObject> containers )
+    {
+      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Remove, count, containers );
+    }
+
+    internal static CustomGeneratorChangedEventArgs Reset()
+    {
+      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Reset, 0, null );
+    }
+
+    private readonly NotifyCollectionChangedAction m_action;
+    private readonly int m_count;
+    private readonly IList<DependencyObject> m_containers;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs
deleted file mode 100644
index dbc85a26..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Collections.Specialized;
-using System.Windows.Controls.Primitives;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void CustomGeneratorChangedEventHandler( object sender, CustomGeneratorChangedEventArgs e );
-
-  internal class CustomGeneratorChangedEventArgs : EventArgs
-  {
-    internal CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction action, GeneratorPosition position, int index, int itemCount, int itemUICount )
-      : this( action, position, index, new GeneratorPosition( -1, 0 ), -1, itemCount, itemUICount, null )
-    {
-
-    }
-
-    internal CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction action, GeneratorPosition position, int index, int itemCount, int itemUICount, IList<DependencyObject> removedContainers )
-      : this( action, position, index, new GeneratorPosition( -1, 0 ), -1, itemCount, itemUICount, removedContainers )
-    {
-
-    }
-
-    internal CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction action, GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> removedContainers )
-    {
-      _action = action;
-      _position = position;
-      _oldPosition = oldPosition;
-      _itemCount = itemCount;
-      _itemUICount = itemUICount;
-      _index = index;
-      _oldIndex = oldIndex;
-      m_removedContainers = removedContainers;
-    }
-
-    public NotifyCollectionChangedAction Action
-    {
-      get
-      {
-        return _action;
-      }
-    }
-
-    public int ItemCount
-    {
-      get
-      {
-        return _itemCount;
-      }
-    }
-
-    public int ItemUICount
-    {
-      get
-      {
-        return _itemUICount;
-      }
-    }
-
-    public GeneratorPosition OldPosition
-    {
-      get
-      {
-        return _oldPosition;
-      }
-    }
-
-    public GeneratorPosition Position
-    {
-      get
-      {
-        return _position;
-      }
-    }
-
-    public IList<DependencyObject> RemovedContainers
-    {
-      get
-      {
-        return m_removedContainers;
-      }
-    }
-
-    public int Index
-    {
-      get
-      {
-        return _index;
-      }
-    }
-
-    public int OldIndex
-    {
-      get
-      {
-        return _oldIndex;
-      }
-    }
-
-    private readonly NotifyCollectionChangedAction _action;
-    private readonly int _itemCount;
-    private readonly int _itemUICount;
-    private readonly GeneratorPosition _oldPosition;
-    private readonly GeneratorPosition _position;
-    private readonly IList<DependencyObject> m_removedContainers;
-    private readonly int _index;
-    private readonly int _oldIndex;
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs
new file mode 100644
index 00000000..81cbe351
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs
@@ -0,0 +1,82 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Xceed.Wpf.DataGrid.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid
+{
+  partial class CustomItemContainerGenerator
+  {
+    private IDisposable TraceBlock( DataGridTraceEventId eventId )
+    {
+      return this.TraceBlock( eventId, ( string )null, null );
+    }
+
+    private IDisposable TraceBlock( DataGridTraceEventId eventId, params DataGridTraceArg[] args )
+    {
+      return this.TraceBlock( eventId, null, args );
+    }
+
+    private IDisposable TraceBlock( DataGridTraceEventId eventId, string message, params DataGridTraceArg[] args )
+    {
+      var traceSource = DataGridControlTraceSources.ItemContainerGeneratorSource;
+      if( !traceSource.ShouldTraceBlock() )
+        return traceSource.NoTrace;
+
+      return traceSource.TraceBlock( eventId, message, this.GetTraceArgs( args ).ToList() );
+    }
+
+    [Conditional( "TRACE" )]
+    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId )
+    {
+      this.TraceEvent( eventType, eventId, ( string )null, null );
+    }
+
+    [Conditional( "TRACE" )]
+    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, params DataGridTraceArg[] args )
+    {
+      this.TraceEvent( eventType, eventId, null, args );
+    }
+
+    [Conditional( "TRACE" )]
+    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, string message, params DataGridTraceArg[] args )
+    {
+      var traceSource = DataGridControlTraceSources.ItemContainerGeneratorSource;
+      if( !traceSource.ShouldTrace( eventType ) )
+        return;
+
+      traceSource.TraceEvent( eventType, eventId, message, this.GetTraceArgs( args ).ToList() );
+    }
+
+    private IEnumerable<DataGridTraceArg> GetTraceArgs( DataGridTraceArg[] args )
+    {
+      if( ( args != null ) && ( args.Length > 0 ) )
+      {
+        foreach( var arg in args )
+        {
+          yield return arg;
+        }
+      }
+
+      yield return DataGridTraceArgs.Generator( this );
+      yield return DataGridTraceArgs.DataGridControl( m_dataGridControl );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
index 0bc8fe9c..eccc13cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
@@ -22,14 +22,13 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using Xceed.Utils.Collections;
-using Xceed.Utils.Wpf;
+using Xceed.Wpf.DataGrid.Diagnostics;
 using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
@@ -41,29 +40,22 @@ namespace Xceed.Wpf.DataGrid
     INotifyPropertyChanged,
     IDataGridContextVisitable
   {
-    #region Static Fields
-
-    private const int GlobalItemsResetThreshold = 10000;
-
-    #endregion
-
     internal static CustomItemContainerGenerator CreateGenerator( DataGridControl dataGridControl, CollectionView collectionView, DataGridContext dataGridContext )
     {
       if( dataGridControl == null )
         throw new ArgumentNullException( "dataGridControl" );
 
       if( collectionView == null )
-        DataGridException.ThrowSystemException( "collectionView", typeof( ArgumentNullException ), dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "collectionView", dataGridControl );
 
       if( dataGridContext == null )
-        DataGridException.ThrowSystemException( "dataGridContext", typeof( ArgumentNullException ), dataGridControl.Name );
-
-      var log = new Log();
-      log.StartUp();
+        throw DataGridException.Create<ArgumentNullException>( "dataGridContext", dataGridControl );
 
+      var recyclingPools = new CustomItemContainerGeneratorRecyclingPools();
+      var ensureNodeTreeCreatedRequiredFlag = new BubbleDirtyFlag( true );
       var handleGlobalItemsResetFlag = new InheritAutoResetFlag();
       var deferDetailsRemapFlag = new LeveledAutoResetFlag();
-      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, log, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
+      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, recyclingPools, ensureNodeTreeCreatedRequiredFlag, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
 
       dataGridContext.SetGenerator( generator );
 
@@ -76,18 +68,19 @@ namespace Xceed.Wpf.DataGrid
         throw new ArgumentNullException( "dataGridControl" );
 
       if( collectionView == null )
-        DataGridException.ThrowSystemException( "collectionView", typeof( ArgumentNullException ), dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "collectionView", dataGridControl );
 
       if( dataGridContext == null )
-        DataGridException.ThrowSystemException( "dataGridContext", typeof( ArgumentNullException ), dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "dataGridContext", dataGridControl );
 
       if( masterGenerator == null )
-        DataGridException.ThrowSystemException( "masterGenerator", typeof( ArgumentNullException ), dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "masterGenerator", dataGridControl );
 
-      var log = masterGenerator.m_log;
+      var recyclingPools = masterGenerator.m_recyclingPools;
+      var ensureNodeTreeCreatedRequiredFlag = new BubbleDirtyFlag( masterGenerator.m_ensureNodeTreeCreatedRequired, true );
       var handleGlobalItemsResetFlag = new InheritAutoResetFlag( masterGenerator.m_handleGlobalItemsReset );
       var deferDetailsRemapFlag = masterGenerator.m_deferDetailsRemap.GetChild();
-      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, log, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
+      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, recyclingPools, ensureNodeTreeCreatedRequiredFlag, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
 
       dataGridContext.SetGenerator( generator );
 
@@ -98,21 +91,24 @@ namespace Xceed.Wpf.DataGrid
       DataGridControl dataGridControl,
       CollectionView collectionView,
       DataGridContext dataGridContext,
-      Log log,
+      CustomItemContainerGeneratorRecyclingPools recyclingPools,
+      BubbleDirtyFlag ensureNodeTreeCreatedRequiredFlag,
       InheritAutoResetFlag handleGlobalItemResetFlag,
       LeveledAutoResetFlag deferDetailsRemapFlag )
     {
       Debug.Assert( dataGridControl != null );
       Debug.Assert( collectionView != null );
       Debug.Assert( dataGridContext != null );
-      Debug.Assert( log != null );
+      Debug.Assert( recyclingPools != null );
+      Debug.Assert( ensureNodeTreeCreatedRequiredFlag != null );
       Debug.Assert( handleGlobalItemResetFlag != null );
       Debug.Assert( deferDetailsRemapFlag != null );
 
       m_dataGridControl = dataGridControl;
       m_dataGridContext = dataGridContext;
       m_collectionView = collectionView;
-      m_log = log;
+      m_recyclingPools = recyclingPools;
+      m_ensureNodeTreeCreatedRequired = ensureNodeTreeCreatedRequiredFlag;
       m_handleGlobalItemsReset = handleGlobalItemResetFlag;
       m_deferDetailsRemap = deferDetailsRemapFlag;
 
@@ -123,6 +119,7 @@ namespace Xceed.Wpf.DataGrid
 
       m_nodeFactory = new GeneratorNodeFactory( this.OnGeneratorNodeItemsCollectionChanged,
                                                 this.OnGeneratorNodeGroupsCollectionChanged,
+                                                this.OnGeneratorNodeHeadersFootersCollectionChanged,
                                                 this.OnGeneratorNodeExpansionStateChanged,
                                                 this.OnGroupGeneratorNodeIsExpandedChanging,
                                                 this.OnGroupGeneratorNodeIsExpandedChanged,
@@ -197,6 +194,22 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region ForceReset Internal Property
+
+    internal bool ForceReset
+    {
+      get
+      {
+        return m_flags[ ( int )CustomItemContainerGeneratorFlags.ForceReset ];
+      }
+      set
+      {
+        m_flags[ ( int )CustomItemContainerGeneratorFlags.ForceReset ] = value;
+      }
+    }
+
+    #endregion
+
     #region Header Property
 
     public HeadersFootersGeneratorNode Header
@@ -308,6 +321,8 @@ namespace Xceed.Wpf.DataGrid
 
     private IDisposable SetIsEnsuringNodeTreeCreated()
     {
+      m_ensureNodeTreeCreatedRequired.IsSet = false;
+
       return m_ensureNodeTreeCreated.Set();
     }
 
@@ -315,6 +330,28 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region IsNodeTreeValid Private Property
+
+    private bool IsNodeTreeValid
+    {
+      get
+      {
+        return !m_ensureNodeTreeCreatedRequired.IsSet;
+      }
+    }
+
+    private void InvalidateNodeTree()
+    {
+      if( this.IsEnsuringNodeTreeCreated )
+        return;
+
+      m_ensureNodeTreeCreatedRequired.IsSet = true;
+    }
+
+    private readonly BubbleDirtyFlag m_ensureNodeTreeCreatedRequired;
+
+    #endregion
+
     #region IsHandlingGlobalItemsReset Private Property
 
     private bool IsHandlingGlobalItemsReset
@@ -335,8 +372,6 @@ namespace Xceed.Wpf.DataGrid
 
     private IDisposable SetIsHandlingGlobalItemsResetLocally()
     {
-      m_log.Assert( this, ( m_containersRemovedDeferCount != 0 ) || ( m_deferredContainersRemoved.Count == 0 ), "( m_containersRemovedDeferCount != 0 ) || ( m_deferredContainersRemoved.Count == 0 )" );
-
       return m_handleGlobalItemsReset.SetLocal();
     }
 
@@ -344,6 +379,25 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region IsItemsChangedInhibited Private Property
+
+    private bool IsItemsChangedInhibited
+    {
+      get
+      {
+        return m_isItemsChangedInhibited.IsSet;
+      }
+    }
+
+    private IDisposable InhibitItemsChanged()
+    {
+      return m_isItemsChangedInhibited.Set();
+    }
+
+    private readonly AutoResetFlag m_isItemsChangedInhibited = AutoResetFlagFactory.Create();
+
+    #endregion
+
     #region DetailsChanged Event
 
     public event EventHandler DetailsChanged;
@@ -354,39 +408,39 @@ namespace Xceed.Wpf.DataGrid
 
     internal event CustomGeneratorChangedEventHandler ItemsChanged;
 
-    private void SendRemoveEvent( GeneratorPosition remPos, int oldIndex, int remCount, int generatedRemCount, IList<DependencyObject> removedContainers )
+    private void SendRemoveEvent( int count, IList<DependencyObject> containers )
     {
       var handler = this.ItemsChanged;
-      if( handler == null )
+      if( ( handler == null ) || ( count <= 0 ) || this.IsItemsChangedInhibited )
         return;
 
       using( this.DeferDetailsRemap() )
       {
-        handler.Invoke( this, new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Remove, remPos, oldIndex, remPos, oldIndex, remCount, generatedRemCount, removedContainers ) );
+        handler.Invoke( this, CustomGeneratorChangedEventArgs.Remove( count, containers ) );
       }
     }
 
-    private void SendAddEvent( GeneratorPosition genPos, int index, int addCount )
+    private void SendAddEvent( int count )
     {
       var handler = this.ItemsChanged;
-      if( handler == null )
+      if( ( handler == null ) || ( count <= 0 ) || this.IsItemsChangedInhibited )
         return;
 
       using( this.DeferDetailsRemap() )
       {
-        handler.Invoke( this, new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Add, genPos, index, addCount, 0 ) );
+        handler.Invoke( this, CustomGeneratorChangedEventArgs.Add( count ) );
       }
     }
 
     private void SendResetEvent()
     {
       var handler = this.ItemsChanged;
-      if( handler == null )
+      if( ( handler == null ) || this.IsItemsChangedInhibited )
         return;
 
       using( this.DeferDetailsRemap() )
       {
-        handler.Invoke( this, new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Reset, new GeneratorPosition(), 0, 0, 0 ) );
+        handler.Invoke( this, CustomGeneratorChangedEventArgs.Reset() );
       }
     }
 
@@ -396,24 +450,32 @@ namespace Xceed.Wpf.DataGrid
 
     internal event ContainersRemovedEventHandler ContainersRemoved;
 
-    private void NotifyContainersRemoved( IList<DependencyObject> removedContainers )
+    private void OnContainersRemoved( IList<DependencyObject> containers )
     {
-      if( m_containersRemovedDeferCount > 0 )
-      {
-        m_deferredContainersRemoved.AddRange( removedContainers );
-      }
-      else if( removedContainers.Count > 0 )
-      {
-        this.NotifyContainersRemoved( new ContainersRemovedEventArgs( removedContainers ) );
-      }
+      var handler = this.ContainersRemoved;
+      if( ( handler == null ) || ( containers == null ) || ( containers.Count <= 0 ) )
+        return;
+
+      handler.Invoke( this, new ContainersRemovedEventArgs( containers ) );
     }
 
-    private void NotifyContainersRemoved( ContainersRemovedEventArgs e )
+    #endregion
+
+    #region RecyclingCandidatesCleaned Internal Event
+
+    internal event RecyclingCandidatesCleanedEventHandler RecyclingCandidatesCleaned;
+
+    private void OnRecyclingCandidatesCleaned( object sender, RecyclingCandidatesCleanedEventArgs e )
     {
       if( !this.IsRecyclingEnabled )
         return;
 
-      var handler = this.ContainersRemoved;
+      foreach( DependencyObject container in e.RecyclingCandidates )
+      {
+        this.ClearStatContext( container );
+      }
+
+      var handler = this.RecyclingCandidatesCleaned;
       if( handler == null )
         return;
 
@@ -422,528 +484,361 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Logging Methods
-
-    [Conditional( "CUSTOMLOG" )]
-    internal void ResetLog( string gridUniqueName )
+    public void ResetGeneratorContent()
     {
-      m_log.StartUp( gridUniqueName );
+      this.CleanupGenerator();
+      this.EnsureNodeTreeCreated();
     }
 
-    [Conditional( "LOG" )]
-    private void LogState()
+    public DependencyObject ContainerFromIndex( int itemIndex )
     {
-      StringBuilder sb = new StringBuilder( 1024 );
-      this.LogState( sb );
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceArgs.Index( itemIndex ) ) )
+      {
+        if( this.IsHandlingGlobalItemsReset )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Index( itemIndex ) );
+          return null;
+        }
 
-      m_log.WriteLine( this, sb.ToString() );
-    }
+        this.EnsureNodeTreeCreated();
 
-    [Conditional( "LOG" )]
-    private void LogState( StringBuilder sb )
-    {
-      var parent = m_dataGridContext.ParentDataGridContext;
-      if( parent != null )
-      {
-        parent.CustomItemContainerGenerator.LogState( sb );
-      }
+        var index = m_genPosToIndex.IndexOf( itemIndex );
+        if( index >= 0 )
+        {
+          var container = m_genPosToContainer[ index ];
 
-      sb.Append( "Generator state : " );
-      if( parent == null )
-      {
-        sb.AppendLine( "MASTER" );
-      }
-      else
-      {
-        sb.AppendLine( CustomItemContainerGenerator.FormatObjectId( "DETAIL - D", m_dataGridContext.ParentItem ) );
-      }
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( itemIndex ) );
 
-      sb.AppendLine( string.Empty );
-      sb.AppendLine( " m_genPosToContainer :" );
-      for( int i = 0; i < m_genPosToContainer.Count; i++ )
-      {
-        object value = m_genPosToContainer[ i ];
+          var detailNode = m_genPosToNode[ index ] as DetailGeneratorNode;
+          if( detailNode == null )
+            return container;
 
-        if( value == null )
-        {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - null" );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerIsInDetail, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.Node( detailNode ) );
         }
         else
         {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - " + value.GetHashCode() );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Index( itemIndex ) );
         }
+
+        return null;
       }
+    }
 
-      sb.AppendLine( " m_genPosToIndex :" );
-      for( int i = 0; i < m_genPosToIndex.Count; i++ )
+    internal DependencyObject ContainerFromItem( object item )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceArgs.Item( item ) ) )
       {
-        object value = m_genPosToIndex[ i ];
-
-        if( value == null )
+        if( this.IsHandlingGlobalItemsReset )
         {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - null" );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Item( item ) );
+          return null;
         }
-        else
+
+        this.EnsureNodeTreeCreated();
+
+        var index = this.FindFirstGeneratedIndexForLocalItem( item );
+        if( index >= 0 )
         {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - " + value.ToString() );
+          var container = m_genPosToContainer[ index ];
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
+          return container;
         }
+
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Item( item ) );
+        return null;
       }
+    }
 
-      sb.AppendLine( " m_genPosToItem :" );
-      for( int i = 0; i < m_genPosToItem.Count; i++ )
-      {
-        object value = m_genPosToItem[ i ];
+    internal List<object> GetRealizedDataItemsForGroup( GroupGeneratorNode group )
+    {
+      var count = m_genPosToNode.Count;
+      var items = new List<object>( count );
 
-        if( value == null )
-        {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - null" );
-        }
-        else
+      for( int i = 0; i < count; i++ )
+      {
+        var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
+        if( ( node != null ) && ( node.Parent == group ) )
         {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - D" + value.GetHashCode() );
+          items.Add( m_genPosToItem[ i ] );
         }
       }
 
-      sb.AppendLine( " m_genPosToNode :" );
-      for( int i = 0; i < m_genPosToNode.Count; i++ )
-      {
-        object value = m_genPosToNode[ i ];
+      return items;
+    }
+
+    internal List<object> GetRealizedDataItems()
+    {
+      var count = m_genPosToNode.Count;
+      var items = new List<object>( count );
 
-        if( value == null )
+      for( int i = 0; i < count; i++ )
+      {
+        var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
+        if( node != null )
         {
-          sb.AppendLine( "  [ " + i.ToString() + " ] - null" );
+          items.Add( m_genPosToItem[ i ] );
         }
-        else
-        {
-          string prefix;
+      }
 
-          if( value is DetailGeneratorNode )
-          {
-            prefix = "DN";
-          }
-          else if( value is ItemsGeneratorNode )
-          {
-            prefix = "IN";
-          }
-          else if( value is CollectionGeneratorNode )
-          {
-            prefix = "CN";
-          }
-          else
-          {
-            prefix = "?N";
-          }
+      return items;
+    }
 
-          int itemCount = ( value is GeneratorNode ) ? ( ( GeneratorNode )value ).ItemCount : 0;
+    internal object ItemFromContainer( DependencyObject container )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceArgs.Container( container ) ) )
+      {
+        if( this.IsHandlingGlobalItemsReset )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Container( container ) );
+          return null;
+        }
 
-          sb.AppendLine( "  [ " + i.ToString() + " ] - " + prefix + value.GetHashCode() + " - ItemCount : " + itemCount );
+        var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( container );
+        if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Container( container ) );
+          return null;
         }
-      }
 
-      sb.AppendLine( " m_generatorDirection :" + m_generatorDirection.ToString() );
-      sb.AppendLine( CustomItemContainerGenerator.FormatObjectId( " m_generatorCurrentDetail : DN", m_generatorCurrentDetail ) );
-      sb.AppendLine( " m_generatorCurrentDetailIndex : " + m_generatorCurrentDetailIndex.ToString() );
-      sb.AppendLine( " m_generatorCurrentDetailNodeIndex : " + m_generatorCurrentDetailNodeIndex.ToString() );
-      sb.AppendLine( " m_generatorCurrentGlobalIndex : " + m_generatorCurrentGlobalIndex.ToString() );
-      sb.AppendLine( " m_generatorCurrentOffset : " + m_generatorCurrentOffset.ToString() );
-      sb.AppendLine( " m_generatorStatus : " + m_generatorStatus.ToString() );
-      sb.AppendLine( " m_genPosToIndexUpdateInhibitCount : " + m_genPosToIndexUpdateInhibitCount.ToString() );
-      sb.AppendLine( " IsEnsuringNodeTreeCreated : " + this.IsEnsuringNodeTreeCreated.ToString() );
-      sb.AppendLine( " IsHandlingGlobalItemsReset : " + this.IsHandlingGlobalItemsReset.ToString() );
-      sb.AppendLine( " IsDetailsRemapDeferred : " + this.IsDetailsRemapDeferred.ToString() );
+        var dataItem = dataItemStore.Data;
+        var index = m_genPosToContainer.IndexOf( container );
 
-      int newItemCount = m_cachedItemCount;
-      if( m_lastValidItemCountGeneration != m_currentGeneratorContentGeneration )
-      {
-        if( m_startNode != null )
+        if( index >= 0 )
         {
-          int chainLength;
-          GeneratorNodeHelper.EvaluateChain( m_startNode, out newItemCount, out chainLength );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ) );
+
+          var detailNode = m_genPosToNode[ index ] as DetailGeneratorNode;
+          if( detailNode != null )
+          {
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerIsInDetail, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Node( detailNode ) );
+            return null;
+          }
         }
         else
         {
-          newItemCount = 0;
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
         }
-      }
 
-      sb.Append( " m_cachedItemCount : " + m_cachedItemCount.ToString() );
-      if( newItemCount != m_cachedItemCount )
-      {
-        sb.Append( " (needs refresh) - ItemCount : " + newItemCount.ToString() );
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( dataItem ), DataGridTraceArgs.Container( container ) );
+        return dataItem;
       }
-      sb.AppendLine( string.Empty );
-
-      sb.AppendLine( string.Empty );
     }
 
-    [Conditional( "LOG" )]
-    private void ValidateIndexOrder( string message )
+    public int IndexFromItem( object item )
     {
-      int count = m_genPosToIndex.Count;
-      int previousIndex = -1;
-
-      for( int i = 0; i < count; i++ )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceArgs.Item( item ) ) )
       {
-        int tempIndex = m_genPosToIndex[ i ];
+        if( item == null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
+          return -1;
+        }
 
-        if( tempIndex <= previousIndex )
+        this.EnsureNodeTreeCreated();
+
+        if( m_startNode == null )
         {
-          this.LogState();
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Item( item ) );
+          return -1;
+        }
 
-          if( string.IsNullOrEmpty( message ) )
-          {
-            m_log.Fail( this, "### none sequential index detected." );
-          }
-          else
+        var index = this.FindFirstGeneratedIndexForLocalItem( item );
+        if( index >= 0 )
+        {
+          var itemIndex = m_genPosToIndex[ index ];
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.IndexFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
+          return itemIndex;
+        }
+        else
+        {
+          //Note: Under that specific case, I do not want to search through collapsed group nodes... Effectivelly, an item "below" a collapsed group node 
+          //      Have no index as per the "item to index" interface of the generator. 
+          var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+          var itemIndex = nodeHelper.FindItem( item );
+
+          if( itemIndex >= 0 )
           {
-            m_log.Fail( this, "### none sequential index detected. " + message );
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.IndexFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Item( item ) );
+            return itemIndex;
           }
-
-          break;
         }
 
-        previousIndex = tempIndex;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.ItemNotFoundOrCollapsed, DataGridTraceArgs.Item( item ) );
+        return -1;
       }
     }
 
-    [Conditional( "DEBUG" ), Conditional( "LOG" )]
-    private void CheckMasterItem( object dataItem )
+    public object ItemFromIndex( int index )
     {
-      if( m_masterToDetails.ContainsKey( dataItem ) )
-        return;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceArgs.Index( index ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      m_log.Fail( this, "m_masterToDetails do not contains the item from m_floatingDetails." );
-    }
+        if( m_startNode == null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Index( index ) );
+          return null;
+        }
 
-    private static string FormatObjectId( string message, object item )
-    {
-      string id = ( item == null ) ? "null" : item.GetHashCode().ToString();
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        var item = nodeHelper.FindIndex( index );
 
-      if( string.IsNullOrEmpty( message ) )
-        return id;
+        if( item != null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Index( index ) );
+        }
+        else
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Index( index ) );
+        }
 
-      return message + id;
+        return item;
+      }
     }
 
-    private readonly Log m_log;
-
-    #endregion
-
-    public static T FindContainerFromChild<T>( DataGridControl dataGridControl, DependencyObject element ) where T : DependencyObject, IDataGridItemContainer
+    internal bool IsGroupRealized( Group group )
     {
-      if( ( dataGridControl == null ) || ( element == null ) )
-        return null;
-
-      T container = null;
+      var groupNode = ( group != null ) ? group.GeneratorNode : null;
+      if( groupNode == null )
+        return false;
 
-      while( element != null )
+      foreach( var node in m_genPosToNode )
       {
-        var currentDataGridContext = DataGridControl.GetDataGridContext( element );
-        var currentDataGridControl = ( currentDataGridContext == null ) ? null : currentDataGridContext.DataGridControl;
+        var parentNode = node;
 
-        // We are only interested in containers that are part of the same grid.
-        if( currentDataGridControl == dataGridControl )
+        // Find the first GroupGeneratorNode among its ancestors.
+        while( parentNode != null )
         {
-          container = element as T;
-
-          // We have found the container;
-          if( container != null )
+          if( parentNode is GroupGeneratorNode )
             break;
+
+          parentNode = parentNode.Parent;
         }
 
-        // Since the element is the grid itself, we already know we will not find a suitable container beyond this point.
-        if( element == dataGridControl )
-          break;
+        // Find out if the GroupGeneratorNode found is the group or a
+        // child of the target group.
+        while( parentNode != null )
+        {
+          if( parentNode == groupNode )
+            return true;
 
-        element = TreeHelper.GetParent( element );
+          // The current node cannot be a child of the target group if
+          // the parent node is not a group.
+          parentNode = parentNode.Parent as GroupGeneratorNode;
+        }
       }
 
-      return container;
+      return false;
     }
 
-    public static FrameworkElement FindContainerFromChildOrRowSelectorOrSelf( DataGridControl dataGridControl, DependencyObject originalChildOrSelf )
+    public int GetGroupIndex( Group group )
     {
-      if( ( dataGridControl == null ) || ( originalChildOrSelf == null ) )
-        return null;
-
-      DependencyObject childOrSelf = originalChildOrSelf;
-      IDataGridItemContainer container = null;
+      if( group == null )
+        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
 
-      while( childOrSelf != null )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceArgs.Group( group ) ) )
       {
-        var currentDataGridContext = DataGridControl.GetDataGridContext( childOrSelf );
-        var currentDataGridControl = ( currentDataGridContext == null ) ? null : currentDataGridContext.DataGridControl;
+        this.EnsureNodeTreeCreated();
 
-        // We are only interested in containers that are part of the same grid.
-        if( currentDataGridControl == dataGridControl )
+        if( m_startNode == null )
         {
-          container = childOrSelf as IDataGridItemContainer;
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Group( group ) );
+          return -1;
+        }
 
-          // We have found the container;
-          if( container != null )
-            break;
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        if( nodeHelper.FindGroup( group.CollectionViewGroup ) )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Index( nodeHelper.Index ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Group( group ) );
+          return nodeHelper.Index;
         }
 
-        // Since the element is the grid itself, we already know we will not find a suitable container beyond this point.
-        if( childOrSelf == dataGridControl )
-          break;
+        foreach( var detailNode in this.GetDetailGeneratorNodes() )
+        {
+          var index = detailNode.DetailGenerator.GetGroupIndex( group );
+          if( index >= 0 )
+          {
+            var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
+            if( detailIndex >= 0 )
+            {
+              var groupIndex = index + detailIndex;
+
+              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Index( groupIndex ), DataGridTraceArgs.Group( group ) );
+              return groupIndex;
+            }
+
+            this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.DetailNodeNotFound, DataGridTraceArgs.Group( group ) );
+            return -1;
+          }
+        }
 
-        childOrSelf = TreeHelper.GetParent( childOrSelf );
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
+        return -1;
       }
+    }
 
-      // RowSelector are handled differently.
-      if( container == null )
+    public Group GetGroupFromItem( object item )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceArgs.Item( item ) ) )
       {
-        var target = DataGridControl.GetContainer( originalChildOrSelf );
+        this.EnsureNodeTreeCreated();
 
-        if( TreeHelper.IsDescendantOf( target, dataGridControl ) )
+        if( m_startNode == null )
         {
-          container = target as IDataGridItemContainer;
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Item( item ) );
+          return null;
         }
-      }
 
-      dataGridControl.CustomItemContainerGenerator.m_log.Assert( ( container == null ) || ( container is FrameworkElement ),
-                                                                "( container == null ) || ( container is FrameworkElement )" );
+        GeneratorNode node;
 
-      return container as FrameworkElement;
-    }
+        var index = this.FindFirstGeneratedIndexForLocalItem( item );
+        if( index >= 0 )
+        {
+          node = m_genPosToNode[ index ];
 
-    public void ResetGeneratorContent()
-    {
-      this.CleanupGenerator();
-      this.EnsureNodeTreeCreated();
-    }
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.NodeFound, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
+        }
+        else
+        {
+          var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+          if( !nodeHelper.Contains( item ) ) //NOTE: this will only return items directly contained in this generator (not from details )
+            throw DataGridException.Create<InvalidOperationException>( "An attempt was made to retrieve the group of an item that does not belong to the generator.", m_dataGridControl );
 
-    public DependencyObject ContainerFromIndex( int itemIndex )
-    {
-      if( this.IsHandlingGlobalItemsReset )
-        return null;
-
-      DependencyObject retval = null;
-
-      this.EnsureNodeTreeCreated();
-
-      //retrieve the genenerator index for the index specified
-      int genPos = m_genPosToIndex.IndexOf( itemIndex );
-
-      //if the generator index is -1, then the item is not realized
-      if( genPos != -1 )
-      {
-        DetailGeneratorNode detailNode = m_genPosToNode[ genPos ] as DetailGeneratorNode;
-
-        if( detailNode == null )
-        {
-          //remap the generator index on the container list.
-          retval = m_genPosToContainer[ genPos ];
-        }
-      }
-
-      return retval;
-    }
-
-    internal DependencyObject ContainerFromItem( object item )
-    {
-      if( this.IsHandlingGlobalItemsReset )
-        return null;
-
-      DependencyObject retval = null;
-
-      //retrieve the genenerator index for the item specified
-      int genPos = this.FindFirstGeneratedIndexForLocalItem( item );
-
-      //if the generator index is -1, then the item is not realized
-      if( genPos != -1 )
-      {
-        retval = m_genPosToContainer[ genPos ];
-      }
-
-      return retval;
-    }
-
-    internal List<object> GetRealizedDataItemsForGroup( GroupGeneratorNode group )
-    {
-      int count = m_genPosToNode.Count;
-      List<object> items = new List<object>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        ItemsGeneratorNode node = m_genPosToNode[ i ] as ItemsGeneratorNode;
+          //if the nodeHelper was able to locate the content, use the nodeHelper's CurrentNode as the node for the item.
+          node = nodeHelper.CurrentNode;
 
-        if( ( node != null ) && ( node.Parent == group ) )
-        {
-          items.Add( m_genPosToItem[ i ] );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.NodeFound, DataGridTraceArgs.Node( node ), DataGridTraceArgs.Item( item ) );
         }
-      }
-
-      return items;
-    }
-
-    internal List<object> GetRealizedDataItems()
-    {
-      int count = m_genPosToNode.Count;
-      List<object> items = new List<object>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        ItemsGeneratorNode node = m_genPosToNode[ i ] as ItemsGeneratorNode;
 
         if( node != null )
         {
-          items.Add( m_genPosToItem[ i ] );
-        }
-      }
-
-      return items;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1822:MarkMembersAsStatic" )]
-    internal object ItemFromContainer( DependencyObject container )
-    {
-      if( this.IsHandlingGlobalItemsReset )
-        return null;
-
-      var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( container );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return null;
-
-      var dataItem = dataItemStore.Data;
-      var genPosIndex = m_genPosToContainer.IndexOf( container );
-
-      if( genPosIndex != -1 )
-      {
-        DetailGeneratorNode detailNode = m_genPosToNode[ genPosIndex ] as DetailGeneratorNode;
-        if( detailNode != null )
-          return null;
-      }
-
-      return dataItem;
-    }
-
-    public int IndexFromItem( object item )
-    {
-      int retval = -1;
-
-      if( item != null )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode != null )
-        {
-          //if item is generated
-          int generatedIndex = this.FindFirstGeneratedIndexForLocalItem( item );
-          if( generatedIndex != -1 )
-          {
-            retval = m_genPosToIndex[ generatedIndex ];
-          }
-          //if the item is not generated
-          else
+          var parentGroup = node.Parent as GroupGeneratorNode;
+          if( parentGroup != null )
           {
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-            //Note: Under that specific case, I do not want to search through collapsed group nodes... Effectivelly, an item "below" a collapsed group node 
-            // Have no index as per the "item to index" interface of the generator. 
-            retval = nodeHelper.FindItem( item );
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( parentGroup.UIGroup ), DataGridTraceArgs.Node( parentGroup ), DataGridTraceArgs.Item( item ) );
+            return parentGroup.UIGroup;
           }
         }
-      }
-
-      return retval;
-    }
-
-    public object ItemFromIndex( int index )
-    {
-      object retval = null;
-
-      this.EnsureNodeTreeCreated();
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      retval = nodeHelper.FindIndex( index );
-
-      return retval;
-    }
-
-    public int GetGroupIndex( Group group )
-    {
-      if( group == null )
-        DataGridException.ThrowSystemException( "group", typeof( ArgumentNullException ), m_dataGridControl.Name );
-
-      this.EnsureNodeTreeCreated();
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      if( nodeHelper.FindGroup( group.CollectionViewGroup ) )
-        return nodeHelper.Index;
 
-      //the item was not found in this generator's content... check all the detail generators
-      foreach( var detailNode in this.GetDetailGeneratorNodes() )
-      {
-        int groupIndex = detailNode.DetailGenerator.GetGroupIndex( group );
-
-        if( groupIndex > -1 )
-          return groupIndex + this.FindGlobalIndexForDetailNode( detailNode );
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Item( item ) );
+        return null;
       }
-
-      return -1;
     }
 
-    public Group GetGroupFromItem( object item )
+    public Group GetGroupFromCollectionViewGroup( CollectionViewGroup collectionViewGroup )
     {
-      Group retval = null;
-
-      GeneratorNode nodeForItem = null;
-
       this.EnsureNodeTreeCreated();
 
-      //item might be in the "generated" list... much quicker to find-out if it is!
-      int itemGenPosIndex = this.FindFirstGeneratedIndexForLocalItem( item );
-      if( itemGenPosIndex != -1 )
-      {
-        //item is generated...
-        nodeForItem = m_genPosToNode[ itemGenPosIndex ];
-      }
-      else
-      {
-        //only try to find the item is the generator has some content...
-        if( m_startNode != null )
-        {
-          GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-          if( nodeHelper.Contains( item ) ) //NOTE: this will only return items directly contained in this generator (not from details )
-          {
-            //if the nodeHelper was able to locate the content, use the nodeHelper's CurrentNode as the node for the item.
-            nodeForItem = nodeHelper.CurrentNode;
-          }
-          else
-          {
-            DataGridException.ThrowSystemException( "An attempt was made to retrieve the group of an item that does not belong to the generator.",
-                                                    typeof( InvalidOperationException ), m_dataGridControl.Name );
-          }
-        }
-      }
-
-      if( nodeForItem != null )
-      {
-        GroupGeneratorNode parentGroup = nodeForItem.Parent as GroupGeneratorNode;
-        if( parentGroup != null )
-        {
-          retval = parentGroup.UIGroup;
-        }
-      }
-
-      return retval;
-    }
-
-    public Group GetGroupFromCollectionViewGroup( CollectionViewGroup collectionViewGroup )
-    {
-      return this.GetGroupFromCollectionViewGroup( null, collectionViewGroup );
+      return this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
     }
 
-    public Group GetGroupFromCollectionViewGroup( Group parentUIGroup, CollectionViewGroup collectionViewGroup )
+    private Group GetGroupFromCollectionViewGroupCore( CollectionViewGroup collectionViewGroup )
     {
-      this.EnsureNodeTreeCreated();
-      GroupGeneratorNode groupGeneratorNode = null;
-
-      if( m_groupNodeMappingCache.TryGetValue( collectionViewGroup, out groupGeneratorNode ) )
-        return groupGeneratorNode.UIGroup;
+      GroupGeneratorNode node;
+      if( m_groupNodeMappingCache.TryGetValue( collectionViewGroup, out node ) )
+        return node.UIGroup;
 
       return null;
     }
@@ -951,13 +846,11 @@ namespace Xceed.Wpf.DataGrid
     public CollectionViewGroup GetParentGroupFromItem( object item, bool recurseDetails )
     {
       if( item == null )
-        DataGridException.ThrowSystemException( "item", typeof( ArgumentNullException ), m_dataGridControl.Name );
-
-      CollectionViewGroup collectionViewGroup = null;
+        throw DataGridException.Create<ArgumentNullException>( "item", m_dataGridControl );
 
+      CollectionViewGroup collectionViewGroup;
       if( !this.TryGetParentGroupFromItem( item, recurseDetails, out collectionViewGroup ) )
-        DataGridException.ThrowSystemException( "An attempt was made to retrieve the parent group of an item that does not belong to the generator.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to retrieve the parent group of an item that does not belong to the generator.", m_dataGridControl );
 
       return collectionViewGroup;
     }
@@ -972,15 +865,10 @@ namespace Xceed.Wpf.DataGrid
       this.EnsureNodeTreeCreated();
 
       if( m_startNode == null )
-        throw new DataGridInternalException( "Start node is null for the CollectionViewGroup.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "Start node is null for the CollectionViewGroup.", m_dataGridControl );
 
-      //Invoke the helper that will check for the parent group within the local generator.
       if( this.TryGetParentGroupFromItemHelper( item, out collectionViewGroup ) )
-      {
-        //if the item was found within the local generator, then return.
         return true;
-      }
-      //If the item was not in the local generator, continue with method.
 
       if( recurseDetails )
       {
@@ -1003,18 +891,16 @@ namespace Xceed.Wpf.DataGrid
       //-----------------------------------------------
       //1 - First check is to see of the item is a CVG.
       //-----------------------------------------------
-      CollectionViewGroup groupItem = item as CollectionViewGroup;
+      var groupItem = item as CollectionViewGroup;
       if( groupItem != null )
       {
-        Group group = this.GetGroupFromCollectionViewGroup( groupItem );
+        var group = this.GetGroupFromCollectionViewGroup( groupItem );
         if( group != null )
         {
-          GroupGeneratorNode groupGeneratorNode = group.GeneratorNode;
+          var groupGeneratorNode = group.GeneratorNode;
           if( groupGeneratorNode.Parent == null )
-          {
-            //no parent for speficied item.
             return true;
-          }
+
           //if the nodeHelper was able to locate the content, use the nodeHelper's CurrentNode as the node for the item.
           collectionViewGroup = ( ( GroupGeneratorNode )groupGeneratorNode.Parent ).CollectionViewGroup;
           return true;
@@ -1030,15 +916,13 @@ namespace Xceed.Wpf.DataGrid
 
       //item might be in the "generated" list... much quicker to find-out if it is!
       //note: if the item belongs to a detail, then it will be excluded from the "fast" algo.
-      int itemGenPosIndex = this.FindFirstGeneratedIndexForLocalItem( item );
+      var itemGenPosIndex = this.FindFirstGeneratedIndexForLocalItem( item );
       if( itemGenPosIndex != -1 )
       {
         //item was generated and was not from a DetailGeneratorNode
         if( m_genPosToNode[ itemGenPosIndex ].Parent == null )
-        {
-          //no parent for speficied item.
           return true;
-        }
+
         collectionViewGroup = ( ( GroupGeneratorNode )m_genPosToNode[ itemGenPosIndex ].Parent ).CollectionViewGroup;
         return true;
       }
@@ -1048,8 +932,8 @@ namespace Xceed.Wpf.DataGrid
       //-----------------------------------------------
       if( item.GetType() == typeof( GroupHeaderFooterItem ) )
       {
-        GroupHeaderFooterItem groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-        CollectionViewGroup parentGroup = groupHeaderFooterItem.Group;
+        var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+        var parentGroup = groupHeaderFooterItem.Group;
 
         if( this.GetGroupFromCollectionViewGroup( parentGroup ) != null )
         {
@@ -1069,231 +953,201 @@ namespace Xceed.Wpf.DataGrid
       //-----------------------------------------------
 
       //if the item was not generated, then try to find the item as is within the generator's content  
-      GeneratorNodeHelper finalNodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var finalNodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
       if( finalNodeHelper.AbsoluteFindItem( item ) )
       {
         //item was not generated but was part of this generator
         if( finalNodeHelper.CurrentNode.Parent == null )
-        {
-          //no parent for speficied item.
           return true;
-        }
+
         collectionViewGroup = ( ( GroupGeneratorNode )finalNodeHelper.CurrentNode.Parent ).CollectionViewGroup;
         return true;
       }
-      else
-      {
-        return false;
-      }
+
+      return false;
     }
 
-    public bool ExpandGroup( CollectionViewGroup group )
+    internal bool ExpandGroup( CollectionViewGroup group )
     {
-      bool groupExpanded = this.ExpandGroupCore( group, false );
-
-      if( !groupExpanded )
-        DataGridException.ThrowSystemException( "An attempt was made to expand a group that does not exist.", typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      return groupExpanded;
+      return this.ExpandGroup( group, false );
     }
 
-    internal bool ExpandGroupCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool ExpandGroup( CollectionViewGroup group, bool recurseDetails )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "An attempt was made to expand a group while the generator is busy generating items.",
-                                                 typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to expand a group while the generator is busy generating items.", m_dataGridControl );
 
       if( group == null )
-        DataGridException.ThrowSystemException( "group", typeof( ArgumentNullException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
 
-      this.EnsureNodeTreeCreated();
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceArgs.Group( group ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      if( m_firstItem == null )
-        throw new DataGridInternalException( "No GeneratorNode found for the group.", m_dataGridControl );
+        if( m_firstItem == null )
+          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
 
-      Group uiGroup = this.GetGroupFromCollectionViewGroup( group );
-      if( uiGroup != null )
-      {
-        uiGroup.GeneratorNode.IsExpanded = true;
-        return true;
-      }
+        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
+        if( uiGroup != null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
 
-      if( recurseDetails )
-      {
-        //the item was not found in this generator's content... check all the detail generators
-        foreach( var generator in this.GetDetailGenerators() )
+          uiGroup.GeneratorNode.IsExpanded = true;
+          return true;
+        }
+
+        if( recurseDetails )
         {
-          // If the item is not found in the detail generator, it will return false;
-          // The "public" function call will throw if item is never found in itself or its details.
-          if( generator.ExpandGroupCore( group, recurseDetails ) )
-            return true;
+          foreach( var generator in this.GetDetailGenerators() )
+          {
+            // If the item is not found in the detail generator, it will return false;
+            if( generator.ExpandGroup( group, recurseDetails ) )
+              return true;
+          }
         }
-      }
 
-      return false;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
+        return false;
+      }
     }
 
-    public bool CollapseGroup( CollectionViewGroup group )
+    internal bool CollapseGroup( CollectionViewGroup group )
     {
-      bool groupCollapsed = this.CollapseGroupCore( group, false );
-
-      if( !groupCollapsed )
-        DataGridException.ThrowSystemException( "An attempt was made to collapse a group that does not exist.", typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      return groupCollapsed;
+      return this.CollapseGroup( group, false );
     }
 
-    internal bool CollapseGroupCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool CollapseGroup( CollectionViewGroup group, bool recurseDetails )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "An attempt was made to collapse a group while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to collapse a group while the generator is busy generating items.", m_dataGridControl );
 
       if( group == null )
-        DataGridException.ThrowSystemException( "group", typeof( ArgumentNullException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
 
-      this.EnsureNodeTreeCreated();
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceArgs.Group( group ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      if( m_firstItem == null )
-        throw new DataGridInternalException( "No GeneratorNode found for the group.", m_dataGridControl );
+        if( m_firstItem == null )
+          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
 
-      Group uiGroup = this.GetGroupFromCollectionViewGroup( group );
-      if( uiGroup != null )
-      {
-        uiGroup.GeneratorNode.IsExpanded = false;
-        return true;
-      }
+        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
+        if( uiGroup != null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
 
-      if( recurseDetails )
-      {
-        //the item was not found in this generator's content... check all the detail generators
-        foreach( var generator in this.GetDetailGenerators() )
+          uiGroup.GeneratorNode.IsExpanded = false;
+          return true;
+        }
+
+        if( recurseDetails )
         {
-          // If the item is not found in the detail generator, it will return false;
-          // The "public" function call will throw if item is never found in itself or its details.
-          if( generator.CollapseGroupCore( group, recurseDetails ) )
-            return true;
+          foreach( var generator in this.GetDetailGenerators() )
+          {
+            // If the item is not found in the detail generator, it will return false;
+            if( generator.CollapseGroup( group, recurseDetails ) )
+              return true;
+          }
         }
-      }
 
-      return false;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
+        return false;
+      }
     }
 
-    public bool ToggleGroupExpansion( CollectionViewGroup group )
+    internal bool ToggleGroupExpansion( CollectionViewGroup group )
     {
-      bool groupToggled = this.ToggleGroupExpansionCore( group, false );
-
-      if( !groupToggled )
-        DataGridException.ThrowSystemException( "An attempt was made to toggle a group that does not exist.", typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      return groupToggled;
+      return this.ToggleGroupExpansion( group, false );
     }
 
-    internal bool ToggleGroupExpansionCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool ToggleGroupExpansion( CollectionViewGroup group, bool recurseDetails )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "An attempt was made to a toggle a group's expansion while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to toggle a group's expansion while the generator is busy generating items.", m_dataGridControl );
 
       if( group == null )
-        DataGridException.ThrowSystemException( "group", typeof( ArgumentNullException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
 
-      this.EnsureNodeTreeCreated();
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceArgs.Group( group ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      if( m_firstItem == null )
-        throw new DataGridInternalException( "No GeneratorNode found for the group.", m_dataGridControl );
+        if( m_firstItem == null )
+          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
 
-      Group uiGroup = this.GetGroupFromCollectionViewGroup( group );
-      if( uiGroup != null )
-      {
-        GroupGeneratorNode groupNode = uiGroup.GeneratorNode;
-        groupNode.IsExpanded = !groupNode.IsExpanded;
-        return true;
-      }
+        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
+        if( uiGroup != null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
 
-      if( recurseDetails )
-      {
-        //the item was not found in this generator's content... check all the detail generators
-        foreach( var generator in this.GetDetailGenerators() )
+          var groupNode = uiGroup.GeneratorNode;
+          groupNode.IsExpanded = !groupNode.IsExpanded;
+          return true;
+        }
+
+        if( recurseDetails )
         {
-          try
-          {
-            return generator.ToggleGroupExpansionCore( group, recurseDetails );
-          }
-          catch( InvalidOperationException )
+          foreach( var generator in this.GetDetailGenerators() )
           {
-            //if the item is not found in the detail generator, it will throw 
-            //an invalid operation exception. If it doesn't throw, then it is 
-            //safe to return the return value of the function.
-
-            //otherwise, suppress this exception as ultimately, the "root" function call will 
-            //throw if item is never found in itself or its details.
+            // If the item is not found in the detail generator, it will return false;
+            if( generator.ToggleGroupExpansion( group, recurseDetails ) )
+              return true;
           }
         }
-      }
 
-      return false;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
+        return false;
+      }
     }
 
-    public bool IsGroupExpanded( CollectionViewGroup group )
+    internal bool? IsGroupExpanded( CollectionViewGroup group )
     {
-      return this.IsGroupExpandedCore( group, false );
+      return this.IsGroupExpanded( group, false );
     }
 
-    internal bool IsGroupExpandedCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool? IsGroupExpanded( CollectionViewGroup group, bool recurseDetails )
     {
       if( group == null )
-      {
-        DataGridException.ThrowSystemException( "group", typeof( ArgumentNullException ), m_dataGridControl.Name );
-        //Simply there to remove compile error.
-        return false;
-      }
+        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
 
-      this.EnsureNodeTreeCreated();
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceArgs.Group( group ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      if( m_firstItem == null )
-        throw new DataGridInternalException( "No GeneratorNode found for the group.", m_dataGridControl );
+        if( m_firstItem == null )
+          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
 
-      Group uiGroup = this.GetGroupFromCollectionViewGroup( group );
-      if( uiGroup != null )
-      {
-        return uiGroup.GeneratorNode.IsExpanded;
-      }
+        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
+        if( uiGroup != null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
+          return uiGroup.GeneratorNode.IsExpanded;
+        }
 
-      if( recurseDetails )
-      {
-        //the group was not found in this generator, check in all the child generators for the group.
-        foreach( var generator in this.GetDetailGenerators() )
+        if( recurseDetails )
         {
-          try
-          {
-            return generator.IsGroupExpandedCore( group, recurseDetails );
-          }
-          catch( InvalidOperationException )
+          //the group was not found in this generator, check in all the child generators for the group.
+          foreach( var generator in this.GetDetailGenerators() )
           {
-            //if the item is not found in the detail generator, it will throw 
-            //an invalid operation exception. If it doesn't throw, then it is 
-            //safe to return the return value of the function.
-
-            //otherwise, suppress this exception as ultimately, the "root" function call will 
-            //throw if item is never found in itself or its details.
+            var result = generator.IsGroupExpanded( group, recurseDetails );
+            if( result.HasValue )
+              return result.Value;
           }
         }
-      }
-
-      DataGridException.ThrowSystemException( "An attempt was made to consult the expansion state of a group that does not exist.",
-                                              typeof( InvalidOperationException ), m_dataGridControl.Name );
 
-      //Simply there to remove compile error.
-      return false;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
+        return null;
+      }
     }
 
     internal void ExpandDetails( object dataItem )
     {
+
     }
 
     internal void CollapseDetails( object dataItem )
     {
+
     }
 
     internal void ToggleDetails( object dataItem )
@@ -1302,120 +1156,132 @@ namespace Xceed.Wpf.DataGrid
 
     internal bool AreDetailsExpanded( object dataItem )
     {
-      if( dataItem == null )
-        DataGridException.ThrowSystemException( "dataItem", typeof( ArgumentNullException ), m_dataGridControl.Name );
-
-      return m_masterToDetails.ContainsKey( dataItem );
+      return false;
     }
 
     public void RemoveAllAndNotify()
     {
       if( m_startNode == null )
-        return; //nothing to do, the generator is already in a "clean" state.
-
-      //this message is issued by the DataGridContext when the VisibleColumns collection changes (re-ordering or changes to its content).
-      IList<DependencyObject> removedContainers = new List<DependencyObject>();
-      this.RemoveGeneratedItems( int.MinValue, int.MaxValue, removedContainers );
+        return;
 
+      this.RemoveGeneratedItems( int.MinValue, int.MaxValue, null );
       this.SendResetEvent();
-
-      removedContainers.Clear();
-      removedContainers = null;
-
-      removedContainers = m_dataGridContext.RecyclingManager.Clear();
-
-      if( removedContainers.Count > 0 )
-      {
-        this.NotifyContainersRemoved( removedContainers );
-      }
+      this.ClearRecyclingPools();
     }
 
     internal int FindIndexForItem( object item, DataGridContext dataGridContext )
     {
-      int retval = -1;
-      bool recurse = false;
-
-      this.EnsureNodeTreeCreated();
-
-      // If the seeked DataGridContext is this generator's context, the item should be here.
-      // When the seeked DataGridContext is null, search for the first item match no matter the generator's context.
-      if( ( m_dataGridContext == dataGridContext ) || ( dataGridContext == null ) )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceArgs.Item( item ) ) )
       {
-        retval = this.IndexFromItem( item );
+        this.EnsureNodeTreeCreated();
 
-        // If the item wasn't found in this generator's context and that we don't have a precise target context, recurse.
-        if( ( retval == -1 ) && ( dataGridContext == null ) )
-          recurse = true;
-      }
-      else
-      {
-        // The seeked DataGridContext is not this generator's context, recurse.
-        recurse = true;
-      }
+        // If the seeked DataGridContext is this generator's context, the item should be here.
+        // When the seeked DataGridContext is null, search for the first item match no matter the generator's context.
+        if( ( m_dataGridContext == dataGridContext ) || ( dataGridContext == null ) )
+        {
+          var itemIndex = this.IndexFromItem( item );
+          if( itemIndex >= 0 )
+          {
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Index( itemIndex ) );
+            return itemIndex;
+          }
 
-      if( recurse )
-      {
-        foreach( KeyValuePair<object, List<DetailGeneratorNode>> masterToDetails in m_masterToDetails )
+          if( dataGridContext != null )
+          {
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
+            return -1;
+          }
+        }
+
+        foreach( var masterToDetails in m_masterToDetails )
         {
-          int detailsTotalCount = 0;
-          foreach( DetailGeneratorNode detailNode in masterToDetails.Value )
+          var detailsTotalCount = 0;
+
+          foreach( var detailNode in masterToDetails.Value )
           {
-            int itemIndex = detailNode.DetailGenerator.FindIndexForItem( item, dataGridContext );
-            if( itemIndex != -1 )
+            var itemIndex = detailNode.DetailGenerator.FindIndexForItem( item, dataGridContext );
+            if( itemIndex >= 0 )
             {
-              int masterIndex = this.IndexFromItem( masterToDetails.Key );
+              var masterIndex = this.IndexFromItem( masterToDetails.Key );
+              if( masterIndex >= 0 )
+              {
+                var result = masterIndex + 1 + detailsTotalCount + itemIndex;
 
-              m_log.Assert( this, masterIndex != -1, "masterIndex != -1" );
+                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Index( result ) );
+                return result;
+              }
 
-              retval = masterIndex + 1 + detailsTotalCount + itemIndex;
-              break;
+              this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
+              return -1;
             }
 
             detailsTotalCount += detailNode.ItemCount;
           }
         }
-      }
 
-      return retval;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
+        return -1;
+      }
     }
 
     public DependencyObject GetRealizedContainerForIndex( int index )
     {
-      //If the node tree is not created, then there can be no containers for the index.
-      if( m_startNode == null )
-        return null;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceArgs.Index( index ) ) )
+      {
+        this.EnsureNodeTreeCreated();
 
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        if( m_startNode == null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Index( index ) );
+          return null;
+        }
 
-      if( !nodeHelper.FindNodeForIndex( index ) )
-        DataGridException.ThrowSystemException( "The specified index does not correspond to an item in the generator.",
-                                                typeof( ArgumentException ), m_dataGridControl.Name, "index" );
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        if( !nodeHelper.FindNodeForIndex( index ) )
+          throw DataGridException.Create<ArgumentException>( "The specified index does not correspond to an item in the generator.", m_dataGridControl, "index" );
 
-      int indexIndex = m_genPosToIndex.IndexOf( index );
-      if( indexIndex == -1 )
-        return null;
+        var indexIndex = m_genPosToIndex.IndexOf( index );
+        if( indexIndex >= 0 )
+        {
+          var container = m_genPosToContainer[ indexIndex ];
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( indexIndex ), DataGridTraceArgs.Index( index ) );
+          return container;
+        }
 
-      return m_genPosToContainer[ indexIndex ];
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Index( index ) );
+        return null;
+      }
     }
 
     public int GetRealizedIndexForContainer( DependencyObject container )
     {
-      int containerIndex = m_genPosToContainer.IndexOf( container );
-      if( containerIndex == -1 )
-        return -1;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceArgs.Container( container ) ) )
+      {
+        this.EnsureNodeTreeCreated();
+
+        var index = m_genPosToContainer.IndexOf( container );
+        if( index >= 0 )
+        {
+          var itemIndex = m_genPosToIndex[ index ];
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.GeneratorIndex( index ) );
+          return itemIndex;
+        }
 
-      return m_genPosToIndex[ containerIndex ];
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Container( container ) );
+        return -1;
+      }
     }
 
-    internal List<int> GetMasterIndexexWithExpandedDetails()
+    internal List<int> GetMasterIndexesWithExpandedDetails()
     {
-      List<int> masterIndexes = new List<int>();
+      var masterIndexes = new List<int>();
 
-      foreach( object dataItem in m_masterToDetails.Keys )
+      foreach( var dataItem in m_masterToDetails.Keys )
       {
-        int itemIndex = m_collectionView.IndexOf( dataItem );
-
-        m_log.Assert( this, itemIndex != -1, "itemIndex != -1" );
+        var itemIndex = m_collectionView.IndexOf( dataItem );
+        Debug.Assert( itemIndex >= 0 );
 
         masterIndexes.Add( itemIndex );
       }
@@ -1427,16 +1293,15 @@ namespace Xceed.Wpf.DataGrid
 
     internal IEnumerable<DataGridContext> GetChildContextsForMasterItem( object item )
     {
-      if( item != null )
-      {
-        List<DetailGeneratorNode> detailNodes = null;
+      if( item == null )
+        yield break;
 
-        if( m_masterToDetails.TryGetValue( item, out detailNodes ) )
+      List<DetailGeneratorNode> detailNodes;
+      if( m_masterToDetails.TryGetValue( item, out detailNodes ) )
+      {
+        foreach( var detailNode in detailNodes )
         {
-          foreach( DetailGeneratorNode detailNode in detailNodes )
-          {
-            yield return detailNode.DetailContext;
-          }
+          yield return detailNode.DetailContext;
         }
       }
     }
@@ -1444,7 +1309,7 @@ namespace Xceed.Wpf.DataGrid
     public DataGridContext GetChildContext( object parentItem, string relationName )
     {
       if( parentItem == null )
-        DataGridException.ThrowSystemException( "parentItem", typeof( ArgumentNullException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentNullException>( "parentItem", m_dataGridControl );
 
       this.EnsureNodeTreeCreated();
 
@@ -1459,9 +1324,7 @@ namespace Xceed.Wpf.DataGrid
           //Note: DetailContext.SourceDetailConfiguration will always be non-null, since we are looking for child contexts ( only the root master context can have a null
           //SourceDetailConfiguration.
           if( detailNode.DetailContext.SourceDetailConfiguration.RelationName == relationName )
-          {
             return detailNode.DetailContext;
-          }
         }
       }
 
@@ -1484,36 +1347,10 @@ namespace Xceed.Wpf.DataGrid
     {
       this.EnsureNodeTreeCreated();
 
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
       return nodeHelper.Contains( item );
     }
 
-    public object[] GetNamesTreeFromGroup( CollectionViewGroup group )
-    {
-      this.EnsureNodeTreeCreated();
-
-      Group uiGroup = this.GetGroupFromCollectionViewGroup( group );
-      if( uiGroup != null )
-      {
-        return uiGroup.GeneratorNode.NamesTree;
-      }
-
-      return null;
-    }
-
-    public CollectionViewGroup GetGroupFromNamesTree( object[] namesTree )
-    {
-      this.EnsureNodeTreeCreated();
-
-      NamesTreeGroupFinderVisitor visitor = new NamesTreeGroupFinderVisitor( namesTree );
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      bool visitWasStopped;
-      nodeHelper.ProcessVisit( m_dataGridContext, 0, int.MaxValue, visitor, DataGridContextVisitorType.Groups, false, out visitWasStopped );
-
-      return visitor.Group;
-    }
-
     #region Sticky Headers Methods
 
     public List<StickyContainerGenerated> GenerateStickyHeaders(
@@ -1522,7 +1359,7 @@ namespace Xceed.Wpf.DataGrid
       bool areGroupHeadersSticky,
       bool areParentRowsSticky )
     {
-      List<StickyContainerGenerated> generatedStickyContainers = new List<StickyContainerGenerated>();
+      var generatedStickyContainers = new List<StickyContainerGenerated>();
 
       GeneratorNode containerNode;
       int containerRealizedIndex;
@@ -1533,9 +1370,8 @@ namespace Xceed.Wpf.DataGrid
                                                                 out containerRealizedIndex,
                                                                 out containerDataItem ) )
       {
-        GeneratorNodeHelper nodeHelper = null;
-
-        DetailGeneratorNode detailNode = containerNode as DetailGeneratorNode;
+        var nodeHelper = default( GeneratorNodeHelper );
+        var detailNode = containerNode as DetailGeneratorNode;
 
         if( detailNode != null )
         {
@@ -1547,18 +1383,17 @@ namespace Xceed.Wpf.DataGrid
 
           // OPTIMIZATION: We will look in the m_genPos* first to avoid using
           //               FindItem for performance reason.
-          int index = m_genPosToItem.IndexOf( containerDataItem );
-          if( index > -1 )
+          var index = m_genPosToItem.IndexOf( containerDataItem );
+          if( index >= 0 )
           {
-            int sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
+            var sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
             containerNode = m_genPosToNode[ index ];
             containerRealizedIndex = m_genPosToIndex[ index ];
 
-            CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
+            var collectionNode = containerNode as CollectionGeneratorNode;
             if( collectionNode != null )
             {
-              nodeHelper = new GeneratorNodeHelper(
-                containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), sourceDataIndex );
+              nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), sourceDataIndex );
             }
           }
 
@@ -1571,7 +1406,7 @@ namespace Xceed.Wpf.DataGrid
           }
 
           if( containerRealizedIndex == -1 )
-            throw new DataGridInternalException( "The index of a sticky header container is out of bound.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "The index of a sticky header container is out of bound.", m_dataGridControl );
 
           generatedStickyContainers.AddRange(
             this.GenerateStickyHeadersForDetail( container,
@@ -1582,7 +1417,7 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
+          var collectionNode = containerNode as CollectionGeneratorNode;
           if( collectionNode != null )
           {
             // We don't need to have an up to date sourceDataIndex so we pass 0
@@ -1606,7 +1441,7 @@ namespace Xceed.Wpf.DataGrid
         // We want to find the HeaderFooterGeneratorNode for the container 
         // node. This is to find the headers for the container.
         nodeHelper.MoveToFirst();
-        HeadersFootersGeneratorNode headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
+        var headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
 
         // There is no headers to generate if the item count of the node is 0.
         if( headersNode.ItemCount > 0 )
@@ -1624,7 +1459,7 @@ namespace Xceed.Wpf.DataGrid
 
         // We must also find the top most headers for our level of detail and, if they need to be sticky,
         // we will generate the containers and add them the to list.
-        HeadersFootersGeneratorNode topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
+        var topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
         if( ( areHeadersSticky )
           && ( topMostHeaderNode != null )
           && ( topMostHeaderNode != headersNode )
@@ -1640,7 +1475,7 @@ namespace Xceed.Wpf.DataGrid
 
     private HeadersFootersGeneratorNode GetTopMostHeaderNode( GeneratorNodeHelper nodeHelper )
     {
-      HeadersFootersGeneratorNode parentNode = null;
+      var parentNode = default( HeadersFootersGeneratorNode );
 
       if( nodeHelper.MoveToParent()
         && nodeHelper.MoveToFirst() )
@@ -1666,32 +1501,30 @@ namespace Xceed.Wpf.DataGrid
       bool areGroupHeadersSticky,
       bool areParentRowsSticky )
     {
-      List<StickyContainerGenerated> generatedStickyContainers =
-        detailNode.DetailGenerator.GenerateStickyHeaders( container, areHeadersSticky, areGroupHeadersSticky, areParentRowsSticky );
+      var generatedStickyContainers = detailNode.DetailGenerator.GenerateStickyHeaders( container, areHeadersSticky, areGroupHeadersSticky, areParentRowsSticky );
+      var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
+      var count = generatedStickyContainers.Count;
 
-      int detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-
-      int count = generatedStickyContainers.Count;
       for( int i = 0; i < count; i++ )
       {
-        StickyContainerGenerated stickyContainer = generatedStickyContainers[ i ];
-        int detailItemIndex = stickyContainer.Index + detailIndex;
+        var stickyContainer = generatedStickyContainers[ i ];
+        var detailItemIndex = stickyContainer.Index + detailIndex;
 
         //if the container was just realized, ensure to add it to the lists maintaining the generated items.
         if( stickyContainer.IsNewlyRealized )
         {
-          int insertionIndex = this.FindInsertionPoint( detailItemIndex );
+          var insertionIndex = this.FindInsertionPoint( detailItemIndex );
+          var item = CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data;
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateStickyHeadersForDetail, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( stickyContainer.StickyContainer ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( detailItemIndex ) );
 
           m_genPosToIndex.Insert( insertionIndex, detailItemIndex );
-          m_genPosToItem.Insert( insertionIndex, CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data );
+          m_genPosToItem.Insert( insertionIndex, item );
           m_genPosToContainer.Insert( insertionIndex, stickyContainer.StickyContainer );
           m_genPosToNode.Insert( insertionIndex, detailNode );
         }
 
-        generatedStickyContainers[ i ] = new StickyContainerGenerated(
-          stickyContainer.StickyContainer,
-          detailItemIndex,
-          stickyContainer.IsNewlyRealized );
+        generatedStickyContainers[ i ] = new StickyContainerGenerated( stickyContainer.StickyContainer, detailItemIndex, stickyContainer.IsNewlyRealized );
       }
 
       return generatedStickyContainers;
@@ -1699,13 +1532,13 @@ namespace Xceed.Wpf.DataGrid
 
     private StickyContainerGenerated GenerateStickyParentRow( int itemNodeIndex )
     {
-      ICustomItemContainerGenerator generator = ( ICustomItemContainerGenerator )this;
-      GeneratorPosition position = generator.GeneratorPositionFromIndex( itemNodeIndex );
+      var generator = ( ICustomItemContainerGenerator )this;
+      var position = generator.GeneratorPositionFromIndex( itemNodeIndex );
 
       using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
       {
         bool isNewlyRealized;
-        DependencyObject container = generator.GenerateNext( out isNewlyRealized );
+        var container = generator.GenerateNext( out isNewlyRealized );
 
         return new StickyContainerGenerated( container, itemNodeIndex, isNewlyRealized );
       }
@@ -1724,11 +1557,11 @@ namespace Xceed.Wpf.DataGrid
       int realizedIndex,
       bool isRealizedIndexPartOfHeaderNode )
     {
-      List<StickyContainerGenerated> generatedStickyContainers = new List<StickyContainerGenerated>();
+      var generatedStickyContainers = new List<StickyContainerGenerated>();
 
       // The container is already part of the header.
-      ICustomItemContainerGenerator generator = ( ICustomItemContainerGenerator )this;
-      GeneratorPosition position = generator.GeneratorPositionFromIndex( headerNodeIndex );
+      var generator = ( ICustomItemContainerGenerator )this;
+      var position = generator.GeneratorPositionFromIndex( headerNodeIndex );
 
       // In that case, the potential sticky containers are the requested one and up.
       using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
@@ -1739,26 +1572,25 @@ namespace Xceed.Wpf.DataGrid
           // item, do not process
           if( ( isRealizedIndexPartOfHeaderNode )
               && ( headerNodeIndex + i > realizedIndex ) )
-          {
             break;
-          }
 
-          object item = headerNode.GetAt( i );
-
-          GroupHeaderFooterItem? groupHeaderFooterItem = null;
+          var item = headerNode.GetAt( i );
+          var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
 
           if( item is GroupHeaderFooterItem )
+          {
             groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+          }
 
           if( ( groupHeaderFooterItem != null )
-            && ( !( groupHeaderFooterItem.Value.Group.IsBottomLevel ) || !this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) ) )
+            && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
           {
             this.Skip();
             continue;
           }
 
           bool isNewlyRealized;
-          DependencyObject stickyContainer = generator.GenerateNext( out isNewlyRealized );
+          var stickyContainer = generator.GenerateNext( out isNewlyRealized );
 
           generatedStickyContainers.Add( new StickyContainerGenerated( stickyContainer, headerNodeIndex + i, isNewlyRealized ) );
         }
@@ -1773,9 +1605,8 @@ namespace Xceed.Wpf.DataGrid
       out int containerRealizedIndex,
       out object containerDataItem )
     {
-      int index = m_genPosToContainer.IndexOf( container );
-
-      if( index == -1 )
+      var index = m_genPosToContainer.IndexOf( container );
+      if( index < 0 )
       {
         containerNode = null;
         containerRealizedIndex = -1;
@@ -1783,12 +1614,14 @@ namespace Xceed.Wpf.DataGrid
 
         return false;
       }
+      else
+      {
+        containerNode = m_genPosToNode[ index ];
+        containerRealizedIndex = m_genPosToIndex[ index ];
+        containerDataItem = m_genPosToItem[ index ];
 
-      containerNode = m_genPosToNode[ index ];
-      containerRealizedIndex = m_genPosToIndex[ index ];
-      containerDataItem = m_genPosToItem[ index ];
-
-      return true;
+        return true;
+      }
     }
 
     public int GetLastHoldingContainerIndexForStickyHeader( DependencyObject stickyHeader )
@@ -1798,7 +1631,7 @@ namespace Xceed.Wpf.DataGrid
 
     private int GetLastHoldingContainerIndexForStickyHeaderRecurse( DependencyObject stickyHeader, int parentCount )
     {
-      int lastContainerIndex = 0;
+      var lastContainerIndex = 0;
 
       int containerRealizedIndex;
       GeneratorNode containerNode;
@@ -1806,8 +1639,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( this.FindGeneratorListMappingInformationForContainer( stickyHeader, out containerNode, out containerRealizedIndex, out containerDataItem ) )
       {
-        DetailGeneratorNode detailNode = containerNode as DetailGeneratorNode;
-
+        var detailNode = containerNode as DetailGeneratorNode;
         if( detailNode != null )
         {
           lastContainerIndex =
@@ -1816,14 +1648,13 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          ItemsGeneratorNode itemsNode = containerNode as ItemsGeneratorNode;
-
+          var itemsNode = containerNode as ItemsGeneratorNode;
           if( itemsNode != null )
           {
             // This means that the sticky container is a MasterRow for a detail.
             if( this.AreDetailsExpanded( containerDataItem ) )
             {
-              List<DetailGeneratorNode> detailNodesForDataItem = m_masterToDetails[ containerDataItem ];
+              var detailNodesForDataItem = m_masterToDetails[ containerDataItem ];
 
               foreach( DetailGeneratorNode detailNodeForDataItem in detailNodesForDataItem )
               {
@@ -1836,10 +1667,10 @@ namespace Xceed.Wpf.DataGrid
           }
           else
           {
-            GeneratorNodeHelper nodeHelper = null;
+            var nodeHelper = default( GeneratorNodeHelper );
 
             // This means that the sticky container is a Header.
-            CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
+            var collectionNode = containerNode as CollectionGeneratorNode;
             if( collectionNode != null )
             {
               // We don't need to have an up to date sourceDataIndex so we pass 0
@@ -1872,7 +1703,7 @@ namespace Xceed.Wpf.DataGrid
 
     public int GetFirstHoldingContainerIndexForStickyFooter( DependencyObject stickyFooter )
     {
-      int firstContainerIndex = 0;
+      var firstContainerIndex = 0;
 
       int containerRealizedIndex;
       GeneratorNode containerNode;
@@ -1880,7 +1711,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( this.FindGeneratorListMappingInformationForContainer( stickyFooter, out containerNode, out containerRealizedIndex, out containerDataItem ) )
       {
-        DetailGeneratorNode detailNode = containerNode as DetailGeneratorNode;
+        var detailNode = containerNode as DetailGeneratorNode;
 
         if( detailNode != null )
         {
@@ -1889,9 +1720,9 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          GeneratorNodeHelper nodeHelper = null;
+          var nodeHelper = default( GeneratorNodeHelper );
+          var collectionNode = containerNode as CollectionGeneratorNode;
 
-          CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
           if( collectionNode != null )
           {
             // We don't need to have an up to date sourceDataIndex so we pass 0
@@ -1922,7 +1753,7 @@ namespace Xceed.Wpf.DataGrid
       bool areFootersSticky,
       bool areGroupFootersSticky )
     {
-      List<StickyContainerGenerated> generatedStickyContainers = new List<StickyContainerGenerated>();
+      var generatedStickyContainers = new List<StickyContainerGenerated>();
 
       GeneratorNode containerNode;
       int containerRealizedIndex;
@@ -1934,8 +1765,8 @@ namespace Xceed.Wpf.DataGrid
                                                                 out containerRealizedIndex,
                                                                 out containerDataItem ) )
       {
-        GeneratorNodeHelper nodeHelper = null;
-        DetailGeneratorNode detailNode = containerNode as DetailGeneratorNode;
+        var nodeHelper = default( GeneratorNodeHelper );
+        var detailNode = containerNode as DetailGeneratorNode;
 
         if( detailNode != null )
         {
@@ -1948,13 +1779,13 @@ namespace Xceed.Wpf.DataGrid
           // OPTIMIZATION: We will look in the m_genPos* first to avoid using
           //               FindItem for performance reason.
           int index = m_genPosToItem.IndexOf( containerDataItem );
-          if( index > -1 )
+          if( index >= 0 )
           {
-            int sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
+            var sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
             containerNode = m_genPosToNode[ index ];
             containerRealizedIndex = m_genPosToIndex[ index ];
 
-            CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
+            var collectionNode = containerNode as CollectionGeneratorNode;
             if( collectionNode != null )
             {
               nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), sourceDataIndex );
@@ -1970,14 +1801,14 @@ namespace Xceed.Wpf.DataGrid
           }
 
           if( containerRealizedIndex == -1 )
-            throw new DataGridInternalException( "The index of a sticky footer container is out of bound.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "The index of a sticky footer container is out of bound.", m_dataGridControl );
 
           generatedStickyContainers.AddRange(
             this.GenerateStickyFootersForDetail( container, detailNode, areFootersSticky, areGroupFootersSticky ) );
         }
         else
         {
-          CollectionGeneratorNode collectionNode = containerNode as CollectionGeneratorNode;
+          var collectionNode = containerNode as CollectionGeneratorNode;
           if( collectionNode != null )
           {
             // We don't need to have an up to date sourceDataIndex so we pass 0
@@ -1998,7 +1829,7 @@ namespace Xceed.Wpf.DataGrid
         // We want to find the HeaderFooterGeneratorNode for the container 
         // node. This is to find the footers for the container.
         nodeHelper.MoveToEnd();
-        HeadersFootersGeneratorNode footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
+        var footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
 
         if( !isHeaderNode )
         {
@@ -2019,7 +1850,7 @@ namespace Xceed.Wpf.DataGrid
 
         // We must also find the bottom most footers for our level of detail and, if they need to be sticky,
         // we will generate the containers and add them the to list.
-        HeadersFootersGeneratorNode bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
+        var bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
 
         if( ( areFootersSticky )
           && ( bottomFootersNode != null )
@@ -2040,32 +1871,30 @@ namespace Xceed.Wpf.DataGrid
       bool areFootersSticky,
       bool areGroupFootersSticky )
     {
-      List<StickyContainerGenerated> generatedStickyContainers =
-        detailNode.DetailGenerator.GenerateStickyFooters( container, areFootersSticky, areGroupFootersSticky );
+      var generatedStickyContainers = detailNode.DetailGenerator.GenerateStickyFooters( container, areFootersSticky, areGroupFootersSticky );
+      var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
+      var count = generatedStickyContainers.Count;
 
-      int detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-
-      int count = generatedStickyContainers.Count;
       for( int i = 0; i < count; i++ )
       {
-        StickyContainerGenerated stickyContainer = generatedStickyContainers[ i ];
-        int detailItemIndex = stickyContainer.Index + detailIndex;
+        var stickyContainer = generatedStickyContainers[ i ];
+        var detailItemIndex = stickyContainer.Index + detailIndex;
 
         //if the container was just realized, ensure to add it to the lists maintaining the generated items.
         if( stickyContainer.IsNewlyRealized )
         {
-          int insertionIndex = this.FindInsertionPoint( detailItemIndex );
+          var insertionIndex = this.FindInsertionPoint( detailItemIndex );
+          var item = CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data;
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateStickyFootersForDetail, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( stickyContainer.StickyContainer ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( detailItemIndex ) );
 
           m_genPosToIndex.Insert( insertionIndex, detailItemIndex );
-          m_genPosToItem.Insert( insertionIndex, CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data );
+          m_genPosToItem.Insert( insertionIndex, item );
           m_genPosToContainer.Insert( insertionIndex, stickyContainer.StickyContainer );
           m_genPosToNode.Insert( insertionIndex, detailNode );
         }
 
-        generatedStickyContainers[ i ] = new StickyContainerGenerated(
-          stickyContainer.StickyContainer,
-          detailItemIndex,
-          stickyContainer.IsNewlyRealized );
+        generatedStickyContainers[ i ] = new StickyContainerGenerated( stickyContainer.StickyContainer, detailItemIndex, stickyContainer.IsNewlyRealized );
       }
 
       return generatedStickyContainers;
@@ -2084,13 +1913,13 @@ namespace Xceed.Wpf.DataGrid
       int realizedIndex,
       bool isRealizedIndexPartOfFooterNode )
     {
-      List<StickyContainerGenerated> generatedStickyContainers = new List<StickyContainerGenerated>();
+      var generatedStickyContainers = new List<StickyContainerGenerated>();
 
       int footersNodeItemCount = footerNode.ItemCount;
 
       // The container is already part of the footer.
-      ICustomItemContainerGenerator generator = ( ICustomItemContainerGenerator )this;
-      GeneratorPosition position = generator.GeneratorPositionFromIndex( footerNodeIndex + footersNodeItemCount - 1 );
+      var generator = ( ICustomItemContainerGenerator )this;
+      var position = generator.GeneratorPositionFromIndex( footerNodeIndex + footersNodeItemCount - 1 );
 
       // In that case, the potential sticky containers are the requested one and bottom.
       using( generator.StartAt( position, GeneratorDirection.Backward, true ) )
@@ -2103,22 +1932,23 @@ namespace Xceed.Wpf.DataGrid
             continue;
           }
 
-          object item = footerNode.GetAt( i );
-
-          GroupHeaderFooterItem? groupHeaderFooterItem = null;
+          var item = footerNode.GetAt( i );
+          var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
 
           if( item is GroupHeaderFooterItem )
+          {
             groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+          }
 
           if( ( groupHeaderFooterItem != null )
-            && ( !( groupHeaderFooterItem.Value.Group.IsBottomLevel ) || !this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) ) )
+            && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
           {
             this.Skip();
             continue;
           }
 
           bool isNewlyRealized;
-          DependencyObject stickyContainer = generator.GenerateNext( out isNewlyRealized );
+          var stickyContainer = generator.GenerateNext( out isNewlyRealized );
 
           generatedStickyContainers.Add( new StickyContainerGenerated( stickyContainer, footerNodeIndex + i, isNewlyRealized ) );
         }
@@ -2129,7 +1959,7 @@ namespace Xceed.Wpf.DataGrid
 
     private HeadersFootersGeneratorNode GetDetailFootersNode( GeneratorNodeHelper nodeHelper )
     {
-      HeadersFootersGeneratorNode parentNode = null;
+      var parentNode = default( HeadersFootersGeneratorNode );
 
       if( nodeHelper.MoveToParent()
         && nodeHelper.MoveToEnd() )
@@ -2158,26 +1988,20 @@ namespace Xceed.Wpf.DataGrid
      bool areGroupHeadersSticky,
      bool areParentRowsSticky )
     {
-      int stickyHeadersCount = 0;
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var stickyHeadersCount = 0;
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
 
+      // Unable to find the node, no sticky header for this node
       if( !nodeHelper.FindNodeForIndex( index ) )
-      {
-        // Unable to find the node, no sticky header for this node
         return 0;
-      }
 
-      GeneratorNode indexNode = nodeHelper.CurrentNode;
-
-      ItemsGeneratorNode itemsGeneratorNode = indexNode as ItemsGeneratorNode;
+      var indexNode = nodeHelper.CurrentNode;
+      var itemsGeneratorNode = indexNode as ItemsGeneratorNode;
 
       // We found an ItemsGeneratorNode
       if( itemsGeneratorNode != null )
       {
-        GeneratorNode innerNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
-
-        DetailGeneratorNode detailNode = innerNode as DetailGeneratorNode;
+        var detailNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
 
         // Only do a special case if the index represent
         // a DetailNode
@@ -2189,10 +2013,10 @@ namespace Xceed.Wpf.DataGrid
             stickyHeadersCount++;
           }
 
-          int detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
-          int correctedIndex = index - detailFirstRealizedIndex;
+          var detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
+          var correctedIndex = index - detailFirstRealizedIndex;
 
-          m_log.Assert( this, correctedIndex >= 0, "correctedIndex >= 0 .. 1" );
+          Debug.Assert( correctedIndex >= 0, "correctedIndex >= 0 .. 1" );
 
           stickyHeadersCount +=
             detailNode.DetailGenerator.GetStickyHeaderCountForIndex( correctedIndex,
@@ -2202,11 +2026,10 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-
       // We want to find the HeaderFooterGeneratorNode for the container 
       // node. This is to find the headers for the container.
       nodeHelper.MoveToFirst();
-      HeadersFootersGeneratorNode headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
+      var headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
 
       // There is no headers to generate if the item count of the node is 0.
       if( headersNode.ItemCount > 0 )
@@ -2225,7 +2048,7 @@ namespace Xceed.Wpf.DataGrid
 
       // We must also find the top most headers for our level of detail and, if they need to be sticky,
       // we will generate the containers and add them the to list.
-      HeadersFootersGeneratorNode topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
+      var topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
       if( ( topMostHeaderNode != null )
         && ( topMostHeaderNode != headersNode )
         && ( topMostHeaderNode.ItemCount > 0 )
@@ -2234,7 +2057,6 @@ namespace Xceed.Wpf.DataGrid
         stickyHeadersCount += this.GetStickyHeaderCountForNode( topMostHeaderNode, nodeHelper.Index );
       }
 
-
       return stickyHeadersCount;
     }
 
@@ -2249,28 +2071,25 @@ namespace Xceed.Wpf.DataGrid
       int realizedIndex,
       bool isRealizedIndexPartOfHeaderNode )
     {
-      int stickyHeaderCount = 0;
+      var stickyHeaderCount = 0;
 
       for( int i = 0; i < headerNode.ItemCount; i++ )
       {
         if( ( isRealizedIndexPartOfHeaderNode )
             && ( headerNodeIndex + i >= realizedIndex ) )
-        {
           break;
-        }
 
-        object item = headerNode.GetAt( i );
-
-        GroupHeaderFooterItem? groupHeaderFooterItem = null;
+        var item = headerNode.GetAt( i );
+        var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
 
         if( item is GroupHeaderFooterItem )
+        {
           groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+        }
 
         if( ( groupHeaderFooterItem != null )
-          && ( !( groupHeaderFooterItem.Value.Group.IsBottomLevel ) || !this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) ) )
-        {
+          && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
           continue;
-        }
 
         stickyHeaderCount++;
       }
@@ -2287,33 +2106,26 @@ namespace Xceed.Wpf.DataGrid
       bool areFootersSticky,
       bool areGroupFootersSticky )
     {
-      int stickyFooterCount = 0;
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var stickyFooterCount = 0;
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
 
+      // Unable to find the node, no sticky header for this node
       if( !nodeHelper.FindNodeForIndex( index ) )
-      {
-        // Unable to find the node, no sticky header for this node
         return 0;
-      }
 
-      GeneratorNode indexNode = nodeHelper.CurrentNode;
-
-      ItemsGeneratorNode itemsGeneratorNode = indexNode as ItemsGeneratorNode;
+      var indexNode = nodeHelper.CurrentNode;
+      var itemsGeneratorNode = indexNode as ItemsGeneratorNode;
 
       // We found an ItemsGeneratorNode
       if( itemsGeneratorNode != null )
       {
-        GeneratorNode innerNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
-
-        DetailGeneratorNode detailNode = innerNode as DetailGeneratorNode;
-
+        var detailNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
         if( detailNode != null )
         {
-          int detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
-          int correctedIndex = index - detailFirstRealizedIndex;
+          var detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
+          var correctedIndex = index - detailFirstRealizedIndex;
 
-          m_log.Assert( this, correctedIndex >= 0, "correctedIndex >= 0 .. 2" );
+          Debug.Assert( correctedIndex >= 0, "correctedIndex >= 0 .. 2" );
 
           stickyFooterCount +=
             detailNode.DetailGenerator.GetStickyFooterCountForIndex( correctedIndex,
@@ -2325,7 +2137,7 @@ namespace Xceed.Wpf.DataGrid
       // We want to find the HeaderFooterGeneratorNode for the container 
       // node. This is to find the footers for the container.
       nodeHelper.MoveToEnd();
-      HeadersFootersGeneratorNode footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
+      var footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
 
       // There is no footers to generate if the item count of the node is 0.
       if( footersNode.ItemCount > 0 )
@@ -2344,7 +2156,7 @@ namespace Xceed.Wpf.DataGrid
 
       // We must also find the bottom most footers for our level of detail and, if they need to be sticky,
       // we will generate the containers and add them the to list.
-      HeadersFootersGeneratorNode bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
+      var bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
 
       if( ( bottomFootersNode != null )
         && ( bottomFootersNode != footersNode )
@@ -2370,29 +2182,26 @@ namespace Xceed.Wpf.DataGrid
       int realizedIndex,
       bool isRealizedIndexPartOfHeaderNode )
     {
-      int stickyFooterCount = 0;
+      var stickyFooterCount = 0;
+      var footersNodeItemCount = footerNode.ItemCount;
 
-      int footersNodeItemCount = footerNode.ItemCount;
       for( int i = footersNodeItemCount - 1; i >= 0; i-- )
       {
         if( ( isRealizedIndexPartOfHeaderNode )
             && ( footerNodeIndex + i < realizedIndex ) )
-        {
           continue;
-        }
 
-        object item = footerNode.GetAt( i );
-
-        GroupHeaderFooterItem? groupHeaderFooterItem = null;
+        var item = footerNode.GetAt( i );
+        var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
 
         if( item is GroupHeaderFooterItem )
+        {
           groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+        }
 
         if( ( groupHeaderFooterItem != null )
-          && ( !( groupHeaderFooterItem.Value.Group.IsBottomLevel ) || !this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) ) )
-        {
+          && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
           continue;
-        }
 
         stickyFooterCount++;
       }
@@ -2407,126 +2216,127 @@ namespace Xceed.Wpf.DataGrid
     DependencyObject IItemContainerGenerator.GenerateNext( out bool isNewlyRealized )
     {
       if( this.Status != GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "The Generator is not active: StartAt() was not called prior calling GenerateNext() or the returned IDisposable was already disposed of.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "The Generator is not active: StartAt() was not called prior calling GenerateNext() or the returned IDisposable was already disposed of.", m_dataGridControl );
 
-      DependencyObject container = null;
       isNewlyRealized = false;
 
-      if( m_generatorNodeHelper == null ) //the m_generatorNodeHelper will be turned to null when we reach the end of the list ot items.
-        return null;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext ) )
+      {
+        if( m_generatorNodeHelper == null ) //the m_generatorNodeHelper will be turned to null when we reach the end of the list ot items.
+          return null;
 
-      m_log.Assert( this, !( m_generatorNodeHelper.CurrentNode is GroupGeneratorNode ), "Algorithm should not allow the Generator's m_generatorNodeHelper to be on a GroupGeneratorNode" );
+        var node = m_generatorNodeHelper.CurrentNode;
+        if( node == null )
+          throw DataGridException.Create<DataGridInternalException>( "CurrentNode is null.", m_dataGridControl );
 
-      GeneratorNode node = m_generatorNodeHelper.CurrentNode;
+        if( !( node is CollectionGeneratorNode ) )
+          throw DataGridException.Create<DataGridInternalException>( "CurrentNode is not a CollectionGeneratorNode.", m_dataGridControl );
 
-      if( node == null )
-        throw new DataGridInternalException( "CurrentNode is null.", m_dataGridControl );
+        if( node is GroupGeneratorNode )
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ) );
+        }
 
-      if( !( node is CollectionGeneratorNode ) )
-        throw new DataGridInternalException( "CurrentNode is not a CollectionGeneratorNode.", m_dataGridControl );
+        var container = default( DependencyObject );
 
-      //if a detail generator is currently "started", then rely on it for the generation of items
-      if( m_generatorCurrentDetail != null )
-      {
-        //if the detail generator was not yet started
-        if( m_generatorCurrentDetailDisposable == null )
+        //if a detail generator is currently "started", then rely on it for the generation of items
+        if( m_generatorCurrentDetail != null )
         {
-          //start it
-          m_generatorCurrentDetailDisposable = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).StartAt( m_generatorCurrentDetail.DetailGenerator.GeneratorPositionFromIndex( m_generatorCurrentDetailIndex ), m_generatorDirection, true );
+          //if the detail generator was not yet started
+          if( m_generatorCurrentDetailDisposable == null )
+          {
+            //start it
+            m_generatorCurrentDetailDisposable = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).StartAt( m_generatorCurrentDetail.DetailGenerator.GeneratorPositionFromIndex( m_generatorCurrentDetailIndex ), m_generatorDirection, true );
+          }
+
+          container = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).GenerateNext( out isNewlyRealized );
+          node = m_generatorCurrentDetail;
+          //Detail Generator will have taken care of the "nasty" stuff ( ItemIndex, ... )
         }
+        else
+        {
+          //otherwise, it means the item to be generated is within this generator.
+          container = this.GenerateNextLocalContainer( out isNewlyRealized );
 
-        container = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).GenerateNext( out isNewlyRealized );
-        node = m_generatorCurrentDetail;
-        //Detail Generator will have taken care of the "nasty" stuff ( ItemIndex, ... )
-      }
-      else
-      {
-        //otherwise, it means the item to be generated is within this generator.
-        container = this.GenerateNextLocalContainer( out isNewlyRealized );
+          //special case for table view grid lines
+          Xceed.Wpf.DataGrid.Views.ViewBase.SetIsLastItem( container, this.ShouldDrawBottomLine() );
+          DataGridControl.SetHasExpandedDetails( container, this.ItemHasExpandedDetails() );
+        }
 
-        //special case for table view grid lines
-        Xceed.Wpf.DataGrid.Views.ViewBase.SetIsLastItem( container, this.ShouldDrawBottomLine() );
-        DataGridControl.SetHasExpandedDetails( container, this.ItemHasExpandedDetails() );
-      }
+        //if the container was just realized, ensure to add it to the lists maintaining the generated items.
+        if( isNewlyRealized )
+        {
+          var insertionIndex = this.FindInsertionPoint( m_generatorCurrentGlobalIndex );
+          var item = CustomItemContainerGenerator.GetDataItemProperty( container ).Data;
 
-      //if the container was just realized, ensure to add it to the lists maintaining the generated items.
-      if( isNewlyRealized )
-      {
-        Debug.Indent();
-        int insertionIndex = this.FindInsertionPoint( m_generatorCurrentGlobalIndex );
-        Debug.Unindent();
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Node( node ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( m_generatorCurrentGlobalIndex ) );
 
-        m_genPosToIndex.Insert( insertionIndex, m_generatorCurrentGlobalIndex );
-        m_genPosToItem.Insert( insertionIndex, CustomItemContainerGenerator.GetDataItemProperty( container ).Data );
-        m_genPosToContainer.Insert( insertionIndex, container );
-        m_genPosToNode.Insert( insertionIndex, node );
+          if( insertionIndex > 0 )
+          {
+            if( m_generatorCurrentGlobalIndex <= m_genPosToIndex[ insertionIndex - 1 ] )
+              throw DataGridException.Create<DataGridInternalException>( "Realized item inserted at wrong location.", m_dataGridControl );
+          }
+          else if( m_genPosToIndex.Count > 0 )
+          {
+            if( m_generatorCurrentGlobalIndex >= m_genPosToIndex[ insertionIndex ] )
+              throw DataGridException.Create<DataGridInternalException>( "Realized item inserted at wrong location.", m_dataGridControl );
+          }
 
-        this.ValidateIndexOrder( "genpos" + insertionIndex.ToString() + ", globalIndex" + m_generatorCurrentGlobalIndex.ToString() + ")" );
-      }
+          m_genPosToIndex.Insert( insertionIndex, m_generatorCurrentGlobalIndex );
+          m_genPosToItem.Insert( insertionIndex, item );
+          m_genPosToContainer.Insert( insertionIndex, container );
+          m_genPosToNode.Insert( insertionIndex, node );
+        }
 
-      if( m_generatorDirection == GeneratorDirection.Forward )
-      {
-        this.MoveGeneratorForward();
-      }
-      else
-      {
-        this.MoveGeneratorBackward();
-      }
+        if( m_generatorDirection == GeneratorDirection.Forward )
+        {
+          this.MoveGeneratorForward();
+        }
+        else
+        {
+          this.MoveGeneratorBackward();
+        }
 
-      return container;
+        return container;
+      }
     }
 
     DependencyObject IItemContainerGenerator.GenerateNext()
     {
-      IItemContainerGenerator generatorInterface = this;
       bool flag;
-      return generatorInterface.GenerateNext( out flag );
+
+      return ( ( IItemContainerGenerator )this ).GenerateNext( out flag );
     }
 
     public GeneratorPosition GeneratorPositionFromIndex( int itemIndex )
     {
       this.EnsureNodeTreeCreated();
 
-      int genPosIndex = m_genPosToIndex.IndexOf( itemIndex );
-      //if the Index maps to a Generated item, then return the GeneratorPosition (easy)
-      if( genPosIndex != -1 )
-      {
+      var genPosIndex = m_genPosToIndex.IndexOf( itemIndex );
+      if( genPosIndex >= 0 )
         return new GeneratorPosition( genPosIndex, 0 );
-      }
-      else
-      {
-        //If not generated
-        int storedIndex = -1;
-        int offset = itemIndex + 1;
 
-        //Find the closest (lower) realized index
-        for( int i = 0; i < m_genPosToIndex.Count; i++ )
-        {
-          storedIndex = i;
-          if( m_genPosToIndex[ i ] > itemIndex )
-          {
-            storedIndex = i - 1;
-            break;
-          }
-        }
+      var storedIndex = -1;
+      var offset = itemIndex + 1;
 
-        //and from there, compute the offset.
-        if( storedIndex >= 0 )
+      //Find the closest (lower) realized index
+      for( int i = 0; i < m_genPosToIndex.Count; i++ )
+      {
+        storedIndex = i;
+        if( m_genPosToIndex[ i ] > itemIndex )
         {
-          offset = itemIndex - m_genPosToIndex[ storedIndex ];
+          storedIndex = i - 1;
+          break;
         }
-
-        return new GeneratorPosition( storedIndex, offset );
       }
-    }
 
-    private GeneratorPosition GetSafeGeneratorPositionFromIndex( int itemIndex )
-    {
-      using( this.DeferDetailsRemap() )
+      //and from there, compute the offset.
+      if( storedIndex >= 0 )
       {
-        return this.GeneratorPositionFromIndex( itemIndex );
+        offset = itemIndex - m_genPosToIndex[ storedIndex ];
       }
+
+      return new GeneratorPosition( storedIndex, offset );
     }
 
     ItemContainerGenerator IItemContainerGenerator.GetItemContainerGeneratorForPanel( Panel panel )
@@ -2534,11 +2344,6 @@ namespace Xceed.Wpf.DataGrid
       return ( ( IItemContainerGenerator )( ( ItemsControl )m_dataGridControl ).ItemContainerGenerator ).GetItemContainerGeneratorForPanel( panel );
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="position"></param>
-    /// <returns>The index returned is the GlobalRealizedIndex</returns>
     public int IndexFromGeneratorPosition( GeneratorPosition position )
     {
       this.EnsureNodeTreeCreated();
@@ -2568,8 +2373,7 @@ namespace Xceed.Wpf.DataGrid
     void IItemContainerGenerator.PrepareItemContainer( DependencyObject container )
     {
       if( this.Status != GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "The Generator is not active: StartAt() was not called prior calling PrepareItemContainer() or the returned IDisposable was already disposed of.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "The Generator is not active: StartAt() was not called prior calling PrepareItemContainer() or the returned IDisposable was already disposed of.", m_dataGridControl );
 
       var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( container );
       if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
@@ -2585,49 +2389,41 @@ namespace Xceed.Wpf.DataGrid
     void IItemContainerGenerator.Remove( GeneratorPosition position, int count )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
 
       if( position.Offset != 0 )
-        DataGridException.ThrowSystemException( "The GeneratorPosition to remove cannot map to a non-realized item.", typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentException>( "The GeneratorPosition to remove cannot map to a non-realized item.", m_dataGridControl, "position" );
 
       if( position.Index == -1 )
-        DataGridException.ThrowSystemException( "he GeneratorPosition to remove cannot map to a non-realized item.", typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<ArgumentException>( "The GeneratorPosition to remove cannot map to a non-realized item.", m_dataGridControl, "position" );
+
+      if( count <= 0 )
+        throw DataGridException.Create<ArgumentException>( "The number of item to remove must be greater than or equal to one.", m_dataGridControl, "count" );
 
-      //if the index passed is within the array!
-      if( position.Index < m_genPosToIndex.Count )
+      if( position.Index >= m_genPosToIndex.Count )
+        throw DataGridException.Create<DataGridInternalException>( "Trying to remove an item at an out-of-bound GeneratorPosition index", m_dataGridControl );
+
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_Remove, DataGridTraceArgs.Index( position.Index ), DataGridTraceArgs.Count( count ) ) )
       {
-        //remove the items requested.
         for( int i = 0; i < count; i++ )
         {
           if( this.RemoveGeneratedItem( position.Index, null ) == 0 )
             //This case deserves a more solid approach... We do not want to allow removal from the user panel of an item that somehow is not present.
-            throw new DataGridInternalException( "Trying to remove an item at an out-of-bound GenratorPosition index.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "Trying to remove an item at an out-of-bound GeneratorPosition index.", m_dataGridControl );
         }
-
-        //No need to update the Generator current generation, since the content of the generator items did not change (only the list of realized items).
-        //m_currentGeneratorContentGeneration++;
-      }
-      else
-      {
-        throw new DataGridInternalException( "Trying to remove an item at an out-of-bound GenratorPosition index", m_dataGridControl );
       }
-
     }
 
     void IItemContainerGenerator.RemoveAll()
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
 
       using( this.SetIsHandlingGlobalItemsResetLocally() )
       {
         //Call to remove all shall not request container recycling panels to remove their containers. Therefore, I am not collecting the remove containers.
         this.RemoveAllGeneratedItems();
       }
-
-      //No need to update the Generator current generation, since the content of the generator items did not change (only the list of realized items).
     }
 
     IDisposable IItemContainerGenerator.StartAt( GeneratorPosition position, GeneratorDirection direction, bool allowStartAtRealizedItem )
@@ -2635,8 +2431,7 @@ namespace Xceed.Wpf.DataGrid
       this.SetIsInUse();
 
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
 
       this.EnsureNodeTreeCreated();
 
@@ -2676,7 +2471,7 @@ namespace Xceed.Wpf.DataGrid
           //then re-evaluate the number of items.
           if( m_startNode != null )
           {
-            //      If it does that correctly, then this function is OK.
+            // If it does that correctly, then this function is OK.
             int chainLength;
             GeneratorNodeHelper.EvaluateChain( m_startNode, out m_cachedItemCount, out chainLength );
           }
@@ -2701,14 +2496,13 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        //if the container recylcing is turned OFF from ON
+        //if the container recycling is turned OFF from ON
         if( value == ( bool )m_flags[ ( int )CustomItemContainerGeneratorFlags.RecyclingEnabled ] )
           return;
 
         if( !value )
         {
-          //clear the container queues
-          m_dataGridContext.RecyclingManager.Clear();
+          this.ClearRecyclingPools();
         }
 
         m_flags[ ( int )CustomItemContainerGeneratorFlags.RecyclingEnabled ] = value;
@@ -2738,25 +2532,23 @@ namespace Xceed.Wpf.DataGrid
       // DataGridControl. This is required for scenarios such as the CardflowItemsHost.
       this.EnsureNodeTreeCreated();
 
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
 
       //First, locate the item within the Generator.
       object newCurrentItem = nodeHelper.FindIndex( newCurrentIndex );
 
       if( newCurrentItem == null )
-        DataGridException.ThrowSystemException( "An attempt was made to access an item at an index that does not correspond to an item.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to access an item at an index that does not correspond to an item.", m_dataGridControl );
 
       //Then, if the item is within an ItemsNode, check if it belongs to a detail
-      ItemsGeneratorNode itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
+      var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
       if( itemsNode != null )
       {
         int masterIndex;
         int detailIndex;
         int detailNodeIndex;
 
-        DetailGeneratorNode detailNode = itemsNode.GetDetailNodeForIndex( newCurrentIndex - nodeHelper.Index, out masterIndex, out detailIndex, out detailNodeIndex );
-        //If it belongs to a detail
+        var detailNode = itemsNode.GetDetailNodeForIndex( newCurrentIndex - nodeHelper.Index, out masterIndex, out detailIndex, out detailNodeIndex );
         if( detailNode != null )
         {
           //call recursively the SetCurrentIndex method on the detail generator to ensure that if the item
@@ -2774,23 +2566,20 @@ namespace Xceed.Wpf.DataGrid
 
     int ICustomItemContainerGenerator.GetCurrentIndex()
     {
-      int index = -1;
       if( m_dataGridControl.CurrentContext != null )
-      {
-        index = this.FindIndexForItem( m_dataGridControl.CurrentContext.InternalCurrentItem, m_dataGridContext );
-      }
+        return this.FindIndexForItem( m_dataGridControl.CurrentContext.InternalCurrentItem, m_dataGridContext );
 
-      return index;
+      return -1;
     }
 
     void ICustomItemContainerGenerator.RestoreFocus( DependencyObject container )
     {
       if( !m_genPosToContainer.Contains( container ) )
-        DataGridException.ThrowSystemException( "The specified container is not part of the generator's content.",
-                                                typeof( ArgumentException ), m_dataGridControl.Name, "container" );
+        throw DataGridException.Create<ArgumentException>( "The specified container is not part of the generator's content.", m_dataGridControl, "container" );
+
+      var dataGridContext = DataGridControl.GetDataGridContext( container );
+      var column = ( dataGridContext == null ) ? null : dataGridContext.CurrentColumn;
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-      ColumnBase column = ( dataGridContext == null ) ? null : dataGridContext.CurrentColumn;
       m_dataGridControl.SetFocusHelper( container as UIElement, column, false, true );
     }
 
@@ -2798,38 +2587,38 @@ namespace Xceed.Wpf.DataGrid
 
     private DependencyObject GenerateNextLocalContainer( out bool isNewlyRealized )
     {
-      DependencyObject container = null;
-      object dataItem;
-      CollectionGeneratorNode node = m_generatorNodeHelper.CurrentNode as CollectionGeneratorNode;
+      var container = default( DependencyObject );
+      var node = m_generatorNodeHelper.CurrentNode as CollectionGeneratorNode;
 
-      m_log.Assert( this, node != null, "CustomItemContainerGenerator.GenerateNextLocalContainer: node is null." );
+      //if the index exists in the list, then the item is already realized.
+      var genPosIndex = m_genPosToIndex.IndexOf( m_generatorCurrentGlobalIndex );
+      var itemsNode = node as ItemsGeneratorNode;
 
-      ItemsGeneratorNode itemsNode = node as ItemsGeneratorNode;
+      if( node == null )
+      {
+        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ) );
+      }
 
-      //if the index exists in the list, then the item is already realized.
-      int genPosIndex = m_genPosToIndex.IndexOf( m_generatorCurrentGlobalIndex );
+      object dataItem;
 
-      if( genPosIndex != -1 )
+      if( genPosIndex >= 0 )
       {
         //retrieve the container for the item that is already stored in the data structure
         container = m_genPosToContainer[ genPosIndex ];
         dataItem = m_genPosToItem[ genPosIndex ];
-        GeneratorNode tempNode = m_genPosToNode[ genPosIndex ];
+
+        var tempNode = m_genPosToNode[ genPosIndex ];
         node = tempNode as CollectionGeneratorNode;
 
         if( tempNode == null )
         {
-          this.LogState();
-          m_log.Fail( this, "CustomItemContainerGenerator.GenerateNextLocalContainer: ### cached Node is null ( at " + genPosIndex.ToString() + " )" );
-
-          throw new DataGridInternalException( "CustomItemContainerGenerator.GenerateNextLocalContainer: cached Node is null", m_dataGridControl );
+          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
+          throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator.GenerateNextLocalContainer: cached Node is null", m_dataGridControl );
         }
         else if( node != m_generatorNodeHelper.CurrentNode )
         {
-          this.LogState();
-          m_log.Fail( this, "CustomItemContainerGenerator.GenerateNextLocalContainer: # testNode is not the current one. ( " + m_genPosToNode[ genPosIndex ].GetType().ToString() + " ) ( at " + genPosIndex.ToString() + " )" );
-
-          throw new DataGridInternalException( "CustomItemContainerGenerator.GenerateNextLocalContainer: Node is not the current one.", m_dataGridControl );
+          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.NodeIsNotTheCurrentNode, DataGridTraceArgs.Node( tempNode ), DataGridTraceArgs.Node( m_generatorNodeHelper.CurrentNode ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
+          throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator.GenerateNextLocalContainer: Node is not the current one.", m_dataGridControl );
         }
 
         isNewlyRealized = false;
@@ -2863,12 +2652,11 @@ namespace Xceed.Wpf.DataGrid
       {
         int itemIndex = m_generatorNodeHelper.SourceDataIndex + m_generatorCurrentOffset;
 
-        //this section is used to ensure that the Item Index is properly attached to all containers
         DataGridVirtualizingPanel.SetItemIndex( container, itemIndex );
 
-        SelectionRange currentSelection = new SelectionRange( itemIndex );
-
-        DataRow rowToSelect = container as DataRow;
+        //In order to make sure the container is properly selected, a new selection range must be initialized with the updated item index.
+        var currentSelection = new SelectionRange( itemIndex );
+        var rowToSelect = container as DataRow;
 
         if( rowToSelect != null )
         {
@@ -2890,8 +2678,9 @@ namespace Xceed.Wpf.DataGrid
       if( node != null )
       {
         //determine the appropriate GroupConfiguration ( based on parent node ) and set it on the container.
-        GroupConfiguration groupConfig = null;
-        GroupGeneratorNode parentNode = node.Parent as GroupGeneratorNode; //implicit rule: a parent node is always a GroupGeneratorNode
+        var groupConfig = default( GroupConfiguration );
+        var parentNode = node.Parent as GroupGeneratorNode; //implicit rule: a parent node is always a GroupGeneratorNode
+
         if( parentNode != null )
         {
           groupConfig = parentNode.GroupConfiguration;
@@ -2902,69 +2691,91 @@ namespace Xceed.Wpf.DataGrid
           DataGridControl.SetContainerGroupConfiguration( container, groupConfig );
         }
       }
-      else
-      {
-        this.LogState();
-        m_log.Fail( this, "CustomItemContainerGenerator.GenerateNextLocalContainer: node is null ( at " + genPosIndex.ToString() + " )" );
-      }
+
+      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.ContainerGenerated, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Value( isNewlyRealized ) );
 
       return container;
     }
 
-    private void UpdateDataVirtualizationLockForItemsNode( ItemsGeneratorNode itemsNode, object dataItem, bool applyLock )
+    private bool IsDataVirtualized( ItemsGeneratorNode node )
     {
-      IList items = itemsNode.Items;
+      DataGridVirtualizingCollectionViewBase collectionView;
+      VirtualList items;
 
-      ItemCollection itemCollection = items as ItemCollection;
+      return this.TryGetVirtualizedCollection( node, out collectionView, out items );
+    }
 
-      if( itemCollection != null )
+    private bool TryGetVirtualizedCollection( ItemsGeneratorNode node, out DataGridVirtualizingCollectionViewBase collectionView, out VirtualList items )
+    {
+      if( node == null )
       {
-        DataGridVirtualizingCollectionViewBase dataGridVirtualizingCollectionViewBase =
-          itemCollection.SourceCollection as DataGridVirtualizingCollectionViewBase;
-
-        if( dataGridVirtualizingCollectionViewBase != null )
-        {
-          int index = itemsNode.Items.IndexOf( dataItem );
-          if( applyLock )
-          {
-            dataGridVirtualizingCollectionViewBase.RootGroup.LockGlobalIndex( index );
-          }
-          else
-          {
-            dataGridVirtualizingCollectionViewBase.RootGroup.UnlockGlobalIndex( index );
-          }
-        }
+        collectionView = default( DataGridVirtualizingCollectionViewBase );
+        items = default( VirtualList );
       }
       else
       {
-        VirtualList virtualItemList = items as VirtualList;
-
-        if( virtualItemList != null )
+        var itemCollection = node.Items as ItemCollection;
+        if( itemCollection != null )
         {
-          int index = itemsNode.Items.IndexOf( dataItem );
-
-          if( applyLock )
-          {
-            virtualItemList.LockPageForLocalIndex( index );
-          }
-          else
-          {
-            virtualItemList.UnlockPageForLocalIndex( index );
-          }
+          collectionView = itemCollection.SourceCollection as DataGridVirtualizingCollectionViewBase;
+          items = default( VirtualList );
+        }
+        else
+        {
+          collectionView = default( DataGridVirtualizingCollectionViewBase );
+          items = node.Items as VirtualList;
         }
       }
 
+      return ( collectionView != null )
+          || ( items != null );
+    }
+
+    private void UpdateDataVirtualizationLockForItemsNode( ItemsGeneratorNode node, object dataItem, bool applyLock )
+    {
+      DataGridVirtualizingCollectionViewBase collectionView;
+      VirtualList items;
+
+      if( !this.TryGetVirtualizedCollection( node, out collectionView, out items ) )
+        return;
+
+      if( collectionView != null )
+      {
+        var index = node.Items.IndexOf( dataItem );
+        if( applyLock )
+        {
+          collectionView.RootGroup.LockGlobalIndex( index );
+        }
+        else
+        {
+          collectionView.RootGroup.UnlockGlobalIndex( index );
+        }
+      }
+      else if( items != null )
+      {
+        var index = node.Items.IndexOf( dataItem );
+        if( applyLock )
+        {
+          items.LockPageForLocalIndex( index );
+        }
+        else
+        {
+          items.UnlockPageForLocalIndex( index );
+        }
+      }
     }
 
     private void MoveGeneratorForward()
     {
-      ItemsGeneratorNode currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
+      var currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
 
       //if I was generating from a detail generator
       if( m_generatorCurrentDetail != null )
       {
-        m_log.Assert( this, currentMasterNode != null, "CustomItemContainerGenerator.MoveGeneratorForward: currentMasterNode is not null." );
-        m_log.Assert( this, currentMasterNode.Details != null, "CustomItemContainerGenerator.MoveGeneratorForward: currentMasterNode.Details is not null." );
+        if( ( currentMasterNode == null ) || ( currentMasterNode.Details == null ) )
+        {
+          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorForward, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( currentMasterNode ) );
+        }
 
         //incremment the running counter for the item index generated in the detail generator
         m_generatorCurrentDetailIndex++;
@@ -2983,7 +2794,10 @@ namespace Xceed.Wpf.DataGrid
           List<DetailGeneratorNode> detailsforMasterNode;
           currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsforMasterNode );
 
-          m_log.Assert( this, detailsforMasterNode != null, "CustomItemContainerGenerator.MoveGeneratorForward: detailsforMasterNode is not null." );
+          if( detailsforMasterNode == null )
+          {
+            this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorForward, DataGridTraceMessages.DetailExpected, DataGridTraceArgs.Node( currentMasterNode ) );
+          }
 
           while( ( m_generatorCurrentDetailNodeIndex < detailsforMasterNode.Count ) && ( m_generatorCurrentDetailIndex == -1 ) )
           {
@@ -3019,11 +2833,11 @@ namespace Xceed.Wpf.DataGrid
         if( ( currentMasterNode != null ) && ( currentMasterNode.Details != null )
           && ( currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsForNode ) ) )
         {
-          bool foundDetail = false;
+          var foundDetail = false;
 
           for( int i = 0; i < detailsForNode.Count; i++ )
           {
-            DetailGeneratorNode detailNode = detailsForNode[ i ];
+            var detailNode = detailsForNode[ i ];
 
             if( detailNode.ItemCount > 0 )
             {
@@ -3069,13 +2883,15 @@ namespace Xceed.Wpf.DataGrid
 
     private void MoveGeneratorBackward()
     {
-      ItemsGeneratorNode currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
+      var currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
 
       //if I was generating from a detail generator
       if( m_generatorCurrentDetail != null )
       {
-        m_log.Assert( this, currentMasterNode != null, "CustomItemContainerGenerator.MoveGeneratorBackward: currentMasterNode is not null." );
-        m_log.Assert( this, currentMasterNode.Details != null, "CustomItemContainerGenerator.MoveGeneratorBackward: currentMasterNode.Details is not null." );
+        if( ( currentMasterNode == null ) || ( currentMasterNode.Details == null ) )
+        {
+          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorBackward, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( currentMasterNode ) );
+        }
 
         //decrement the running counter for the item index generated in the detail generator
         m_generatorCurrentDetailIndex--;
@@ -3096,7 +2912,10 @@ namespace Xceed.Wpf.DataGrid
             List<DetailGeneratorNode> detailsforMasterNode;
             currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsforMasterNode );
 
-            m_log.Assert( this, detailsforMasterNode != null, "CustomItemContainerGenerator.MoveGeneratorBackward: detailsforMasterNode is not null." );
+            if( detailsforMasterNode == null )
+            {
+              this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorBackward, DataGridTraceMessages.DetailExpected, DataGridTraceArgs.Node( currentMasterNode ) );
+            }
 
             while( ( m_generatorCurrentDetailNodeIndex >= 0 ) && ( m_generatorCurrentDetailIndex == -1 ) )
             {
@@ -3161,20 +2980,17 @@ namespace Xceed.Wpf.DataGrid
       }
 
       m_generatorCurrentGlobalIndex--;
-
     }
 
     private void SetupLastDetailForNode( ItemsGeneratorNode node )
     {
       List<DetailGeneratorNode> detailsForNode;
 
-      if( ( node != null ) && ( node.Details != null )
-        && ( node.Details.TryGetValue( m_generatorCurrentOffset, out detailsForNode ) ) )
+      if( ( node != null ) && ( node.Details != null ) && ( node.Details.TryGetValue( m_generatorCurrentOffset, out detailsForNode ) ) )
       {
         for( int i = detailsForNode.Count - 1; i >= 0; i-- )
         {
-          DetailGeneratorNode detailNode = detailsForNode[ i ];
-
+          var detailNode = detailsForNode[ i ];
           if( detailNode.ItemCount > 0 )
           {
             //There are details for the master item
@@ -3190,8 +3006,7 @@ namespace Xceed.Wpf.DataGrid
     private bool ShouldDrawBottomLine()
     {
       if( m_generatorStatus != GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "An attempt was made to call the CustomItemContainerGenerator.ShouldDrawBottomLine method while containers are not being generated.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to call the CustomItemContainerGenerator.ShouldDrawBottomLine method while containers are not being generated.", m_dataGridControl );
 
       return ( m_generatorCurrentGlobalIndex == ( this.ItemCount - 1 ) );
     }
@@ -3199,10 +3014,9 @@ namespace Xceed.Wpf.DataGrid
     private bool ItemHasExpandedDetails()
     {
       if( m_generatorStatus != GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "An attempt was made to call the CustomItemContainerGenerator.ItemHasExpandedDetails method while containers are not being generated.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to call the CustomItemContainerGenerator.ItemHasExpandedDetails method while containers are not being generated.", m_dataGridControl );
 
-      ItemsGeneratorNode itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
+      var itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
       if( ( itemsNode == null ) || ( itemsNode.Details == null ) )
         return false;
 
@@ -3216,71 +3030,60 @@ namespace Xceed.Wpf.DataGrid
 
     internal void CleanupGenerator( bool isNestedCall )
     {
-      m_log.Assert( this, !this.IsHandlingGlobalItemsResetLocally, "Generator is already processing a HandleGlobalItemReset or CleanupGenerator" );
-
-      if( this.IsHandlingGlobalItemsResetLocally )
-        return;
-
-      using( m_log.BeginBlock( this, null ) )
-      using( this.SetIsHandlingGlobalItemsResetLocally() )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_CleanupGenerator ) )
       {
-        this.RemoveAllGeneratedItems();
+        this.ForceReset = false;
 
-        IList<DependencyObject> removedContainers = null;
-
-        var recyclingManager = m_dataGridContext.RecyclingManager;
-        recyclingManager.RemoveRef( this );
-        if( recyclingManager.RefCount == 0 )
+        if( this.IsHandlingGlobalItemsResetLocally )
         {
-          removedContainers = m_dataGridContext.RecyclingManager.Clear();
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_CleanupGenerator, DataGridTraceMessages.CannotProcessOnReset );
+          return;
         }
 
-        if( !isNestedCall )
+        using( this.SetIsHandlingGlobalItemsResetLocally() )
         {
-          this.SendResetEvent();
-        }
+          this.RemoveAllGeneratedItems();
 
-        //This call needs not to be defered or moved... effectivelly, the reset has already occured in that case...
-        if( ( removedContainers != null ) && ( removedContainers.Count > 0 ) )
-        {
-          this.NotifyContainersRemoved( removedContainers );
-        }
+          if( !isNestedCall )
+          {
+            this.SendResetEvent();
+            this.ClearRecyclingPools();
+          }
 
-        this.ClearLateGroupLevelDescriptions();
+          this.ClearLateGroupLevelDescriptions();
 
-        if( m_startNode != null )
-        {
-          //Note: this does not disconnects the "general" master/detail relationship established between an Item and its details,
-          //within the Generator itself, however, it does break the link between the GeneratorNode where the details are mapped.
-          this.NodeFactory.CleanGeneratorNodeTree( m_startNode );
-        }
+          if( m_startNode != null )
+          {
+            //Note: this does not disconnects the "general" master/detail relationship established between an Item and its details,
+            //within the Generator itself, however, it does break the link between the GeneratorNode where the details are mapped.
+            this.NodeFactory.CleanGeneratorNodeTree( m_startNode );
+          }
 
-        m_groupNodeMappingCache.Clear();
-        m_firstHeader = null;
-        m_firstFooter = null;
-        m_firstItem = null;
-        m_startNode = null;
+          m_groupNodeMappingCache.Clear();
+          m_firstHeader = null;
+          m_firstFooter = null;
+          m_firstItem = null;
+          m_startNode = null;
 
-        //This absolutelly needs to be done after the node list is Cleaned!
-        this.CleanupDetailRelations();
+          //This absolutelly needs to be done after the node list is Cleaned!
+          this.CleanupDetailRelations();
+          this.InvalidateNodeTree();
+        }
       }
     }
 
     private void CleanupDetailRelations()
     {
-      using( m_log.BeginBlock( this, null ) )
-      {
-        var detailNodes = this.GetDetailGeneratorNodes().ToList();
-
-        m_masterToDetails.Clear();
+      var detailNodes = this.GetDetailGeneratorNodes().ToList();
 
-        foreach( var detailNode in detailNodes )
-        {
-          this.ClearDetailGeneratorNode( detailNode );
-        }
+      m_masterToDetails.Clear();
 
-        m_floatingDetails.Clear();
+      foreach( var detailNode in detailNodes )
+      {
+        this.ClearDetailGeneratorNode( detailNode );
       }
+
+      m_floatingDetails.Clear();
     }
 
     private void IncrementCurrentGenerationCount( bool updateGenPosList )
@@ -3320,27 +3123,57 @@ namespace Xceed.Wpf.DataGrid
 
     private void OnDetailConfigurationsChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      switch( e.Action )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnDetailConfigurationsChanged ) )
       {
-        case NotifyCollectionChangedAction.Remove:
-          {
-            break;
-          }
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailConfigurationsChanged, DataGridTraceArgs.Action( e.Action ) );
 
-        case NotifyCollectionChangedAction.Move:
-        case NotifyCollectionChangedAction.Add:
-        case NotifyCollectionChangedAction.Replace:
-        case NotifyCollectionChangedAction.Reset:
-        default:
-          {
-            using( m_log.BeginBlock( this, "DetailConfiguration Changed" ) )
+        switch( e.Action )
+        {
+          case NotifyCollectionChangedAction.Remove:
+            {
+              using( m_recyclingPools.DeferContainersRemoved() )
+              {
+                foreach( DetailConfiguration detailConfiguration in e.OldItems )
+                {
+                  this.CloseDetails( detailConfiguration );
+
+                  m_recyclingPools.Clear( detailConfiguration );
+                }
+              }
+              break;
+            }
+
+          case NotifyCollectionChangedAction.Move:
+          case NotifyCollectionChangedAction.Add:
+          case NotifyCollectionChangedAction.Replace:
+          case NotifyCollectionChangedAction.Reset:
+          default:
             {
               // That ensure the RemapFloatingDetails() got called and the loop on m_masterToDetails.Keys will not contain invalid item.
               this.EnsureNodeTreeCreated();
+
+              foreach( object item in m_masterToDetails.Keys.ToList() )
+              {
+                this.CloseDetailsForItem( item, null );
+              }
+              break;
             }
+        }
+      }
+    }
 
-            break;
-          }
+    private void OnCollectionViewPropertyChanged( PropertyChangedEventArgs e )
+    {
+      var propertyName = e.PropertyName;
+
+      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.GroupsPropertyName ) )
+      {
+        this.OnCollectionViewGroupsPropertyChanged();
+      }
+
+      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.RootGroupPropertyName ) )
+      {
+        this.OnCollectionViewRootGroupChanged();
       }
     }
 
@@ -3352,362 +3185,342 @@ namespace Xceed.Wpf.DataGrid
       this.HandleGlobalItemsReset();
     }
 
-    private void OnItemsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnCollectionViewRootGroupChanged()
     {
-      // Avoid re-entrance when processing a global reset
-      if( this.IsHandlingGlobalItemsResetLocally )
-        return;
-
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      switch( e.Action )
+      for( int i = 0; i < m_genPosToNode.Count; i++ )
       {
-        case NotifyCollectionChangedAction.Add:
-          //do not handle the Items.CollectionChanged if groups are present or if there is already a items node.
-          // (because the OnGeneratorNodeItemsCollectionChanged will handle things)
-          if( m_collectionView.GroupDescriptions.Count == 0 )
-          {
-            if( m_firstItem == null )
-            {
+        if( !( m_genPosToNode[ i ] is HeadersFootersGeneratorNode ) )
+          continue;
 
-              int addCount = e.NewItems.Count;
-              GeneratorPosition genPos = new GeneratorPosition( -1, 1 );
+        this.SetStatContext( m_genPosToContainer[ i ], m_genPosToNode[ i ] );
+      }
+    }
 
-              this.IncrementCurrentGenerationCount();
+    private void OnItemsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged ) )
+      {
+        if( this.IsHandlingGlobalItemsResetLocally )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Action( e.Action ) );
+          return;
+        }
 
-              this.SendAddEvent( genPos, 0, addCount );
-            }
-          }
-          break;
+        if( this.Status == GeneratorStatus.GeneratingContainers )
+          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-        case NotifyCollectionChangedAction.Move:
-        case NotifyCollectionChangedAction.Remove:
-        case NotifyCollectionChangedAction.Replace:
-          //I voluntarilly do not handle these particular cases because the ItemsNode
-          //handler will cover it. (OnGeneratorNodeItemsCollectionChanged)
-          break;
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged, DataGridTraceArgs.Action( e.Action ) );
 
-        case NotifyCollectionChangedAction.Reset:
-          if( ( m_groupsCollection == null ) || ( m_collectionView.GroupDescriptions.Count == 0 ) )
+        if( this.ForceReset )
+        {
+          this.HandleGlobalItemsReset();
+        }
+        else
+        {
+          if( e.Action == NotifyCollectionChangedAction.Reset )
           {
-            this.HandleGlobalItemsReset();
+            if( ( m_groupsCollection == null ) != ( m_collectionView.GroupDescriptions.Count == 0 ) )
+            {
+              this.HandleGlobalItemsReset();
+            }
           }
-
-          break;
+        }
       }
     }
 
     private void OnGroupsChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      // Avoid re-entrance when processing a global reset
-      if( this.IsHandlingGlobalItemsResetLocally )
-        return;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceArgs.Group( sender ) ) )
+      {
+        if( this.IsHandlingGlobalItemsResetLocally )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Group( sender ), DataGridTraceArgs.Action( e.Action ) );
+          return;
+        }
 
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        if( this.Status == GeneratorStatus.GeneratingContainers )
+          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-      //this fonction is only used to process the content of the DataGridControl.Items.Groups collection...
-      // for the CollectionChanged event of branch groups ( IsBottomLevel = false ), refer to the 
-      // OnBranchGroupsChanged fonction
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceArgs.Group( sender ), DataGridTraceArgs.Action( e.Action ) );
 
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          int addCount = e.NewItems.Count;
+        switch( e.Action )
+        {
+          case NotifyCollectionChangedAction.Add:
+            {
+              var count = e.NewItems.Count;
+
+              //if the first item is empty, do not do anything, the structure will be generated when the generator is started!
+              if( m_firstItem != null )
+              {
+                //The only moment where the m_firstItem is null is typically when a reset occured...
+                //other moments is when there are 0 items.
+                this.HandleSameLevelGroupAddition( m_firstItem, out count, e );
+                this.IncrementCurrentGenerationCount();
+              }
 
-          GeneratorPosition genPos = new GeneratorPosition( -1, 1 ); //this would map to the first item in the list if not generated.
+              this.SendAddEvent( count );
+            }
+            break;
 
-          int addIndex = -1;
+          case NotifyCollectionChangedAction.Move:
+            {
+              if( m_firstItem != null )
+              {
+                if( !( m_firstItem is GroupGeneratorNode ) )
+                  throw DataGridException.Create<DataGridInternalException>( "Trying to move a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
 
-          //if the first item is empty, do not do anything, the structure will be generated when the generator is started!
-          if( m_firstItem != null )
-          {
-            //The only moment where the m_firstItem is null is typically when a reset occured...
-            //other moments is when there are 0 items (in which case, the.
+                Debug.Assert( e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
 
-            GeneratorNode addNode = this.HandleSameLevelGroupAddition( m_firstItem, out addCount, e );
+                this.HandleSameLevelGroupMove( m_firstItem, e );
+              }
+            }
+            break;
 
-            this.IncrementCurrentGenerationCount();
+          case NotifyCollectionChangedAction.Remove:
+            {
+              if( m_firstItem != null )
+              {
+                if( !( m_firstItem is GroupGeneratorNode ) )
+                  throw DataGridException.Create<DataGridInternalException>( "Trying to remove a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
 
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( addNode, 0, 0 );//index not important, will reserve find it.
-            nodeHelper.ReverseCalculateIndex();
-            addIndex = nodeHelper.Index;
+                var count = default( int );
+                var containers = new List<DependencyObject>();
 
-            genPos = this.GeneratorPositionFromIndex( addIndex );
-          }
+                this.HandleSameLevelGroupRemove( m_firstItem, out count, e, containers );
+                this.IncrementCurrentGenerationCount();
+                this.SendRemoveEvent( count, containers );
+              }
+            }
+            break;
 
-          this.SendAddEvent( genPos, addIndex, addCount );
+          case NotifyCollectionChangedAction.Replace:
+            throw DataGridException.Create<NotSupportedException>( "Replace not supported at the moment on groups.", m_dataGridControl );
 
-          break;
+          case NotifyCollectionChangedAction.Reset:
+            {
+              if( m_firstItem != null )
+              {
+                if( !( m_firstItem is GroupGeneratorNode ) )
+                  throw DataGridException.Create<DataGridInternalException>( "Trying to reset a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
 
-        case NotifyCollectionChangedAction.Move:
-          if( m_firstItem != null )
-          {
-            if( !( m_firstItem is GroupGeneratorNode ) )
-              throw new DataGridInternalException( "Trying to move a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
+                this.HandleSameLevelGroupReset( m_firstItem );
+              }
+              else
+              {
+                this.HandleGlobalItemsReset();
+              }
+            }
+            break;
+        }
+      }
+    }
 
-            m_log.Assert( this, e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
+    private void OnGeneratorNodeItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) ) )
+      {
+        if( this.IsHandlingGlobalItemsResetLocally )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
+          return;
+        }
 
-            this.HandleSameLevelGroupMove( m_firstItem, e );
-          }
-          break;
+        if( this.Status == GeneratorStatus.GeneratingContainers )
+          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-        case NotifyCollectionChangedAction.Remove:
-          if( m_firstItem != null )
-          {
-            if( !( m_firstItem is GroupGeneratorNode ) )
-              throw new DataGridInternalException( "Trying to remove a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
+        var node = ( ItemsGeneratorNode )sender;
+        var updateContainersIndex = !node.IsComputedExpanded;
 
-            int remCount;
-            int generatedRemCount;
-            int removeIndex;
-            List<DependencyObject> removedContainers = new List<DependencyObject>();
-            GeneratorPosition remPos = this.HandleSameLevelGroupRemove( m_firstItem, out remCount, out generatedRemCount, out removeIndex, e, removedContainers );
+        e = e.GetRangeActionOrSelf();
 
-            //there is no need to check if the parent node is expanded or not... since the first level of group cannot be collapsed.
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
 
-            this.IncrementCurrentGenerationCount();
+        switch( e.Action )
+        {
+          case NotifyCollectionChangedAction.Add:
+            {
+              this.HandleItemAddition( node, e );
+            }
+            break;
 
-            this.SendRemoveEvent( remPos, removeIndex, remCount, generatedRemCount, removedContainers );
-          }
+          case NotifyCollectionChangedAction.Remove:
+            {
+              this.HandleItemRemoveMoveReplace( node, e );
+            }
+            break;
 
-          break;
+          case NotifyCollectionChangedAction.Move:
+          case NotifyCollectionChangedAction.Replace:
+            {
+              //detect the case where the replace is targeted at a single item, replaced with himself.
+              //This particular case is there to handle the particularities of the DGCV with regards to
+              //IBindingList.ListChanged.ChangeType == ItemChanged.
+              if( ( e.Action == NotifyCollectionChangedAction.Replace ) &&
+                  ( e.OldItems.Count == 1 ) && ( e.NewItems.Count == 1 ) &&
+                  ( e.NewItems[ 0 ] == e.OldItems[ 0 ] ) )
+              {
+                // Getting a replace with the same instance should just do nothing.
+                //
+                // Note : We know that will prevent a row from refreshing correctly if the item 
+                // are not implementing a mechanic of notification ( like INotifyPropertyChanged ).
 
-        case NotifyCollectionChangedAction.Replace:
-          DataGridException.ThrowSystemException( "Replace not supported at the moment on groups.", typeof( NotSupportedException ), m_dataGridControl.Name );
-          break;
+                updateContainersIndex = false;
+              }
+              else
+              {
+                //any other case, normal handling
+                this.HandleItemRemoveMoveReplace( node, e );
+              }
+            }
+            break;
 
-        case NotifyCollectionChangedAction.Reset:
-          if( m_firstItem != null )
-          {
-            if( !( m_firstItem is GroupGeneratorNode ) )
-              throw new DataGridInternalException( "Trying to reset a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
+          case NotifyCollectionChangedAction.Reset:
+            {
+              this.HandleItemReset( node );
+            }
+            break;
+        }
 
-            this.HandleSameLevelGroupReset( m_firstItem );
-          }
-          else
-          {
-            this.HandleGlobalItemsReset();
-          }
-          break;
+        if( updateContainersIndex )
+        {
+          this.UpdateContainersIndex();
+        }
       }
-
     }
 
-    private void OnGeneratorNodeItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnGeneratorNodeExpansionStateChanged( object sender, ExpansionStateChangedEventArgs e )
     {
-      // Avoid re-entrance when processing a global reset
-      if( this.IsHandlingGlobalItemsResetLocally )
-        return;
-
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-      var node = sender as GeneratorNode;
-      if( node == null )
-        return;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceArgs.Node( sender ) ) )
+      {
 
-      var itemsNode = sender as ItemsGeneratorNode;
-      var headersNode = sender as HeadersFootersGeneratorNode;
+        var node = sender as GeneratorNode;
+        Debug.Assert( node != null );
 
-      e = e.GetRangeActionOrSelf();
+        var changedNode = node.Parent as GroupGeneratorNode;
+        if( changedNode == null )
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node.Parent ) );
+        }
 
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.HandleItemAddition( node, e );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          if( itemsNode != null )
-          {
-            this.HandleItemRemoveMoveReplace( itemsNode, e );
-          }
-          else if( headersNode != null )
-          {
-            this.HandleHeaderFooterRemove( headersNode, e );
-          }
-          else
-          {
-            throw new DataGridInternalException( "Cannot remove the GeneratorNode as it is not of a valid type.", m_dataGridControl );
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-        case NotifyCollectionChangedAction.Replace:
-          if( itemsNode != null )
-          {
-            //detect the case where the replace is targeted at a single item, replaced with himself.
-            //This particular case is there to handle the particularities of the DGCV with regards to
-            //IBindingList.ListChanged.ChangeType == ItemChanged.
-            if( ( e.Action == NotifyCollectionChangedAction.Replace ) &&
-                ( e.OldItems.Count == 1 ) && ( e.NewItems.Count == 1 ) &&
-                ( e.NewItems[ 0 ] == e.OldItems[ 0 ] ) )
-            {
-              // Getting a replace with the same instance should just do nothing.
-              //
-              // Note : We know that will prevent a row from refreshing correctly if the item 
-              // are not implementing a mechanic of notification ( like INotifyPropertyChanged ).
-            }
-            else
-            {
-              //any other case, normal handling
-              this.HandleItemRemoveMoveReplace( itemsNode, e );
-            }
-          }
-          else if( headersNode != null )
-          {
-            this.HandleHeaderFooterReplace( headersNode, e );
-          }
-          else
-          {
-            throw new DataGridInternalException( "Cannot move or replace the GeneratorNode as it is not of a valid type.", m_dataGridControl );
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          this.HandleItemReset( node );
-          break;
-      }
-    }
-
-    private void OnGeneratorNodeExpansionStateChanged( object sender, ExpansionStateChangedEventArgs e )
-    {
-      //throw an error is the Generator is actually busy generating!
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      GeneratorNode node = sender as GeneratorNode;
-
-      m_log.Assert( this, node != null, "node != null" );
-
-      if( node == null )
-        return;
-
-      GroupGeneratorNode changedNode = node.Parent as GroupGeneratorNode;
-
-      m_log.Assert( this, changedNode != null, "changedNode != null" ); //should never be null, as the "node" is supposed to be the child node of this one.
-
-      //Determine if the changedNode is "below" a collapsed group (because if so, I don't need any sort of notification or removal ).
-      GroupGeneratorNode parentGroupNode = changedNode.Parent as GroupGeneratorNode;
-      if( ( parentGroupNode != null ) && ( !parentGroupNode.IsComputedExpanded ) )
-        return;
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-      nodeHelper.ReverseCalculateIndex();
-
-      //if the node was "Collapsed"
-      if( !e.NewExpansionState )
-      {
-        int removeCount = e.Count;
-        int startIndex = nodeHelper.Index + e.IndexOffset;
-
-        GeneratorPosition removeGenPos = this.GeneratorPositionFromIndex( startIndex );
+        //Determine if the changedNode is "below" a collapsed group (because if so, I don't need any sort of notification or removal ).
+        var parentGroupNode = changedNode.Parent as GroupGeneratorNode;
+        if( ( parentGroupNode != null ) && ( !parentGroupNode.IsComputedExpanded ) )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
+          return;
+        }
 
-        List<DependencyObject> removedContainers = new List<DependencyObject>();
-        //remove the Generated items between the appropriate indexes
-        int removeUICount = this.RemoveGeneratedItems( startIndex, startIndex + removeCount - 1, removedContainers );
+        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
+        nodeHelper.ReverseCalculateIndex();
 
-        if( removeCount > 0 )
+        //if the node was "Collapsed"
+        if( !e.NewExpansionState )
         {
-          //send the event so the panel can remove the group elements
-          this.SendRemoveEvent( removeGenPos, startIndex, removeCount, removeUICount, removedContainers );
-        }
-      }
-      //if the node was "Expanded" 
-      else
-      {
-        int addCount = e.Count;
-        int startIndex = nodeHelper.Index + e.IndexOffset;
-        GeneratorPosition addGenPos = this.GeneratorPositionFromIndex( startIndex );
+          var startIndex = nodeHelper.Index + e.IndexOffset;
+          var containers = new List<DependencyObject>();
 
-        if( addCount > 0 )
+          this.RemoveGeneratedItems( startIndex, startIndex + e.Count - 1, containers );
+          this.SendRemoveEvent( e.Count, containers );
+        }
+        //if the node was "Expanded" 
+        else
         {
-          //send the event so the panel can add the group elements
-          this.SendAddEvent( addGenPos, startIndex, addCount );
+          this.SendAddEvent( e.Count );
         }
       }
     }
 
     private void OnGroupGeneratorNodeIsExpandedChanging( object sender, EventArgs e )
     {
-      //throw an error is the Generator is actually busy generating!
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
+
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging, DataGridTraceArgs.Node( sender ) ) )
+      {
+        if( m_currentGenPosToIndexInhibiterDisposable != null )
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging, DataGridTraceMessages.InhibiterAlreadySet );
+        }
 
-      m_log.Assert( this, m_currentGenPosToIndexInhibiterDisposable == null, "m_currentGenPosToIndexInhibiterDisposable == null" );
+        m_currentGenPosToIndexInhibiterDisposable = this.InhibitParentGenPosToIndexUpdate();
 
-      m_currentGenPosToIndexInhibiterDisposable = this.InhibitParentGenPosToIndexUpdate();
+        var groupGeneratorNode = sender as GroupGeneratorNode;
 
-      GroupGeneratorNode groupGeneratorNode = sender as GroupGeneratorNode;
-      if( ( m_dataGridContext != null )
-        && ( !m_dataGridContext.IsDeferRestoringState )
-        && ( !m_dataGridContext.IsRestoringState )
-        && ( m_dataGridControl != null )
-        && ( groupGeneratorNode != null )
-        && ( groupGeneratorNode.IsExpanded ) )
-      {
-        TableflowViewItemsHost tableflowItemsHost = m_dataGridControl.ItemsHost as TableflowViewItemsHost;
-        if( tableflowItemsHost != null )
+        if( ( m_dataGridContext != null )
+          && ( !m_dataGridContext.IsDeferRestoringState )
+          && ( !m_dataGridContext.IsRestoringState )
+          && ( m_dataGridControl != null )
+          && ( groupGeneratorNode != null )
+          && ( groupGeneratorNode.IsExpanded ) )
         {
-          tableflowItemsHost.OnGroupCollapsing( groupGeneratorNode.UIGroup );
+          var tableflowItemsHost = m_dataGridControl.ItemsHost as TableflowViewItemsHost;
+          if( tableflowItemsHost != null )
+          {
+            tableflowItemsHost.OnGroupCollapsing( groupGeneratorNode.UIGroup );
+          }
         }
       }
     }
 
     private void OnGroupGeneratorNodeIsExpandedChanged( object sender, EventArgs e )
     {
-      //throw an error is the Generator is actually busy generating!
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-      GroupGeneratorNode node = sender as GroupGeneratorNode;
-      if( node != null )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged, DataGridTraceArgs.Node( sender ) ) )
       {
-        this.IncrementCurrentGenerationCount();
-      }
+        var node = sender as GroupGeneratorNode;
+        if( node != null )
+        {
+          this.IncrementCurrentGenerationCount();
+        }
+        else
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( sender ) );
+        }
 
-      if( m_currentGenPosToIndexInhibiterDisposable != null )
-      {
-        m_currentGenPosToIndexInhibiterDisposable.Dispose();
-        m_currentGenPosToIndexInhibiterDisposable = null;
+        if( m_currentGenPosToIndexInhibiterDisposable != null )
+        {
+          m_currentGenPosToIndexInhibiterDisposable.Dispose();
+          m_currentGenPosToIndexInhibiterDisposable = null;
+        }
       }
     }
 
     private void OnGeneratorNodeGroupsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
-
-      GroupGeneratorNode node = sender as GroupGeneratorNode;
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-      if( node != null )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) ) )
       {
+        var node = sender as GroupGeneratorNode;
+        if( node == null )
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
+          return;
+        }
+
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
+
         switch( e.Action )
         {
           case NotifyCollectionChangedAction.Add:
             {
-              int addCount;
-              GeneratorNode addNode = this.HandleParentGroupAddition( node, out addCount, e );
+              var count = default( int );
+              this.HandleParentGroupAddition( node, out count, e );
 
               if( node.IsComputedExpanded )
               {
-                GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( addNode, 0, 0 );//index not important, will reserve find it.
-                nodeHelper.ReverseCalculateIndex();
-
                 this.IncrementCurrentGenerationCount();
-
-                GeneratorPosition genPos = this.GeneratorPositionFromIndex( nodeHelper.Index );
-
-                this.SendAddEvent( genPos, nodeHelper.Index, addCount );
+                this.SendAddEvent( count );
+              }
+              else
+              {
+                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
               }
             }
             break;
@@ -3715,9 +3528,9 @@ namespace Xceed.Wpf.DataGrid
           case NotifyCollectionChangedAction.Move:
             {
               if( node.Child == null )
-                throw new DataGridInternalException( "An attempt was made to move a group with a null child GeneratorNode.", m_dataGridControl );
+                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to move a group with a null child GeneratorNode.", m_dataGridControl );
 
-              m_log.Assert( this, e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
+              Debug.Assert( e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
 
               this.HandleSameLevelGroupMove( node.Child, e );
             }
@@ -3726,31 +3539,32 @@ namespace Xceed.Wpf.DataGrid
           case NotifyCollectionChangedAction.Remove:
             {
               if( node.Child == null )
-                throw new DataGridInternalException( "An attempt was made to remove a group with a null child GeneratorNode.", m_dataGridControl );
+                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to remove a group with a null child GeneratorNode.", m_dataGridControl );
 
-              int remCount;
-              int generatedRemCount;
-              int removeIndex;
-              List<DependencyObject> removedContainers = new List<DependencyObject>();
-              GeneratorPosition remPos = this.HandleParentGroupRemove( node, out remCount, out generatedRemCount, out removeIndex, e, removedContainers );
+              var count = default( int );
+              var containers = new List<DependencyObject>();
+
+              this.HandleParentGroupRemove( node, out count, e, containers );
 
               if( node.IsComputedExpanded )
               {
                 this.IncrementCurrentGenerationCount();
-
-                this.SendRemoveEvent( remPos, removeIndex, remCount, generatedRemCount, removedContainers );
+                this.SendRemoveEvent( count, containers );
+              }
+              else
+              {
+                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
               }
             }
             break;
 
           case NotifyCollectionChangedAction.Replace:
-            DataGridException.ThrowSystemException( "Replace not supported at the moment on groups.", typeof( NotSupportedException ), m_dataGridControl.Name );
-            break;
+            throw DataGridException.Create<NotSupportedException>( "Replace not supported at the moment on groups.", m_dataGridControl );
 
           case NotifyCollectionChangedAction.Reset:
             {
               if( node.Child == null )
-                throw new DataGridInternalException( "An attempt was made to reset a group with a null child GeneratorNode.", m_dataGridControl );
+                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to reset a group with a null child GeneratorNode.", m_dataGridControl );
 
               this.HandleSameLevelGroupReset( node.Child );
             }
@@ -3759,11 +3573,50 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private void OnGeneratorNodeHeadersFootersCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged ) )
+      {
+        if( this.IsHandlingGlobalItemsResetLocally )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged, DataGridTraceMessages.CannotProcessOnReset );
+          return;
+        }
+
+        if( this.Status == GeneratorStatus.GeneratingContainers )
+          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
+
+        var nodes = ( IEnumerable<HeadersFootersGeneratorNode> )sender;
+        Debug.Assert( nodes != null );
+        Debug.Assert( nodes.Any() );
+
+        e = e.GetRangeActionOrSelf();
+
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged, DataGridTraceArgs.Action( e.Action ) );
+
+        switch( e.Action )
+        {
+          case NotifyCollectionChangedAction.Add:
+            this.HandleHeadersFootersAddition( nodes, e );
+            break;
+
+          case NotifyCollectionChangedAction.Remove:
+          case NotifyCollectionChangedAction.Move:
+          case NotifyCollectionChangedAction.Replace:
+            this.HandleHeadersFootersRemoveMoveReplace( nodes, e );
+            break;
+
+          case NotifyCollectionChangedAction.Reset:
+            this.HandleGlobalItemsReset();
+            break;
+        }
+      }
+    }
+
     private void OnViewThemeChanged( object sender, EventArgs e )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
       if( m_startNode != null )
       {
@@ -3778,105 +3631,110 @@ namespace Xceed.Wpf.DataGrid
       this.CleanupGenerator();
     }
 
-    private void ResetNodeList()
+    private void OnRecyclingPoolsContainersRemoved( object sender, ContainersRemovedEventArgs e )
     {
+      this.OnContainersRemoved( e.RemovedContainers );
+    }
 
+    private void ResetNodeList()
+    {
       this.UpdateHeaders( m_dataGridContext.Headers );
 
       int addCount;
       this.SetupInitialItemsNodes( out addCount );
 
       this.UpdateFooters( m_dataGridContext.Footers );
-
-      //Add self to the RecyclingManager ref count manager.
-      //This is to ensure that the list of container availlable for recycling will be preserved taking this generator into consideration
-      m_dataGridContext.RecyclingManager.AddRef( this );
     }
 
     private int ClearItems()
     {
-      int retval = 0;
-
       //if the first item is not null, that means that we have items within the grid.
-      if( m_firstItem != null )
-      {
-        GeneratorNode previous = m_firstItem.Previous;
+      if( m_firstItem == null )
+        return 0;
 
-        //there are footers items
-        if( m_firstFooter != null )
+      var previous = m_firstItem.Previous;
+
+      //there are footers items
+      if( m_firstFooter != null )
+      {
+        //there is a previous item (headers present)
+        if( previous != null )
         {
-          //there is a previous item (headers present)
-          if( previous != null )
-          {
-            m_firstFooter.Previous.Next = null; //clear the next pointer from the last item
-            m_firstFooter.Previous = previous; //set the last header as the previous from the first footer
-            previous.Next = m_firstFooter; //set the first footer as the next from the last header
-          }
-          else
-          {
-            //there is no header present
-            m_firstFooter.Previous.Next = null; //set the last item next to null (protect again recursive clearing)
-            m_firstFooter.Previous = null; //make the first footer have not previous
+          m_firstFooter.Previous.Next = null; //clear the next pointer from the last item
+          m_firstFooter.Previous = previous; //set the last header as the previous from the first footer
+          previous.Next = m_firstFooter; //set the first footer as the next from the last header
+        }
+        else
+        {
+          //there is no header present
+          m_firstFooter.Previous.Next = null; //set the last item next to null (protect again recursive clearing)
+          m_firstFooter.Previous = null; //make the first footer have not previous
 
-            m_startNode = m_firstFooter;
-          }
+          m_startNode = m_firstFooter;
+        }
+      }
+      else
+      {
+        //There is no footers after the items.
+        if( previous != null )
+        {
+          //this means we have some headers before the items.
+          previous.Next = null;
         }
         else
         {
-          //There is no footers after the items.
-          if( previous != null )
-          {
-            //this means we have some headers before the items.
-            previous.Next = null;
-          }
-          else
-          {
-            //this means we have no headers before the items and no footers after.
-            m_startNode = null;
-          }
+          //this means we have no headers before the items and no footers after.
+          m_startNode = null;
         }
+      }
 
-        int removeCount;
-        int chainLength;
-        GeneratorNodeHelper.EvaluateChain( m_firstItem, out removeCount, out chainLength );
+      int removeCount;
+      int chainLength;
+      GeneratorNodeHelper.EvaluateChain( m_firstItem, out removeCount, out chainLength );
 
-        this.ClearLateGroupLevelDescriptions();
-        m_groupNodeMappingCache.Clear();
-        this.NodeFactory.CleanGeneratorNodeTree( m_firstItem );
-        m_firstItem = null;
+      this.ClearLateGroupLevelDescriptions();
+      m_groupNodeMappingCache.Clear();
 
-        retval = removeCount;
-      }
+      this.NodeFactory.CleanGeneratorNodeTree( m_firstItem );
+      m_firstItem = null;
 
-      return retval;
+      this.InvalidateNodeTree();
+
+      return removeCount;
+    }
+
+    private void ClearRecyclingPools()
+    {
+      // Only the top most generator may clear the recycling pools.
+      if( m_dataGridContext.SourceDetailConfiguration != null )
+        return;
+
+      m_recyclingPools.Clear();
     }
 
     private int RemoveGeneratedItem( int index, IList<DependencyObject> removedContainers )
     {
-      //basic error handling
       if( ( index < 0 ) || ( index >= m_genPosToIndex.Count ) )
         return 0;
 
-      object item = m_genPosToItem[ index ];
-      DependencyObject container = m_genPosToContainer[ index ];
-      GeneratorNode node = m_genPosToNode[ index ];
+      Debug.Assert( ( m_genPosToContainer.Count == m_genPosToIndex.Count )
+                 && ( m_genPosToIndex.Count == m_genPosToItem.Count )
+                 && ( m_genPosToItem.Count == m_genPosToNode.Count ) );
 
-      m_log.Assert( this, ( m_genPosToContainer.Count != 0 )
-                     && ( m_genPosToIndex.Count != 0 )
-                     && ( m_genPosToItem.Count != 0 )
-                     && ( m_genPosToNode.Count != 0 ), "Internal Generator's lists are empty, cannot continue to process RemoveGeneratedItems" );
+      var item = m_genPosToItem[ index ];
+      var container = m_genPosToContainer[ index ];
+      var node = m_genPosToNode[ index ];
 
       //remove the item from the 4 lists... (same as doing a "remove")
       this.GenPosArraysRemoveAt( index );
 
       if( removedContainers != null )
       {
-        removedContainers.Add( container );
+        removedContainers.Insert( 0, container );
       }
 
-      DetailGeneratorNode detailNode = node as DetailGeneratorNode;
-
       //to ensure this is only done once, check if the node associated with the container is a Detail or not
+      var detailNode = node as DetailGeneratorNode;
       if( detailNode == null )
       {
         //Node for item is NOT a detail, can safelly remove the container locally (int this generator instance).
@@ -3893,34 +3751,30 @@ namespace Xceed.Wpf.DataGrid
 
     private int RemoveGeneratedItem( DependencyObject container )
     {
-      int index = m_genPosToContainer.IndexOf( container );
-
-      if( index == -1 )
+      var index = m_genPosToContainer.IndexOf( container );
+      if( index < 0 )
         return 0;
 
       return this.RemoveGeneratedItem( index, null );
     }
 
-    private int RemoveGeneratedItems( int startIndex, int endIndex, IList<DependencyObject> removedContainers )
+    private void RemoveGeneratedItems( int startIndex, int endIndex, IList<DependencyObject> removedContainers )
     {
       if( startIndex > endIndex )
-        return 0;
+        return;
 
       var count = m_genPosToIndex.Count;
       if( ( count <= 0 ) || ( m_genPosToIndex[ 0 ] > endIndex ) || ( m_genPosToIndex[ count - 1 ] < startIndex ) )
-        return 0;
+        return;
 
-      var removed = 0;
+      Debug.Assert( ( m_genPosToContainer.Count == m_genPosToIndex.Count )
+                 && ( m_genPosToIndex.Count == m_genPosToItem.Count )
+                 && ( m_genPosToItem.Count == m_genPosToNode.Count ) );
 
       //cycle through the list of generated items, and see if any items are generated between the indexes in the removed range.
       //start from the end so that removing an item will not cause the indexes to shift.
       for( var i = count - 1; i >= 0; i-- )
       {
-        m_log.Assert( this, ( m_genPosToContainer.Count != 0 )
-                         && ( m_genPosToIndex.Count != 0 )
-                         && ( m_genPosToItem.Count != 0 )
-                         && ( m_genPosToNode.Count != 0 ), "Internal Generator's lists are empty, cannot continue to process RemoveGeneratedItems" );
-
         var index = m_genPosToIndex[ i ];
 
         //if the item is within the range removed
@@ -3929,30 +3783,25 @@ namespace Xceed.Wpf.DataGrid
           //this will ensure to recurse the call to the appropriate Detail Generator for clearing of the container.
           //otherwise, it will only remove it from the list of container generated in the current generator instance.
           this.RemoveGeneratedItem( i, removedContainers );
-
-          removed++;
         }
       }
-
-      return removed;
     }
 
-    private int RemoveGeneratedItems( GeneratorNode referenceNode, IList<DependencyObject> removedContainers )
+    private void RemoveGeneratedItems( GeneratorNode referenceNode, IList<DependencyObject> removedContainers )
     {
-      int genCountRemoved = 0;
+      var toRemove = new List<GeneratorNode>();
 
-      List<GeneratorNode> toRemove = new List<GeneratorNode>();
       toRemove.Add( referenceNode );
 
-      ItemsGeneratorNode itemsNode = referenceNode as ItemsGeneratorNode;
+      var itemsNode = referenceNode as ItemsGeneratorNode;
       if( itemsNode != null )
       {
         if( itemsNode.Details != null )
         {
           //cycle through all the details currently mapped to the reference node
-          foreach( KeyValuePair<int, List<DetailGeneratorNode>> detailsForNode in itemsNode.Details )
+          foreach( var detailsForNode in itemsNode.Details )
           {
-            foreach( DetailGeneratorNode detailNode in detailsForNode.Value )
+            foreach( var detailNode in detailsForNode.Value )
             {
               toRemove.Add( detailNode );
             }
@@ -3964,7 +3813,7 @@ namespace Xceed.Wpf.DataGrid
       //start from the end so that removing an item will not cause the indexes to shift
       for( int i = m_genPosToNode.Count - 1; i >= 0; i-- )
       {
-        GeneratorNode node = m_genPosToNode[ i ];
+        var node = m_genPosToNode[ i ];
 
         //if the item is within the range removed
         if( toRemove.Contains( node ) )
@@ -3972,94 +3821,131 @@ namespace Xceed.Wpf.DataGrid
           //this will ensure to recurse the call to the appropriate Detail Generator for clearing of the container.
           //otherwise, it will only remove it from the list of container generated in the current generator instance.
           this.RemoveGeneratedItem( i, removedContainers );
-
-          //increment realized item count removed
-          genCountRemoved++;
         }
       }
-
-      return genCountRemoved;
     }
 
     private void RemoveAllGeneratedItems()
     {
-      m_log.Assert( this.IsHandlingGlobalItemsReset, "IsHandlingGlobalItemsReset is not set." );
+      Debug.Assert( this.IsHandlingGlobalItemsReset, "A flag is not set." );
 
-      using( m_log.BeginBlock( this, null ) )
+      //Call RemoveAllGeneratedItems() on all the detail generators
+      foreach( var generator in this.GetDetailGenerators() )
       {
-        //Call RemoveAllGeneratedItems() on all the detail generators
-        foreach( var generator in this.GetDetailGenerators() )
-        {
-          generator.RemoveAllGeneratedItems();
-        }
-
-        //then we can clean the list of items of items generated held by this generator
-        int genCountRemoved = m_genPosToNode.Count;
-
-        //start from the end so that removing an item will not cause the indexes to shift
-        for( int i = genCountRemoved - 1; i >= 0; i-- )
-        {
-          GeneratorNode node = m_genPosToNode[ i ];
-          DependencyObject container = m_genPosToContainer[ i ];
+        generator.RemoveAllGeneratedItems();
+      }
 
-          //if item is NOT a detail
-          if( !( node is DetailGeneratorNode ) )
-          {
-            // Clear it.
-            this.RemoveContainer( container, m_genPosToItem[ i ] );
-          }
+      //then we can clean the list of items of items generated held by this generator
+      var genCountRemoved = m_genPosToNode.Count;
 
-          //Note: there is no need to call "RemoveContainer" on the "detail" items... since RemoveAllGeneratedItems() was called 
-          //      on all detail generators already.
+      //start from the end so that removing an item will not cause the indexes to shift
+      for( int i = genCountRemoved - 1; i >= 0; i-- )
+      {
+        var node = m_genPosToNode[ i ];
+        var container = m_genPosToContainer[ i ];
 
-          this.GenPosArraysRemoveAt( i );
+        //if item is NOT a detail
+        if( !( node is DetailGeneratorNode ) )
+        {
+          // Clear it.
+          this.RemoveContainer( container, m_genPosToItem[ i ] );
         }
+
+        //Note: there is no need to call "RemoveContainer" on the "detail" items... since RemoveAllGeneratedItems() was called 
+        //      on all detail generators already.
+        this.GenPosArraysRemoveAt( i );
       }
     }
 
     private bool RemoveGeneratedItems( HeadersFootersGeneratorNode referenceNode, object referenceItem, IList<DependencyObject> removedContainers )
     {
 
-      bool retval = false;
-
       //cycle through the list of generated items, and see if any items are generated between the indexes in the removed range.
       //start from the end so that removing an item will not cause the indexes to shift
       for( int i = m_genPosToNode.Count - 1; i >= 0; i-- )
       {
-        GeneratorNode node = m_genPosToNode[ i ];
+        var node = m_genPosToNode[ i ];
 
         //if the item is within the range removed
         if( node == referenceNode )
         {
-          object item = m_genPosToItem[ i ];
+          var item = m_genPosToItem[ i ];
 
           if( item.Equals( referenceItem ) )
           {
-            DependencyObject container = m_genPosToContainer[ i ];
-            removedContainers.Add( container );
-
-            this.RemoveContainer( container, referenceItem );
+            var container = m_genPosToContainer[ i ];
 
-            retval = true;
+            if( removedContainers != null )
+            {
+              removedContainers.Add( container );
+            }
 
+            this.RemoveContainer( container, referenceItem );
             this.GenPosArraysRemoveAt( i );
 
-            break;
+            return true;
           }
         }
       }
 
-      return retval;
+      return false;
+    }
+
+    private void RemoveContainer( DependencyObject container, object dataItem )
+    {
+      m_dataGridControl.ClearItemContainer( container, dataItem );
+
+      var isContainerRecycled = false;
+
+      if( this.IsRecyclingEnabled )
+      {
+        isContainerRecycled = this.EnqueueContainer( container, dataItem );
+
+        var dataItemStore = container.ReadLocalValue( CustomItemContainerGenerator.DataItemPropertyProperty ) as DataItemDataProviderBase;
+        if( dataItemStore != null )
+        {
+          dataItemStore.ClearDataItem();
+        }
+      }
+
+      //If recycling is not enabled, or if the container could not be enqueued, make sure it is removed from the DataGridItemsHost's child collection.
+      if( !isContainerRecycled )
+      {
+        Debug.Assert( container != null );
+        this.OnContainersRemoved( new DependencyObject[] { container } );
+      }
+    }
+
+    private void RemoveDetailContainers( IEnumerable<DependencyObject> containers )
+    {
+      if( containers == null )
+        return;
+
+      var toRemove = new HashSet<DependencyObject>( containers );
+      if( toRemove.Count <= 0 )
+        return;
+
+      for( int i = m_genPosToContainer.Count - 1; i >= 0; i-- )
+      {
+        if( !toRemove.Contains( m_genPosToContainer[ i ] ) )
+          continue;
+
+        this.GenPosArraysRemoveAt( i );
+      }
     }
 
     private void GenPosArraysRemoveAt( int index )
     {
       //remove the item from the 4 lists... (same as doing a "remove")
-      ItemsGeneratorNode itemsNode = m_genPosToNode[ index ] as ItemsGeneratorNode;
+      var itemsNode = m_genPosToNode[ index ] as ItemsGeneratorNode;
 
       // Unlock DataVirtualization hold on item's page.
       if( itemsNode != null )
+      {
         this.UpdateDataVirtualizationLockForItemsNode( itemsNode, m_genPosToItem[ index ], false );
+      }
+
+      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenPosArraysRemoveAt, DataGridTraceMessages.ContainerRemoved, DataGridTraceArgs.Container( m_genPosToContainer[ index ] ), DataGridTraceArgs.Node( m_genPosToNode[ index ] ), DataGridTraceArgs.Item( m_genPosToItem[ index ] ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( m_genPosToIndex[ index ] ) );
 
       m_genPosToContainer.RemoveAt( index );
       m_genPosToIndex.RemoveAt( index );
@@ -4069,73 +3955,71 @@ namespace Xceed.Wpf.DataGrid
 
     private void UpdateHeaders( IList headers )
     {
+      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
+      //which we monitor otherwise.
+      if( m_firstHeader != null )
+        return;
 
-      //if there was no header prior this udpate.
-      if( m_firstHeader == null )
+      //create the node(s) that would contain the headers
+      m_firstHeader = this.CreateHeaders( headers );
+
+      int count;
+      int chainLength;
+      GeneratorNodeHelper.EvaluateChain( m_firstHeader, out count, out chainLength );
+
+      //if there was items present in the linked list.
+      if( m_startNode != null )
+      {
+        //headers are automatically inserted at the beginning
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        nodeHelper.InsertBefore( m_firstHeader );
+      }
+      else
       {
-        //create the node(s) that would contain the headers
-        m_firstHeader = this.CreateHeaders( headers );
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateHeaders, DataGridTraceMessages.NewTreeCreated, DataGridTraceArgs.Node( m_firstHeader ) );
+      }
 
+      //set the start node as the first header node.
+      m_startNode = m_firstHeader;
+
+      this.InvalidateNodeTree();
+    }
+
+    private void UpdateFooters( IList footers )
+    {
+      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
+      //which we monitor otherwise.
+      if( m_firstFooter != null )
+        return;
+
+      //create the node(s) that would contain the footers
+      m_firstFooter = this.CreateFooters( footers );
+
+      //if there are no footers, then the m_firstFooter will remain null
+      if( m_firstFooter != null )
+      {
         int count;
         int chainLength;
-        GeneratorNodeHelper.EvaluateChain( m_firstHeader, out count, out chainLength );
+        GeneratorNodeHelper.EvaluateChain( m_firstFooter, out count, out chainLength );
 
         //if there was items present in the linked list.
         if( m_startNode != null )
         {
-          //headers are automatically inserted at the beginning
+          //since we called ClearFooters earlier, I can just go at the end of the list of items
           GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-          nodeHelper.InsertBefore( m_firstHeader );
+
+          nodeHelper.MoveToEnd();
+          nodeHelper.InsertAfter( m_firstFooter );
         }
         else
         {
-          m_log.WriteLine( this, "UpdateHeaders - new tree" );
-        }
+          m_startNode = m_firstFooter;
 
-        //set the start node as the first header node.
-        m_startNode = m_firstHeader;
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateFooters, DataGridTraceMessages.NewStartNode, DataGridTraceArgs.Node( m_startNode ) );
+        }
       }
 
-      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
-      //which we monitor otherwise.
-    }
-
-    private void UpdateFooters( IList footers )
-    {
-
-      //if there was no header prior this udpate.
-      if( m_firstFooter == null )
-      {
-        //create the node(s) that would contain the footers
-        m_firstFooter = this.CreateFooters( footers );
-
-        //if there are no footers, then the m_firstFooter will remain null
-        if( m_firstFooter != null )
-        {
-          int count;
-          int chainLength;
-          GeneratorNodeHelper.EvaluateChain( m_firstFooter, out count, out chainLength );
-
-          //if there was items present in the linked list.
-          if( m_startNode != null )
-          {
-            //since we called ClearFooters earlier, I can just go at the end of the list of items
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-            nodeHelper.MoveToEnd();
-            nodeHelper.InsertAfter( m_firstFooter );
-          }
-          else
-          {
-            m_startNode = m_firstFooter;
-
-            m_log.WriteLine( this, "UpdateFooters - new tree" );
-          }
-        }
-      }
-
-      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
-      //which we monitor otherwise.
+      this.InvalidateNodeTree();
     }
 
     private HeadersFootersGeneratorNode CreateHeaders( IList headers )
@@ -4150,10 +4034,10 @@ namespace Xceed.Wpf.DataGrid
 
     private GeneratorNode SetupInitialItemsNodes( out int addCount )
     {
-      GeneratorNode newItemNode = null;
-
       addCount = 0;
 
+      var newItemNode = default( GeneratorNode );
+
       this.RefreshGroupsCollection();
 
       //this function should only be called when the m_firstItem is null.
@@ -4180,8 +4064,8 @@ namespace Xceed.Wpf.DataGrid
           //if there is a footer node, then the insertion point is just before the footer node (if there is anything before!)
           if( m_firstFooter != null )
           {
-            GeneratorNode originalPrevious = m_firstFooter.Previous;
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_firstFooter, 0, 0 ); //do not care about index!
+            var originalPrevious = m_firstFooter.Previous;
+            var nodeHelper = new GeneratorNodeHelper( m_firstFooter, 0, 0 ); //do not care about index!
 
             nodeHelper.InsertBefore( m_firstItem );
 
@@ -4192,7 +4076,7 @@ namespace Xceed.Wpf.DataGrid
           }
           else if( m_firstHeader != null ) //if there is no footer but some headers, add it at the end.
           {
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_firstHeader, 0, 0 ); //do not care about index!
+            var nodeHelper = new GeneratorNodeHelper( m_firstHeader, 0, 0 ); //do not care about index!
 
             nodeHelper.MoveToEnd();
             nodeHelper.InsertAfter( m_firstItem );
@@ -4200,15 +4084,17 @@ namespace Xceed.Wpf.DataGrid
           else
           {
             //this case should not be possible: no header, no footers but there is a startNode
-            throw new DataGridInternalException( "No start node found for the current GeneratorNode.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "No start node found for the current GeneratorNode.", m_dataGridControl );
           }
         }
         else
         {
           m_startNode = m_firstItem;
 
-          m_log.WriteLine( this, "SetupInitialItemsNodes - new tree" );
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_SetupInitialItemsNodes, DataGridTraceMessages.NewStartNode, DataGridTraceArgs.Node( m_startNode ) );
         }
+
+        this.InvalidateNodeTree();
       }
 
       return newItemNode;
@@ -4237,7 +4123,7 @@ namespace Xceed.Wpf.DataGrid
     {
       var list = CustomItemContainerGenerator.GetList( m_collectionView );
 
-      return this.NodeFactory.CreateItemsGeneratorNode( list, null, null, null, this );
+      return this.NodeFactory.CreateItemsGeneratorNode( list, null, null, null );
     }
 
     private GeneratorNode CreateGroupListFromCollection( IList collection, GeneratorNode parentNode )
@@ -4245,24 +4131,23 @@ namespace Xceed.Wpf.DataGrid
       if( collection.Count == 0 )
         return null;
 
-      GeneratorNode rootNode = null;
-      GeneratorNode previousNode = null;
-      GroupGeneratorNode actualNode = null;
+      var rootNode = default( GeneratorNode );
+      var previousNode = default( GeneratorNode );
+      var actualNode = default( GroupGeneratorNode );
+      var childNode = default( GeneratorNode );
+      var level = ( parentNode == null ) ? 0 : parentNode.Level + 1;
 
-      GeneratorNode childNode = null;
-      int level = ( parentNode == null ) ? 0 : parentNode.Level + 1;
       GroupConfiguration groupConfig;
       bool initiallyExpanded;
 
-      ObservableCollection<GroupDescription> groupDescriptions = DataGridContext.GetGroupDescriptionsHelper( m_collectionView );
-      GroupConfigurationSelector groupConfigurationSelector = m_dataGridContext.GroupConfigurationSelector;
-      LateGroupLevelDescription lateGroupLevelDescription = this.CreateOrGetLateGroupLevelDescription( level, groupDescriptions );
+      var groupDescriptions = DataGridContext.GetGroupDescriptionsHelper( m_collectionView );
+      var groupConfigurationSelector = m_dataGridContext.GroupConfigurationSelector;
+      var lateGroupLevelDescription = this.CreateOrGetLateGroupLevelDescription( level, groupDescriptions );
 
       foreach( CollectionViewGroup group in collection )
       {
         groupConfig = GroupConfiguration.GetGroupConfiguration( m_dataGridContext, groupDescriptions, groupConfigurationSelector, level, group );
-
-        m_log.Assert( this, groupConfig != null, "groupConfig != null" );
+        Debug.Assert( groupConfig != null );
 
         if( groupConfig.UseDefaultHeadersFooters )
         {
@@ -4287,17 +4172,17 @@ namespace Xceed.Wpf.DataGrid
         childNode = this.SetupGroupHeaders( groupConfig, actualNode );
         actualNode.Child = childNode;
 
-        GeneratorNodeHelper childNodeHelper = new GeneratorNodeHelper( childNode, 0, 0 ); //do not care about index.
+        var childNodeHelper = new GeneratorNodeHelper( childNode, 0, 0 ); //do not care about index.
         childNodeHelper.MoveToEnd(); //extensibility, just in case SetupGroupHeaders() ever return a node list.
 
-        IList<object> subItems = group.GetItems();
+        var subItems = group.GetItems();
 
         //if the node newly created is not the bottom level
         if( !group.IsBottomLevel )
         {
           if( ( subItems != null ) && ( subItems.Count > 0 ) )
           {
-            GeneratorNode subGroupsNode = this.CreateGroupListFromCollection( subItems as IList, actualNode );
+            var subGroupsNode = this.CreateGroupListFromCollection( subItems as IList, actualNode );
             if( subGroupsNode != null )
             {
               childNodeHelper.InsertAfter( subGroupsNode );
@@ -4307,7 +4192,7 @@ namespace Xceed.Wpf.DataGrid
         else
         {
           //this is the bottom level, create an Items node
-          GeneratorNode itemsNode = this.NodeFactory.CreateItemsGeneratorNode( subItems as IList, actualNode, null, null, this );
+          var itemsNode = this.NodeFactory.CreateItemsGeneratorNode( subItems as IList, actualNode, null, null );
           if( itemsNode != null )
           {
             childNodeHelper.InsertAfter( itemsNode );
@@ -4376,91 +4261,88 @@ namespace Xceed.Wpf.DataGrid
       return this.NodeFactory.CreateHeadersFootersGeneratorNode( groupConfig.Headers, actualNode, null, null );
     }
 
-    private GeneratorPosition HandleParentGroupRemove( GeneratorNode parent, out int countRemoved, out int genCountRemoved, out int removeIndex, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
+    private void HandleParentGroupRemove( GeneratorNode parent, out int countRemoved, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
     {
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
+      var nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
 
       // start by moving to the first child... of the node (GroupHeaders node, most probably).
       // false parameter is to prevent skipping over a collapsed node (item count 0 )
       if( !nodeHelper.MoveToChild( false ) )
         //could not advance to the child item so there is no items to be removed...
-        throw new DataGridInternalException( "No child item in the group to remove.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "No child item in the group to remove.", m_dataGridControl );
 
-      return this.HandleSameLevelGroupRemove( nodeHelper.CurrentNode, out countRemoved, out genCountRemoved, out removeIndex, e, removedContainers );
+      this.HandleSameLevelGroupRemove( nodeHelper.CurrentNode, out countRemoved, e, removedContainers );
     }
 
-    private GeneratorPosition HandleSameLevelGroupRemove( GeneratorNode firstChild, out int countRemoved, out int genCountRemoved, out int removeIndex, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
+    private void HandleSameLevelGroupRemove( GeneratorNode firstChild, out int countRemoved, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
     {
-      GeneratorPosition retval;
-
-      countRemoved = 0;
-      genCountRemoved = 0;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupRemove ) )
+      {
+        countRemoved = 0;
 
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 );
-      nodeHelper.ReverseCalculateIndex();
+        var nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 );
+        nodeHelper.ReverseCalculateIndex();
 
-      //Advance to the first "Group" node (skip the GroupHeaders)
-      while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-      {
-        if( !nodeHelper.MoveToNext() )
-          throw new DataGridInternalException( "Unable to move to next GeneratorNode.", m_dataGridControl );
-      }
+        //Advance to the first "Group" node (skip the GroupHeaders)
+        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+        {
+          if( !nodeHelper.MoveToNext() )
+            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
+        }
 
-      //then move up to the removal start point.
-      if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
-        throw new DataGridInternalException( "Unable to move to the requested generator index.", m_dataGridControl );
+        //then move up to the removal start point.
+        if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
+          throw DataGridException.Create<DataGridInternalException>( "Unable to move to the requested generator index.", m_dataGridControl );
 
-      GroupGeneratorNode startNode = nodeHelper.CurrentNode as GroupGeneratorNode;
-      removeIndex = -1;
+        var startNode = nodeHelper.CurrentNode as GroupGeneratorNode;
+        var removeIndex = -1;
 
-      //Only fetch the index if the group itself is not "collapsed" or under a collapsed group already
-      if( ( startNode.IsExpanded == startNode.IsComputedExpanded ) && ( startNode.ItemCount > 0 ) )
-      {
-        removeIndex = nodeHelper.Index;
-        retval = this.GeneratorPositionFromIndex( removeIndex );
-      }
-      else
-      {
-        retval = new GeneratorPosition( -1, 1 );
-      }
+        //Only fetch the index if the group itself is not "collapsed" or under a collapsed group already
+        if( ( startNode.IsExpanded == startNode.IsComputedExpanded ) && ( startNode.ItemCount > 0 ) )
+        {
+          removeIndex = nodeHelper.Index;
+        }
 
-      //retrieve the generator position for the first item to remove.
+        //retrieve the generator position for the first item to remove.
+        this.ProcessGroupRemoval( startNode, e.OldItems.Count, true, out countRemoved );
 
-      this.ProcessGroupRemoval( startNode, e.OldItems.Count, true, out countRemoved );
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupRemove, DataGridTraceMessages.GroupNodeRemoved, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.ItemCount( countRemoved ) );
 
-      //Clean the chain "isolated" previously
-      this.NodeFactory.CleanGeneratorNodeTree( startNode );
+        //Clean the chain "isolated" previously
+        this.NodeFactory.CleanGeneratorNodeTree( startNode );
 
-      if( removeIndex != -1 )
-      {
-        //remove the appropriate 
-        genCountRemoved = this.RemoveGeneratedItems( removeIndex, removeIndex + countRemoved - 1, removedContainers );
+        if( removeIndex >= 0 )
+        {
+          this.RemoveGeneratedItems( removeIndex, removeIndex + countRemoved - 1, removedContainers );
+        }
       }
-
-      return retval;
     }
 
     private GroupGeneratorNode ProcessGroupRemoval( GeneratorNode startNode, int removeCount, bool updateGroupNodeMappingCache, out int countRemoved )
     {
-      m_log.Assert( this, removeCount != 0, "remove count cannot be 0" );
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( startNode, 0, 0 );//index not important.
-      GroupGeneratorNode parentGroup = startNode.Parent as GroupGeneratorNode;
-      int i = 0;
-
       countRemoved = 0;
 
+      var nodeHelper = new GeneratorNodeHelper( startNode, 0, 0 ); //index not important.
+      var parentGroup = startNode.Parent as GroupGeneratorNode;
+      var i = 0;
+
       do
       {
-        GroupGeneratorNode group = nodeHelper.CurrentNode as GroupGeneratorNode;
+        var group = nodeHelper.CurrentNode as GroupGeneratorNode;
+        if( group == null )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( nodeHelper.CurrentNode ) );
+        }
+        else
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.GroupNodeRemoved, DataGridTraceArgs.Node( group ), DataGridTraceArgs.ItemCount( group.ItemCount ) );
+        }
 
         if( updateGroupNodeMappingCache )
         {
           m_groupNodeMappingCache.Remove( group.CollectionViewGroup );
         }
 
-        m_log.Assert( this, group != null, "node to be removed must be a GroupGeneratorNode" );
-
         //add the total number of child to the count of items removed.
         countRemoved += group.ItemCount;
 
@@ -4469,14 +4351,14 @@ namespace Xceed.Wpf.DataGrid
         if( i < removeCount )
         {
           if( !nodeHelper.MoveToNext() )
-            throw new DataGridInternalException( "Could not move to the last node to be removed.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "Could not move to the last node to be removed.", m_dataGridControl );
         }
       }
       while( i < removeCount );
 
       //disconnect the node chain to be removed from the linked list.
-      GeneratorNode previous = startNode.Previous;
-      GeneratorNode next = nodeHelper.CurrentNode.Next;
+      var previous = startNode.Previous;
+      var next = nodeHelper.CurrentNode.Next;
 
       if( next != null )
       {
@@ -4515,9 +4397,14 @@ namespace Xceed.Wpf.DataGrid
         {
           m_startNode = next;
         }
+
+        this.InvalidateNodeTree();
       }
 
-      m_log.Assert( this, nodeHelper.CurrentNode is GroupGeneratorNode, "last node is not a GroupGeneratorNode" );
+      if( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+      {
+        this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.LastNode( nodeHelper.CurrentNode ) );
+      }
 
       return ( GroupGeneratorNode )nodeHelper.CurrentNode;
     }
@@ -4526,111 +4413,41 @@ namespace Xceed.Wpf.DataGrid
     {
       Debug.Assert( node != null );
 
-      var parentNode = node.Parent as GroupGeneratorNode;
-      var oldGroups = new List<CollectionViewGroup>();
-      var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-
-      do
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupReset ) )
       {
-        var groupNode = nodeHelper.CurrentNode as GroupGeneratorNode;
-        if( groupNode != null )
+        var parentNode = node.Parent as GroupGeneratorNode;
+        var oldGroups = new List<CollectionViewGroup>();
+        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
+
+        do
         {
-          Debug.Assert( groupNode.CollectionViewGroup != null );
-          oldGroups.Add( groupNode.CollectionViewGroup );
+          var groupNode = nodeHelper.CurrentNode as GroupGeneratorNode;
+          if( groupNode != null )
+          {
+            Debug.Assert( groupNode.CollectionViewGroup != null );
+            oldGroups.Add( groupNode.CollectionViewGroup );
+          }
         }
-      }
-      while( nodeHelper.MoveToNext() );
-
-      var newGroups = ( parentNode != null )
-                        ? parentNode.CollectionViewGroup.GetItems().Cast<CollectionViewGroup>().ToList()
-                        : m_groupsCollection.Cast<CollectionViewGroup>().ToList();
-
-      // If nothing has changed, avoid the heavy process of finding out which groups have been added,
-      // removed and moved.
-      if( newGroups.Count == oldGroups.Count )
-      {
-        if( newGroups.SequenceEqual( oldGroups ) )
-          return;
-      }
-
-      var groupsAdded = default( ICollection<CollectionViewGroup> );
-      var groupsRemoved = default( ICollection<CollectionViewGroup> );
-      var groupsMoved = default( ICollection<CollectionViewGroup> );
-
-      this.GetGroupChanges( oldGroups, newGroups, out groupsAdded, out groupsRemoved, out groupsMoved );
-
-      if( groupsAdded.Count + groupsRemoved.Count + groupsMoved.Count > CustomItemContainerGenerator.GlobalItemsResetThreshold )
-      {
-        this.HandleGlobalItemsReset();
-      }
-      else
-      {
-        this.ApplyGroupChanges( node, oldGroups, newGroups, groupsAdded, groupsRemoved, groupsMoved );
-      }
-    }
-
-    private void GetGroupChanges(
-      IList<CollectionViewGroup> oldGroups,
-      IList<CollectionViewGroup> newGroups,
-      out ICollection<CollectionViewGroup> groupsAdded,
-      out ICollection<CollectionViewGroup> groupsRemoved,
-      out ICollection<CollectionViewGroup> groupsMoved )
-    {
-      Debug.Assert( oldGroups != null );
-      Debug.Assert( newGroups != null );
-
-      groupsAdded = new HashSet<CollectionViewGroup>();
-      groupsRemoved = new HashSet<CollectionViewGroup>();
-      groupsMoved = new HashSet<CollectionViewGroup>();
-
-      var oldGroupsPositions = new Dictionary<CollectionViewGroup, int>();
-
-      for( var i = 0; i < oldGroups.Count; i++ )
-      {
-        oldGroupsPositions.Add( oldGroups[ i ], i );
-      }
+        while( nodeHelper.MoveToNext() );
 
-      var sequence = new List<int>( newGroups.Count );
-      var isAlive = new BitArray( oldGroups.Count, false );
-
-      foreach( var group in newGroups )
-      {
-        int index;
+        var newGroups = ( parentNode != null )
+                          ? parentNode.CollectionViewGroup.GetItems().Cast<CollectionViewGroup>().ToList()
+                          : m_groupsCollection.Cast<CollectionViewGroup>().ToList();
 
-        if( oldGroupsPositions.TryGetValue( group, out index ) )
-        {
-          isAlive[ index ] = true;
-          sequence.Add( index );
-        }
-        else
+        // If nothing has changed, avoid the heavy process of finding out which groups have been added,
+        // removed and moved.
+        if( newGroups.Count == oldGroups.Count )
         {
-          Debug.Assert( !m_groupNodeMappingCache.ContainsKey( group ), "How come there is a node for the group." );
-
-          groupsAdded.Add( group );
+          if( newGroups.SequenceEqual( oldGroups ) )
+            return;
         }
-      }
-
-      var hasNotMoved = new BitArray( oldGroups.Count, false );
 
-      // The subsequence contains the position of the old groups that are in the new groups and that have not moved.
-      foreach( var index in LongestIncreasingSubsequence.Find( sequence ) )
-      {
-        hasNotMoved[ index ] = true;
-      }
+        var groupsAdded = new HashSet<CollectionViewGroup>();
+        var groupsRemoved = new HashSet<CollectionViewGroup>();
+        var groupsMoved = new HashSet<CollectionViewGroup>();
 
-      for( var i = 0; i < oldGroups.Count; i++ )
-      {
-        if( isAlive[ i ] )
-        {
-          if( !hasNotMoved[ i ] )
-          {
-            groupsMoved.Add( oldGroups[ i ] );
-          }
-        }
-        else
-        {
-          groupsRemoved.Add( oldGroups[ i ] );
-        }
+        CustomItemContainerGenerator.FindChanges( oldGroups, newGroups, groupsAdded, groupsRemoved, groupsMoved );
+        this.ApplyGroupChanges( node, oldGroups, newGroups, groupsAdded, groupsRemoved, groupsMoved );
       }
     }
 
@@ -4725,10 +4542,12 @@ namespace Xceed.Wpf.DataGrid
 
             if( insertAfter )
             {
+              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
               addNodeHelper.InsertAfter( groupNode );
             }
             else
             {
+              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.NextNode( addNodeHelper.CurrentNode ) );
               addNodeHelper.InsertBefore( groupNode );
               insertAfter = true;
             }
@@ -4741,6 +4560,8 @@ namespace Xceed.Wpf.DataGrid
               }
 
               m_firstItem = groupNode;
+
+              this.InvalidateNodeTree();
             }
           }
           else
@@ -4754,23 +4575,29 @@ namespace Xceed.Wpf.DataGrid
                 if( m_firstFooter != null )
                 {
                   var addNodeHelper = new GeneratorNodeHelper( m_firstFooter, 0, 0 );
+
+                  this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.NextNode( addNodeHelper.CurrentNode ) );
                   addNodeHelper.InsertBefore( groupNode );
                 }
                 else if( m_firstHeader != null )
                 {
                   var addNodeHelper = new GeneratorNodeHelper( m_firstHeader, 0, 0 );
                   addNodeHelper.MoveToEnd();
+
+                  this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
                   addNodeHelper.InsertAfter( groupNode );
                 }
                 else
                 {
-                  throw new DataGridInternalException( "No start node found for the current GeneratorNode.", m_dataGridControl );
+                  throw DataGridException.Create<DataGridInternalException>( "No start node found for the current GeneratorNode.", m_dataGridControl );
                 }
               }
               else
               {
                 m_startNode = groupNode;
               }
+
+              this.InvalidateNodeTree();
             }
             else
             {
@@ -4778,6 +4605,8 @@ namespace Xceed.Wpf.DataGrid
 
               var addNodeHelper = new GeneratorNodeHelper( parentNode.Child, 0, 0 );
               addNodeHelper.MoveToEnd();
+
+              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
               addNodeHelper.InsertAfter( groupNode );
             }
           }
@@ -4809,6 +4638,8 @@ namespace Xceed.Wpf.DataGrid
           Debug.Assert( groupNode != null );
 
           var addNodeHelper = new GeneratorNodeHelper( m_groupNodeMappingCache[ newGroups[ i - 1 ] ], 0, 0 );
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
           addNodeHelper.InsertAfter( groupNode );
         }
       }
@@ -4819,318 +4650,434 @@ namespace Xceed.Wpf.DataGrid
 
     private void HandleSameLevelGroupMove( GeneratorNode node, NotifyCollectionChangedEventArgs e )
     {
-      GroupGeneratorNode parentGroup = node.Parent as GroupGeneratorNode;
-
-      //Start a NodeHelper on the first child of the node where the move occured.
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-      nodeHelper.ReverseCalculateIndex(); //determine index of the node.
-
-      //Advance to the first "Group" node (skip the GroupHEaders)
-      while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove ) )
       {
-        if( !nodeHelper.MoveToNext() )
-          throw new DataGridInternalException( "Unable to move to next GeneratorNode.", m_dataGridControl );
-      }
+        var parentGroup = node.Parent as GroupGeneratorNode;
 
-      //then move up to the removal start point.
-      if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
-        throw new DataGridInternalException( "Unable to move to the requested generator index.", m_dataGridControl );
+        //Start a NodeHelper on the first child of the node where the move occured.
+        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
+        nodeHelper.ReverseCalculateIndex(); //determine index of the node.
+
+        //Advance to the first "Group" node (skip the GroupHEaders)
+        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+        {
+          if( !nodeHelper.MoveToNext() )
+            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
+        }
 
-      //remember the current node as the start point of the move (will be used when "extracting the chain")
-      GeneratorNode startNode = nodeHelper.CurrentNode;
-      //also remember the index of the node, to calculate range of elements to remove (containers )
-      int startIndex = nodeHelper.Index;
+        //then move up to the removal start point.
+        if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
+          throw DataGridException.Create<DataGridInternalException>( "Unable to move to the requested generator index.", m_dataGridControl );
 
-      //then, cumulate the total number of items in the groups concerned
-      int totalCountRemoved = 0;
+        //remember the current node as the start point of the move (will be used when "extracting the chain")
+        var startNode = nodeHelper.CurrentNode;
+        //also remember the index of the node, to calculate range of elements to remove (containers )
+        var startIndex = nodeHelper.Index;
 
-      node = this.ProcessGroupRemoval( startNode, e.OldItems.Count, false, out totalCountRemoved );
+        //then, cumulate the total number of items in the groups concerned
+        var totalCountRemoved = 0;
 
-      //send a message to the panel to remove the visual elements concerned 
-      GeneratorPosition removeGenPos = this.GeneratorPositionFromIndex( startIndex );
+        node = this.ProcessGroupRemoval( startNode, e.OldItems.Count, false, out totalCountRemoved );
 
-      List<DependencyObject> removedContainers = new List<DependencyObject>();
-      int genCountRemoved = this.RemoveGeneratedItems( startIndex, startIndex + totalCountRemoved - 1, removedContainers );
+        //send a message to the panel to remove the visual elements concerned 
+        var containers = new List<DependencyObject>();
 
-      this.SendRemoveEvent( removeGenPos, startIndex, totalCountRemoved, genCountRemoved, removedContainers );
+        this.RemoveGeneratedItems( startIndex, startIndex + totalCountRemoved - 1, containers );
+        this.SendRemoveEvent( totalCountRemoved, containers );
 
-      //reset the node parameter for the "re-addition"
-      node = ( parentGroup != null ) ? parentGroup.Child : m_firstItem;
+        //reset the node parameter for the "re-addition"
+        node = ( parentGroup != null ) ? parentGroup.Child : m_firstItem;
 
-      if( node == null )
-        throw new DataGridInternalException( "No node found to move.", m_dataGridControl );
+        if( node == null )
+          throw DataGridException.Create<DataGridInternalException>( "No node found to move.", m_dataGridControl );
 
-      //Once the chain was pulled out, re-insert it at the appropriate location.
-      nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //do not care about the index for what I need
+        //Once the chain was pulled out, re-insert it at the appropriate location.
+        nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //do not care about the index for what I need
 
-      //Advance to the first "Group" node (skip the GroupHEaders)
-      while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-      {
-        if( !nodeHelper.MoveToNext() )
-          throw new DataGridInternalException( "Unable to move to next GeneratorNode.", m_dataGridControl );
-      }
+        //Advance to the first "Group" node (skip the GroupHEaders)
+        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+        {
+          if( !nodeHelper.MoveToNext() )
+            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
+        }
 
-      bool insertBefore = nodeHelper.MoveToNextBy( e.NewStartingIndex );
+        bool insertBefore = nodeHelper.MoveToNextBy( e.NewStartingIndex );
 
-      if( insertBefore )
-      {
-        if( nodeHelper.CurrentNode == m_firstItem )
+        if( insertBefore )
         {
-          if( m_startNode == m_firstItem )
+          if( nodeHelper.CurrentNode == m_firstItem )
           {
-            m_startNode = startNode;
+            if( m_startNode == m_firstItem )
+            {
+              m_startNode = startNode;
+            }
+
+            m_firstItem = startNode;
+
+            this.InvalidateNodeTree();
           }
 
-          m_firstItem = startNode;
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.NextNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( totalCountRemoved ) );
+          nodeHelper.InsertBefore( startNode );
+        }
+        else
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.PreviousNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( totalCountRemoved ) );
+          nodeHelper.InsertAfter( startNode );
         }
 
-        //reinsert the chain at the specified location.
-        nodeHelper.InsertBefore( startNode );
-      }
-      else
-      {
-        nodeHelper.InsertAfter( startNode );
+        //and finally, call to increment the generation count for the generator content
+        this.IncrementCurrentGenerationCount();
       }
-
-      //and finally, call to increment the generation count for the generator content
-      this.IncrementCurrentGenerationCount();
     }
 
-    private GeneratorNode HandleSameLevelGroupAddition( GeneratorNode firstChild, out int countAdded, NotifyCollectionChangedEventArgs e )
+    private void HandleSameLevelGroupAddition( GeneratorNode firstChild, out int countAdded, NotifyCollectionChangedEventArgs e )
     {
-      m_log.Assert( this, ( ( firstChild.Parent == null ) || ( firstChild.Parent is GroupGeneratorNode ) ), "parent of the node should be a GroupGeneratorNode" );
-
-      GeneratorNode newNodeChain = this.CreateGroupListFromCollection( e.NewItems, firstChild.Parent );
-
-      countAdded = 0;
-      if( newNodeChain != null )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition ) )
       {
-        int chainLength;
-        GeneratorNodeHelper.EvaluateChain( newNodeChain, out countAdded, out chainLength );
+        if( ( firstChild.Parent != null ) && !( firstChild.Parent is GroupGeneratorNode ) )
+        {
+          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( firstChild.Parent ) );
+        }
 
-        GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 ); //do not care about index.
+        var newNodeChain = this.CreateGroupListFromCollection( e.NewItems, firstChild.Parent );
 
-        //Advance to the first "Group" node (skip the GroupHEaders)
-        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+        countAdded = 0;
+        if( newNodeChain != null )
         {
-          if( !nodeHelper.MoveToNext() )
+          int chainLength;
+          GeneratorNodeHelper.EvaluateChain( newNodeChain, out countAdded, out chainLength );
+
+          var nodeHelper = default( GeneratorNodeHelper );
+          var insertAfter = false;
+
+          // Instead of counting groups to insert the group chain, we may locate right away the GroupGeneratorNode that
+          // preceed the insertion point.  This will give us a performance boost when there are lots of groups.
+          if( e.NewStartingIndex > 0 )
           {
-            //if there are no items and no groups in the Group Node, then we will never find a GroupGeneratorNode...
-            //However, the structure of the group/headers/footers/group headers/groups footers makes it so 
-            //that inserting before the last item (footer/group footer) will place the group at the appropriate location.
-            break;
+            IList groups;
+
+            if( firstChild.Parent != null )
+            {
+              var parentGroup = ( ( GroupGeneratorNode )firstChild.Parent ).CollectionViewGroup;
+
+              groups = ( parentGroup != null ) ? parentGroup.Items : null;
+            }
+            else
+            {
+              groups = m_groupsCollection;
+            }
+
+            if( ( groups != null ) && ( groups.Count > 0 ) )
+            {
+              Debug.Assert( e.NewStartingIndex <= groups.Count );
+
+              var previousGroup = ( CollectionViewGroup )groups[ e.NewStartingIndex - 1 ];
+              var previousGroupNode = default( GroupGeneratorNode );
+
+              if( m_groupNodeMappingCache.TryGetValue( previousGroup, out previousGroupNode ) )
+              {
+                nodeHelper = new GeneratorNodeHelper( previousGroupNode, 0, 0 ); //do not care about index.
+                insertAfter = true;
+              }
+            }
           }
-        }
 
-        bool insertAfter = false;
-        //If there is 0 group in the parent group, then this loop will exit without executing the control block once...
-        for( int i = 0; i < e.NewStartingIndex; i++ )
-        {
-          if( !nodeHelper.MoveToNext() )
+          // We could not find the insertion point efficiently, use a fallback strategy.
+          if( nodeHelper == null )
           {
-            insertAfter = true;
+            nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 ); //do not care about index.
+
+            while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
+            {
+              if( !nodeHelper.MoveToNext() )
+              {
+                //if there are no items and no groups in the Group Node, then we will never find a GroupGeneratorNode...
+                //However, the structure of the group/headers/footers/group headers/groups footers makes it so 
+                //that inserting before the last item (footer/group footer) will place the group at the appropriate location.
+                break;
+              }
+            }
+
+            //If there is 0 group in the parent group, then this loop will exit without executing the control block once...
+            for( int i = 0; i < e.NewStartingIndex; i++ )
+            {
+              if( !nodeHelper.MoveToNext() )
+              {
+                insertAfter = true;
+              }
+            }
           }
-        }
 
-        //if we are inserting past the end of the linked list level.
-        if( insertAfter )
-        {
-          nodeHelper.InsertAfter( newNodeChain );
-        }
-        else
-        {
-          //we are inserting in the middle of the list
-          nodeHelper.InsertBefore( newNodeChain );
-        }
+          Debug.Assert( nodeHelper != null );
 
+          //if we are inserting past the end of the linked list level.
+          if( insertAfter )
+          {
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( newNodeChain ), DataGridTraceArgs.PreviousNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( countAdded ) );
+            nodeHelper.InsertAfter( newNodeChain );
+          }
+          else
+          {
+            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( newNodeChain ), DataGridTraceArgs.NextNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( countAdded ) );
+            nodeHelper.InsertBefore( newNodeChain );
+          }
 
-        //If the insertion point is the beginning, check that the node pointers are updated properly
-        if( ( e.NewStartingIndex == 0 ) && ( ( firstChild.Parent == null ) ) )
-        {
-          if( m_startNode == m_firstItem )
+
+          //If the insertion point is the beginning, check that the node pointers are updated properly
+          if( ( e.NewStartingIndex == 0 ) && ( ( firstChild.Parent == null ) ) )
           {
-            m_startNode = newNodeChain;
+            if( m_startNode == m_firstItem )
+            {
+              m_startNode = newNodeChain;
+            }
+
+            m_firstItem = newNodeChain;
+
+            this.InvalidateNodeTree();
           }
-          m_firstItem = newNodeChain;
         }
-
       }
-
-      return newNodeChain;
     }
 
-    private GeneratorNode HandleParentGroupAddition( GeneratorNode parent, out int countAdded, NotifyCollectionChangedEventArgs e )
+    private void HandleParentGroupAddition( GeneratorNode parent, out int countAdded, NotifyCollectionChangedEventArgs e )
     {
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
+      var nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
 
       //start by moving to the first child... of the node (GroupHeaders node, most probably).
       if( !nodeHelper.MoveToChild( false ) ) 
-        throw new DataGridInternalException( "Could not move to the child node to be removed.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "Could not move to the child node to be removed.", m_dataGridControl );
 
-      return this.HandleSameLevelGroupAddition( nodeHelper.CurrentNode, out countAdded, e );
+      this.HandleSameLevelGroupAddition( nodeHelper.CurrentNode, out countAdded, e );
     }
 
-    private void HandleItemAddition( GeneratorNode node, NotifyCollectionChangedEventArgs e )
+    private void HandleItemAddition( ItemsGeneratorNode node, NotifyCollectionChangedEventArgs e )
     {
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
-
-      node.AdjustItemCount( e.NewItems.Count );
-
-      ItemsGeneratorNode itemsNode = node as ItemsGeneratorNode;
-      if( itemsNode != null )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceArgs.Node( node ) ) )
       {
-        itemsNode.AdjustLeafCount( e.NewItems.Count );
-        this.OffsetDetails( itemsNode, e.NewStartingIndex, e.NewItems.Count );
-      }
-
-      //if the node is totally expanded
-      if( node.IsComputedExpanded )
-      {
-        nodeHelper.ReverseCalculateIndex();
+        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
+        var itemCount = e.NewItems.Count;
 
-        //invalidate the indexes
-        this.IncrementCurrentGenerationCount();
+        node.AdjustItemCount( itemCount );
+        node.AdjustLeafCount( itemCount );
+        this.OffsetDetails( node, e.NewStartingIndex, itemCount );
 
-        int startIndex = nodeHelper.Index + e.NewStartingIndex;
-        GeneratorPosition addGenPos = this.GeneratorPositionFromIndex( startIndex );
+        if( node.IsComputedExpanded )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceMessages.ItemAdded, DataGridTraceArgs.ItemCount( itemCount ) );
 
-        //and send notification message
-        this.SendAddEvent( addGenPos, startIndex, e.NewItems.Count );
-      }
-      else
-      {
-        //An item can be added in the source without the need to regenerate the containers, but still provoke a change to the realized containers' corresponding source index.
-        this.UpdateContainersIndex();
+          this.IncrementCurrentGenerationCount();
+          this.SendAddEvent( itemCount );
+        }
+        else
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceMessages.CollapsedItemAdded, DataGridTraceArgs.ItemCount( itemCount ) );
+        }
       }
     }
 
     private void HandleItemRemoveMoveReplace( ItemsGeneratorNode node, NotifyCollectionChangedEventArgs e )
     {
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
-      nodeHelper.ReverseCalculateIndex();
+      if( e.Action == NotifyCollectionChangedAction.Remove )
+      {
+        node.AdjustItemCount( -e.OldItems.Count );
+        node.AdjustLeafCount( -e.OldItems.Count );
+      }
 
-      node.AdjustItemCount( -e.OldItems.Count );
-      node.AdjustLeafCount( -e.OldItems.Count );
+      var nodeStartIndex = e.OldStartingIndex;
+      var nodeEndIndex = nodeStartIndex + e.OldItems.Count - 1;
+      var detailCountToRemove = CustomItemContainerGenerator.ComputeDetailsCount( node, nodeStartIndex, nodeEndIndex );
+      var detailCountBeforeRemovedItems = 0;
 
-      int nodeStartIndex = e.OldStartingIndex;
-      int nodeEndIndex = nodeStartIndex + e.OldItems.Count - 1;
-      int detailCountToRemove = CustomItemContainerGenerator.ComputeDetailsCount( node, nodeStartIndex, nodeEndIndex );
-      int detailCountBeforeRemovedItems = 0;
       if( nodeStartIndex > 0 )
       {
         detailCountBeforeRemovedItems = CustomItemContainerGenerator.ComputeDetailsCount( node, 0, nodeStartIndex - 1 );
       }
 
-      int startIndex = nodeHelper.Index + e.OldStartingIndex + detailCountBeforeRemovedItems;
-      int endIndex = startIndex + detailCountToRemove + e.OldItems.Count - 1;
+      var removeCount = e.OldItems.Count + detailCountToRemove;
+      var replaceCount = ( e.Action == NotifyCollectionChangedAction.Replace ) ? e.NewItems.Count : 0;
+      var startIndex = -1;
+      var endIndex = -1;
+
+      // We must memorize the range of items that we are going to remove before starting any action.
+      if( node.IsComputedExpanded )
+      {
+        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
+        nodeHelper.ReverseCalculateIndex();
 
-      int removeCount = e.OldItems.Count + detailCountToRemove;
-      int replaceCount = ( e.Action == NotifyCollectionChangedAction.Replace ) ? e.NewItems.Count : 0;
+        startIndex = nodeHelper.Index + e.OldStartingIndex + detailCountBeforeRemovedItems;
+        endIndex = startIndex + detailCountToRemove + e.OldItems.Count - 1;
+      }
 
       //Remove the details from the ItemsGeneratorNode and re-index the other details appropriatly.
       this.RemoveDetails( node, nodeStartIndex, nodeEndIndex, replaceCount );
 
-      GeneratorPosition removeGenPos = this.GetSafeGeneratorPositionFromIndex( startIndex );
-
       //Try to remap the old item for detail remapping (will do nothing if item has no details )
-      foreach( object oldItem in e.OldItems )
+      foreach( var oldItem in e.OldItems )
       {
         this.QueueDetailItemForRemapping( oldItem );
       }
 
-      bool needsUpdateToIndexes = true;
-      //if the node is totally expanded
+      var raiseEvent = false;
+      var removedContainers = default( List<DependencyObject> );
+
+      // Remove the matching realized containers.
       if( node.IsComputedExpanded )
       {
-        needsUpdateToIndexes = false;
-        List<DependencyObject> removedContainers = new List<DependencyObject>();
-        int genRemCount = this.RemoveGeneratedItems( startIndex, endIndex, removedContainers );
+        raiseEvent = true;
+        removedContainers = new List<DependencyObject>();
 
-        this.IncrementCurrentGenerationCount();
+        Debug.Assert( ( startIndex >= 0 ) && ( endIndex >= 0 ) );
 
-        this.SendRemoveEvent( removeGenPos, startIndex, removeCount, genRemCount, removedContainers );
+        this.RemoveGeneratedItems( startIndex, endIndex, removedContainers );
       }
 
-      //then, based on the action that was performed (move, replace or remove)
-      switch( e.Action )
+      if( e.Action == NotifyCollectionChangedAction.Move )
       {
-        case NotifyCollectionChangedAction.Move:
-          this.OffsetDetails( node, e.NewStartingIndex, e.NewItems.Count );
-          this.HandleItemMoveRemoveReplaceHelper( node, e, nodeHelper.Index );
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          this.HandleItemMoveRemoveReplaceHelper( node, e, nodeHelper.Index );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          if( needsUpdateToIndexes )
-          {
-            //An item can be removed from the source without the need to regenerate the containers,
-            //but still provoke a change to the realized containers' corresponding source index.
-            this.UpdateContainersIndex();
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Add:
-        case NotifyCollectionChangedAction.Reset:
-          DataGridException.ThrowSystemException( "Add or Reset not supported at the moment on groups.", typeof( NotSupportedException ), m_dataGridControl.Name );
-          break;
+        this.OffsetDetails( node, e.NewStartingIndex, e.NewItems.Count );
       }
 
-    }
-
-    private void HandleItemMoveRemoveReplaceHelper( ItemsGeneratorNode node, NotifyCollectionChangedEventArgs e, int nodeIndex )
-    {
-      node.AdjustItemCount( e.NewItems.Count );
-      node.AdjustLeafCount( e.NewItems.Count );
+      if( raiseEvent )
+      {
+        Debug.Assert( removedContainers != null );
 
-      this.IncrementCurrentGenerationCount();
+        this.IncrementCurrentGenerationCount();
+        this.SendRemoveEvent( removeCount, removedContainers );
 
-      //this is used to notify any Master Generator that it must update its content's status (UpdateGenPosToIndexList)
-      this.SendAddEvent( new GeneratorPosition( -1, 1 ), nodeIndex + e.NewStartingIndex, e.NewItems.Count );
+        switch( e.Action )
+        {
+          case NotifyCollectionChangedAction.Move:
+          case NotifyCollectionChangedAction.Replace:
+            {
+              this.SendAddEvent( e.NewItems.Count );
+            }
+            break;
+
+          case NotifyCollectionChangedAction.Remove:
+            // There is nothing to do.
+            break;
+
+          case NotifyCollectionChangedAction.Add:
+          case NotifyCollectionChangedAction.Reset:
+            throw DataGridException.Create<NotSupportedException>( "Add or Reset not supported at the moment on groups.", m_dataGridControl );
+        }
+      }
     }
 
-    private void UpdateContainersIndex()
+    private void HandleHeadersFootersAddition( IEnumerable<HeadersFootersGeneratorNode> nodes, NotifyCollectionChangedEventArgs e )
     {
-      DataGridCollectionView collectionView = m_collectionView.SourceCollection as DataGridCollectionView;
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      int currentIndex = -1;
-      int offset = 0;
-      int sourceItemIndex;
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleHeadersFootersAddition ) )
+      {
+        var itemCount = e.NewItems.Count;
+        var notify = false;
+
+        foreach( var node in nodes )
+        {
+          node.AdjustItemCount( itemCount );
+          notify = notify || node.IsComputedExpanded;
+        }
+
+        if( notify )
+        {
+          this.IncrementCurrentGenerationCount();
+
+          this.SendResetEvent();
+        }
+        else
+        {
+          //There is no need to regenerate the containers.  However, we still need to update the realized containers source index.
+          this.UpdateContainersIndex();
+        }
+      }
+    }
 
-      foreach( object item in m_genPosToItem )
+    private void HandleHeadersFootersRemoveMoveReplace( IEnumerable<HeadersFootersGeneratorNode> nodes, NotifyCollectionChangedEventArgs e )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleHeadersFootersRemoveMoveReplace ) )
       {
-        currentIndex++;
+        Debug.Assert( e.OldItems != null );
 
-        //If the item is not found, it means it belongs to a detail grid, no need to process it.
-        if( nodeHelper.FindItem( item ) == -1 )
-          continue;
+        var itemCount = ( ( e.NewItems != null ) ? e.NewItems.Count : 0 ) - e.OldItems.Count;
+        var notify = false;
 
-        //If we're not on a ItemsGeneratorNode, it means we are not on a DataRow, so no need to process it (all ItemIndex == -1 in this case).
-        ItemsGeneratorNode itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-        if( itemsNode == null )
+        foreach( var node in nodes )
         {
-          offset = 0;
-          continue;
+          node.AdjustItemCount( itemCount );
+
+          if( node.IsComputedExpanded )
+          {
+            notify = true;
+
+            var parentGroup = node.Parent as GroupGeneratorNode;
+
+            foreach( var item in e.OldItems )
+            {
+              var targetItem = ( parentGroup != null ) ? new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, item ) : item;
+
+              this.RemoveGeneratedItems( node, targetItem, null );
+            }
+          }
         }
 
-        //If we have a DataGridCollectionView, let's get the sorted index from it in case there are details expanded.
-        if( collectionView != null )
+        if( notify )
         {
-          sourceItemIndex = collectionView.GetGlobalSortedIndexFromDataItem( item );
+          this.IncrementCurrentGenerationCount();
+
+          this.SendResetEvent();
         }
-        //If not a DGCV, it means there are no details, so this will work fine.
         else
         {
-          if( offset == 0 )
+          //There is no need to regenerate the containers.  However, we still need to update the realized containers source index.
+          this.UpdateContainersIndex();
+        }
+      }
+    }
+
+    private void UpdateContainersIndex()
+    {
+      if( ( m_startNode == null ) || ( m_genPosToItem.Count <= 0 ) )
+        return;
+
+      var collectionView = m_collectionView.SourceCollection as DataGridCollectionView;
+      if( collectionView != null )
+      {
+        for( int i = 0; i < m_genPosToItem.Count; i++ )
+        {
+          // If we're not on an ItemsGeneratorNode, it means we are not on a DataRow, so no need to process it (all ItemIndex == -1 in this case).
+          if( !( m_genPosToNode[ i ] is ItemsGeneratorNode ) )
+            continue;
+
+          // There is no need to find the node or the item within the node since it should match the CollectionView.
+          var sourceIndex = collectionView.GetGlobalSortedIndexFromDataItem( m_genPosToItem[ i ] );
+
+          DataGridVirtualizingPanel.SetItemIndex( m_genPosToContainer[ i ], sourceIndex );
+        }
+      }
+      else
+      {
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+
+        for( int i = 0; i < m_genPosToItem.Count; i++ )
+        {
+          // If we're not on an ItemsGeneratorNode, it means we are not on a DataRow, so no need to process it (all ItemIndex == -1 in this case).
+          var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
+          if( node == null )
+            continue;
+
+          int offset = -1;
+
+          if( nodeHelper.FindNode( node ) && ( nodeHelper.FindItem( m_genPosToItem[ i ] ) >= 0 ) )
           {
-            //This will make sure we get the right index in case the group is patially scrolled.
-            offset = itemsNode.IndexOf( item );
+            offset = node.IndexOf( m_genPosToItem[ i ] );
           }
-          sourceItemIndex = nodeHelper.SourceDataIndex + offset++;
+
+          // If not a DGCV, it means there are no details, so this will work fine.
+          var sourceIndex = ( offset >= 0 )
+                              ? nodeHelper.SourceDataIndex + offset
+                              : -1;
+
+          DataGridVirtualizingPanel.SetItemIndex( m_genPosToContainer[ i ], sourceIndex );
         }
-        DataGridVirtualizingPanel.SetItemIndex( m_genPosToContainer[ currentIndex ], sourceItemIndex );
       }
     }
 
@@ -5139,35 +5086,23 @@ namespace Xceed.Wpf.DataGrid
       if( ( node.Details == null ) || ( node.Details.Count == 0 ) )
         return;
 
-      int detailsCount = node.Details.Count;
-      //first, create an array that will contain the keys for all the expanded details from the ItemsGeneratorNode
-      int[] keys = new int[ detailsCount ];
+      var detailsCount = node.Details.Count;
+      var keys = new int[ detailsCount ];
       node.Details.Keys.CopyTo( keys, 0 );
 
-      //sort the array, this will prevent any operation that will duplicate keys in the dictionary.
       Array.Sort<int>( keys );
 
-      //loop from the end of the sorted array to the beginning. to ensuyre
       for( int i = detailsCount - 1; i >= 0; i-- )
       {
-        int key = keys[ i ];
-
-        //only process the key if it is in the processed range
+        var key = keys[ i ];
         if( key >= startIndex )
         {
           List<DetailGeneratorNode> details;
-          if( node.Details.TryGetValue( key, out details ) )
-          {
-            m_log.WriteLine( this, "details.Offset for Add - IN" + node.GetHashCode().ToString() + "- Di" + key.ToString() + " - new Di" + ( key + addOffset ).ToString() );
+          if( !node.Details.TryGetValue( key, out details ) )
+            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary.", m_dataGridControl );
 
-            node.Details.Remove( key );
-            node.Details.Add( key + addOffset, details );
-          }
-          else
-          {
-            //Key not found in the dictionary, something wrong is going on.
-            throw new DataGridInternalException( "Key not found in Details dictionary.", m_dataGridControl );
-          }
+          node.Details.Remove( key );
+          node.Details.Add( key + addOffset, details );
         }
       }
     }
@@ -5177,21 +5112,19 @@ namespace Xceed.Wpf.DataGrid
       if( ( node.Details == null ) || ( node.Details.Count == 0 ) )
         return;
 
-      int removeCount = nodeEndIndex - nodeStartIndex + 1 - replaceCount;
+      var removeCount = nodeEndIndex - nodeStartIndex + 1 - replaceCount;
       //Note: If a replace was invoked, replace count will be greater than 0, and will be used to properly re-offset the 
       //details beyond the initial remove range.
 
       //Note2: for the case of a move or remove, the replace count must remain 0, so that the other details are correctly offseted.
 
-      //first, create an array that will contain the keys for all the expanded details from the ItemsGeneratorNode
-      int[] keys = new int[ node.Details.Count ];
+      var keys = new int[ node.Details.Count ];
       node.Details.Keys.CopyTo( keys, 0 );
 
-      //sort the array, this will prevent any operation that will duplicate keys in the dictionary.
       Array.Sort<int>( keys );
 
-      //cycle through all of the old items
-      int countDetailsRemoved = 0;
+      var countDetailsRemoved = 0;
+
       foreach( int key in keys )
       {
         //if the key is below the remove range, do not do anything with the dictionary entry
@@ -5203,14 +5136,12 @@ namespace Xceed.Wpf.DataGrid
           if( node.Details.TryGetValue( key, out details ) )
           {
             //sum them
-            foreach( DetailGeneratorNode detailNode in details )
+            foreach( var detailNode in details )
             {
               countDetailsRemoved += detailNode.ItemCount;
             }
             details.Clear(); //note: detail generators will be "closed" by another section of code (Remap floating details).
 
-            m_log.WriteLine( this, "details.Remove - IN" + node.GetHashCode().ToString() + " - Di" + key.ToString() );
-
             node.Details.Remove( key );
 
             if( node.Details.Count == 0 )
@@ -5221,7 +5152,7 @@ namespace Xceed.Wpf.DataGrid
           else
           {
             //Key not found in the dictionary, something wrong is going on.
-            throw new DataGridInternalException( "Key not found in Details dictionary within the remove range.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary within the remove range.", m_dataGridControl );
           }
         }
         //If the key is above the remove range, re-key it appropriatly.
@@ -5230,15 +5161,13 @@ namespace Xceed.Wpf.DataGrid
           List<DetailGeneratorNode> details;
           if( node.Details.TryGetValue( key, out details ) )
           {
-            m_log.WriteLine( this, "details.offset for remove - IN" + node.GetHashCode().ToString() + "- Di" + key.ToString() + " - new Di" + ( key - removeCount ).ToString() );
-
             node.Details.Remove( key );
             node.Details.Add( key - removeCount, details );
           }
           else
           {
             //Key not found in the dictionary, something wrong is going on.
-            throw new DataGridInternalException( "Key not found in Details dictionary above the remove range.", m_dataGridControl );
+            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary above the remove range.", m_dataGridControl );
           }
         }
       }
@@ -5262,7 +5191,7 @@ namespace Xceed.Wpf.DataGrid
           List<DetailGeneratorNode> details;
           if( node.Details.TryGetValue( i, out details ) )
           {
-            foreach( DetailGeneratorNode detailNode in details )
+            foreach( var detailNode in details )
             {
               detailCount += detailNode.ItemCount;
             }
@@ -5273,313 +5202,584 @@ namespace Xceed.Wpf.DataGrid
       return detailCount;
     }
 
-    private void HandleItemReset( GeneratorNode node )
+    private void HandleItemReset( ItemsGeneratorNode node )
     {
-      //these 4 variables will hold the content for the Removal and the re-addition of the items.
-      int countGeneratedRemoved;
-      GeneratorPosition itemGenPos;
-
-      List<DependencyObject> removedContainers = new List<DependencyObject>();
-
-      //by definition, items from a node are contiguous...
-      itemGenPos = this.FindFirstRealizedItemsForNode( node );
-      int removeIndex = ( itemGenPos.Offset == 0 ) ? m_genPosToIndex[ itemGenPos.Index ] : -1;
-      countGeneratedRemoved = this.RemoveGeneratedItems( node, removedContainers );
+      Debug.Assert( node != null );
 
-      // ensure that the mapping of the details to that node are removed!
-      ItemsGeneratorNode itemsNode = node as ItemsGeneratorNode;
-      if( ( itemsNode != null ) && ( itemsNode.Details != null ) )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleItemReset ) )
       {
-        int detailCount = 0;
-        foreach( List<DetailGeneratorNode> detailList in itemsNode.Details.Values )
+        var oldItems = new List<object>();
+        var newItems = new IListWrapper( node.Items );
+        var oldItemsFound = new HashSet<object>();
+
+        for( int i = 0; i < m_genPosToNode.Count; i++ )
         {
-          foreach( DetailGeneratorNode detailNode in detailList )
+          var currentNode = m_genPosToNode[ i ];
+          var currentItem = default( object );
+
+          if( currentNode == node )
           {
-            detailCount += detailNode.ItemCount;
+            currentItem = m_genPosToItem[ i ];
+          }
+          // Since some details of an unrealized item may be realized, we need to consider the unrealized
+          // item as if it was realized or the details containers may not be properly ordered in the
+          // internal data structure.
+          else if( currentNode is DetailGeneratorNode )
+          {
+            currentItem = ( ( DetailGeneratorNode )currentNode ).DetailContext.ParentItem;
+          }
+          else
+          {
+            continue;
           }
-        }
 
-        m_log.WriteLine( this, "details.Clear - IN" + itemsNode.GetHashCode().ToString() );
+          Debug.Assert( currentItem != null );
+          if( !oldItemsFound.Add( currentItem ) )
+            continue;
 
-        itemsNode.Details.Clear();
-        itemsNode.Details = null;
+          oldItems.Add( currentItem );
+        }
 
-        node.AdjustItemCount( -detailCount );
-      }
+        ICollection<object> itemsRemoved;
+        ICollection<object> itemsMoved;
 
-      //send the removal notification to the panel...
-      this.IncrementCurrentGenerationCount();
+        if( this.IsDataVirtualized( node ) )
+        {
+          // Since the items collection is doning data virtualization, we do not want to enumerate items.
+          // Instead, we will simply remove the containers that were linked to old items to requery the items
+          // on demand.
+          itemsRemoved = new HashSet<object>( oldItems );
+          itemsMoved = new HashSet<object>();
+        }
+        else
+        {
+          itemsRemoved = new HashSet<object>();
+          itemsMoved = new HashSet<object>();
 
-      if( countGeneratedRemoved > 0 )
-      {
-        this.SendRemoveEvent( itemGenPos, removeIndex, 0, countGeneratedRemoved, removedContainers );
+          // Since the old items collection contains only items that are realized, we must be aware
+          // that the collections for the items moved or removed are for realized items only.  Other
+          // items may have moved or were removed and we are not aware of it.
+          CustomItemContainerGenerator.FindChanges( oldItems, newItems, null, itemsRemoved, itemsMoved );
+        }
+
+        this.ApplyItemChanges( node, newItems, itemsRemoved, itemsMoved );
       }
     }
 
-    private void HandleHeaderFooterRemove( HeadersFootersGeneratorNode node, NotifyCollectionChangedEventArgs e )
+    private void HandleGlobalItemsReset()
     {
-      bool itemsRemoved = false;
-
-      node.AdjustItemCount( -e.OldItems.Count );
-
-      //if the node is totally expanded
-      if( node.IsComputedExpanded )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset ) )
       {
-        GroupGeneratorNode parentGroup = node.Parent as GroupGeneratorNode;
+        this.ForceReset = false;
+
+        if( this.IsHandlingGlobalItemsResetLocally )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset, DataGridTraceMessages.CannotProcessOnReset );
+          return;
+        }
 
-        int removeGenPosIndex;
-        int removeIndex;
+        if( m_startNode == null )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset, DataGridTraceMessages.EmptyTree );
+          return;
+        }
 
-        foreach( object item in e.OldItems )
+        using( this.SetIsHandlingGlobalItemsResetLocally() )
         {
-          object realItem = ( parentGroup != null )
-                              ? new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, item )
-                              : item;
+          this.RemoveAllGeneratedItems();
 
+          //No need to clean any more Master/Detail stuff, effectivelly, the call to ClearItems() below will clean the nodes themselves...
+          //generator will then be able to remap.
 
-          removeGenPosIndex = m_genPosToItem.IndexOf( realItem );
-          GeneratorPosition removeGenPos;
-          // If the value is -1, it means the Header/Footer was not realized when the remove occured.
-          if( removeGenPosIndex != -1 )
-          {
-            removeIndex = m_genPosToIndex[ removeGenPosIndex ];
-            removeGenPos = new GeneratorPosition( removeGenPosIndex, 0 );
-          }
-          else
+          //if there are items to start with!!!
+          if( m_firstItem != null )
           {
-            //Since there is no way to get the item's index from the list of generated items, then
-            //compute it based on the node's index and the event args parameters.
+            m_dataGridControl.SaveDataGridContextState( m_dataGridContext, true, int.MaxValue );
 
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-            nodeHelper.ReverseCalculateIndex();
+            //requeue all opened details for remapping!
+            foreach( object item in m_masterToDetails.Keys )
+            {
+              this.QueueDetailItemForRemapping( item );
+            }
 
-            removeIndex = nodeHelper.Index + e.OldStartingIndex;
+            //then clear the items nodes
+            this.ClearItems();
+            this.RefreshGroupsCollection();
 
-            removeGenPos = this.GeneratorPositionFromIndex( removeIndex );
-          }
+            //increment the generation count... to ensure that further calls to the index based functions are not messed up.
+            this.IncrementCurrentGenerationCount();
 
-          List<DependencyObject> removedContainers = new List<DependencyObject>();
-          this.RemoveGeneratedItems( node, realItem, removedContainers );
+            //Note: There is no need to Clear the recyclingManager since this only represents a reset of the Items (not the headers and footers nodes)
+            //and that the list of containers to be recycled is not "invalidated"
 
-          this.SendRemoveEvent( removeGenPos, removeIndex, 1, removedContainers.Count, removedContainers );
-          itemsRemoved = true;
-        }
+          }
 
-        this.IncrementCurrentGenerationCount( itemsRemoved );
+          this.SendResetEvent();
+        }
       }
     }
 
-    private void HandleHeaderFooterReplace( HeadersFootersGeneratorNode node, NotifyCollectionChangedEventArgs e )
-    {
-      //add immediately the number of new items to the "parent" node since the function call right below will remove the number of old items.
-      node.AdjustItemCount( e.NewItems.Count );
-
-      this.HandleHeaderFooterRemove( node, e );
-    }
-
-    private GeneratorPosition FindFirstRealizedItemsForNode( GeneratorNode referenceNode )
+    private void ApplyItemChanges(
+      ItemsGeneratorNode node,
+      IList<object> newItems,
+      ICollection<object> itemsRemoved,
+      ICollection<object> itemsMoved )
     {
-      GeneratorPosition retval = new GeneratorPosition( -1, 1 );
-      int genPosCounter = -1;
+      Debug.Assert( node != null );
+      Debug.Assert( newItems != null );
+      Debug.Assert( itemsRemoved != null );
+      Debug.Assert( itemsMoved != null );
 
-      List<GeneratorNode> nodesAccepted = new List<GeneratorNode>();
-      nodesAccepted.Add( referenceNode );
+      // IMPORTANT: The items removed and moved collection contains realized items that have moved
+      //            or have been removed.  It is possible that some of the items that were not
+      //            realized have moved or have been removed and we are unaware of it.  We must
+      //            consider this possibility in the following algorithm.
 
-      //if there are details for the reference node
-      ItemsGeneratorNode itemsNode = referenceNode as ItemsGeneratorNode;
-      if( ( itemsNode != null ) && ( itemsNode.Details != null ) )
-      {
-        foreach( List<DetailGeneratorNode> details in itemsNode.Details.Values )
-        {
-          foreach( DetailGeneratorNode detailNode in details )
-          {
-            nodesAccepted.Add( detailNode );
-          }
-        }
-      }
+      var detailEntries = node.Details;
+      var detailNodes = new HashSet<GeneratorNode>();
+      var detailNodesByItem = new Dictionary<object, List<DetailGeneratorNode>>();
+      var isDataVirtualized = this.IsDataVirtualized( node );
 
-      for( int i = 0; i < m_genPosToNode.Count; i++ )
+      // The first thing to do is to remove all details that are linked to items that are not in the final result set.
+      if( detailEntries != null )
       {
-        GeneratorNode node = m_genPosToNode[ i ];
+        var itemCount = 0;
 
-        //For master/detail, I have to decouple the index to genPos relationship (because of detail rows, possibly messing up with generated items.
-        genPosCounter++;
-
-        //if the node currently observed is my reference node, get it's computed generator position
-        if( nodesAccepted.Contains( node ) )
+        foreach( var detailEntry in detailEntries.ToList() )
         {
-          retval = new GeneratorPosition( genPosCounter, 0 );
-          break;
-        }
-      }
-
-      return retval;
-    }
+          var i = 0;
+          var detailList = detailEntry.Value;
 
-    private void HandleGlobalItemsReset()
-    {
-      m_log.Assert( this, !this.IsHandlingGlobalItemsResetLocally, "Generator is already processing a HandleGlobalItemReset or CleanupGenerator" );
+          while( i < detailList.Count )
+          {
+            var detailNode = detailList[ i ];
+            var masterItem = detailNode.DetailContext.ParentItem;
 
-      if( this.IsHandlingGlobalItemsResetLocally )
-        return;
+            // Since the items removed collection is for realized item only, we must take a look
+            // at the final result set in case the item was unrealized and removed.
+            if( isDataVirtualized || itemsRemoved.Contains( masterItem ) || !newItems.Contains( masterItem ) )
+            {
+              itemCount += detailNode.ItemCount;
+              detailList.RemoveAt( i );
 
-      if( m_startNode == null )
-      {
-        m_log.WriteLine( this, "No starting node in HandleGlobalItemsReset." );
-        return;
-      }
+              // Put the detail aside and close it properly later.
+              this.RemoveGeneratedItems( detailNode, null );
+              this.QueueDetailItemForRemapping( masterItem );
+            }
+            else
+            {
+              // Keep a list of active detail nodes and their order.  We will need those later in the algorithm.
+              detailNodes.Add( detailNode );
 
-      using( m_log.BeginBlock( this, null ) )
-      using( this.SetIsHandlingGlobalItemsResetLocally() )
-      {
-        this.RemoveAllGeneratedItems();
+              var detailNodesList = default( List<DetailGeneratorNode> );
+              if( !detailNodesByItem.TryGetValue( masterItem, out detailNodesList ) )
+              {
+                detailNodesList = new List<DetailGeneratorNode>( 1 );
+                detailNodesByItem.Add( masterItem, detailNodesList );
+              }
 
-        //No need to clean any more Master/Detail stuff, effectivelly, the call to ClearItems() below will clean the nodes themselves...
-        //generator will then be able to remap.
+              Debug.Assert( detailNodesList != null );
+              detailNodesList.Add( detailNode );
 
-        //if there are items to start with!!!
-        if( m_firstItem != null )
-        {
-          m_dataGridControl.SaveDataGridContextState( m_dataGridContext, true, int.MaxValue );
+              i++;
+            }
+          }
 
-          //requeue all opened details for remapping!
-          foreach( object item in m_masterToDetails.Keys )
+          if( detailList.Count <= 0 )
           {
-            this.QueueDetailItemForRemapping( item );
+            detailEntries.Remove( detailEntry.Key );
           }
+        }
 
-          //then clear the items nodes
-          this.ClearItems();
-          this.RefreshGroupsCollection();
-
-          //increment the generation count... to ensure that further calls to the index based functions are not messed up.
-          this.IncrementCurrentGenerationCount();
-
-          //Note: There is no need to Clear the recyclingManager since this only represents a reset of the Items (not the headers and footers nodes)
-          //and that the list of containers to be recycled is not "invalidated"
-
+        if( detailEntries.Count <= 0 )
+        {
+          node.Details = null;
         }
 
-        this.SendResetEvent();
+        node.AdjustItemCount( -itemCount );
       }
-    }
-
-    internal void EnsureNodeTreeCreated()
-    {
-      //This is done to ensure that any public interface function called get an "up to date" generator content when being accessed.
 
-      // No reentrency is allowed for this method
-      // to avoid any problem.
-      if( this.IsEnsuringNodeTreeCreated )
-        return;
-
-      using( this.SetIsEnsuringNodeTreeCreated() )
+      // The next thing to do is to remove the containers for the realized items that were removed.
+      if( itemsRemoved.Count > 0 )
       {
-        if( m_startNode == null )
+        for( int i = m_genPosToItem.Count - 1; i >= 0; i-- )
         {
-          m_log.WriteLine( this, "EnsureNodeTreeCreated - new tree" );
+          if( !itemsRemoved.Contains( m_genPosToItem[ i ] ) )
+            continue;
 
-          int addCount;
+          this.RemoveGeneratedItem( i, null );
+        }
+      }
 
-          this.UpdateHeaders( m_dataGridContext.Headers );
-          this.SetupInitialItemsNodes( out addCount );
-          this.UpdateFooters( m_dataGridContext.Footers );
+      // Now that everything that needed to be removed was removed, we will repair the collection
+      // that is used as a link between items and detail nodes.
+      if( detailNodes.Count > 0 )
+      {
+        Debug.Assert( detailEntries != null );
+        Debug.Assert( detailEntries == node.Details );
+        Debug.Assert( !isDataVirtualized );
 
-          //This is to ensure that the RecyclingManager will consider this generator with regards to RefCount
-          //(refcount is used to determine when the list of container from the RecyclingManager needs to be removed)
-          m_dataGridContext.RecyclingManager.AddRef( this );
+        detailEntries.Clear();
 
-          this.IncrementCurrentGenerationCount();
-        }
-        else if( m_firstItem == null )
+        for( int i = 0; i < newItems.Count; i++ )
         {
-          this.HandleItemsRecreation();
-        }
-
-        m_dataGridControl.RestoreDataGridContextState( m_dataGridContext );
-      }
-    }
+          var masterItem = newItems[ i ];
+          var detailNodesList = default( List<DetailGeneratorNode> );
 
-    private void HandleItemsRecreation()
-    {
-      //Then, since its a Reset, recreates the Items nodes.
-      int resetAddCount;
-      GeneratorNode addNode = this.SetupInitialItemsNodes( out resetAddCount );
+          if( detailNodesByItem.TryGetValue( masterItem, out detailNodesList ) )
+          {
+            detailNodesByItem.Remove( masterItem );
+            detailEntries.Add( i, detailNodesList );
+          }
+        }
 
-      if( addNode != null )
-      {
-        this.IncrementCurrentGenerationCount();
+        Debug.Assert( ( detailNodesByItem.Count == 0 ), "The detail nodes should have been reinserted properly." );
       }
-    }
-
-    private void UpdateGenPosToIndexList()
-    {
-      this.ValidateIndexOrder( "Before" );
-
-      //after the modification to have the item count stored "locally" in the DetailGeneratorNodes,
-      //it becomes important to have the nodes updated when the layout of the items changes.
-      foreach( var detailNode in this.GetDetailGeneratorNodes() )
+      else
       {
-        detailNode.UpdateItemCount();
+        Debug.Assert( ( detailEntries == null ) || ( detailEntries.Count == 0 ) );
+        Debug.Assert( node.Details == null );
       }
 
-      if( m_startNode != null )
+      // The next thing to do is to reorder the containers within the internal data structure so it match
+      // the ordering of the realized items that have moved.
+      if( itemsMoved.Count > 0 )
       {
-        GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 ); //index is 0, since i'm beginning at the start 
-        //(and I want to reindex the whole list)
+        Debug.Assert( !isDataVirtualized );
 
-        DetailGeneratorNode cachedDetailNode = null;
-        int cachedDetailNodeIndex = -1;
-        int previousDetailIndex = -1;
+        var insertionIndex = default( int? );
+        var itemGenPosEntries = new Dictionary<object, DependencyObject>();
+        var detailGenPosEntries = new Dictionary<GeneratorNode, IList<Tuple<object, DependencyObject>>>();
 
-        //loop through the realized items. By design they are present sequentially in the linked list, so I do not need to reset the GeneratorNodeHelper
-        for( int i = 0; i < m_genPosToItem.Count; i++ )
+        // Remove the entries within the data structure that are linked to the current node or one of its detail.
         {
-          object item = m_genPosToItem[ i ];
+          var i = 0;
 
-          DetailGeneratorNode detailNode = m_genPosToNode[ i ] as DetailGeneratorNode;
-          if( detailNode == null )
+          while( i < m_genPosToNode.Count )
           {
-            //find the Item 
-            int tmpIndex = nodeHelper.FindItem( item );
-            if( tmpIndex != -1 )
+            var currentNode = m_genPosToNode[ i ];
+
+            // We have found a container that is linked to one of the data item.
+            if( currentNode == node )
             {
-              //set the Index (new) for the item
-              ItemsGeneratorNode itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-              if( itemsNode != null )
+              itemGenPosEntries.Add( m_genPosToItem[ i ], m_genPosToContainer[ i ] );
+            }
+            // We have found a container that is part of a detail that is linked to one of the data item.
+            else if( detailNodes.Contains( currentNode ) )
+            {
+              var detailInfos = default( IList<Tuple<object, DependencyObject>> );
+
+              if( !detailGenPosEntries.TryGetValue( currentNode, out detailInfos ) )
               {
-                tmpIndex = nodeHelper.Index + itemsNode.IndexOf( item );
+                detailInfos = new List<Tuple<object, DependencyObject>>();
+                detailGenPosEntries.Add( currentNode, detailInfos );
               }
 
-              m_genPosToIndex[ i ] = tmpIndex;
+              Debug.Assert( detailInfos != null );
+              detailInfos.Add( new Tuple<object, DependencyObject>( m_genPosToItem[ i ], m_genPosToContainer[ i ] ) );
             }
+            // The container as nothing to do with the node we are looking for or one of its detail.
             else
             {
-              m_log.WriteLine( this, CustomItemContainerGenerator.FormatObjectId( "# UpdateGenPosToIndexList - item not found D", item ) );
-
-              //a possible fix for this is to set the index of the "not found" element to the same index as previous item in the generated list...
-              m_genPosToIndex[ i ] = ( i > 0 ) ? m_genPosToIndex[ i - 1 ] : 0;
+              i++;
+              continue;
+            }
 
-              //item is not in the linked list... there is a problem, throw.
-              //throw new DataGridInternalException();
+            // Remove the entries from the internal data structure.
+            this.GenPosArraysRemoveAt( i );
 
+            // Keep a reference on the first location a removal occurred.
+            if( !insertionIndex.HasValue )
+            {
+              insertionIndex = i;
             }
           }
-          else //else is detailNode != null
+        }
+
+        // We must reinsert all entries that have been removed in the last step in appropriate order.
+        if( insertionIndex.HasValue )
+        {
+          var index = insertionIndex.Value;
+
+          for( int i = 0; i < newItems.Count; i++ )
           {
-            if( cachedDetailNode != detailNode )
+            var currentItem = newItems[ i ];
+            var currentContainer = default( DependencyObject );
+
+            if( itemGenPosEntries.TryGetValue( currentItem, out currentContainer ) )
+            {
+              itemGenPosEntries.Remove( currentItem );
+
+              // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
+              m_genPosToContainer.Insert( index, currentContainer );
+              m_genPosToIndex.Insert( index, int.MinValue );
+              m_genPosToItem.Insert( index, currentItem );
+              m_genPosToNode.Insert( index, node );
+
+              index++;
+            }
+
+            if( ( detailEntries != null ) && ( detailEntries.Count > 0 ) )
             {
-              cachedDetailNodeIndex = this.FindGlobalIndexForDetailNode( detailNode );
-              cachedDetailNode = detailNode;
-              previousDetailIndex = -1;
+              var detailNodesList = default( List<DetailGeneratorNode> );
+
+              if( detailEntries.TryGetValue( i, out detailNodesList ) && ( detailNodesList != null ) )
+              {
+                foreach( var detailNode in detailNodesList )
+                {
+                  var detailInfos = default( IList<Tuple<object, DependencyObject>> );
+                  if( !detailGenPosEntries.TryGetValue( detailNode, out detailInfos ) )
+                    continue;
+
+                  detailGenPosEntries.Remove( detailNode );
+
+                  foreach( var detailInfo in detailInfos )
+                  {
+                    // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
+                    m_genPosToContainer.Insert( index, detailInfo.Item2 );
+                    m_genPosToIndex.Insert( index, int.MinValue );
+                    m_genPosToItem.Insert( index, detailInfo.Item1 );
+                    m_genPosToNode.Insert( index, detailNode );
+
+                    index++;
+                  }
+                }
+              }
             }
-            int detailIndex = detailNode.DetailGenerator.IndexFromRealizedItem( item, previousDetailIndex + 1, out previousDetailIndex );
-            m_genPosToIndex[ i ] = cachedDetailNodeIndex + detailIndex;
           }
-        } //end for()
+        }
+
+        Debug.Assert( ( itemGenPosEntries.Count == 0 ), "The containers should have been reinserted properly." );
+        Debug.Assert( ( detailGenPosEntries.Count == 0 ), "The detail containers should have been reinserted properly." );
       }
 
-      this.ValidateIndexOrder( "After" );
+      // The last thing to do is to update the indexes and raise a notification.
+      this.IncrementCurrentGenerationCount();
+      this.SendResetEvent();
+    }
+
+    private void ApplyDetailChanges(
+      DetailGeneratorNode node,
+      IList<DependencyObject> newContainers,
+      ICollection<DependencyObject> containersRemoved,
+      ICollection<DependencyObject> containersMoved )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( newContainers != null );
+      Debug.Assert( containersRemoved != null );
+      Debug.Assert( containersMoved != null );
+
+      // The first thing to do is to remove the containers for the realized items that were removed.
+      if( containersRemoved.Count > 0 )
+      {
+        for( int i = m_genPosToContainer.Count - 1; i >= 0; i-- )
+        {
+          if( !containersRemoved.Contains( m_genPosToContainer[ i ] ) )
+            continue;
+
+          this.RemoveGeneratedItem( i, null );
+        }
+      }
+
+      // The next thing to do is to reorder the containers within the internal data structure so it match
+      // the ordering of the realized containers that have moved.
+      if( containersMoved.Count > 0 )
+      {
+        var insertionIndex = default( int? );
+        var entries = new Dictionary<DependencyObject, object>();
+
+        // Remove the entries within the data structure that are linked to the detail node.
+        {
+          var i = 0;
+
+          while( i < m_genPosToNode.Count )
+          {
+            var currentNode = m_genPosToNode[ i ];
+
+            // We have found a container that is linked to the desired node.
+            if( currentNode == node )
+            {
+              entries.Add( m_genPosToContainer[ i ], m_genPosToItem[ i ] );
+
+              // Remove the entries from the internal data structure.
+              this.GenPosArraysRemoveAt( i );
+
+              // Keep a reference on the first location a removal occurred.
+              if( !insertionIndex.HasValue )
+              {
+                insertionIndex = i;
+              }
+            }
+            // The container as nothing to do with the node we are looking.
+            else
+            {
+              i++;
+            }
+          }
+        }
+
+        // We must reinsert all entries that have been removed in the last step in appropriate order.
+        if( insertionIndex.HasValue )
+        {
+          var index = insertionIndex.Value;
+
+          for( int i = 0; i < newContainers.Count; i++ )
+          {
+            var currentContainer = newContainers[ i ];
+            var currentItem = default( object );
+
+            if( entries.TryGetValue( currentContainer, out currentItem ) )
+            {
+              entries.Remove( currentContainer );
+
+              // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
+              m_genPosToContainer.Insert( index, currentContainer );
+              m_genPosToIndex.Insert( index, int.MinValue );
+              m_genPosToItem.Insert( index, currentItem );
+              m_genPosToNode.Insert( index, node );
+
+              index++;
+            }
+          }
+        }
+
+        Debug.Assert( ( entries.Count == 0 ), "The containers should have been reinserted properly." );
+      }
+
+      // The last thing to do is to update the indexes and raise a notification.
+      this.IncrementCurrentGenerationCount();
+      this.SendResetEvent();
+    }
+
+    internal void EnsureNodeTreeCreated()
+    {
+      //This is done to ensure that any public interface function called get an "up to date" generator content when being accessed.
+
+      // No reentrency is allowed for this method
+      // to avoid any problem.
+      if( this.IsNodeTreeValid || this.IsEnsuringNodeTreeCreated )
+        return;
+
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_EnsureNodeTreeCreated ) )
+      using( this.SetIsEnsuringNodeTreeCreated() )
+      {
+        if( m_startNode == null )
+        {
+          int addCount;
+
+          this.UpdateHeaders( m_dataGridContext.Headers );
+          this.SetupInitialItemsNodes( out addCount );
+          this.UpdateFooters( m_dataGridContext.Footers );
+
+          this.IncrementCurrentGenerationCount();
+        }
+        else if( m_firstItem == null )
+        {
+          this.HandleItemsRecreation();
+        }
+
+        this.EnsureDetailsNodeTreeCreated();
+        this.RemapFloatingDetails();
+
+        m_dataGridControl.RestoreDataGridContextState( m_dataGridContext );
+      }
+
+      // The current method will need to be called again.  The data source is most probably not set yet.
+      if( ( m_startNode == null ) || ( m_firstItem == null ) || ( m_floatingDetails.Count != 0 ) )
+      {
+        this.InvalidateNodeTree();
+      }
+    }
+
+    private void EnsureDetailsNodeTreeCreated()
+    {
+      if( m_masterToDetails.Count == 0 )
+        return;
+
+      Debug.Assert( this.IsEnsuringNodeTreeCreated, "The method EnsureDetailsNodeTreeCreated should have been called from EnsureNodeTreeCreated." );
+
+      foreach( var generator in this.GetDetailGenerators().ToList() )
+      {
+        generator.EnsureNodeTreeCreated();
+      }
+    }
+
+    private void HandleItemsRecreation()
+    {
+      //Then, since its a Reset, recreates the Items nodes.
+      int resetAddCount;
+
+      var addNode = this.SetupInitialItemsNodes( out resetAddCount );
+      if( addNode != null )
+      {
+        this.IncrementCurrentGenerationCount();
+      }
+    }
+
+    private void UpdateGenPosToIndexList()
+    {
+      if( m_startNode == null )
+        return;
+
+      //after the modification to have the item count stored "locally" in the DetailGeneratorNodes,
+      //it becomes important to have the nodes updated when the layout of the items changes.
+      foreach( var detailNode in this.GetDetailGeneratorNodes() )
+      {
+        detailNode.UpdateItemCount();
+      }
+
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var cachedDetailNode = default( DetailGeneratorNode );
+      var cachedDetailNodeIndex = -1;
+      var previousDetailIndex = -1;
+
+      //loop through the realized items. By design they are present sequentially in the linked list, so I do not need to reset the GeneratorNodeHelper
+      for( int i = 0; i < m_genPosToItem.Count; i++ )
+      {
+        var item = m_genPosToItem[ i ];
+        var node = m_genPosToNode[ i ];
+        var detailNode = node as DetailGeneratorNode;
+
+        int index;
+
+        if( detailNode == null )
+        {
+          if( !nodeHelper.FindNode( node ) )
+            throw DataGridException.Create<DataGridInternalException>( "Realized item not found.", m_dataGridControl );
+
+          index = nodeHelper.FindItem( item );
+          if( index < 0 )
+            throw DataGridException.Create<DataGridInternalException>( "Realized item not found.", m_dataGridControl );
+
+          var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
+          if( itemsNode != null )
+          {
+            index = nodeHelper.Index + itemsNode.IndexOf( item );
+          }
+        }
+        else
+        {
+          if( cachedDetailNode != detailNode )
+          {
+            cachedDetailNodeIndex = this.FindGlobalIndexForDetailNode( detailNode );
+            cachedDetailNode = detailNode;
+            previousDetailIndex = -1;
+          }
+
+          var detailIndex = detailNode.DetailGenerator.IndexFromRealizedItem( item, previousDetailIndex + 1, out previousDetailIndex );
+          if( detailIndex < 0 )
+            throw DataGridException.Create<DataGridInternalException>( "Realized item not found at detail level.", m_dataGridControl );
+
+          index = cachedDetailNodeIndex + detailIndex;
+        }
+
+        if( ( i > 0 ) && ( index <= m_genPosToIndex[ i - 1 ] ) )
+          throw DataGridException.Create<DataGridInternalException>( "Realized item re-indexed at wrong location.", m_dataGridControl );
+
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateGenPosToIndexList, DataGridTraceMessages.IndexUpdated, DataGridTraceArgs.Container( m_genPosToContainer[ i ] ), DataGridTraceArgs.Node( m_genPosToNode[ i ] ), DataGridTraceArgs.Item( m_genPosToItem[ i ] ), DataGridTraceArgs.GeneratorIndex( i ), DataGridTraceArgs.From( m_genPosToIndex[ i ] ), DataGridTraceArgs.To( index ) );
+
+        m_genPosToIndex[ i ] = index;
+      }
     }
 
     private int IndexFromRealizedItem( object referenceItem, int startIndex, out int foundIndex )
@@ -5627,7 +5827,7 @@ namespace Xceed.Wpf.DataGrid
 
         var parentItemIndex = nodeHelper.FindItem( parentItem );
         if( parentItemIndex < 0 )
-          throw new DataGridInternalException( "Master item index is out of bound.", m_dataGridControl );
+          throw DataGridException.Create<DataGridInternalException>( "Master item index is out of bound.", m_dataGridControl );
 
         return offset + detailIndex + parentItemIndex + 1;
       }
@@ -5638,24 +5838,14 @@ namespace Xceed.Wpf.DataGrid
     private void StartGenerator( GeneratorPosition startPos, GeneratorDirection direction )
     {
       if( this.Status == GeneratorStatus.GeneratingContainers )
-        DataGridException.ThrowSystemException( "Cannot perform this operation while the generator is busy generating items.",
-                                                typeof( InvalidOperationException ), m_dataGridControl.Name );
+        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
-      //set the GeneratorStatus to "Generating"
       m_generatorStatus = GeneratorStatus.GeneratingContainers;
-
-      //Initialize the Direction
       m_generatorDirection = direction;
-
-      //retrieve the Index for the GeneratorPosition retrieved
       m_generatorCurrentGlobalIndex = this.IndexFromGeneratorPosition( startPos );
 
-      int itemCount = this.ItemCount;
-      if( ( m_generatorCurrentGlobalIndex < 0 ) || ( ( itemCount > 0 ) && ( m_generatorCurrentGlobalIndex >= itemCount ) ) )
-        DataGridException.ThrowSystemException( "The specified start position is outside the range of the Generator content.",
-                                                typeof( ArgumentOutOfRangeException ), m_dataGridControl.Name, "startPos" );
-
-      if( itemCount == 0 )
+      var itemCount = this.ItemCount;
+      if( ( m_generatorCurrentGlobalIndex < 0 ) || ( m_generatorCurrentGlobalIndex >= itemCount ) )
         return;
 
       //and create a node helper that will assist us during the Generation process...
@@ -5664,12 +5854,12 @@ namespace Xceed.Wpf.DataGrid
       //position the GeneratorNodeHelper to the appropriate node
       if( !m_generatorNodeHelper.FindNodeForIndex( m_generatorCurrentGlobalIndex ) ) //find index?!?!
         //there was a problem moving the Node helper... 
-        throw new DataGridInternalException( "Unable to move to the required generator node by using the current index.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "Unable to move to the required generator node by using the current index.", m_dataGridControl );
 
       //Calculate the offset
       m_generatorCurrentOffset = m_generatorCurrentGlobalIndex - m_generatorNodeHelper.Index;
 
-      ItemsGeneratorNode itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
+      var itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
       if( itemsNode != null )
       {
         m_generatorCurrentDetail = itemsNode.GetDetailNodeForIndex( m_generatorCurrentOffset, out m_generatorCurrentOffset, out m_generatorCurrentDetailIndex, out m_generatorCurrentDetailNodeIndex );
@@ -5679,7 +5869,7 @@ namespace Xceed.Wpf.DataGrid
       {
         // No detail generator should be started already.
         if( m_generatorCurrentDetailDisposable != null )
-          throw new DataGridInternalException( "The detail generator is already started.", m_dataGridControl );
+          throw DataGridException.Create<DataGridInternalException>( "The detail generator is already started.", m_dataGridControl );
 
         m_generatorCurrentDetailDisposable = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).StartAt( m_generatorCurrentDetail.DetailGenerator.GeneratorPositionFromIndex( m_generatorCurrentDetailIndex ), direction, true );
       }
@@ -5688,7 +5878,7 @@ namespace Xceed.Wpf.DataGrid
     private void StopGenerator()
     {
       if( this.Status != GeneratorStatus.GeneratingContainers )
-        throw new DataGridInternalException( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
 
       m_generatorNodeHelper = null;
       m_generatorCurrentOffset = -1;
@@ -5719,9 +5909,8 @@ namespace Xceed.Wpf.DataGrid
 
     private GeneratorPosition FindNextUnrealizedGeneratorPosition( GeneratorPosition position )
     {
-      GeneratorPosition retval = position;
-
-      int index = this.IndexFromGeneratorPosition( position ) + 1;
+      var retval = position;
+      var index = this.IndexFromGeneratorPosition( position ) + 1;
 
       while( index < this.ItemCount )
       {
@@ -5743,52 +5932,21 @@ namespace Xceed.Wpf.DataGrid
 
     private GeneratorPosition FindPreviousUnrealizedGeneratorPosition( GeneratorPosition position )
     {
-      int index = this.IndexFromGeneratorPosition( position ) - 1;
-
+      var index = this.IndexFromGeneratorPosition( position ) - 1;
       while( index >= 0 )
       {
         if( !m_genPosToIndex.Contains( index ) )
-        {
           break;
-        }
 
         index--;
       }
 
-      GeneratorPosition retval = this.GeneratorPositionFromIndex( index );
-
-      return retval;
-    }
-
-    private void RemoveContainer( DependencyObject container, object dataItem )
-    {
-      m_dataGridControl.ClearItemContainer( container, dataItem );
-
-      if( this.IsRecyclingEnabled )
-      {
-        this.EnqueueContainer( container, dataItem );
-
-        var dataItemStore = container.ReadLocalValue( CustomItemContainerGenerator.DataItemPropertyProperty ) as DataItemDataProviderBase;
-        if( dataItemStore != null )
-        {
-          dataItemStore.ClearDataItem();
-        }
-
-        if( GroupLevelIndicatorPane.GetGroupLevel( container ) == -1 )
-        {
-          container.ClearValue( GroupLevelIndicatorPane.GroupLevelProperty );
-        }
-
-        if( container is HeaderFooterItem )
-        {
-          container.ClearValue( DataGridControl.StatContextPropertyKey );
-        }
-      }
+      return this.GeneratorPositionFromIndex( index );
     }
 
     private DependencyObject CreateContainerForItem( object dataItem, GeneratorNode node )
     {
-      DependencyObject container = null;
+      var container = default( DependencyObject );
 
       if( node is HeadersFootersGeneratorNode )
       {
@@ -5821,11 +5979,11 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        throw new DataGridInternalException( "Cannot create container for the GeneratorNode, as it is not of a valid type.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "Cannot create container for the GeneratorNode, as it is not of a valid type.", m_dataGridControl );
       }
 
       if( container == null )
-        throw new DataGridInternalException( "A container could not be created or recycled for the GeneratorNode.", m_dataGridControl );
+        throw DataGridException.Create<DataGridInternalException>( "A container could not be created or recycled for the GeneratorNode.", m_dataGridControl );
 
       var dataItemStore = container.ReadLocalValue( CustomItemContainerGenerator.DataItemPropertyProperty ) as DataItemDataProviderBase;
       if( dataItemStore != null )
@@ -5847,8 +6005,8 @@ namespace Xceed.Wpf.DataGrid
 
     private void SetStatContext( DependencyObject container, GeneratorNode node )
     {
-      GroupGeneratorNode parentGroup = node.Parent as GroupGeneratorNode;
-      DataGridCollectionViewGroup collectionViewGroup = null;
+      var parentGroup = node.Parent as GroupGeneratorNode;
+      var collectionViewGroup = default( DataGridCollectionViewGroup );
 
       if( parentGroup != null )
       {
@@ -5869,6 +6027,19 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private void ClearStatContext( DependencyObject container )
+    {
+      if( GroupLevelIndicatorPane.GetGroupLevel( container ) == -1 )
+      {
+        container.ClearValue( GroupLevelIndicatorPane.GroupLevelProperty );
+      }
+
+      if( container is HeaderFooterItem )
+      {
+        container.ClearValue( DataGridControl.StatContextPropertyKey );
+      }
+    }
+
     private bool IsItemItsOwnContainer( object dataItem )
     {
       return m_dataGridControl.IsItemItsOwnContainer( dataItem );
@@ -5878,23 +6049,22 @@ namespace Xceed.Wpf.DataGrid
     {
       if( this.IsRecyclingEnabled )
       {
-        DependencyObject recycledContainer = null;
-        recycledContainer = this.DequeueHeaderFooterContainer( dataItem );
+        var recycledContainer = this.DequeueHeaderFooterContainer( dataItem );
         if( recycledContainer != null )
           return recycledContainer;
       }
 
       //If the container cannot be recycled, then create a new one.
-      object realDataItem = dataItem;
+      var realDataItem = dataItem;
       if( dataItem.GetType() == typeof( GroupHeaderFooterItem ) )
       {
         realDataItem = ( ( GroupHeaderFooterItem )dataItem ).Template;
       }
 
-      DataTemplate template = realDataItem as DataTemplate;
+      var template = realDataItem as DataTemplate;
       if( template == null )
       {
-        GroupHeaderFooterItemTemplate vwc = realDataItem as GroupHeaderFooterItemTemplate;
+        var vwc = realDataItem as GroupHeaderFooterItemTemplate;
         if( vwc != null )
         {
           vwc.Seal();
@@ -5902,10 +6072,10 @@ namespace Xceed.Wpf.DataGrid
         }
 
         if( template == null )
-          throw new DataGridInternalException( "No template found for the creation of a header or footer container.", m_dataGridControl );
+          throw DataGridException.Create<DataGridInternalException>( "No template found for the creation of a header or footer container.", m_dataGridControl );
       }
 
-      HeaderFooterItem newItem = new HeaderFooterItem();
+      var newItem = new HeaderFooterItem();
 
       BindingOperations.SetBinding( newItem, HeaderFooterItem.ContentProperty, m_headerFooterDataContextBinding );
       newItem.ContentTemplate = template;
@@ -5915,20 +6085,106 @@ namespace Xceed.Wpf.DataGrid
 
     private int FindInsertionPoint( int itemIndex )
     {
-      int i = 0;
+      var count = m_genPosToIndex.Count;
 
-      int collectionCount = m_genPosToIndex.Count;
-      for( i = 0; i < collectionCount; i++ )
+      for( var i = 0; i < count; i++ )
       {
         //if the item is larger in index, then I want to insert before it!
         if( m_genPosToIndex[ i ] > itemIndex )
+          return i;
+      }
+
+      return count;
+    }
+
+    private void RemapFloatingDetails()
+    {
+      if( m_floatingDetails.Count == 0 )
+        return;
+
+      if( this.IsDetailsRemapDeferred )
+      {
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.CannotRemapDetails );
+        return;
+      }
+
+      Debug.Assert( m_startNode != null, "Generator structure should already be created." );
+
+      while( m_floatingDetails.Count > 0 )
+      {
+        var closeDetail = true; //using this approach to have a default behavior or closing the details, if something inconsistent occur (see Debug Asserts).
+        var itemToCheck = m_floatingDetails[ 0 ];
+        m_floatingDetails.RemoveAt( 0 );
+
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        if( nodeHelper.AbsoluteFindItem( itemToCheck ) )
         {
-          break;
+          var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
+          if( itemsNode != null )
+          {
+            var insertionIndex = itemsNode.Items.IndexOf( itemToCheck );
+            if( insertionIndex < 0 )
+            {
+              this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.ItemNotBelongingToNode, DataGridTraceArgs.Item( itemToCheck ), DataGridTraceArgs.Node( itemsNode ) );
+            }
+
+            if( itemsNode.Details == null )
+            {
+              itemsNode.Details = new SortedDictionary<int, List<DetailGeneratorNode>>();
+            }
+
+            try
+            {
+              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.RemapDetailNodes, DataGridTraceArgs.Item( itemToCheck ) );
+
+              var oldItemCount = this.ItemCount;
+
+              itemsNode.Details.Add( insertionIndex, new List<DetailGeneratorNode>( m_masterToDetails[ itemToCheck ] ) );
+
+              var addCount = 0;
+              foreach( var detailNode in m_masterToDetails[ itemToCheck ] )
+              {
+                // Refresh the item count in case it changed while the detail was floating.
+                detailNode.UpdateItemCount();
+
+                addCount += detailNode.ItemCount;
+              }
+              itemsNode.AdjustItemCount( addCount );
+
+              this.IncrementCurrentGenerationCount();
+
+              // The ItemsChanged event should not be raised if the new items are hidden under a collapsed group, or else the master node's ItemCount will become unbalanced.
+              var newItemCount = this.ItemCount;
+              if( oldItemCount != newItemCount )
+              {
+                //ensure that no add event is sent when the generator is currently processing a Reset.
+                if( !this.IsHandlingGlobalItemsReset )
+                {
+                  this.SendAddEvent( addCount );
+                }
+              }
+
+              closeDetail = false;
+            }
+            catch( Exception e )
+            {
+              //both the "Add" and the " [] " could throw if the key is already present or if its not...
+              throw new DataGridInternalException( e.Message, e, m_dataGridControl );
+            }
+          }
+          else
+          {
+            this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( nodeHelper.CurrentNode ) );
+          }
         }
 
+        if( closeDetail )
+        {
+          //The item was not located in the generator, then it's time to "close" the detail node/generator
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.CollapsingDetail, DataGridTraceArgs.Item( itemToCheck ) );
+          this.CloseDetailsForItem( itemToCheck, null );
+        }
       }
-
-      return i;
     }
 
     private void QueueDetailItemForRemapping( object item )
@@ -5936,17 +6192,134 @@ namespace Xceed.Wpf.DataGrid
       if( item == null )
         return;
 
-      if( ( !m_floatingDetails.Contains( item ) ) && ( m_masterToDetails.ContainsKey( item ) ) )
+      if( !m_masterToDetails.ContainsKey( item ) || m_floatingDetails.Contains( item ) )
+        return;
+
+      m_floatingDetails.Add( item );
+
+      this.InvalidateNodeTree();
+    }
+
+    private void CloseDetails( DetailConfiguration detailConfiguration )
+    {
+      var details = new KeyValuePair<object, List<DetailGeneratorNode>>[ m_masterToDetails.Count ];
+      ( ( ICollection<KeyValuePair<object, List<DetailGeneratorNode>>> )m_masterToDetails ).CopyTo( details, 0 );
+
+      foreach( var detail in details )
+      {
+        this.CloseDetailsForItem( detail.Key, detailConfiguration );
+      }
+    }
+
+    private int CloseDetailsForItem( object dataItem, DetailConfiguration detailConfiguration )
+    {
+      if( m_generatorStatus == GeneratorStatus.GeneratingContainers )
+        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
+
+      if( dataItem is EmptyDataItem )
+      {
+        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.CannotCollapseDetail, DataGridTraceArgs.Item( dataItem ) );
+        return -1;
+      }
+
+      if( ( dataItem == null ) || ( !m_masterToDetails.ContainsKey( dataItem ) ) )
+        return -1; //the item is no longer present in the opened details list... or item is invalid (null)
+
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var globalItemIndex = nodeHelper.FindItem( dataItem );
+      var dataItemFound = ( globalItemIndex >= 0 );
+      //Note: this function will only return index for items directly contained in this generator ( no details ).
+
+      ItemsGeneratorNode masterNode;
+
+      if( dataItemFound )
+      {
+        masterNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
+      }
+      else
+      {
+        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        masterNode = ( nodeHelper.Contains( dataItem ) ) ? nodeHelper.CurrentNode as ItemsGeneratorNode : null;
+      }
+
+      List<DetailGeneratorNode> oldDetails;
+      if( !m_masterToDetails.TryGetValue( dataItem, out oldDetails ) )
+      {
+        this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailNotFound, DataGridTraceArgs.Item( dataItem ) );
+        throw DataGridException.Create<DataGridInternalException>( "Detail not found", m_dataGridControl );
+      }
+
+      var count = 0;
+      var containers = new List<DependencyObject>();
+
+      for( int i = oldDetails.Count - 1; i >= 0; i-- )
+      {
+        var detailNode = oldDetails[ i ];
+
+        if( ( detailConfiguration == null ) || ( detailConfiguration == detailNode.DetailContext.SourceDetailConfiguration ) )
+        {
+          count += detailNode.ItemCount;
+
+          this.RemoveGeneratedItems( detailNode, containers );
+          this.ClearDetailGeneratorNode( detailNode );
+
+          oldDetails.RemoveAt( i );
+        }
+      }
+
+      if( oldDetails.Count == 0 )
       {
-        m_floatingDetails.Add( item );
+        m_masterToDetails.Remove( dataItem );
+        m_floatingDetails.Remove( dataItem );
       }
+
+      if( ( masterNode != null ) && ( masterNode.Details != null ) )
+      {
+        var indexOfItem = masterNode.Items.IndexOf( dataItem );
+
+        if( !masterNode.Details.TryGetValue( indexOfItem, out oldDetails ) )
+        {
+          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailNotFound, DataGridTraceArgs.Item( dataItem ) );
+          throw DataGridException.Create<DataGridInternalException>( "Detail not found .. 2", m_dataGridControl );
+        }
+
+        for( int i = oldDetails.Count - 1; i >= 0; i-- )
+        {
+          var detailNode = oldDetails[ i ];
+
+          if( ( detailConfiguration == null ) || ( detailConfiguration == detailNode.DetailContext.SourceDetailConfiguration ) )
+          {
+            oldDetails.RemoveAt( i );
+          }
+        }
+
+        if( oldDetails.Count == 0 )
+        {
+          masterNode.Details.Remove( indexOfItem );
+        }
+
+        masterNode.AdjustItemCount( -count );
+
+        if( masterNode.Details.Count == 0 )
+        {
+          masterNode.Details = null;
+        }
+      }
+
+      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailCollapsed, DataGridTraceArgs.Item( dataItem ) );
+
+      if( dataItemFound )
+      {
+        this.IncrementCurrentGenerationCount();
+        this.SendRemoveEvent( count, containers );
+      }
+
+      return globalItemIndex;
     }
 
     private DetailGeneratorNode CreateDetailGeneratorNode( object dataItem, DataGridCollectionViewBase collectionView, DetailConfiguration detailConfiguration )
     {
       var detailDataGridContext = new DataGridContext( m_dataGridContext, m_dataGridControl, dataItem, collectionView, detailConfiguration );
-      detailDataGridContext.SetAssociatedAutomationPeer();
-
       var detailGenerator = CustomItemContainerGenerator.CreateGenerator( m_dataGridControl, collectionView, detailDataGridContext, this );
       detailGenerator.SetGenPosToIndexUpdateInhibiter( this );
       detailGenerator.IsRecyclingEnabled = this.IsRecyclingEnabled;
@@ -5974,45 +6347,41 @@ namespace Xceed.Wpf.DataGrid
 
     private void ClearDetailGeneratorNode( DetailGeneratorNode detailNode )
     {
-      using( m_log.BeginBlock( this, CustomItemContainerGenerator.FormatObjectId( "ClearDetailGeneratorNode - DN", detailNode ) ) )
-      {
-        m_dataGridControl.SelectionChangerManager.Begin();
+      m_dataGridControl.SelectionChangerManager.Begin();
 
-        try
-        {
-          m_dataGridControl.SelectionChangerManager.UnselectAllItems( detailNode.DetailContext );
-          m_dataGridControl.SelectionChangerManager.UnselectAllCells( detailNode.DetailContext );
-        }
-        finally
-        {
-          m_dataGridControl.SelectionChangerManager.End( false, false, false );
-        }
+      try
+      {
+        m_dataGridControl.SelectionChangerManager.UnselectAllItems( detailNode.DetailContext );
+        m_dataGridControl.SelectionChangerManager.UnselectAllCells( detailNode.DetailContext );
+      }
+      finally
+      {
+        m_dataGridControl.SelectionChangerManager.End( false, false );
+      }
 
-        m_dataGridControl.SaveDataGridContextState( detailNode.DetailContext, true, int.MaxValue );
+      m_dataGridControl.SaveDataGridContextState( detailNode.DetailContext, true, int.MaxValue );
 
-        CustomItemContainerGenerator detailGenerator = detailNode.DetailGenerator;
+      var detailGenerator = detailNode.DetailGenerator;
 
-        detailNode.CleanGeneratorNode();
+      detailNode.CleanGeneratorNode();
 
-        DetailsChangedEventManager.RemoveListener( detailGenerator, this );
-        detailGenerator.ItemsChanged -= new CustomGeneratorChangedEventHandler( this.HandleDetailGeneratorContentChanged );
-        detailGenerator.ContainersRemoved -= new ContainersRemovedEventHandler( this.OnDetailContainersRemoved );
-        detailGenerator.SetGenPosToIndexUpdateInhibiter( null );
-        detailGenerator.UnregisterEvents();
-        detailGenerator.ClearEvents();
-      }
+      DetailsChangedEventManager.RemoveListener( detailGenerator, this );
+      detailGenerator.ItemsChanged -= new CustomGeneratorChangedEventHandler( this.HandleDetailGeneratorContentChanged );
+      detailGenerator.ContainersRemoved -= new ContainersRemovedEventHandler( this.OnDetailContainersRemoved );
+      detailGenerator.SetGenPosToIndexUpdateInhibiter( null );
+      detailGenerator.UnregisterEvents();
+      detailGenerator.ClearEvents();
     }
 
     private void RegisterEvents()
     {
       Debug.Assert( m_dataGridControl != null );
       Debug.Assert( m_collectionView != null );
-      Debug.Assert( ( m_dataGridContext != null ) && ( m_dataGridContext.DetailConfigurations != null ) );
+      Debug.Assert( m_dataGridContext != null );
 
       CollectionChangedEventManager.AddListener( m_collectionView, this );
       GroupConfigurationSelectorChangedEventManager.AddListener( m_dataGridContext, this );
-      CollectionChangedEventManager.AddListener( m_dataGridContext.DetailConfigurations, this );
-      PropertyChangedEventManager.AddListener( m_collectionView, this, "Groups" );
+      PropertyChangedEventManager.AddListener( m_collectionView, this, string.Empty );
 
       // The top most generator must register to additional events.
       if( m_dataGridContext.SourceDetailConfiguration == null )
@@ -6020,6 +6389,9 @@ namespace Xceed.Wpf.DataGrid
         ItemsSourceChangeCompletedEventManager.AddListener( m_dataGridControl, this );
         ViewChangedEventManager.AddListener( m_dataGridControl, this );
         ThemeChangedEventManager.AddListener( m_dataGridControl, this );
+
+        m_recyclingPools.ContainersRemoved += new ContainersRemovedEventHandler( this.OnRecyclingPoolsContainersRemoved );
+        m_recyclingPools.RecyclingCandidatesCleaned += new RecyclingCandidatesCleanedEventHandler( this.OnRecyclingCandidatesCleaned );
       }
     }
 
@@ -6032,7 +6404,7 @@ namespace Xceed.Wpf.DataGrid
       CollectionChangedEventManager.RemoveListener( m_collectionView, this );
       GroupConfigurationSelectorChangedEventManager.RemoveListener( m_dataGridContext, this );
       CollectionChangedEventManager.RemoveListener( m_dataGridContext.DetailConfigurations, this );
-      PropertyChangedEventManager.RemoveListener( m_collectionView, this, "Groups" );
+      PropertyChangedEventManager.RemoveListener( m_collectionView, this, string.Empty );
 
       // The top most generator must unregister from additional events.
       if( m_dataGridContext.SourceDetailConfiguration == null )
@@ -6040,6 +6412,9 @@ namespace Xceed.Wpf.DataGrid
         ItemsSourceChangeCompletedEventManager.RemoveListener( m_dataGridControl, this );
         ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
         ThemeChangedEventManager.RemoveListener( m_dataGridControl, this );
+
+        m_recyclingPools.ContainersRemoved -= new ContainersRemovedEventHandler( this.OnRecyclingPoolsContainersRemoved );
+        m_recyclingPools.RecyclingCandidatesCleaned -= new RecyclingCandidatesCleanedEventHandler( this.OnRecyclingCandidatesCleaned );
       }
     }
 
@@ -6051,47 +6426,259 @@ namespace Xceed.Wpf.DataGrid
       this.PropertyChanged = null;
     }
 
-    private void HandleDetailGeneratorContentChanged( object sender, CustomGeneratorChangedEventArgs e )
+    internal int CreateDetailsHelper( ItemsGeneratorNode masterNode, object dataItem )
+    {
+      var dataGridCollectionViewBase = ( m_dataGridContext != null ) ? m_dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase
+                                                                     : default( DataGridCollectionViewBase );
+
+      if( dataGridCollectionViewBase == null )
+      {
+        this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailNotSupported,
+                         DataGridTraceArgs.DataSource( dataGridCollectionViewBase ) );
+      }
+
+      var totalAddCount = 0;
+      var newDetails = default( List<DetailGeneratorNode> );
+      var detailsAlreadyExist = m_floatingDetails.Contains( dataItem );
+
+      if( detailsAlreadyExist )
+      {
+        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.RemapDetailNodes,
+                         DataGridTraceArgs.Item( dataItem ) );
+
+        newDetails = new List<DetailGeneratorNode>( m_masterToDetails[ dataItem ] );
+        m_floatingDetails.Remove( dataItem );
+      }
+
+      var detailConfigurations = m_dataGridContext.DetailConfigurations;
+
+      //If the master item was not found in the list of details pending requeuing, then create a new set of detail nodes
+      if( newDetails == null )
+      {
+        newDetails = new List<DetailGeneratorNode>( detailConfigurations.Count );
+
+        foreach( DetailConfiguration detailConfig in detailConfigurations )
+        {
+          if( detailConfig.IsAutoCreated )
+          {
+            var defaultDetailConfig = m_dataGridContext.DefaultDetailConfiguration;
+            if( defaultDetailConfig == null )
+            {
+              defaultDetailConfig = m_dataGridContext.GetDefaultDetailConfigurationForContext();
+            }
+
+            if( defaultDetailConfig != null )
+            {
+              //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
+              if( defaultDetailConfig.UseDefaultHeadersFooters )
+              {
+                defaultDetailConfig.AddDefaultHeadersFooters();
+                detailConfig.AddDefaultHeadersFooters();
+              }
+            }
+            else
+            {
+              //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
+              if( detailConfig.UseDefaultHeadersFooters )
+              {
+                detailConfig.AddDefaultHeadersFooters();
+              }
+            }
+          }
+          else
+          {
+            //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
+            if( detailConfig.UseDefaultHeadersFooters )
+            {
+              detailConfig.AddDefaultHeadersFooters();
+            }
+          }
+
+          // If the DetailConfiguration is not meant to be visible, then skip next section (creation of detail) and continue looping on other detail configurations
+          if( !detailConfig.Visible )
+            continue;
+
+          var newDetailCollectionViewBase = default( DataGridCollectionViewBase );
+          var detailDataSource = default( IEnumerable );
+
+          // If the data source returned by the detailDescription is null ( or if there was no detail description ), then create an empty data source for the detail data.
+          if( detailDataSource == null )
+          {
+            detailDataSource = new object[] { };
+          }
+
+          newDetailCollectionViewBase = dataGridCollectionViewBase.CreateDetailDataGridCollectionViewBase( detailDataSource, null, dataGridCollectionViewBase );
+
+          Debug.Assert( newDetailCollectionViewBase != null );
+
+          using( detailConfig.ColumnManager.DeferUpdate( new ColumnHierarchyManager.UpdateOptions( TableView.GetFixedColumnCount( detailConfig ), true ) ) )
+          {
+            if( detailConfig.AutoCreateForeignKeyConfigurations && !detailConfig.ForeignKeysUpdatedOnAutoCreate )
+            {
+              // Ensure to update the foreign key related properties before expanding detail
+              ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView( detailConfig.Columns,
+                                                                                                       newDetailCollectionViewBase.ItemProperties,
+                                                                                                       detailConfig.AutoCreateForeignKeyConfigurations );
+              detailConfig.ForeignKeysUpdatedOnAutoCreate = true;
+            }
+          }
+
+          var newDetailNode = this.CreateDetailGeneratorNode( dataItem, newDetailCollectionViewBase, detailConfig );
+          newDetails.Add( newDetailNode );
+
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailNodeAdded,
+                           DataGridTraceArgs.Node( newDetailNode ), DataGridTraceArgs.Item( dataItem ) );
+
+          totalAddCount += newDetailNode.ItemCount;
+        }
+      }
+      else // there was details for the master item in the list to be requeued
+      {
+        // count the items from the details.
+        foreach( var detailNode in newDetails )
+        {
+          totalAddCount += detailNode.ItemCount;
+        }
+      }
+
+      // Plug details in the master items node.
+      var indexOfItem = masterNode.Items.IndexOf( dataItem );
+      var details = masterNode.Details;
+
+      if( details == null )
+      {
+        details = new SortedDictionary<int, List<DetailGeneratorNode>>();
+        masterNode.Details = details;
+      }
+
+      details.Add( indexOfItem, newDetails );
+
+      masterNode.AdjustItemCount( totalAddCount );
+
+      if( !detailsAlreadyExist )
+      {
+        m_masterToDetails.Add( dataItem, new List<DetailGeneratorNode>( newDetails ) );
+
+        for( int i = 0; i < newDetails.Count; i++ )
+        {
+          m_dataGridControl.RestoreDataGridContextState( newDetails[ i ].DetailContext );
+        }
+      }
+      else
+      {
+        var detailsMapped = m_masterToDetails.ContainsKey( dataItem );
+        Debug.Assert( detailsMapped, "Item not found on master level." );
+
+        if( !detailsMapped )
+        {
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.RemapZombieDetail,
+                           DataGridTraceArgs.Item( dataItem ) );
+        }
+      }
+
+      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailExpanded,
+                       DataGridTraceArgs.Item( dataItem ) );
+
+      return totalAddCount;
+    }
+
+    private void CreateDetailsForItem( object dataItem )
     {
-      m_log.Assert( this, !this.IsHandlingGlobalItemsResetLocally, "Generator is already processing a HandleGlobalItemReset or CleanupGenerator" );
+      if( m_generatorStatus == GeneratorStatus.GeneratingContainers )
+        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
 
-      if( this.IsHandlingGlobalItemsResetLocally )
+      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
+      {
+        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsForItem, DataGridTraceMessages.CannotExpandDetail, DataGridTraceArgs.Item( dataItem ) );
         return;
+      }
 
-      m_log.Assert( this, m_startNode != null, "m_startNode != null" );
+      if( m_masterToDetails.ContainsKey( dataItem ) )
+      {
+        //before throwing, verify if the item is not currently pending requeue
+        if( !m_floatingDetails.Contains( dataItem ) )
+          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item whose details are already mapped.", m_dataGridControl );
+      }
 
-      CustomItemContainerGenerator detailGenerator = sender as CustomItemContainerGenerator;
+      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+      var dataItemFound = ( nodeHelper.FindItem( dataItem ) >= 0 );
 
-      m_log.Assert( this, detailGenerator != null, "detailGenerator != null" );
+      //means either that the item is not present in the Generator or that a parent group of the item is collapsed...
+      if( !dataItemFound )
+      {
+        //make sure it is the later, else throw an exception.
+        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        if( !nodeHelper.Contains( dataItem ) )
+          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item that does not belong to the generator.", m_dataGridControl );
+      }
 
-      object masterItem;
-      DetailGeneratorNode detailNode = this.FindDetailGeneratorNodeForGenerator( detailGenerator, out masterItem );
+      var masterNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
+      if( masterNode == null )
+        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item that does not map to an item node.", m_dataGridControl );
 
-      m_log.Assert( this, masterItem != null, "masterItem != null" );
-      m_log.Assert( this, detailNode != null, "detailNode != null" );
+      try
+      {
+        var count = this.CreateDetailsHelper( masterNode, dataItem );
 
-      if( ( detailNode != null ) && ( masterItem != null ) )
+        this.IncrementCurrentGenerationCount();
+
+        if( dataItemFound )
+        {
+          this.SendAddEvent( count );
+        }
+      }
+      catch( Exception e )
       {
-        switch( e.Action )
+        throw new DataGridException( e.Message, e, m_dataGridControl );
+      }
+    }
+
+    private void HandleDetailGeneratorContentChanged( object sender, CustomGeneratorChangedEventArgs e )
+    {
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceArgs.Node( sender ) ) )
+      {
+        if( this.IsHandlingGlobalItemsResetLocally )
         {
-          case NotifyCollectionChangedAction.Add:
-            this.HandleDetailAddition( masterItem, detailNode, e );
-            break;
+          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceMessages.CannotProcessOnReset );
+          return;
+        }
 
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Remove:
-            this.HandleDetailMoveRemove( masterItem, detailNode, e );
-            break;
+        var detailGenerator = sender as CustomItemContainerGenerator;
 
-          case NotifyCollectionChangedAction.Replace: //CustomItemContainerGenreator never issues a Replace!
-            throw new DataGridInternalException( "CustomItemContainerGenerator never notifies a Replace action.", m_dataGridControl );
+        Debug.Assert( detailGenerator != null );
+        Debug.Assert( m_startNode != null );
 
-          case NotifyCollectionChangedAction.Reset:
-            this.HandleDetailReset( masterItem, detailNode );
-            break;
+        object masterItem;
+        var detailNode = this.FindDetailGeneratorNodeForGenerator( detailGenerator, out masterItem );
 
-          default:
-            break;
+        Debug.Assert( masterItem != null );
+        Debug.Assert( detailNode != null );
+
+        if( ( detailNode != null ) && ( masterItem != null ) )
+        {
+          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceArgs.Action( e.Action ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( masterItem ) );
+
+          switch( e.Action )
+          {
+            case NotifyCollectionChangedAction.Add:
+              this.HandleDetailAddition( masterItem, detailNode, e );
+              break;
+
+            case NotifyCollectionChangedAction.Move:
+            case NotifyCollectionChangedAction.Remove:
+              this.HandleDetailMoveRemove( masterItem, detailNode, e );
+              break;
+
+            case NotifyCollectionChangedAction.Replace: //CustomItemContainerGenreator never issues a Replace!
+              throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator never notifies a Replace action.", m_dataGridControl );
+
+            case NotifyCollectionChangedAction.Reset:
+              this.HandleDetailReset( masterItem, detailNode );
+              break;
+
+            default:
+              break;
+          }
         }
       }
     }
@@ -6102,20 +6689,17 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var masterIndex = nodeHelper.FindItem( masterItem );
 
       // The master item has been found.
-      if( masterIndex != -1 )
+      if( nodeHelper.FindItem( masterItem ) >= 0 )
       {
-        int globalIndex = -1;
-        var convertedGeneratorPosition = this.ConvertDetailGeneratorPosition( e.Position, masterItem, detailNode, out globalIndex );
         var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
 
-        masterNode.AdjustItemCount( e.ItemCount );
+        masterNode.AdjustItemCount( e.Count );
         detailNode.UpdateItemCount();
 
         this.IncrementCurrentGenerationCount();
-        this.SendAddEvent( convertedGeneratorPosition, masterIndex + 1 + e.Index, e.ItemCount );
+        this.SendAddEvent( e.Count );
       }
       // The master item could be located inside a collapsed group.
       else
@@ -6123,12 +6707,11 @@ namespace Xceed.Wpf.DataGrid
         //in that case, I need to determine the appropriate masterNode another way
         nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
         if( !nodeHelper.Contains( masterItem ) )
-          DataGridException.ThrowSystemException( "An attempt was made to add a detail for an item that does not belong to the generator.",
-                                                  typeof( InvalidOperationException ), m_dataGridControl.Name );
+          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to add a detail for an item that does not belong to the generator.", m_dataGridControl );
 
         var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
 
-        masterNode.AdjustItemCount( e.ItemCount );
+        masterNode.AdjustItemCount( e.Count );
         detailNode.UpdateItemCount();
 
         this.IncrementCurrentGenerationCount();
@@ -6141,26 +6724,22 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var masterIndex = nodeHelper.FindItem( masterItem );
 
       // The master item has been found.
-      if( masterIndex != -1 )
+      if( nodeHelper.FindItem( masterItem ) >= 0 )
       {
-        int globalIndex = -1;
-        var convertedGeneratorPosition = this.ConvertDetailGeneratorPosition( e.OldPosition, masterItem, detailNode, out globalIndex );
-
-        this.RemoveDetailContainers( convertedGeneratorPosition, e.ItemUICount );
+        this.RemoveDetailContainers( e.Containers );
 
         if( e.Action == NotifyCollectionChangedAction.Remove )
         {
           var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
 
-          masterNode.AdjustItemCount( -e.ItemCount );
+          masterNode.AdjustItemCount( -e.Count );
           detailNode.UpdateItemCount();
         }
 
         this.IncrementCurrentGenerationCount();
-        this.SendRemoveEvent( convertedGeneratorPosition, globalIndex, e.ItemCount, e.ItemUICount, e.RemovedContainers );
+        this.SendRemoveEvent( e.Count, e.Containers );
       }
       // The master item could be located inside a collapsed group.
       else
@@ -6168,14 +6747,13 @@ namespace Xceed.Wpf.DataGrid
         //in that case, I need to determine the appropriate masterNode another way
         nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
         if( !nodeHelper.Contains( masterItem ) )
-          DataGridException.ThrowSystemException( "An attempt was made to move or remove a detail for an item that does not belong to the generator.",
-                                                  typeof( InvalidOperationException ), m_dataGridControl.Name );
+          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to move or remove a detail for an item that does not belong to the generator.", m_dataGridControl );
 
         if( e.Action == NotifyCollectionChangedAction.Remove )
         {
           var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
 
-          masterNode.AdjustItemCount( -e.ItemCount );
+          masterNode.AdjustItemCount( -e.Count );
           detailNode.UpdateItemCount();
         }
 
@@ -6185,166 +6763,57 @@ namespace Xceed.Wpf.DataGrid
 
     private void HandleDetailReset( object masterItem, DetailGeneratorNode detailNode )
     {
-      if( m_floatingDetails.Contains( masterItem ) )
-        return;
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var masterIndex = nodeHelper.FindItem( masterItem );
-      var masterItemFound = ( masterIndex != -1 );
-
-      // The master item could be located inside a collapsed group.
-      if( !masterItemFound )
-      {
-        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( !nodeHelper.Contains( masterItem ) )
-          DataGridException.ThrowSystemException( "An attempt was made to reset a detail for an item that does not belong to the generator.",
-                                                  typeof( InvalidOperationException ), m_dataGridControl.Name );
-      }
-
-      var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-
-      List<DetailGeneratorNode> detailsForMaster;
-      if( ( masterNode.Details == null ) || !masterNode.Details.TryGetValue( masterNode.Items.IndexOf( masterItem ), out detailsForMaster ) )
-        throw new DataGridInternalException( "An attempt was made to reset a detail that does not belong to the generator.", m_dataGridControl );
-
-      //start index will be ignored later on if the masterIndex is -1!!
-      int startIndex = nodeHelper.Index + masterNode.IndexOf( masterItem ) + 1; //details start a master index + 1
-
-      //this is required to ensure that if the details that resets is not the first one, the index is calculated appropriatly.
-      foreach( DetailGeneratorNode node in detailsForMaster )
-      {
-        if( node == detailNode )
-          break;
-
-        startIndex += node.ItemCount;
-      }
-
-      var removePosition = new GeneratorPosition( -1, 1 );
-      int removedCount = 0;
-      var removedContainers = new List<DependencyObject>();
-      var oldDetailCount = detailNode.ItemCount;
-      var hasOldDetailItems = ( oldDetailCount > 0 );
-
-      if( hasOldDetailItems )
+      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset ) )
       {
-        // The information about the removal is only required when the master item is not collapsed.
-        if( masterItemFound )
+        if( m_floatingDetails.Contains( masterItem ) )
         {
-          removePosition = this.GetSafeGeneratorPositionFromIndex( startIndex );
-          removedCount = this.RemoveGeneratedItems( startIndex, startIndex + oldDetailCount - 1, removedContainers );
+          this.TraceEvent( TraceEventType.Information, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.DetailIsFloating );
+          return;
         }
 
-        masterNode.AdjustItemCount( -oldDetailCount );
-      }
-
-      detailNode.UpdateItemCount();
-
-      GeneratorPosition addPosition = new GeneratorPosition( -1, 1 );
-      int newDetailCount = detailNode.ItemCount;
-      bool hasNewDetailItems = ( newDetailCount > 0 );
+        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+        var masterItemFound = ( nodeHelper.FindItem( masterItem ) >= 0 );
 
-      if( hasNewDetailItems )
-      {
-        // The information about the addition is only required when the master item is not collapsed.
-        if( masterItemFound )
+        // The master item could be located inside a collapsed group.
+        if( !masterItemFound )
         {
-          addPosition = this.GetSafeGeneratorPositionFromIndex( startIndex );
-        }
+          nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
+          if( !nodeHelper.Contains( masterItem ) )
+          {
+            this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.ItemNotBelongingToGenerator );
+            throw DataGridException.Create<InvalidOperationException>( "An attempt was made to reset a detail for an item that does not belong to the generator.", m_dataGridControl );
+          }
 
-        masterNode.AdjustItemCount( newDetailCount );
-      }
+          this.TraceEvent( TraceEventType.Information, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.ItemNotFoundOrCollapsed );
+        }
 
-      this.IncrementCurrentGenerationCount();
+        var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
+        var oldDetailCount = detailNode.ItemCount;
+        var oldContainers = m_genPosToContainer.Where( ( c, i ) => m_genPosToNode[ i ] == detailNode ).ToList();
 
-      // The events must be raised only when the master item is not collapsed.
-      if( masterItemFound )
-      {
-        if( hasOldDetailItems && hasNewDetailItems )
-        {
-          this.SendResetEvent();
-        }
-        else if( hasOldDetailItems )
+        using( detailNode.DetailGenerator.InhibitItemsChanged() )
         {
-          this.SendRemoveEvent( removePosition, masterIndex + 1, oldDetailCount, removedCount, removedContainers );
-        }
-        else if( hasNewDetailItems )
-        {
-          this.SendAddEvent( addPosition, masterIndex + 1, newDetailCount );
+          detailNode.UpdateItemCount();
         }
-      }
-    }
-
-    private void RemoveDetailContainers( GeneratorPosition convertedGeneratorPosition, int removeCount )
-    {
-      int removeGenPosIndex = convertedGeneratorPosition.Index;
-      if( convertedGeneratorPosition.Offset > 0 )
-      {
-        Debug.Assert( convertedGeneratorPosition.Offset == 1 );
-        removeGenPosIndex++;
-      }
-
-      for( int i = 0; i < removeCount; i++ )
-      {
-        this.GenPosArraysRemoveAt( removeGenPosIndex );
-      }
-    }
-
-    private GeneratorPosition ConvertDetailGeneratorPosition( GeneratorPosition referencePosition, object masterItem, DetailGeneratorNode detailNode, out int globalIndex )
-    {
-      //If the requested generator position map past at least one generated item from the detail generator, then the job is easy...
-      if( referencePosition.Index >= 0 )
-      {
-        int generatorIndex = this.FindGeneratorIndexForNode( detailNode, referencePosition.Index );
 
-        // Ensure to return the globalIndex as -1
-        // if the generator index is not found for
-        // a DetailNode. This can occur if a Detail
-        // is filtered out via AutoFiltering.
-        globalIndex = ( generatorIndex > -1 ) ? m_genPosToIndex[ generatorIndex ] : -1;
+        var newDetailCount = detailNode.ItemCount;
+        var newContainers = detailNode.DetailGenerator.m_genPosToContainer;
 
-        return new GeneratorPosition( generatorIndex, referencePosition.Offset );
-      }
-      else
-      {
-        //This means the GeneratorPosition returned by the DetailGenerator is "before" any generated item from the detail generator.
-        //I need more complex detection of the GeneratorPosition.
-
-        // First - Get the Index of the MasterItem
-        int masterIndex = this.IndexFromItem( masterItem );
-
-        //Second - Get the DetailGenerator's Index for the DetailGenerator's GenPos
-        int detailGeneratorIndex = detailNode.DetailGenerator.IndexFromGeneratorPosition( referencePosition );
-
-        globalIndex = masterIndex + detailGeneratorIndex + 1;
-
-        // Finally - Have the Master Generator compute the GeneratorPosition from the sum of both
-        return this.GeneratorPositionFromIndex( globalIndex );
-      }
-    }
+        masterNode.AdjustItemCount( newDetailCount - oldDetailCount );
 
-    private int FindGeneratorIndexForNode( DetailGeneratorNode referenceNode, int offset )
-    {
-      int offsetCounter = -1;
+        var containersRemoved = new HashSet<DependencyObject>();
+        var containersMoved = new HashSet<DependencyObject>();
 
-      for( int i = 0; i < m_genPosToNode.Count; i++ )
-      {
-        GeneratorNode node = m_genPosToNode[ i ];
-        if( node == referenceNode )
-        {
-          offsetCounter++;
-          if( offsetCounter == offset )
-            return i;
-        }
+        CustomItemContainerGenerator.FindChanges( oldContainers, newContainers, null, containersRemoved, containersMoved );
+        this.ApplyDetailChanges( detailNode, newContainers, containersRemoved, containersMoved );
       }
-
-      return -1;
     }
 
     private DetailGeneratorNode FindDetailGeneratorNodeForGenerator( CustomItemContainerGenerator detailGenerator, out object masterItem )
     {
-      foreach( KeyValuePair<object, List<DetailGeneratorNode>> detailsForItem in m_masterToDetails )
+      foreach( var detailsForItem in m_masterToDetails )
       {
-        foreach( DetailGeneratorNode detailNode in detailsForItem.Value )
+        foreach( var detailNode in detailsForItem.Value )
         {
           if( detailNode.DetailGenerator == detailGenerator )
           {
@@ -6366,9 +6835,8 @@ namespace Xceed.Wpf.DataGrid
     private IDisposable InhibitParentGenPosToIndexUpdate()
     {
       if( m_genPosToIndexInhibiter != null )
-      {
         return m_genPosToIndexInhibiter.InhibitGenPosToIndexUpdates();
-      }
+
       return null;
     }
 
@@ -6376,10 +6844,9 @@ namespace Xceed.Wpf.DataGrid
     {
       //this function will find an item in the m_genPosToItem, but will filter out those that belongs to details.
       //This is to avoid the problem caused by Detail items that belongs also to a master.
-      int retval = -1;
-
-      int runningIndex = 0;
-      int itemCount = m_genPosToItem.Count;
+      var retval = -1;
+      var runningIndex = 0;
+      var itemCount = m_genPosToItem.Count;
 
       while( runningIndex < itemCount )
       {
@@ -6390,7 +6857,7 @@ namespace Xceed.Wpf.DataGrid
           break;
 
         //check if the item belongs to a Detail or not.
-        DetailGeneratorNode detailNode = m_genPosToNode[ retval ] as DetailGeneratorNode;
+        var detailNode = m_genPosToNode[ retval ] as DetailGeneratorNode;
         if( detailNode == null )
           break; //the item is not a detail and therefore qualifies as a return value.
 
@@ -6401,108 +6868,111 @@ namespace Xceed.Wpf.DataGrid
       return retval;
     }
 
-    private void EnqueueContainer( DependencyObject container, object item )
+    private bool EnqueueContainer( DependencyObject container, object item )
     {
-      RecyclingManager manager = m_dataGridContext.RecyclingManager;
-
-      m_log.Assert( this, manager != null, "manager != null" );
-
       if( container is HeaderFooterItem )
       {
         if( item is GroupHeaderFooterItem )
         {
-          //If the group is not in the CollectionView anymore (e.g. all its rows have been deleted), do not recycle it.
-          CollectionViewGroup viewGroup = ( ( GroupHeaderFooterItem )item ).Group;
-          if( viewGroup == null )
-            return;
-
-          //The tree is already correctly created since we are recycling containers!
-          Group group;
+          //If the group does not exist anymore (i.e. all its rows have been deleted), do not recycle it.
+          var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+          var collectionViewGroup = groupHeaderFooterItem.Group;
+          if( collectionViewGroup == null )
+            return false;
 
-          using( this.SetIsEnsuringNodeTreeCreated() )
+          string groupBy = null;
+          if( collectionViewGroup is DataGridCollectionViewGroup )
           {
-            group = this.GetGroupFromCollectionViewGroup( viewGroup );
+            groupBy = ( ( DataGridCollectionViewGroup )collectionViewGroup ).GroupByName;
           }
 
-          if( group == null )
-            return;
-
-          string groupBy = group.GroupBy;
           if( string.IsNullOrEmpty( groupBy ) )
-            return;
+          {
+            var group = this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
+            if( group == null )
+              return false;
+
+            groupBy = group.GroupBy;
+            if( string.IsNullOrEmpty( groupBy ) )
+              return false;
+          }
 
-          manager.EnqueueGroupHeaderFooterContainer( groupBy, item, container );
+          m_recyclingPools.GetGroupHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( groupBy, groupHeaderFooterItem.Template, container );
         }
         else
         {
-          manager.EnqueueHeaderFooterContainer( item, container );
+          m_recyclingPools.GetHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( item, container );
         }
       }
       else
       {
-        manager.EnqueueItemContainer( item, container );
+        m_recyclingPools.GetItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( item, container );
       }
+
+      return true;
     }
 
     private DependencyObject DequeueItemContainer( object item )
     {
-      RecyclingManager manager = m_dataGridContext.RecyclingManager;
-
-      m_log.Assert( this, manager != null, "manager != null" );
+      var pool = m_recyclingPools.GetItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
+      if( pool == null )
+        return null;
 
-      return manager.DequeueItemContainer( item );
+      return pool.Dequeue( item );
     }
 
     private DependencyObject DequeueHeaderFooterContainer( object item )
     {
-      RecyclingManager manager = m_dataGridContext.RecyclingManager;
-
-      m_log.Assert( this, manager != null, "manager != null" );
+      if( !( item is GroupHeaderFooterItem ) )
+      {
+        var pool = m_recyclingPools.GetHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
+        if( pool == null )
+          return null;
 
-      if( item is GroupHeaderFooterItem )
+        return pool.Dequeue( item );
+      }
+      else
       {
-        CollectionViewGroup viewGroup = ( ( GroupHeaderFooterItem )item ).Group;
-        if( viewGroup == null )
+        var pool = m_recyclingPools.GetGroupHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
+        if( pool == null )
           return null;
 
-        //The tree is already correctly created since we are recycling containers!
-        Group group;
+        var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+        var collectionViewGroup = groupHeaderFooterItem.Group;
+        if( collectionViewGroup == null )
+          return null;
 
-        using( this.SetIsEnsuringNodeTreeCreated() )
+        string groupBy = null;
+        if( collectionViewGroup is DataGridCollectionViewGroup )
         {
-          group = this.GetGroupFromCollectionViewGroup( viewGroup );
+          groupBy = ( ( DataGridCollectionViewGroup )collectionViewGroup ).GroupByName;
         }
 
-        if( group == null )
-          return null;
-
-        string groupBy = group.GroupBy;
         if( string.IsNullOrEmpty( groupBy ) )
-          return null;
+        {
+          var group = this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
+          if( group == null )
+            return null;
 
-        return manager.DequeueGroupHeaderFooterContainer( groupBy, item );
-      }
-      else
-      {
-        return manager.DequeueHeaderFooterContainer( item );
+          groupBy = group.GroupBy;
+          if( string.IsNullOrEmpty( groupBy ) )
+            return null;
+        }
+
+        return pool.Dequeue( groupBy, groupHeaderFooterItem.Template );
       }
     }
 
-    private void OnDetailContainersRemoved( object sender, ContainersRemovedEventArgs e )
+    internal void CleanRecyclingCandidates()
     {
-      if( m_containersRemovedDeferCount > 0 )
-      {
-        m_deferredContainersRemoved.AddRange( e.RemovedContainers );
-      }
-      else
-      {
-        this.NotifyContainersRemoved( e );
-      }
+      m_recyclingPools.CleanRecyclingCandidates();
     }
 
-    private IDisposable DeferContainersRemovedNotification()
+    private void OnDetailContainersRemoved( object sender, ContainersRemovedEventArgs e )
     {
-      return new DeferContainersRemovedDisposable( this );
+      Debug.Assert( !this.IsRecyclingEnabled );
+
+      this.OnContainersRemoved( e.RemovedContainers );
     }
 
     private DependencyObject CreateNextItemContainer( object item )
@@ -6557,6 +7027,82 @@ namespace Xceed.Wpf.DataGrid
       return collectionView.SourceCollection as IList;
     }
 
+    private static void FindChanges<T>(
+      IList<T> source,
+      IList<T> destination,
+      ICollection<T> itemsAdded,
+      ICollection<T> itemsRemoved,
+      ICollection<T> itemsMoved )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      if( destination == null )
+        throw new ArgumentNullException( "destination" );
+
+      // There is nothing to do since the caller is not interested by the result.
+      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
+        return;
+
+      var sourceCount = source.Count;
+      var sourcePositions = new Dictionary<T, int>( sourceCount );
+      var sequence = new List<int>( Math.Min( sourceCount, destination.Count ) );
+      var isAlive = new BitArray( sourceCount, false );
+      var hasNotMoved = default( BitArray );
+
+      for( var i = 0; i < sourceCount; i++ )
+      {
+        sourcePositions.Add( source[ i ], i );
+      }
+
+      foreach( var item in destination )
+      {
+        int index;
+
+        if( sourcePositions.TryGetValue( item, out index ) )
+        {
+          isAlive[ index ] = true;
+          sequence.Add( index );
+        }
+        else if( itemsAdded != null )
+        {
+          itemsAdded.Add( item );
+        }
+      }
+
+      // We may omit this part of the algorithm if the caller is not interested by the items that have moved.
+      if( itemsMoved != null )
+      {
+        hasNotMoved = new BitArray( sourceCount, false );
+
+        // The subsequence contains the position of the item that are in the destination collection and that have not moved.
+        foreach( var index in LongestIncreasingSubsequence.Find( sequence ) )
+        {
+          hasNotMoved[ index ] = true;
+        }
+      }
+
+      // We may omit this part of the algorithm if the caller is not interested by the items that have moved or were removed.
+      if( ( itemsRemoved != null ) || ( itemsMoved != null ) )
+      {
+        for( var i = 0; i < sourceCount; i++ )
+        {
+          if( isAlive[ i ] )
+          {
+            // We check if the move collection is not null first because the bit array is null when the move collection is null.
+            if( ( itemsMoved != null ) && !hasNotMoved[ i ] )
+            {
+              itemsMoved.Add( source[ i ] );
+            }
+          }
+          else if( itemsRemoved != null )
+          {
+            itemsRemoved.Add( source[ i ] );
+          }
+        }
+      }
+    }
+
     public void Skip()
     {
       if( m_generatorDirection == GeneratorDirection.Forward )
@@ -6569,8 +7115,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    // Data Members
-
     #region Private Fields
 
     private BitVector32 m_flags = new BitVector32();
@@ -6593,6 +7137,8 @@ namespace Xceed.Wpf.DataGrid
     private readonly DataGridContext m_dataGridContext;
     private readonly CollectionView m_collectionView;
 
+    private readonly CustomItemContainerGeneratorRecyclingPools m_recyclingPools;
+
     private int m_lastValidItemCountGeneration = 0;
 
     private int m_cachedItemCount = 0;
@@ -6615,9 +7161,6 @@ namespace Xceed.Wpf.DataGrid
     private IInhibitGenPosToIndexUpdating m_genPosToIndexInhibiter; // = null
     private IDisposable m_currentGenPosToIndexInhibiterDisposable; // = null
 
-    private List<DependencyObject> m_deferredContainersRemoved = new List<DependencyObject>();
-    private int m_containersRemovedDeferCount = 0;
-
     private Binding m_headerFooterDataContextBinding;
 
     #endregion
@@ -6625,47 +7168,46 @@ namespace Xceed.Wpf.DataGrid
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        var nccArgs = ( NotifyCollectionChangedEventArgs )e;
+        var eventArgs = ( ( NotifyCollectionChangedEventArgs )e ).GetRangeActionOrSelf();
 
         if( sender == m_collectionView )
         {
-          this.OnItemsChanged( sender, nccArgs.GetRangeActionOrSelf() );
-          return true;
+          this.OnItemsChanged( sender, eventArgs );
         }
         else if( sender == m_groupsCollection )
         {
-          this.OnGroupsChanged( sender, nccArgs );
-          return true;
+          this.OnGroupsChanged( sender, eventArgs );
         }
         else if( sender == m_dataGridContext.DetailConfigurations )
         {
-          this.OnDetailConfigurationsChanged( sender, nccArgs );
-          return true;
+          this.OnDetailConfigurationsChanged( sender, eventArgs );
         }
       }
       else if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        var pcArgs = ( PropertyChangedEventArgs )e;
+        var eventArgs = ( PropertyChangedEventArgs )e;
 
         if( sender == m_collectionView )
         {
-          this.OnCollectionViewGroupsPropertyChanged();
-          return true;
+          this.OnCollectionViewPropertyChanged( eventArgs );
         }
         else
         {
           //this is only registered on the DataGridContext, this has the effect of forwarding property changes for all properties of the DataGridContext
-          this.OnNotifyPropertyChanged( pcArgs );
-          return true;
+          this.OnNotifyPropertyChanged( eventArgs );
         }
       }
       else if( ( managerType == typeof( ViewChangedEventManager ) ) || ( managerType == typeof( ThemeChangedEventManager ) ) )
       {
         this.OnViewThemeChanged( sender, e );
-        return true;
       }
       else if( managerType == typeof( DetailsChangedEventManager ) )
       {
@@ -6673,21 +7215,21 @@ namespace Xceed.Wpf.DataGrid
         {
           this.DetailsChanged( sender, e );
         }
-
-        return true;
       }
       else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
       {
         this.OnItemsSourceChanged( sender, e );
-        return true;
       }
       else if( managerType == typeof( GroupConfigurationSelectorChangedEventManager ) )
       {
         this.OnGroupConfigurationSelectorChanged();
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
@@ -6698,10 +7240,11 @@ namespace Xceed.Wpf.DataGrid
 
     private void OnNotifyPropertyChanged( PropertyChangedEventArgs e )
     {
-      if( this.PropertyChanged != null )
-      {
-        this.PropertyChanged( this, e );
-      }
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
     }
 
     #endregion
@@ -6832,7 +7375,14 @@ namespace Xceed.Wpf.DataGrid
       {
         get
         {
-          return m_flag.IsSet;
+          if( m_flag.IsSet )
+            return true;
+
+          var parent = this.GetFlag( m_index - 1 );
+          if( parent != null )
+            return parent.IsSet;
+
+          return false;
         }
       }
 
@@ -6843,17 +7393,23 @@ namespace Xceed.Wpf.DataGrid
 
       internal LeveledAutoResetFlag GetChild()
       {
-        int index = m_index + 1;
-        if( index < m_levels.Count )
-        {
-          var flag = ( LeveledAutoResetFlag )m_levels[ index ].Target;
-          if( flag != null )
-            return flag;
-        }
+        var index = m_index + 1;
+        var flag = this.GetFlag( index );
+
+        if( flag != null )
+          return flag;
 
         return new LeveledAutoResetFlag( m_levels, index );
       }
 
+      private LeveledAutoResetFlag GetFlag( int index )
+      {
+        if( ( index < 0 ) || ( index >= m_levels.Count ) )
+          return null;
+
+        return ( LeveledAutoResetFlag )m_levels[ index ].Target;
+      }
+
       private readonly IList<WeakReference> m_levels;
       private readonly AutoResetFlag m_flag;
       private readonly int m_index;
@@ -6861,6 +7417,48 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region BubbleDirtyFlag Private Class
+
+    private sealed class BubbleDirtyFlag
+    {
+      internal BubbleDirtyFlag( bool isSet )
+        : this( null, isSet )
+      {
+      }
+
+      internal BubbleDirtyFlag( BubbleDirtyFlag parent, bool isSet )
+      {
+        m_parent = parent;
+
+        this.IsSet = isSet;
+      }
+
+      internal bool IsSet
+      {
+        get
+        {
+          return m_isSet;
+        }
+        set
+        {
+          if( value == m_isSet )
+            return;
+
+          m_isSet = value;
+
+          if( value && ( m_parent != null ) )
+          {
+            m_parent.IsSet = true;
+          }
+        }
+      }
+
+      private readonly BubbleDirtyFlag m_parent;
+      private bool m_isSet;
+    }
+
+    #endregion
+
     #region CustomItemContainerGeneratorDisposableDisposer Private Class
 
     private sealed class CustomItemContainerGeneratorDisposableDisposer : IDisposable
@@ -6900,10 +7498,9 @@ namespace Xceed.Wpf.DataGrid
 
       private void Dispose( bool disposing )
       {
-        var generator = m_generator;
-
         // Prevent this method from being called more than once.
-        if( Interlocked.CompareExchange<CustomItemContainerGenerator>( ref m_generator, null, generator ) == null )
+        var generator = Interlocked.Exchange( ref m_generator, null );
+        if( generator == null )
           return;
 
         generator.StopGenerator();
@@ -6923,14 +7520,14 @@ namespace Xceed.Wpf.DataGrid
 
     private sealed class GenPosToIndexInhibitionDisposable : IDisposable
     {
-      public GenPosToIndexInhibitionDisposable( CustomItemContainerGenerator generator )
+      internal GenPosToIndexInhibitionDisposable( CustomItemContainerGenerator generator )
       {
         if( generator == null )
           throw new ArgumentNullException( "generator" );
 
         m_generator = generator;
 
-        m_generator.m_genPosToIndexUpdateInhibitCount++;
+        Interlocked.Increment( ref m_generator.m_genPosToIndexUpdateInhibitCount );
 
         if( m_generator.m_genPosToIndexInhibiter != null )
         {
@@ -6938,15 +7535,18 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      #region IDisposable Members
-
-      public void Dispose()
+      private void Dispose( bool disposing )
       {
-        m_generator.m_genPosToIndexUpdateInhibitCount--;
+        var generator = Interlocked.Exchange( ref m_generator, null );
+        if( generator == null )
+          return;
 
-        if( ( m_generator.m_genPosToIndexUpdateInhibitCount == 0 ) && ( m_generator.GenPosToIndexNeedsUpdate ) )
+        if( Interlocked.Decrement( ref generator.m_genPosToIndexUpdateInhibitCount ) == 0 )
         {
-          m_generator.IncrementCurrentGenerationCount();
+          if( generator.GenPosToIndexNeedsUpdate )
+          {
+            generator.IncrementCurrentGenerationCount();
+          }
         }
 
         if( m_nestedDisposable != null )
@@ -6956,46 +7556,19 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      #endregion
-
-      private CustomItemContainerGenerator m_generator; // = null
-      private IDisposable m_nestedDisposable; // = null
-    }
-
-    #endregion
-
-    #region DeferContainersRemovedDisposable Private Class
-
-    private sealed class DeferContainersRemovedDisposable : IDisposable
-    {
-      public DeferContainersRemovedDisposable( CustomItemContainerGenerator generator )
+      void IDisposable.Dispose()
       {
-        if( generator == null )
-          throw new ArgumentNullException( "generator" );
-
-        m_generator = generator;
-
-        m_generator.m_log.Assert( this, ( m_generator.m_containersRemovedDeferCount != 0 ) || ( m_generator.m_deferredContainersRemoved.Count == 0 ), "( m_generator.m_containersRemovedDeferCount != 0 ) || ( m_generator.m_deferredContainersRemoved.Count == 0 )" );
-
-        m_generator.m_containersRemovedDeferCount++;
+        this.Dispose( true );
+        GC.SuppressFinalize( this );
       }
 
-      #region IDisposable Members
-
-      public void Dispose()
+      ~GenPosToIndexInhibitionDisposable()
       {
-        m_generator.m_containersRemovedDeferCount--;
-
-        if( ( m_generator.m_containersRemovedDeferCount == 0 ) && ( m_generator.m_deferredContainersRemoved.Count > 0 ) )
-        {
-          m_generator.NotifyContainersRemoved( new ContainersRemovedEventArgs( m_generator.m_deferredContainersRemoved ) );
-          m_generator.m_deferredContainersRemoved.Clear();
-        }
+        this.Dispose( false );
       }
 
-      #endregion
-
       private CustomItemContainerGenerator m_generator; // = null
+      private IDisposable m_nestedDisposable; // = null
     }
 
     #endregion
@@ -7005,9 +7578,10 @@ namespace Xceed.Wpf.DataGrid
     [Flags]
     private enum CustomItemContainerGeneratorFlags
     {
-      RecyclingEnabled = 1,
-      InUse = 2,
-      GenPosToIndexNeedsUpdate = 4,
+      RecyclingEnabled = 1 << 0,
+      InUse = 1 << 1,
+      GenPosToIndexNeedsUpdate = 1 << 2,
+      ForceReset = 1 << 3,
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs
new file mode 100644
index 00000000..79678e3d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs
@@ -0,0 +1,306 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Windows;
+using Xceed.Utils.Wpf;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class CustomItemContainerGeneratorRecyclingPools
+  {
+    #region ContainersRemoved Event
+
+    internal event ContainersRemovedEventHandler ContainersRemoved;
+
+    private void OnContainersRemoved()
+    {
+      if( ( m_containersRemoved == null ) || ( m_deferCount != 0 ) )
+        return;
+
+      var containers = m_containersRemoved;
+      m_containersRemoved = null;
+
+      if( containers.Count <= 0 )
+        return;
+
+      var handler = this.ContainersRemoved;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new ContainersRemovedEventArgs( containers ) );
+    }
+
+    #endregion
+
+    #region RecyclingCandidateCleaned Event
+
+    internal event RecyclingCandidatesCleanedEventHandler RecyclingCandidatesCleaned;
+
+    private void OnRecyclingCandidatesCleaned( List<DependencyObject> recyclingCandidates )
+    {
+      if( recyclingCandidates.Count == 0 )
+        return;
+
+      var handler = this.RecyclingCandidatesCleaned;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new RecyclingCandidatesCleanedEventArgs( recyclingCandidates ) );
+    }
+
+    #endregion
+
+    internal IDisposable DeferContainersRemoved()
+    {
+      return new DeferredDisposable( new DeferContainersRemovedState( this ) );
+    }
+
+    internal void Clear()
+    {
+      m_containersRemoved = m_containersRemoved ?? new List<DependencyObject>();
+
+      this.ClearPools( m_itemContainerPools, m_containersRemoved, pool => pool.Clear() );
+      this.ClearPools( m_headerFooterItemContainerPools, m_containersRemoved, pool => pool.Clear() );
+      this.ClearPools( m_groupHeaderFooterItemContainerPools, m_containersRemoved, pool => pool.Clear() );
+
+      this.OnContainersRemoved();
+    }
+
+    internal void Clear( DetailConfiguration detailConfiguration )
+    {
+      m_containersRemoved = m_containersRemoved ?? new List<DependencyObject>();
+
+      var key = CustomItemContainerGeneratorRecyclingPools.GetKey( detailConfiguration );
+
+      var itemContainerPool = default( ItemContainerRecyclingPool );
+      if( m_itemContainerPools.TryGetValue( key, out itemContainerPool ) )
+      {
+        m_itemContainerPools.Remove( key );
+
+        this.ClearPool( itemContainerPool, m_containersRemoved, pool => pool.Clear() );
+      }
+
+      var headerFooterItemContainerPool = default( HeaderFooterItemContainerRecyclingPool );
+      if( m_headerFooterItemContainerPools.TryGetValue( key, out headerFooterItemContainerPool ) )
+      {
+        m_headerFooterItemContainerPools.Remove( key );
+
+        this.ClearPool( headerFooterItemContainerPool, m_containersRemoved, pool => pool.Clear() );
+      }
+
+      var groupHeaderFooterItemContainerPool = default( GroupHeaderFooterItemContainerRecyclingPool );
+      if( m_groupHeaderFooterItemContainerPools.TryGetValue( key, out groupHeaderFooterItemContainerPool ) )
+      {
+        m_groupHeaderFooterItemContainerPools.Remove( key );
+
+        this.ClearPool( groupHeaderFooterItemContainerPool, m_containersRemoved, pool => pool.Clear() );
+      }
+
+      this.OnContainersRemoved();
+    }
+
+    internal void CleanRecyclingCandidates()
+    {
+      var recyclingCandidates = new List<DependencyObject>( 4 );
+
+      foreach( var pool in m_itemContainerPools.Values )
+      {
+        foreach( var container in pool )
+        {
+          var dataGridItemContainer = container as IDataGridItemContainer;
+          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
+          {
+            dataGridItemContainer.IsRecyclingCandidate = false;
+            dataGridItemContainer.CleanRecyclingCandidate();
+            recyclingCandidates.Add( container );
+          }
+        }
+      }
+
+      foreach( var pool in m_headerFooterItemContainerPools.Values )
+      {
+        foreach( var container in pool )
+        {
+          var dataGridItemContainer = container as IDataGridItemContainer;
+          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
+          {
+            dataGridItemContainer.IsRecyclingCandidate = false;
+            dataGridItemContainer.CleanRecyclingCandidate();
+            recyclingCandidates.Add( container );
+          }
+        }
+      }
+
+      foreach( var pool in m_groupHeaderFooterItemContainerPools.Values )
+      {
+        foreach( var container in pool )
+        {
+          var dataGridItemContainer = container as IDataGridItemContainer;
+          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
+          {
+            dataGridItemContainer.IsRecyclingCandidate = false;
+            dataGridItemContainer.CleanRecyclingCandidate();
+            recyclingCandidates.Add( container );
+          }
+        }
+      }
+
+      this.OnRecyclingCandidatesCleaned( recyclingCandidates );
+    }
+
+    internal ItemContainerRecyclingPool GetItemContainerPool( DetailConfiguration detailConfiguration )
+    {
+      return this.GetPool( m_itemContainerPools, detailConfiguration, false );
+    }
+
+    internal ItemContainerRecyclingPool GetItemContainerPool( DetailConfiguration detailConfiguration, bool create )
+    {
+      return this.GetPool( m_itemContainerPools, detailConfiguration, create );
+    }
+
+    internal HeaderFooterItemContainerRecyclingPool GetHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration )
+    {
+      return this.GetPool( m_headerFooterItemContainerPools, detailConfiguration, false );
+    }
+
+    internal HeaderFooterItemContainerRecyclingPool GetHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration, bool create )
+    {
+      return this.GetPool( m_headerFooterItemContainerPools, detailConfiguration, create );
+    }
+
+    internal GroupHeaderFooterItemContainerRecyclingPool GetGroupHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration )
+    {
+      return this.GetPool( m_groupHeaderFooterItemContainerPools, detailConfiguration, false );
+    }
+
+    internal GroupHeaderFooterItemContainerRecyclingPool GetGroupHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration, bool create )
+    {
+      return this.GetPool( m_groupHeaderFooterItemContainerPools, detailConfiguration, create );
+    }
+
+    private T GetPool<T>( Dictionary<object, T> pools, DetailConfiguration detailConfiguration, bool create ) where T : class, new()
+    {
+      if( pools == null )
+        throw new ArgumentNullException( "pools" );
+
+      var key = CustomItemContainerGeneratorRecyclingPools.GetKey( detailConfiguration );
+      var pool = default( T );
+
+      if( !pools.TryGetValue( key, out pool ) )
+      {
+        if( create )
+        {
+          pool = new T();
+          pools.Add( key, pool );
+        }
+        else
+        {
+          pool = null;
+        }
+      }
+
+      return pool;
+    }
+
+    private void ClearPools<T>(
+      Dictionary<object, T> pools,
+      ICollection<DependencyObject> containers,
+      Action<T> clearPool ) where T : IEnumerable<DependencyObject>
+    {
+      Debug.Assert( pools != null );
+
+      foreach( var pool in pools.Values )
+      {
+        this.ClearPool( pool, containers, clearPool );
+      }
+
+      pools.Clear();
+    }
+
+    private void ClearPool<T>(
+      T pool,
+      ICollection<DependencyObject> containers,
+      Action<T> clearPool ) where T : IEnumerable<DependencyObject>
+    {
+      Debug.Assert( pool != null );
+      Debug.Assert( clearPool != null );
+
+      foreach( var container in pool )
+      {
+        containers.Add( container );
+      }
+
+      clearPool.Invoke( pool );
+    }
+
+    private static object GetKey( DetailConfiguration detailConfiguration )
+    {
+      return detailConfiguration ?? CustomItemContainerGeneratorRecyclingPools.MasterConfiguration;
+    }
+
+    private static readonly object MasterConfiguration = new object();
+
+    private int m_deferCount; //0
+    private List<DependencyObject> m_containersRemoved; //null
+
+    private readonly Dictionary<object, ItemContainerRecyclingPool> m_itemContainerPools = new Dictionary<object, ItemContainerRecyclingPool>();
+    private readonly Dictionary<object, HeaderFooterItemContainerRecyclingPool> m_headerFooterItemContainerPools = new Dictionary<object, HeaderFooterItemContainerRecyclingPool>();
+    private readonly Dictionary<object, GroupHeaderFooterItemContainerRecyclingPool> m_groupHeaderFooterItemContainerPools = new Dictionary<object, GroupHeaderFooterItemContainerRecyclingPool>();
+
+    #region DeferContainersRemovedState Private Class
+
+    private sealed class DeferContainersRemovedState : DeferredDisposableState
+    {
+      internal DeferContainersRemovedState( CustomItemContainerGeneratorRecyclingPools target )
+      {
+        if( target == null )
+          throw new ArgumentNullException( "target" );
+
+        m_target = target;
+      }
+
+      protected override bool IsDeferred
+      {
+        get
+        {
+          return ( m_target.m_deferCount != 0 );
+        }
+      }
+
+      protected override void Increment()
+      {
+        m_target.m_deferCount++;
+      }
+
+      protected override void Decrement()
+      {
+        m_target.m_deferCount--;
+      }
+
+      protected override void OnDeferEnded( bool disposing )
+      {
+        m_target.OnContainersRemoved();
+      }
+
+      private readonly CustomItemContainerGeneratorRecyclingPools m_target;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs
index 18b5a77f..83187b67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs
@@ -15,11 +15,14 @@
   ***********************************************************************************/
 
 using System.Windows.Data;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal abstract class DataItemDataProviderBase : DataSourceProvider
   {
+    internal static readonly string DataPropertyName = PropertyHelper.GetPropertyName( ( DataItemDataProviderBase s ) => s.Data );
+
     #region IsEmpty Property
 
     public abstract bool IsEmpty
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
index 41bdea0e..e2e791fa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
@@ -15,24 +15,22 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal partial class DetailGeneratorNode : GeneratorNode
   {
-    public DetailGeneratorNode( DataGridContext context, CustomItemContainerGenerator generator )
+    internal DetailGeneratorNode( DataGridContext dataGridContext, CustomItemContainerGenerator generator )
       : base( null )
     {
+      if( dataGridContext == null )
+        throw new ArgumentNullException( "dataGridContext" );
+
       if( generator == null )
         throw new ArgumentNullException( "generator" );
 
-      if( context == null )
-        throw new ArgumentNullException( "context" );
-
+      m_dataGridContext = dataGridContext;
       m_generator = generator;
-      m_context = context;
       m_itemCount = generator.ItemCount;
     }
 
@@ -48,7 +46,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return m_context;
+        return m_dataGridContext;
       }
     }
 
@@ -65,7 +63,7 @@ namespace Xceed.Wpf.DataGrid
       base.CleanGeneratorNode();
 
       m_generator.CleanupGenerator( true );
-      m_context.CleanDataGridContext();
+      m_dataGridContext.CleanDataGridContext();
 
       m_generator = null;
     }
@@ -75,8 +73,8 @@ namespace Xceed.Wpf.DataGrid
       m_itemCount = m_generator.ItemCount;
     }
 
+    private readonly DataGridContext m_dataGridContext;
     private CustomItemContainerGenerator m_generator;
-    private DataGridContext m_context;
     private int m_itemCount;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
index c2a5ef90..193cde13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
@@ -111,9 +111,9 @@ namespace Xceed.Wpf.DataGrid
     {
       delta = this.AdjustItemCountOverride( delta );
 
-      if( ( this.Parent != null ) && (  delta != 0 ) )
+      if( ( this.Parent != null ) && ( delta != 0 ) )
       {
-        this.Parent.AdjustItemCount( delta);
+        this.Parent.AdjustItemCount( delta );
       }
     }
 
@@ -123,7 +123,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( ( this.Parent != null ) && ( delta != 0 ) )
       {
-        this.Parent.AdjustLeafCount( delta);
+        this.Parent.AdjustLeafCount( delta );
       }
     }
 
@@ -143,10 +143,11 @@ namespace Xceed.Wpf.DataGrid
 
     protected void OnExpansionStateChanged( bool newExpansionState, int itemOffset, int count )
     {
-      if( this.ExpansionStateChanged != null )
-      {
-        this.ExpansionStateChanged( this, new ExpansionStateChangedEventArgs( newExpansionState, itemOffset, count ) );
-      }
+      var handler = this.ExpansionStateChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new ExpansionStateChangedEventArgs( newExpansionState, itemOffset, count ) );
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
index 38c40e8a..be0703fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
@@ -29,6 +29,7 @@ namespace Xceed.Wpf.DataGrid
   {
     public GeneratorNodeFactory( NotifyCollectionChangedEventHandler itemsChangedHandler,
                                  NotifyCollectionChangedEventHandler groupsChangedHandler,
+                                 NotifyCollectionChangedEventHandler headersFootersChangedHandler,
                                  EventHandler<ExpansionStateChangedEventArgs> expansionStateChangedHandler,
                                  EventHandler isExpandedChangingHandler,
                                  EventHandler isExpandedChangedHandler,
@@ -40,6 +41,9 @@ namespace Xceed.Wpf.DataGrid
       if( groupsChangedHandler == null )
         throw new ArgumentNullException( "groupsChangedHandler" );
 
+      if( headersFootersChangedHandler == null )
+        throw new ArgumentNullException( "headersFootersChangedHandler" );
+
       if( expansionStateChangedHandler == null )
         throw new ArgumentNullException( "expansionStateChangedHandler" );
 
@@ -51,6 +55,7 @@ namespace Xceed.Wpf.DataGrid
 
       m_itemsChangedHandler = itemsChangedHandler;
       m_groupsChangedHandler = groupsChangedHandler;
+      m_headersFootersChangedHandler = headersFootersChangedHandler;
       m_expansionStateChangedHandler = expansionStateChangedHandler;
       m_isExpandedChangingHandler = isExpandedChangingHandler;
       m_isExpandedChangedHandler = isExpandedChangedHandler;
@@ -102,7 +107,7 @@ namespace Xceed.Wpf.DataGrid
       }
       node.Next = next;
 
-      node.IsExpanded = groupConfig.InitiallyExpanded;
+      node.SetIsExpandedAtInitialization( groupConfig.InitiallyExpanded );
 
       if( !collectionViewGroup.IsBottomLevel )
       {
@@ -129,11 +134,9 @@ namespace Xceed.Wpf.DataGrid
       IList collection,
       GeneratorNode parent,
       GeneratorNode previous,
-      GeneratorNode next,
-      CustomItemContainerGenerator generator )
+      GeneratorNode next )
     {
       Debug.Assert( collection != null, "collection cannot be null for CreateItemsGeneratorNode()" );
-      Debug.Assert( generator != null );
 
       INotifyCollectionChanged notifyCollection = collection as INotifyCollectionChanged;
 
@@ -153,7 +156,6 @@ namespace Xceed.Wpf.DataGrid
 
       this.SetupCollectionGeneratorNode( node, parent, previous, next );
 
-
       node.AdjustLeafCount( node.Items.Count );
 
       return node;
@@ -339,9 +341,7 @@ namespace Xceed.Wpf.DataGrid
 
     private void UnregisterNodeCollectionChanged( INotifyCollectionChanged source )
     {
-      bool existed = m_nodesCollectionChangedEventHandlers.Remove( source );
-
-      if( existed )
+      if( m_nodesCollectionChangedEventHandlers.Remove( source ) )
       {
         CollectionChangedEventManager.RemoveListener( source, this );
       }
@@ -350,14 +350,22 @@ namespace Xceed.Wpf.DataGrid
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
         this.OnCollectionChanged( ( INotifyCollectionChanged )sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     private void OnCollectionChanged( INotifyCollectionChanged source, NotifyCollectionChangedEventArgs e )
@@ -371,17 +379,9 @@ namespace Xceed.Wpf.DataGrid
       }
       else if( m_headersFootersMapping.TryGetValue( source, out nodeList ) )
       {
-        try
-        {
-          foreach( var node in nodeList )
-          {
-            m_itemsChangedHandler.Invoke( node, e );
-          }
-        }
-        catch( Exception ex )
-        {
-          throw new DataGridInternalException( ex.Message, ex, this.DataGridControl );
-        }
+        Debug.Assert( nodeList.Count > 0 );
+
+        m_headersFootersChangedHandler.Invoke( nodeList, e );
       }
     }
 
@@ -389,11 +389,12 @@ namespace Xceed.Wpf.DataGrid
 
     #region Private Fields
 
-    private readonly NotifyCollectionChangedEventHandler m_itemsChangedHandler; // = null
-    private readonly NotifyCollectionChangedEventHandler m_groupsChangedHandler; // = null
-    private readonly EventHandler<ExpansionStateChangedEventArgs> m_expansionStateChangedHandler; // = null
-    private readonly EventHandler m_isExpandedChangedHandler; // = null
-    private readonly EventHandler m_isExpandedChangingHandler; // = null
+    private readonly NotifyCollectionChangedEventHandler m_itemsChangedHandler;
+    private readonly NotifyCollectionChangedEventHandler m_groupsChangedHandler;
+    private readonly NotifyCollectionChangedEventHandler m_headersFootersChangedHandler;
+    private readonly EventHandler<ExpansionStateChangedEventArgs> m_expansionStateChangedHandler;
+    private readonly EventHandler m_isExpandedChangedHandler;
+    private readonly EventHandler m_isExpandedChangingHandler;
 
     private readonly Dictionary<INotifyCollectionChanged, ICollection<HeadersFootersGeneratorNode>> m_headersFootersMapping = new Dictionary<INotifyCollectionChanged, ICollection<HeadersFootersGeneratorNode>>( 32 );
     private readonly Dictionary<object, NotifyCollectionChangedEventHandler> m_nodesCollectionChangedEventHandlers = new Dictionary<object, NotifyCollectionChangedEventHandler>( 32 );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
index 6423c1d7..1a448bf4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
@@ -15,224 +15,130 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class GeneratorNodeHelper
+  internal sealed class GeneratorNodeHelper
   {
-    public GeneratorNodeHelper( GeneratorNode initialPointer, int index, int sourceDataIndex )
+    internal GeneratorNodeHelper( GeneratorNode startNode, int index, int sourceDataIndex )
     {
-      if( initialPointer == null )
-        throw new ArgumentNullException( "initialPointer" );
+      if( startNode == null )
+        throw new ArgumentNullException( "startNode" );
 
-      m_currentNode = initialPointer;
-      m_index = index;
-      m_sourceDataIndex = sourceDataIndex;
+      m_state = new State( startNode, index, sourceDataIndex );
     }
 
-    //-------------
-    // Properties
-
-    public GeneratorNode CurrentNode
+    internal GeneratorNode CurrentNode
     {
       get
       {
-        return m_currentNode;
+        return m_state.Node;
       }
     }
 
-    public int Index
+    internal int Index
     {
       get
       {
-        return m_index;
+        return m_state.Index;
       }
     }
 
-    public int SourceDataIndex
+    internal int SourceDataIndex
     {
       get
       {
-        return m_sourceDataIndex;
+        return m_state.DataIndex;
       }
     }
 
-    //-------------
-    // Methods
-
-    public bool MoveToNext()
+    internal bool MoveToNext()
     {
-      if( m_currentNode.Next != null )
-      {
-        GroupGeneratorNode groupNode = m_currentNode as GroupGeneratorNode;
-
-        if( groupNode != null )
-        {
-          m_sourceDataIndex += groupNode.TotalLeafCount;
-        }
+      var success = GeneratorNodeHelper.MoveToNext( ref m_state );
 
-        m_index += m_currentNode.ItemCount;
-        m_currentNode = m_currentNode.Next;
-        return true;
-      }
+      this.EnsureState();
 
-      return false;
+      return success;
     }
 
-    public bool MoveToNextBy( int count )
+    internal bool MoveToNextBy( int count )
     {
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
+      var success = GeneratorNodeHelper.MoveToNext( ref m_state, count );
 
-      for( int i = 0; i < count; i++ )
-      {
-        //if we are not capable of moving forward to the item specified, problem.... throw.
-        if( !this.MoveToNext() )
-        {
-          m_currentNode = originalNode;
-          m_index = originalIndex;
-          m_sourceDataIndex = originalSourceDataIndex;
-          return false;
-        }
-      }
+      this.EnsureState();
 
-      return true;
+      return success;
     }
 
-    //internal use only
-    public bool MoveToPrevious()
+    internal bool MoveToPrevious()
     {
-      if( m_currentNode.Previous != null )
-      {
-        m_currentNode = m_currentNode.Previous;
-        GroupGeneratorNode groupNode = m_currentNode as GroupGeneratorNode;
+      var success = GeneratorNodeHelper.MoveToPrevious( ref m_state );
 
-        if( groupNode != null )
-        {
-          m_sourceDataIndex -= groupNode.TotalLeafCount;
-        }
+      this.EnsureState();
 
-        m_index -= m_currentNode.ItemCount;
-        return true;
-      }
-
-      return false;
+      return success;
     }
 
-    public bool MoveToFirst()
+    internal bool MoveToFirst()
     {
-      //this function stays at the same level and moves to the first node
-      while( this.MoveToPrevious() )
-      {
-      }
+      GeneratorNodeHelper.MoveToFirst( ref m_state );
+
+      this.EnsureState();
 
       return true;
     }
 
-    public bool MoveToEnd()
+    internal bool MoveToEnd()
     {
-      //this function stays at the same level and moves to the end
-      while( this.MoveToNext() )
+      // We call MoveToNext instead of MoveToEnd because MoveToEnd includes the indexes of the last node.
+      while( GeneratorNodeHelper.MoveToNext( ref m_state ) )
       {
       }
 
-      return true;
-    }
-
-    public bool MoveToChild()
-    {
-      return this.MoveToChild( true );
-    }
+      this.EnsureState();
 
-    public bool MoveToChild( bool skipItemLessGroupNodes )
-    {
-      GroupGeneratorNode groupNode = m_currentNode as GroupGeneratorNode;
-
-      if( ( groupNode == null ) || ( groupNode.Child == null ) )
-        return false;
-
-      if( ( skipItemLessGroupNodes ) && ( !( groupNode.ItemCount > 0 ) ) )
-        return false;
-
-      m_currentNode = groupNode.Child;
       return true;
     }
 
-    public bool MoveToParent()
+    internal bool MoveToChild( bool skipItemLessGroupNodes )
     {
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
-
-      //move until we arrive at the first of the linked list.
-      while( this.MoveToPrevious() )
-      {
-      }
+      var success = GeneratorNodeHelper.MoveToChild( ref m_state, skipItemLessGroupNodes );
 
-      //if the first does not have a parent, then... error.
-      if( m_currentNode.Parent != null )
-      {
-        m_currentNode = m_currentNode.Parent;
-        return true;
-      }
+      this.EnsureState();
 
-      //if there was an error, revert to the original node;
-      m_currentNode = originalNode;
-      m_index = originalIndex;
-      m_sourceDataIndex = originalSourceDataIndex;
-      return false;
+      return success;
     }
 
-    public bool MoveToFollowing()
+    internal bool MoveToParent()
     {
-      bool retval = false;
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_currentNode, m_index, m_sourceDataIndex );
+      var success = GeneratorNodeHelper.MoveToParent( ref m_state );
 
-      while( !retval )
-      {
-        retval = nodeHelper.MoveToNext();
+      this.EnsureState();
 
-        if( !retval )
-        {
-          if( !nodeHelper.MoveToParent() )
-          {
-            //cannot move to parent and could not move to next, this is the end of the chain.
-            break;
-          }
-        }
-      }
-
-      if( retval )
-      {
-        m_currentNode = nodeHelper.CurrentNode;
-        m_index = nodeHelper.Index;
-        m_sourceDataIndex = nodeHelper.SourceDataIndex;
-      }
-
-      return retval;
+      return success;
     }
 
-    public bool InsertAfter( GeneratorNode insert )
+    internal bool InsertAfter( GeneratorNode insert )
     {
       if( insert == null )
         throw new DataGridInternalException( "GeneratorNode is null." );
 
-      int insertionCount;
-      int chainLength;
-      GeneratorNode insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
+      var insertionCount = default( int );
+      var chainLength = default( int );
+      var insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
 
-      if( m_currentNode.Next != null )
+      var nextNode = m_state.Node.Next;
+      if( nextNode != null )
       {
-        m_currentNode.Next.Previous = insertLast;
+        nextNode.Previous = insertLast;
       }
 
-      insertLast.Next = m_currentNode.Next;
-      insert.Previous = m_currentNode;
-      m_currentNode.Next = insert;
+      insertLast.Next = nextNode;
+      insert.Previous = m_state.Node;
+      m_state.Node.Next = insert;
 
       // Move the current node to the last node inserted
       if( !this.MoveToNextBy( chainLength ) )
@@ -241,527 +147,362 @@ namespace Xceed.Wpf.DataGrid
       return true;
     }
 
-    public bool InsertBefore( GeneratorNode insert )
+    internal bool InsertBefore( GeneratorNode insert )
     {
       if( insert == null )
         throw new DataGridInternalException( "GeneratorNode is null" );
 
-      int insertionCount;
-      int chainLength;
-      GeneratorNode insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
-      GeneratorNode previous = m_currentNode.Previous;
+      var insertionCount = default( int );
+      var chainLength = default( int );
+      var insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
 
-      if( previous != null )
+      var previousNode = m_state.Node.Previous;
+      if( previousNode != null )
       {
-        previous.Next = insert;
+        previousNode.Next = insert;
       }
 
-      insert.Previous = previous;
-      m_currentNode.Previous = insertLast;
-      insertLast.Next = m_currentNode;
-
-      GroupGeneratorNode parentGroup = insert.Parent as GroupGeneratorNode;
+      insert.Previous = previousNode;
+      m_state.Node.Previous = insertLast;
+      insertLast.Next = m_state.Node;
 
+      var parentGroup = insert.Parent as GroupGeneratorNode;
       if( parentGroup != null )
       {
-        if( parentGroup.Child == m_currentNode )
+        if( parentGroup.Child == m_state.Node )
         {
           parentGroup.Child = insert;
         }
       }
 
       // Move the current to the first item inserted.
-      // No need to change m_index, m_sourceDataIndex since they will still be with the correct value.
-      m_currentNode = insert;
-      return true;
-    }
-
-    public static GeneratorNode EvaluateChain( GeneratorNode chainStart, out int totalChildCount, out int chainLength )
-    {
-      //if we insert a chain of nodes, this GeneratorNodeHelper will help us
-      GeneratorNodeHelper newHelper = new GeneratorNodeHelper( chainStart, 0, 0 );
+      // No need to update the indexes since they will still be with the correct value.
+      m_state.Node = insert;
 
-      //first determine the total number of childs from this "node"
-      totalChildCount = 0;
-      chainLength = 0;
+      this.EnsureState();
 
-      do
-      {
-        totalChildCount += newHelper.CurrentNode.ItemCount;
-        chainLength++;
-      }
-      while( newHelper.MoveToNext() );
-
-      //then, since we moved at the end of the "chain"
-      return newHelper.CurrentNode;
+      return true;
     }
 
-    //FindItem skips over itemless nodes.
-    public int FindItem( object item )
+    internal int FindItem( object item )
     {
-      //finding items can only be done in "forward" direction
-      int retval = -1;
-
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
+      var current = m_state;
 
-      while( retval == -1 )
+      while( true )
       {
-        ItemsGeneratorNode itemsNode = m_currentNode as ItemsGeneratorNode;
-
+        var itemsNode = current.Node as ItemsGeneratorNode;
         if( itemsNode != null )
         {
-          int tmpIndex = itemsNode.Items.IndexOf( item );
-          if( tmpIndex > -1 )
+          var index = itemsNode.Items.IndexOf( item );
+          if( index >= 0 )
           {
-            tmpIndex += itemsNode.CountDetailsBeforeDataIndex( tmpIndex );
-            //item is directly from this items node... then return the appropriate index!
-            retval = m_index + tmpIndex;
-            break;
-          }
-          else
-          {
-            //if the item is from a detail, then I don't want to "use" it!!!
-            retval = -1;
-            //but continue looping.... to find occurances of this item somewhere else in the tree
+            index += itemsNode.CountDetailsBeforeDataIndex( index );
+
+            // Item is directly from this items node... then return the appropriate index!
+            m_state = current;
+
+            this.EnsureState();
+
+            return index + current.Index;
           }
+
+          // If the item is from a detail, then I don't want to "use" it!!!
+          // but continue looping.... to find occurances of this item somewhere else in the tree.
         }
         else
         {
-          CollectionGeneratorNode collectionNode = m_currentNode as CollectionGeneratorNode;
-
+          var collectionNode = current.Node as CollectionGeneratorNode;
           if( collectionNode != null )
           {
-            int tmpIndex = collectionNode.IndexOf( item );
-
-            if( tmpIndex != -1 )
+            var index = collectionNode.IndexOf( item );
+            if( index >= 0 )
             {
-              retval = m_index + tmpIndex;
-              break;
+              m_state = current;
+
+              this.EnsureState();
+
+              return index + current.Index;
             }
           }
         }
 
-        //if we reach this point, it's because the item we are looking
-        //for is not in this node... Try to access the child
-        if( this.MoveToChild() )
-          continue;
-
-        //if we reach this point, it's because we have no child...
-        if( this.MoveToNext() )
-          continue;
-
-        //final try, try "advancing" to the next item.
-        if( this.MoveToFollowing() )
-          continue;
-
-        //up to this, we are in an endpoint, we failed.
-        break;
-      }
-
-      if( retval == -1 )
-      {
-        m_currentNode = originalNode;
-        m_index = originalIndex;
-        m_sourceDataIndex = originalSourceDataIndex;
+        // If we reach this point, it's because the item we are looking
+        // for is not in this node... Try to access the child
+        if( !GeneratorNodeHelper.MoveToChild( ref current ) )
+        {
+          // Try "advancing" to the next item.
+          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
+            break;
+        }
       }
 
-      return retval;
+      return -1;
     }
 
-    public object FindIndex( int index )
+    internal object FindIndex( int index )
     {
-      //WARNING: this method only searches forward
-
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
+      var current = m_state;
 
-      do
+      while( true )
       {
-        if( index < ( m_index + m_currentNode.ItemCount ) )
+        if( index < current.Index + current.Node.ItemCount )
         {
-          CollectionGeneratorNode itemsNode = m_currentNode as CollectionGeneratorNode;
-
+          var itemsNode = current.Node as CollectionGeneratorNode;
           if( itemsNode != null )
           {
-            return itemsNode.GetAt( index - m_index );
-          }
-          else // not an Items Node, then try to move to child...
-          {
-            //if it fails, then quit loop with failure
-            if( !this.MoveToChild() )
-            {
-              break;
-            }
+            m_state = current;
+
+            this.EnsureState();
+
+            return itemsNode.GetAt( index - current.Index );
           }
+
+          if( !GeneratorNodeHelper.MoveToChild( ref current ) )
+            break;
         }
         else
         {
-          //if we reach this point, it's because the item we are looking
-          //for is not in this node... Try to access the child
-
-          //No need to check for childs, since the condition above would catch it (childs part of ItemCount).
-
-          if( this.MoveToNext() )
-            continue;
-
-          //final try, try "advancing" to the next item.
-          if( this.MoveToFollowing() )
-            continue;
-
-          //up to this, we are in an endpoint, we failed.
-          break;
+          // If we reach this point, it's because the item we are looking for is not in this node... Try to access the child.
+          // No need to check for childs, since the condition above would catch it (childs part of ItemCount).
+          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
+            break;
         }
       }
-      while( true );
 
-      m_currentNode = originalNode;
-      m_index = originalIndex;
-      m_sourceDataIndex = originalSourceDataIndex;
       return null;
     }
 
-    public bool ReverseCalculateIndex()
+    internal bool FindNode( GeneratorNode node )
     {
-      // index need to be 0, as I will use the value from the index once I backtracked all the way to the root.
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( this.CurrentNode, 0, 0 );
+      if( node == null )
+        throw new ArgumentNullException( "node" );
 
-      while( ( nodeHelper.CurrentNode.Previous != null ) || ( nodeHelper.CurrentNode.Parent != null ) )
-      {
-        if( !nodeHelper.MoveToPrevious() )
-        {
-          nodeHelper.MoveToParent();
-        }
-      }
+      var success = GeneratorNodeHelper.FindNode( ref m_state, node );
 
-      m_index = Math.Abs( nodeHelper.Index );
-      m_sourceDataIndex = Math.Abs( nodeHelper.SourceDataIndex );
-      return true;
+      this.EnsureState();
+
+      return success;
     }
 
-    public bool FindNodeForIndex( int index )
+    internal bool FindNodeForIndex( int index )
     {
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
-
-      //The algo is a single drill-down... for optimized performance..
-      //It first tries to go Horizontally in the tree and then drills-down it can.
-
-      do
-      {
-        int itemCount = m_currentNode.ItemCount;
+      var success = GeneratorNodeHelper.FindNodeForIndex( ref m_state, index );
 
-        //verify if the current node contains ( directly or its children ) the required index
-        if( index < ( m_index + itemCount ) )
-        {
-          //a Group node is the only node that can Have Children is by definition empty... let's dig deeper.
-          //If we try to dig deeper and fail... 
-          if( !this.MoveToChild() )
-          {
-            //if we cannot travel deeper, then this node is the closest we get...
-            return true;
-          }
-        }
-        else if( ( index == m_index ) && ( itemCount != 0 ) )
-        {
-          return true;
-        }
-        else
-        {
-          //Move to the NextNode in the list... 
-          if( !this.MoveToNext() )
-            break;
-        }
-      }
-      while( true );
+      this.EnsureState();
 
-      m_currentNode = originalNode;
-      m_index = originalIndex;
-      m_sourceDataIndex = originalSourceDataIndex;
-      return false;
+      return success;
     }
 
-    public bool MoveForward()
+    //Note: this function will not check for the presence of the item in the details for Items nodes.
+    internal bool AbsoluteFindItem( object item )
     {
-      bool recurseGroup = true;
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_currentNode, m_index, m_sourceDataIndex );
+      // This method will search through nodes, even those collapsed for the item.
+      var current = m_state;
 
-      do
+      while( true )
       {
-        GroupGeneratorNode groupNode = nodeHelper.CurrentNode as GroupGeneratorNode;
+        var itemsNode = current.Node as CollectionGeneratorNode;
+        if( ( itemsNode != null ) && itemsNode.Items.Contains( item ) )
+          break;
 
-        if( ( groupNode == null ) && ( nodeHelper.CurrentNode != m_currentNode ) && ( nodeHelper.CurrentNode.ItemCount != 0 ) )
+        // If we reach this point, it's because the item we are looking
+        // for is not in this node... Try to access the child
+        if( !GeneratorNodeHelper.MoveToChild( ref current, false ) )
         {
-          m_currentNode = nodeHelper.CurrentNode;
-          m_index = nodeHelper.Index;
-          m_sourceDataIndex = nodeHelper.SourceDataIndex;
-          return true;
+          // Try "advancing" to the next item.
+          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
+            return false;
         }
+      }
 
-        if( ( recurseGroup ) && ( nodeHelper.MoveToChild() ) )
-          continue;
+      m_state = current;
 
-        recurseGroup = true;
+      this.EnsureState();
 
-        if( nodeHelper.MoveToNext() )
-          continue;
-
-        if( nodeHelper.MoveToParent() )
-        {
-          recurseGroup = false;
-          continue;
-        }
-
-        break;
-      }
-      while( true );
-
-      return false;
+      return true;
     }
 
-    public bool MoveBackward()
+    //Note: this function will not check for the presence of the group in the details for Items nodes.
+    internal bool FindGroup( CollectionViewGroup group )
     {
-      bool recurseGroup = true;
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_currentNode, m_index, m_sourceDataIndex );
+      if( group == null )
+        return false;
 
-      do
-      {
-        GroupGeneratorNode groupNode = nodeHelper.CurrentNode as GroupGeneratorNode;
+      var current = m_state;
 
-        if( ( groupNode == null ) && ( nodeHelper.CurrentNode != m_currentNode ) && ( nodeHelper.CurrentNode.ItemCount != 0 ) )
+      while( true )
+      {
+        var groupNode = current.Node as GroupGeneratorNode;
+        if( groupNode != null )
         {
-          m_currentNode = nodeHelper.CurrentNode;
-          m_index = nodeHelper.Index;
-          m_sourceDataIndex = nodeHelper.SourceDataIndex;
-          return true;
-        }
+          if( groupNode.CollectionViewGroup == group )
+            break;
 
-        if( ( recurseGroup ) && ( nodeHelper.MoveToChild() ) )
+          if( !groupNode.CollectionViewGroup.IsBottomLevel )
+          {
+            if( !GeneratorNodeHelper.MoveToChild( ref current, false ) )
+              return false;
+          }
+          else
+          {
+            if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
+              return false;
+          }
+        }
+        else
         {
-          nodeHelper.MoveToEnd();
-          continue;
+          // There is nothing under a non GroupGeneratorNode, try to move Next node in the list.
+          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
+            return false;
         }
+      }
 
-        recurseGroup = true;
+      m_state = current;
 
-        if( nodeHelper.MoveToPrevious() )
-          continue;
+      this.EnsureState();
 
+      return true;
+    }
 
-        if( nodeHelper.MoveToParent() )
-        {
-          recurseGroup = false;
-          continue;
-        }
-
-        break;
-      }
-      while( true );
+    internal void ReverseCalculateIndex()
+    {
+      m_state = GeneratorNodeHelper.FindNodeLocation( m_state.Node );
 
-      return false;
+      this.EnsureState();
     }
 
-    //Note: this function will not check for the presence of the item in the details for Items nodes.
-    public bool AbsoluteFindItem( object item )
+    internal bool MoveForward()
     {
-      //this method will search through nodes, even those collapsed for the item 
-      //finding items can only be done in "forward" direction
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
+      var startNode = m_state.Node;
 
-      do
+      while( true )
       {
-        CollectionGeneratorNode itemsNode = m_currentNode as CollectionGeneratorNode;
+        if( !( m_state.Node is GroupGeneratorNode ) && ( m_state.Node != startNode ) && ( m_state.Node.ItemCount != 0 ) )
+          break;
 
-        if( itemsNode != null )
+        if( !GeneratorNodeHelper.MoveToChild( ref m_state ) )
         {
-          if( itemsNode.Items.Contains( item ) )
-            return true;
+          if( !GeneratorNodeHelper.MoveToFollowing( ref m_state ) )
+            return false;
         }
+      }
 
-        //if we reach this point, it's because the item we are looking
-        //for is not in this node... Try to access the child
-        if( this.MoveToChild() )
-          continue;
-
-        //if we reach this point, it's because we have no child...
-        if( this.MoveToNext() )
-          continue;
-
-        //final try, try "advancing" to the next item.
-        if( this.MoveToFollowing() )
-          continue;
-
-        //up to this, we are in an endpoint, we failed.
-        break;
-      } while( true );
+      this.EnsureState();
 
-      m_currentNode = originalNode;
-      m_index = originalIndex;
-      m_sourceDataIndex = originalSourceDataIndex;
-      return false;
+      return true;
     }
 
-    //Note: this function will not check for the presence of the group in the details for Items nodes.
-    public bool FindGroup( CollectionViewGroup group )
+    internal bool MoveBackward()
     {
-      if( group == null )
-        return false;
-
-      GeneratorNode originalNode = m_currentNode;
-      int originalIndex = m_index;
-      int originalSourceDataIndex = m_sourceDataIndex;
+      var startNode = m_state.Node;
 
-      do
+      while( true )
       {
-        GroupGeneratorNode groupNode = m_currentNode as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          if( groupNode.CollectionViewGroup == group )
-            return true;
+        if( !( m_state.Node is GroupGeneratorNode ) && ( m_state.Node != startNode ) && ( m_state.Node.ItemCount != 0 ) )
+          break;
 
-          if( !groupNode.CollectionViewGroup.IsBottomLevel )
-          {
-            if( !this.MoveToChild( false ) )
-            {
-              break;
-            }
-          }
-          else
-          {
-            if( !this.MoveToFollowing() )
-            {
-              break;
-            }
-          }
+        if( !GeneratorNodeHelper.MoveToChild( ref m_state ) )
+        {
+          if( !GeneratorNodeHelper.MoveToPreceding( ref m_state ) )
+            return false;
         }
         else
         {
-          //There can be nothing under a non-GroupGeneratorNode, try to move Next node in the list.
-          if( !this.MoveToFollowing() )
-          {
-            break;
-          }
+          GeneratorNodeHelper.MoveToEnd( ref m_state );
         }
-      } while( true );
+      }
+
+      this.EnsureState();
 
-      m_currentNode = originalNode;
-      m_index = originalIndex;
-      m_sourceDataIndex = originalSourceDataIndex;
-      return false;
+      return true;
     }
 
-    //This method cannot be used for groups.
-    //This method will search for items independently of the Expanded/Collpased status of GroupGeneratorNodes
-    public bool Contains( object item )
+    // This method cannot be used for groups.
+    // This method will search for items independently of the Expanded/Collapsed status of GroupGeneratorNodes.
+    internal bool Contains( object item )
     {
-      bool skipCollectionGeneratorNodeCheck = false;
+      var current = m_state;
+      var found = false;
+      var skipCollectionGeneratorNodeCheck = false;
 
-      do
+      while( true )
       {
-        HeadersFootersGeneratorNode headersFootersNode = m_currentNode as HeadersFootersGeneratorNode;
         skipCollectionGeneratorNodeCheck = false;
 
-        //If the node is a HeadersFootersGeneratorNode, do some specific handling.
-        if( headersFootersNode != null )
+        var headersFootersNode = current.Node as HeadersFootersGeneratorNode;
+        if( ( headersFootersNode != null ) && ( item is GroupHeaderFooterItem ) )
         {
-          //If the item passed to the function is a GroupHeaderFooterItem, then its because we are looking for a GroupHeader/Footer       
-          if( item.GetType() == typeof( GroupHeaderFooterItem ) )
-          {
-            GroupHeaderFooterItem groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+          var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
+          var parentGroup = headersFootersNode.Parent as GroupGeneratorNode;
 
-            //Determine the parent node/collectionViewGroup
-            GroupGeneratorNode parentGroup = headersFootersNode.Parent as GroupGeneratorNode;
-
-            if( parentGroup != null )
-            {
-              if( groupHeaderFooterItem.Group == parentGroup.CollectionViewGroup )
-              {
-                if( headersFootersNode.Items.Contains( groupHeaderFooterItem.Template ) )
-                  return true;
-              }
-            }
-            //If there is no parent node, then its because the current HeadersFootersGeneratorNode is not a GroupHeaders/Footers node (FixedHeaders/Fotoers or Headers/Footers).
-
-            skipCollectionGeneratorNodeCheck = true; //force skip CollectionGeneratorNode verification, this is to limit amount of job done by loop body.
+          if( ( parentGroup != null ) && ( parentGroup.CollectionViewGroup == groupHeaderFooterItem.Group ) && headersFootersNode.Items.Contains( groupHeaderFooterItem.Template ) )
+          {
+            found = true;
+            break;
           }
 
-          //If the item passed is not a GroupHeaderFooterItem, not need to do specific processing, reverting to "Common" algo.
+          // If there is no parent node, then its because the current HeadersFootersGeneratorNode is not a GroupHeaders/Footers node (FixedHeaders/Footers or Headers/Footers).
+          skipCollectionGeneratorNodeCheck = true; // force skip CollectionGeneratorNode verification, this is to limit amount of job done by loop body.
         }
 
         if( !skipCollectionGeneratorNodeCheck )
         {
-          CollectionGeneratorNode collectionNode = m_currentNode as CollectionGeneratorNode;
-
+          var collectionNode = current.Node as CollectionGeneratorNode;
           if( collectionNode != null )
           {
             // When dealing with a DataView, the DataView's IList's Contains implementation will return false 
             // for a dataRowView which is in edition and was modified even though it is really part of the collection.
             // Therefore, we must use a for loop of Object.Equals method calls.
-            System.Data.DataRowView dataRowViewItem = item as System.Data.DataRowView;
-
+            var dataRowViewItem = item as System.Data.DataRowView;
             if( dataRowViewItem != null )
             {
-              IList items = collectionNode.Items;
-              int itemsCount = items.Count;
-
-              System.Data.DataRow itemDataRow = dataRowViewItem.Row;
+              var items = collectionNode.Items;
+              var itemsCount = items.Count;
+              var itemDataRow = dataRowViewItem.Row;
 
               for( int i = 0; i < itemsCount; i++ )
               {
-                System.Data.DataRowView currentDataRowView = items[ i ] as System.Data.DataRowView;
-
+                var currentDataRowView = items[ i ] as System.Data.DataRowView;
                 if( ( currentDataRowView != null ) && ( itemDataRow == currentDataRowView.Row ) )
-                  return true;
+                {
+                  found = true;
+                  break;
+                }
               }
+
+              if( found )
+                break;
             }
             else
             {
-              //Since the GetAt() methods can be overriden to compensate for the Expand/Collapse status of Groups
+              // Since the GetAt() methods can be overriden to compensate for the Expand/Collapse status of Groups
               // AND the details features, accessing the collection directly prevent pre-processing of the content of the collection node.
               if( collectionNode.Items.Contains( item ) )
               {
-                //if the item is from a detail, then I don't want to "use" it!!!
-                return true;
+                found = true;
+                break;
               }
             }
           }
         }
 
-        //if we reach this point, it's because the item we are looking
-        //for is not in this node... Try to access the child
-        //Note: Since I want to search independently of the Expand/Collapse status,
-        //pass false to the method to systematically visit childs.
-        if( this.MoveToChild( false ) )
+        if( GeneratorNodeHelper.MoveToChild( ref current, false ) )
           continue;
 
-        //if we reach this point, it's because we have no child...
-        if( this.MoveToNext() )
+        if( GeneratorNodeHelper.MoveToFollowing( ref current ) )
           continue;
 
-        //final try, try "advancing" to the next item.
-        if( this.MoveToFollowing() )
-          continue;
-
-        //up to this, we are in an endpoint, we failed.
         break;
-      } while( true );
+      }
 
-      return false;
-    }
+      m_state = current;
 
-    //-------------
-    // Data Members
+      this.EnsureState();
 
-    private GeneratorNode m_currentNode; // = null
-    private int m_index;
-    private int m_sourceDataIndex;
+      return found;
+    }
 
-    public void ProcessVisit(
+    internal void ProcessVisit(
       DataGridContext sourceContext,
       int minIndex,
       int maxIndex,
@@ -773,14 +514,11 @@ namespace Xceed.Wpf.DataGrid
       visitWasStopped = false;
 
       // This is used only for DataGridContextVisitorType.ItemsBlock
-      int startSourceDataItemIndex = -1;
-      int endSourceDataItemIndex = -1;
+      var startSourceDataItemIndex = -1;
+      var endSourceDataItemIndex = -1;
 
       if( minIndex < 0 )
-      {
-        DataGridException.ThrowSystemException( "The minimum index must be greater than or equal to zero.",
-                                                typeof( ArgumentException ), sourceContext.DataGridControl.Name, "minIndex" );
-      }
+        throw DataGridException.Create<ArgumentException>( "The minimum index must be greater than or equal to zero.", sourceContext.DataGridControl, "minIndex" );
 
       if( ( visitorType & DataGridContextVisitorType.DataGridContext ) == DataGridContextVisitorType.DataGridContext )
       {
@@ -792,43 +530,42 @@ namespace Xceed.Wpf.DataGrid
 
       //Take a shortcut, if the visit is made only for contexts, and there is no child contexts
       //return right away.
-      bool containsDetails = false;
+      var containsDetails = false;
 
-      foreach( DataGridContext childContext in sourceContext.GetChildContexts() )
+      foreach( var childContext in sourceContext.GetChildContextsCore() )
       {
         containsDetails = true;
         break;
       }
 
-      bool processed = false;
+      var processed = false;
+      var current = m_state;
 
-      do
+      while( true )
       {
-        //resets the flag that indicates if the node was already processed
         processed = false;
 
-        int itemCount = this.CurrentNode.ItemCount;
+        var itemCount = current.Node.ItemCount;
 
         //If the whole current node is below the minIndex, jump over it.
-        if( ( this.Index + ( itemCount - 1 ) ) < minIndex )
+        if( ( current.Index + ( itemCount - 1 ) ) < minIndex )
         {
           processed = true;
         }
 
         //when the index to visit exceeds the range defined, exit the loop.
-        if( this.Index > maxIndex )
+        if( current.Index > maxIndex )
           break;
 
-        int minForNode = Math.Max( 0, minIndex - this.Index ); // this will give the base offset within the node where to start the visitating!
-        int maxForNode = Math.Min( itemCount - 1, maxIndex - this.Index ); //this will five the max offset within this node to visit (protected against overlfow )
+        var minForNode = Math.Max( 0, minIndex - current.Index ); // this will give the base offset within the node where to start the visitating!
+        var maxForNode = Math.Min( itemCount - 1, maxIndex - current.Index ); //this will five the max offset within this node to visit (protected against overlfow )
 
         if( !processed )
         {
-          HeadersFootersGeneratorNode headersNode = this.CurrentNode as HeadersFootersGeneratorNode;
-
+          var headersNode = current.Node as HeadersFootersGeneratorNode;
           if( headersNode != null )
           {
-            bool isHeaderFooter = ( headersNode.Parent == null );
+            var isHeaderFooter = ( headersNode.Parent == null );
 
             //If the node is a Headers or Footers node AND the visitorType does not contain HeadersFooters
             if( ( isHeaderFooter ) && ( ( visitorType & DataGridContextVisitorType.HeadersFooters ) == DataGridContextVisitorType.HeadersFooters ) )
@@ -846,8 +583,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( !processed )
         {
-          ItemsGeneratorNode itemsNode = this.CurrentNode as ItemsGeneratorNode;
-
+          var itemsNode = current.Node as ItemsGeneratorNode;
           if( itemsNode != null )
           {
             if( ( visitorType & DataGridContextVisitorType.ItemsBlock ) == DataGridContextVisitorType.ItemsBlock )
@@ -855,7 +591,7 @@ namespace Xceed.Wpf.DataGrid
               GeneratorNodeHelper.ProcessItemsNodeBlockVisit(
                 itemsNode, sourceContext,
                 minForNode, maxForNode,
-                visitor, visitorType, visitDetails, containsDetails, m_sourceDataIndex,
+                visitor, visitorType, visitDetails, containsDetails, current.DataIndex,
                 ref startSourceDataItemIndex, ref endSourceDataItemIndex, ref visitWasStopped );
             }
             else if( ( ( visitDetails ) && ( containsDetails ) )
@@ -864,7 +600,7 @@ namespace Xceed.Wpf.DataGrid
               GeneratorNodeHelper.ProcessItemsNodeVisit(
                 itemsNode, sourceContext,
                 minForNode, maxForNode,
-                visitor, visitorType, visitDetails, m_sourceDataIndex, ref visitWasStopped );
+                visitor, visitorType, visitDetails, current.DataIndex, ref visitWasStopped );
             }
 
             processed = true;
@@ -873,8 +609,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( !processed )
         {
-          GroupGeneratorNode groupNode = this.CurrentNode as GroupGeneratorNode;
-
+          var groupNode = current.Node as GroupGeneratorNode;
           if( groupNode != null )
           {
             if( ( visitorType & DataGridContextVisitorType.Groups ) == DataGridContextVisitorType.Groups )
@@ -894,31 +629,61 @@ namespace Xceed.Wpf.DataGrid
         }
 
         if( !processed )
-          throw new DataGridInternalException( "Unable to process the visit.", sourceContext.DataGridControl );
+          throw DataGridException.Create<DataGridInternalException>( "Unable to process the visit.", sourceContext.DataGridControl );
 
         if( visitWasStopped )
           break;
 
-        if( this.MoveToChild() )
+        if( GeneratorNodeHelper.MoveToChild( ref current ) )
           continue;
 
-        if( this.MoveToFollowing() )
+        if( GeneratorNodeHelper.MoveToFollowing( ref current ) )
           continue;
 
         break;
       }
-      while( true ); //loop is controled by continue and break statements.
-
 
       if( ( visitorType & DataGridContextVisitorType.ItemsBlock ) == DataGridContextVisitorType.ItemsBlock )
       {
         if( startSourceDataItemIndex != -1 )
         {
-          bool stopVisit = false;
+          var stopVisit = false;
           visitor.Visit( sourceContext, startSourceDataItemIndex, endSourceDataItemIndex, ref stopVisit );
           visitWasStopped = visitWasStopped || stopVisit;
         }
       }
+
+      m_state = current;
+
+      this.EnsureState();
+    }
+
+    internal static GeneratorNode EvaluateChain( GeneratorNode startNode, out int totalChildCount, out int chainLength )
+    {
+      if( startNode == null )
+        throw new ArgumentNullException( "startNode" );
+
+      var current = new State( startNode, 0, 0 );
+
+      totalChildCount = startNode.ItemCount;
+      chainLength = 1;
+
+      while( true )
+      {
+        if( !GeneratorNodeHelper.MoveToNext( ref current ) )
+          break;
+
+        totalChildCount += current.Node.ItemCount;
+        chainLength++;
+      }
+
+      return current.Node;
+    }
+
+    private void EnsureState()
+    {
+      if( m_state.Node == null )
+        throw new DataGridInternalException();
     }
 
     private static void ProcessItemsNodeBlockVisit(
@@ -1030,7 +795,7 @@ namespace Xceed.Wpf.DataGrid
       int sourceDataItemIndex,
       ref bool stopVisit )
     {
-      int runningIndex = minIndex;
+      var runningIndex = minIndex;
       sourceDataItemIndex += minIndex;
 
       int masterIndex;
@@ -1039,19 +804,18 @@ namespace Xceed.Wpf.DataGrid
 
       while( runningIndex <= maxIndex )
       {
-        DetailGeneratorNode detailNode = itemsNode.GetDetailNodeForIndex( runningIndex, out masterIndex, out detailStartIndex, out detailNodeIndex );
+        var detailNode = itemsNode.GetDetailNodeForIndex( runningIndex, out masterIndex, out detailStartIndex, out detailNodeIndex );
 
         if( detailNode != null )
         {
-          int detailEndIndex = Math.Min( detailNode.ItemCount - 1, detailStartIndex + ( maxIndex - runningIndex ) );
+          var detailEndIndex = Math.Min( detailNode.ItemCount - 1, detailStartIndex + ( maxIndex - runningIndex ) );
           sourceDataItemIndex -= detailStartIndex;
 
           if( visitDetails )
           {
             bool visitWasStopped;
 
-            ( ( IDataGridContextVisitable )detailNode.DetailGenerator ).AcceptVisitor(
-              detailStartIndex, detailEndIndex, visitor, visitorType, visitDetails, out visitWasStopped );
+            ( ( IDataGridContextVisitable )detailNode.DetailGenerator ).AcceptVisitor( detailStartIndex, detailEndIndex, visitor, visitorType, visitDetails, out visitWasStopped );
 
             stopVisit = stopVisit || visitWasStopped;
 
@@ -1083,9 +847,9 @@ namespace Xceed.Wpf.DataGrid
     {
       for( int i = minIndex; i <= maxIndex; i++ )
       {
-        object template = headersNode.GetAt( i );
+        var template = headersNode.GetAt( i );
 
-        GroupGeneratorNode groupNode = headersNode.Parent as GroupGeneratorNode;
+        var groupNode = headersNode.Parent as GroupGeneratorNode;
         if( groupNode != null )
         {
           visitor.Visit( sourceContext, ( GroupHeaderFooterItem )template, ref stopVisit );
@@ -1100,5 +864,289 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private static bool MoveToNext( ref State state )
+    {
+      return GeneratorNodeHelper.MoveToNext( ref state, 1 );
+    }
+
+    private static bool MoveToNext( ref State state, int count )
+    {
+      if( count <= 0 )
+        return true;
+
+      var node = state.Node;
+      var index = state.Index;
+      var dataIndex = state.DataIndex;
+
+      for( int i = 0; i < count; i++ )
+      {
+        var nextNode = node.Next;
+        if( nextNode == null )
+          return false;
+
+        var groupNode = node as GroupGeneratorNode;
+        if( groupNode != null )
+        {
+          dataIndex += groupNode.TotalLeafCount;
+        }
+
+        index += node.ItemCount;
+        node = nextNode;
+      }
+
+      state.Node = node;
+      state.Index = index;
+      state.DataIndex = dataIndex;
+
+      return true;
+    }
+
+    private static bool MoveToPrevious( ref State state )
+    {
+      var node = state.Node.Previous;
+      if( node == null )
+        return false;
+
+      state.Node = node;
+      state.Index -= node.ItemCount;
+
+      var groupNode = node as GroupGeneratorNode;
+      if( groupNode != null )
+      {
+        state.DataIndex -= groupNode.TotalLeafCount;
+      }
+
+      return true;
+    }
+
+    private static void MoveToFirst( ref State state )
+    {
+      var node = state.Node.Previous;
+      if( node == null )
+        return;
+
+      var index = state.Index;
+      var dataIndex = state.DataIndex;
+
+      while( true )
+      {
+        var groupNode = node as GroupGeneratorNode;
+        if( groupNode != null )
+        {
+          dataIndex -= groupNode.TotalLeafCount;
+        }
+
+        index -= node.ItemCount;
+
+        var target = node.Previous;
+        if( target == null )
+          break;
+
+        node = target;
+      }
+
+      state.Node = node;
+      state.Index = index;
+      state.DataIndex = dataIndex;
+    }
+
+    private static void MoveToEnd( ref State state )
+    {
+      var node = state.Node;
+      if( node.Next == null )
+        return;
+
+      var index = state.Index;
+      var dataIndex = state.DataIndex;
+
+      while( true )
+      {
+        var groupNode = node as GroupGeneratorNode;
+        if( groupNode != null )
+        {
+          dataIndex += groupNode.TotalLeafCount;
+        }
+
+        index += node.ItemCount;
+
+        var target = node.Next;
+        if( target == null )
+          break;
+
+        node = target;
+      }
+
+      state.Node = node;
+      state.Index = index;
+      state.DataIndex = dataIndex;
+    }
+
+    private static bool MoveToChild( ref State state )
+    {
+      return GeneratorNodeHelper.MoveToChild( ref state, true );
+    }
+
+    private static bool MoveToChild( ref State state, bool skipItemLessGroupNodes )
+    {
+      var groupNode = state.Node as GroupGeneratorNode;
+      if( ( groupNode == null ) || ( groupNode.Child == null ) )
+        return false;
+
+      if( ( skipItemLessGroupNodes ) && ( groupNode.ItemCount <= 0 ) )
+        return false;
+
+      state.Node = groupNode.Child;
+
+      return true;
+    }
+
+    private static bool MoveToParent( ref State state )
+    {
+      if( state.Node.Level == 0 )
+        return false;
+
+      GeneratorNodeHelper.MoveToFirst( ref state );
+
+      state.Node = state.Node.Parent;
+      Debug.Assert( state.Node != null );
+
+      return true;
+    }
+
+    private static bool MoveToFollowing( ref State state )
+    {
+      while( !GeneratorNodeHelper.MoveToNext( ref state ) )
+      {
+        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
+          return false;
+      }
+
+      return true;
+    }
+
+    private static bool MoveToPreceding( ref State state )
+    {
+      while( !GeneratorNodeHelper.MoveToPrevious( ref state ) )
+      {
+        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
+          return false;
+      }
+
+      return true;
+    }
+
+    private static State FindNodeLocation( GeneratorNode node )
+    {
+      var state = new State( node, 0, 0 );
+
+      while( true )
+      {
+        GeneratorNodeHelper.MoveToFirst( ref state );
+
+        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
+          break;
+      }
+
+      Debug.Assert( state.Index <= 0 );
+      Debug.Assert( state.DataIndex <= 0 );
+
+      return new State( node, -state.Index, -state.DataIndex );
+    }
+
+    private static bool FindNode( ref State state, GeneratorNode node )
+    {
+      if( state.Node == node )
+        return true;
+
+      var from = state;
+      var fromLevel = state.Node.Level;
+      var to = new State( node, 0, 0 );
+      var toLevel = node.Level;
+
+      while( from.Node != to.Node )
+      {
+        if( fromLevel > toLevel )
+        {
+          if( !GeneratorNodeHelper.MoveToParent( ref from ) )
+            return false;
+
+          fromLevel = from.Node.Level;
+        }
+        else
+        {
+          if( !GeneratorNodeHelper.MoveToPrevious( ref to ) )
+          {
+            if( !GeneratorNodeHelper.MoveToParent( ref to ) )
+              return false;
+
+            toLevel = to.Node.Level;
+          }
+        }
+      }
+
+      state.Node = node;
+      state.Index = from.Index - to.Index;
+      state.DataIndex = from.DataIndex - to.DataIndex;
+
+      return true;
+    }
+
+    private static bool FindNodeForIndex( ref State state, int index )
+    {
+      var current = state;
+
+      // The algo is a single drill-down... for optimized performance..
+      // It first tries to go horizontally in the tree and then drills-down if it can.
+      while( true )
+      {
+        var itemCount = current.Node.ItemCount;
+
+        // Verify if the current node contains ( directly or its children ) the required index
+        if( index < current.Index + itemCount )
+        {
+          // A Group node is the only node that can have children is by definition empty... let's dig deeper.
+          // If we cannot travel deeper, then this node is the closest we get.
+          if( !GeneratorNodeHelper.MoveToChild( ref current ) )
+            break;
+        }
+        else if( ( index == current.Index ) && ( itemCount != 0 ) )
+        {
+          break;
+        }
+        else
+        {
+          if( !GeneratorNodeHelper.MoveToNext( ref current ) )
+            return false;
+        }
+      }
+
+      state.Node = current.Node;
+      state.Index = current.Index;
+      state.DataIndex = current.DataIndex;
+
+      return true;
+    }
+
+    private State m_state;
+
+    #region State Private Struct
+
+    private struct State
+    {
+      internal State( GeneratorNode node, int index, int dataIndex )
+      {
+        Debug.Assert( node != null );
+
+        this.Node = node;
+        this.Index = index;
+        this.DataIndex = dataIndex;
+      }
+
+      internal GeneratorNode Node;
+      internal int Index;
+      internal int DataIndex;
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
index 671e27f1..a0b3ce6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
@@ -32,15 +32,11 @@ namespace Xceed.Wpf.DataGrid
       m_groupConfig = groupConfig;
     }
 
-    #region PUBLIC EVENTS
-
     public event EventHandler TotalLeafCountChanged;
     public event EventHandler IsExpandedChanged;
     public event EventHandler IsExpandedChanging;
 
-    #endregion PUBLIC EVENTS
-
-    #region PUBLIC PROPERTIES
+    #region CollectionViewGroup Property
 
     public CollectionViewGroup CollectionViewGroup
     {
@@ -50,6 +46,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region UIGroup Property
+
     public Group UIGroup
     {
       get
@@ -62,6 +62,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region GroupConfiguration Property
+
     public GroupConfiguration GroupConfiguration
     {
       get
@@ -70,6 +74,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region TotalLeafCount Property
+
     public int TotalLeafCount
     {
       get
@@ -78,6 +86,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region ItemCount Property
+
     internal override int ItemCount
     {
       get
@@ -91,6 +103,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region IsExpanded Property
+
     public bool IsExpanded
     {
       get
@@ -102,23 +118,59 @@ namespace Xceed.Wpf.DataGrid
         //if the expanded status changed
         if( m_isExpanded != value )
         {
-          if( this.IsExpandedChanging != null )
+          var dataGridContext = m_uiGroup.DataGridContext;
+          var groupExpansionChangingEventArgs = default( GroupExpansionChangingEventArgs );
+          if( value )
+          {
+            groupExpansionChangingEventArgs = new GroupExpansionChangingEventArgs( DataGridControl.GroupExpandingEvent, m_uiGroup, m_group, dataGridContext, true );
+            dataGridContext.DataGridControl.RaiseGroupExpanding( groupExpansionChangingEventArgs );
+          }
+          else
+          {
+            groupExpansionChangingEventArgs = new GroupExpansionChangingEventArgs( DataGridControl.GroupCollapsingEvent, m_uiGroup, m_group, dataGridContext, false );
+            dataGridContext.DataGridControl.RaiseGroupCollapsing( groupExpansionChangingEventArgs );
+          }
+
+          if( groupExpansionChangingEventArgs.Cancel )
+            return;
+
+          var handler = this.IsExpandedChanging;
+          if( handler != null )
           {
-            this.IsExpandedChanging( this, EventArgs.Empty );
+            handler.Invoke( this, EventArgs.Empty );
           }
 
           this.NotifyImmediateChildren( value );
 
           m_isExpanded = value;
 
-          if( this.IsExpandedChanged != null )
+          handler = this.IsExpandedChanged;
+          if( handler != null )
+          {
+            handler.Invoke( this, EventArgs.Empty );
+          }
+
+          if( m_isExpanded )
+          {
+            dataGridContext.DataGridControl.RaiseGroupExpanded( new GroupExpansionChangedEventArgs( DataGridControl.GroupExpandedEvent, m_uiGroup, m_group, dataGridContext, true ) );
+          }
+          else
           {
-            this.IsExpandedChanged( this, EventArgs.Empty );
+            dataGridContext.DataGridControl.RaiseGroupCollapsed( new GroupExpansionChangedEventArgs( DataGridControl.GroupCollapsedEvent, m_uiGroup, m_group, dataGridContext, false ) );
           }
         }
       }
     }
 
+    internal void SetIsExpandedAtInitialization( bool isExpanded )
+    {
+      m_isExpanded = isExpanded;
+    }
+
+    #endregion
+
+    #region NamesTree Property
+
     public object[] NamesTree
     {
       get
@@ -127,9 +179,29 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PUBLIC PROPERTIES
+    #endregion
+
+    #region Child Property
+
+    public GeneratorNode Child
+    {
+      get;
+      set;
+    }
+
+    #endregion
 
-    #region PUBLIC METHODS
+    #region IsComputedExpandedOverride Property
+
+    protected override bool IsComputedExpandedOverride
+    {
+      get
+      {
+        return this.IsExpanded;
+      }
+    }
+
+    #endregion
 
     public HeadersFootersGeneratorNode GetHeaderNode()
     {
@@ -153,58 +225,6 @@ namespace Xceed.Wpf.DataGrid
       return footerGeneratorNode;
     }
 
-    internal override void NotifyExpansionStateChanged( bool isParentExpanded )
-    {
-      base.NotifyExpansionStateChanged( isParentExpanded );
-
-      if( this.Parent != null )
-      {
-        this.OnExpansionStateChanged( isParentExpanded, 0, m_itemCount );
-
-        if( isParentExpanded == true )
-        {
-          this.Parent.AdjustItemCount( m_itemCount );
-        }
-        else
-        {
-          this.Parent.AdjustItemCount( -m_itemCount );
-        }
-      }
-    }
-
-    internal override void CleanGeneratorNode()
-    {
-      base.CleanGeneratorNode();
-
-      this.Child = null;
-      this.UIGroup.ClearGroup();
-      this.UIGroup = null;
-
-      m_group = null;
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PUBLIC FIELDS
-
-    public GeneratorNode Child;
-
-    #endregion PUBLIC FIELDS
-
-    #region PROTECTED PROPERTIES
-
-    protected override bool IsComputedExpandedOverride
-    {
-      get
-      {
-        return this.IsExpanded;
-      }
-    }
-
-    #endregion PROTECTED PROPERTIES
-
-    #region PROTECTED METHODS
-
     protected override int AdjustItemCountOverride( int delta )
     {
       delta = base.AdjustItemCountOverride( delta );
@@ -237,9 +257,35 @@ namespace Xceed.Wpf.DataGrid
       return delta;
     }
 
-    #endregion PROTECTED METHODS
+    internal override void NotifyExpansionStateChanged( bool isParentExpanded )
+    {
+      base.NotifyExpansionStateChanged( isParentExpanded );
+
+      if( this.Parent != null )
+      {
+        this.OnExpansionStateChanged( isParentExpanded, 0, m_itemCount );
+
+        if( isParentExpanded == true )
+        {
+          this.Parent.AdjustItemCount( m_itemCount );
+        }
+        else
+        {
+          this.Parent.AdjustItemCount( -m_itemCount );
+        }
+      }
+    }
+
+    internal override void CleanGeneratorNode()
+    {
+      base.CleanGeneratorNode();
 
-    #region INTERNAL METHODS
+      this.Child = null;
+      this.UIGroup.ClearGroup();
+      this.UIGroup = null;
+
+      m_group = null;
+    }
 
     internal void BuildNamesTree()
     {
@@ -257,10 +303,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE METHODS
-
     private void NotifyImmediateChildren( bool value )
     {
       if( this.Child != null )
@@ -275,10 +317,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
     private GroupConfiguration m_groupConfig;
     private bool m_isExpanded = true;
     private int m_leafCount; //this is the storage for the total number of "leaf" items that are child of this group. (no counting the groups, headers and footers)
@@ -286,7 +324,5 @@ namespace Xceed.Wpf.DataGrid
     private CollectionViewGroup m_group;
     private Group m_uiGroup;
     private object[] m_namesTree;
-
-    #endregion PRIVATE FIELDS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
index cc840051..55f73cfb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
@@ -15,26 +15,36 @@
   ***********************************************************************************/
 
 using System;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Automation;
 
 namespace Xceed.Wpf.DataGrid
 {
   public struct GroupHeaderFooterItem
   {
-    #region CONSTRUCTORS
+    #region Static Fields
+
+    public static readonly GroupHeaderFooterItem Empty = new GroupHeaderFooterItem();
+
+    #endregion
 
     public GroupHeaderFooterItem( CollectionViewGroup collectionViewGroup, object template )
     {
       if( !( template is DataTemplate ) && !( template is GroupHeaderFooterItemTemplate ) )
         throw new ArgumentException( "A GroupHeaderFooterItem can only be created with a DataTemplate or VisibleWhenCollapsed objects.", "template" );
 
+      Debug.Assert( template != null );
+
       m_template = template;
-      m_weakGroup = new WeakReference( collectionViewGroup );
-    }
+      m_group = new WeakReference( collectionViewGroup );
 
-    #endregion CONSTRUCTORS
+      m_hashCode = template.GetHashCode();
+      if( collectionViewGroup != null )
+      {
+        m_hashCode ^= collectionViewGroup.GetHashCode();
+      }
+    }
 
     #region Template Property
 
@@ -46,9 +56,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private object m_template;
+    private readonly object m_template;
 
-    #endregion Template Property
+    #endregion
 
     #region Group Property
 
@@ -56,25 +66,22 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        if( m_weakGroup.IsAlive )
-          return m_weakGroup.Target as CollectionViewGroup;
-
-        if( m_weakGroup.Target != null )
-          m_weakGroup.Target = null;
+        if( m_group != null )
+          return m_group.Target as CollectionViewGroup;
 
         return null;
       }
     }
 
-    private WeakReference m_weakGroup;
-
-    #endregion Group Property
+    private readonly WeakReference m_group;
 
-    #region PUBLIC METHODS
+    #endregion
 
     public static bool Equals( GroupHeaderFooterItem item1, GroupHeaderFooterItem item2 )
     {
-      return ( ( item1.m_template == item2.m_template ) && ( item1.Group == item2.Group ) );
+      return ( item1.m_hashCode == item2.m_hashCode )
+          && ( item1.m_template == item2.m_template )
+          && ( item1.Group == item2.Group );
     }
 
     public static bool operator ==( GroupHeaderFooterItem item1, GroupHeaderFooterItem item2 )
@@ -89,7 +96,7 @@ namespace Xceed.Wpf.DataGrid
 
     public override bool Equals( object obj )
     {
-      if( ( obj == null ) || ( !( obj is GroupHeaderFooterItem ) ) )
+      if( ( obj == null ) || !( obj is GroupHeaderFooterItem ) )
         return false;
 
       return this.Equals( ( GroupHeaderFooterItem )obj );
@@ -102,21 +109,9 @@ namespace Xceed.Wpf.DataGrid
 
     public override int GetHashCode()
     {
-      int hashCode = 0;
-
-      if( m_template != null )
-        hashCode ^= m_template.GetHashCode();
-
-      CollectionViewGroup group = this.Group;
-
-      if( group != null )
-        hashCode ^= group.GetHashCode();
-
-      return hashCode;
+      return m_hashCode;
     }
 
-    #endregion PUBLIC METHODS
-
-    public static readonly GroupHeaderFooterItem Empty = new GroupHeaderFooterItem();
+    private readonly int m_hashCode;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs
new file mode 100644
index 00000000..18defb54
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs
@@ -0,0 +1,117 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class GroupHeaderFooterItemContainerRecyclingPool : IEnumerable<DependencyObject>
+  {
+    internal int Count
+    {
+      get
+      {
+        return m_count;
+      }
+    }
+
+    internal void Clear()
+    {
+      m_collection.Clear();
+      m_count = 0;
+    }
+
+    internal void Enqueue( string groupBy, object template, DependencyObject container )
+    {
+      if( groupBy == null )
+        throw new ArgumentNullException( "groupBy" );
+
+      if( template == null )
+        throw new ArgumentNullException( "template" );
+
+      var pool = default( HeaderFooterItemContainerRecyclingPool );
+      if( m_collection.TryGetValue( groupBy, out pool ) )
+      {
+        pool.Enqueue( template, container );
+      }
+      else
+      {
+        pool = new HeaderFooterItemContainerRecyclingPool();
+        pool.Enqueue( template, container );
+
+        m_collection.Add( groupBy, pool );
+      }
+
+      m_count++;
+    }
+
+    internal DependencyObject Dequeue( string groupBy, object template )
+    {
+      if( groupBy == null )
+        throw new ArgumentNullException( "groupBy" );
+
+      if( template == null )
+        throw new ArgumentNullException( "template" );
+
+      var pool = default( HeaderFooterItemContainerRecyclingPool );
+      if( !m_collection.TryGetValue( groupBy, out pool ) )
+        return null;
+
+      var container = pool.Dequeue( template );
+      if( container != null )
+      {
+        if( pool.Count == 0 )
+        {
+          m_collection.Remove( groupBy );
+        }
+
+        m_count--;
+      }
+
+      return container;
+    }
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<DependencyObject> GetEnumerator()
+    {
+      foreach( var pool in m_collection.Values )
+      {
+        foreach( var entry in pool )
+        {
+          yield return entry;
+        }
+      }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    private int m_count; //0
+    private readonly Dictionary<string, HeaderFooterItemContainerRecyclingPool> m_collection = new Dictionary<string, HeaderFooterItemContainerRecyclingPool>();
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs
new file mode 100644
index 00000000..0968de47
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs
@@ -0,0 +1,190 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class HeaderFooterItemContainerRecyclingPool : IEnumerable<DependencyObject>
+  {
+    internal int Count
+    {
+      get
+      {
+        return m_count;
+      }
+    }
+
+    internal void Clear()
+    {
+      if( m_count <= 0 )
+        return;
+
+      m_collection.Clear();
+      m_count = 0;
+      m_version++;
+    }
+
+    internal void Enqueue( object item, DependencyObject container )
+    {
+      if( item == null )
+        throw new ArgumentNullException( "item" );
+
+      if( container == null )
+        throw new ArgumentNullException( "container" );
+
+      var entry = default( Entry );
+
+      if( !m_collection.TryGetValue( item, out entry ) )
+      {
+        entry = new Entry();
+      }
+
+      entry.Push( container );
+
+      m_collection[ item ] = entry;
+      m_count++;
+      m_version++;
+    }
+
+    internal DependencyObject Dequeue( object item )
+    {
+      if( item == null )
+        throw new ArgumentNullException( "item" );
+
+      if( m_collection.Count <= 0 )
+        return null;
+
+      var entry = default( Entry );
+
+      if( !m_collection.TryGetValue( item, out entry ) )
+        return null;
+
+      Debug.Assert( entry.Count > 0 );
+      var container = entry.Pop();
+      Debug.Assert( container != null );
+
+      if( entry.Count == 0 )
+      {
+        m_collection.Remove( item );
+      }
+      else
+      {
+        m_collection[ item ] = entry;
+      }
+
+      m_count--;
+      m_version++;
+
+      return container;
+    }
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<DependencyObject> GetEnumerator()
+    {
+      var version = m_version;
+
+      foreach( var entry in m_collection.Values )
+      {
+        for( int i = entry.Count - 1; i >= 0; i-- )
+        {
+          if( version != m_version )
+            throw new InvalidOperationException();
+
+          yield return entry[ i ];
+        }
+      }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    private int m_count; //0
+    private int m_version; //0
+    private readonly Dictionary<object, Entry> m_collection = new Dictionary<object, Entry>();
+
+    #region Entry Private Struct
+
+    private struct Entry
+    {
+      internal int Count
+      {
+        get
+        {
+          return m_count;
+        }
+      }
+
+      internal DependencyObject this[ int index ]
+      {
+        get
+        {
+          Debug.Assert( ( index >= 0 ) && ( index < m_count ) );
+          return m_containers[ index ];
+        }
+      }
+
+      internal void Push( DependencyObject container )
+      {
+        Debug.Assert( container != null );
+
+        if( m_containers == null )
+        {
+          Array.Resize( ref m_containers, 1 );
+        }
+        else if( m_count == m_containers.Length )
+        {
+          Debug.Assert( m_containers.Length > 0 );
+          Array.Resize( ref m_containers, m_containers.Length * 2 );
+        }
+
+        m_containers[ m_count ] = container;
+        m_count++;
+      }
+
+      internal DependencyObject Pop()
+      {
+        Debug.Assert( m_count > 0 );
+        Debug.Assert( m_containers != null );
+
+        m_count--;
+
+        var container = m_containers[ m_count ];
+        m_containers[ m_count ] = default( DependencyObject );
+
+        return container;
+      }
+
+      private int m_count; //0
+      private DependencyObject[] m_containers; //null
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
index d3a0131d..91849d2c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
@@ -86,7 +86,7 @@ namespace Xceed.Wpf.DataGrid
       for( int i = 0; i < this.Items.Count; i++ )
       {
         //determine if the DataTemplate for the node is a GroupHeaderFooterTemplate 
-        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate; 
+        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate;
 
         //if the Node represent a GroupHeader of GroupFooter and the template is a GroupHeaderFooterTemplate which
         //is VisibleWhenCollapsed
@@ -180,36 +180,35 @@ namespace Xceed.Wpf.DataGrid
 
     public override object GetAt( int index )
     {
-      object retval = null;
-      GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-      if( ( parentGroup != null ) && ( parentGroup.IsExpanded == false ) )
+      var parentGroup = this.Parent as GroupGeneratorNode;
+      object item;
+
+      if( ( parentGroup != null ) && !parentGroup.IsExpanded )
       {
-        retval = this.ComputeCollapsedGetAt( index );
+        item = this.ComputeCollapsedGetAt( index );
       }
       else
       {
-        retval = base.GetAt( index );
+        item = base.GetAt( index );
       }
 
-      if( parentGroup != null )
-      {
-        retval = new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, retval );
-      }
+      if( ( parentGroup != null ) && ( item != null ) )
+        return new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, item );
 
-      return retval;
+      return item;
     }
 
     #region ImmediateUIGroups
 
     internal ReadOnlyCollection<Group> GetImmediateUIGroups( int generatorCurrentGeneration )
     {
-      if( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) 
+      if( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration )
         || ( m_readOnlyImmediateUIGroups == null ) )
       {
         Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups == null ) ),
           "Creating Groups collection since generator version differs AND ReadOnlyCollection is null." );
 
-        Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups != null ) ), 
+        Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups != null ) ),
           "Creating Groups collection since generator version differs." );
 
         Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration == generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups == null ) ),
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
index 3fdf6072..60a172bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
@@ -14,8 +14,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -37,7 +37,7 @@ namespace Xceed.Wpf.DataGrid
     int GetRealizedIndexForContainer( DependencyObject container );
 
     void SetCurrentIndex( int newCurrentIndex );
-    int GetCurrentIndex( );
+    int GetCurrentIndex();
 
     void RestoreFocus( DependencyObject container );
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs
new file mode 100644
index 00000000..0d40ba07
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs
@@ -0,0 +1,192 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class ItemContainerRecyclingPool : IEnumerable<DependencyObject>
+  {
+    internal int Count
+    {
+      get
+      {
+        return m_count;
+      }
+    }
+
+    internal void Clear()
+    {
+      if( m_count <= 0 )
+        return;
+
+      m_collection.Clear();
+      m_count = 0;
+      m_version++;
+    }
+
+    internal void Enqueue( object hint, DependencyObject container )
+    {
+      if( container == null )
+        throw new ArgumentNullException( "container" );
+
+      var key = ( hint != null ) ? hint.GetHashCode() : 0;
+      var entry = default( Entry );
+
+      if( !m_collection.TryGetValue( key, out entry ) )
+      {
+        entry = new Entry();
+      }
+
+      entry.Push( container );
+
+      m_collection[ key ] = entry;
+      m_count++;
+      m_version++;
+    }
+
+    internal DependencyObject Dequeue( object hint )
+    {
+      if( m_collection.Count <= 0 )
+        return null;
+
+      var key = ( hint != null ) ? hint.GetHashCode() : 0;
+      var entry = default( Entry );
+
+      if( !m_collection.TryGetValue( key, out entry ) )
+      {
+        var pair = m_collection.First();
+
+        key = pair.Key;
+        entry = pair.Value;
+      }
+
+      Debug.Assert( entry.Count > 0 );
+      var container = entry.Pop();
+      Debug.Assert( container != null );
+
+      if( entry.Count == 0 )
+      {
+        m_collection.Remove( key );
+      }
+      else
+      {
+        m_collection[ key ] = entry;
+      }
+
+      m_count--;
+      m_version++;
+
+      return container;
+    }
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<DependencyObject> GetEnumerator()
+    {
+      var version = m_version;
+
+      foreach( var entry in m_collection.Values )
+      {
+        for( int i = entry.Count - 1; i >= 0; i-- )
+        {
+          if( version != m_version )
+            throw new InvalidOperationException();
+
+          yield return entry[ i ];
+        }
+      }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    private int m_count; //0
+    private int m_version; //0
+    private readonly Dictionary<int, Entry> m_collection = new Dictionary<int, Entry>();
+
+    #region Entry Private Struct
+
+    private struct Entry
+    {
+      internal int Count
+      {
+        get
+        {
+          return m_count;
+        }
+      }
+
+      internal DependencyObject this[ int index ]
+      {
+        get
+        {
+          Debug.Assert( ( index >= 0 ) && ( index < m_count ) );
+          return m_containers[ index ];
+        }
+      }
+
+      internal void Push( DependencyObject container )
+      {
+        Debug.Assert( container != null );
+
+        if( m_containers == null )
+        {
+          Array.Resize( ref m_containers, 1 );
+        }
+        else if( m_count == m_containers.Length )
+        {
+          Debug.Assert( m_containers.Length > 0 );
+          Array.Resize( ref m_containers, m_containers.Length * 2 );
+        }
+
+        m_containers[ m_count ] = container;
+        m_count++;
+      }
+
+      internal DependencyObject Pop()
+      {
+        Debug.Assert( m_count > 0 );
+        Debug.Assert( m_containers != null );
+
+        m_count--;
+
+        var container = m_containers[ m_count ];
+        m_containers[ m_count ] = default( DependencyObject );
+
+        return container;
+      }
+
+      private int m_count; //0
+      private DependencyObject[] m_containers; //null
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
index 5986ac07..ebd0e1c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
@@ -15,23 +15,22 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows;
+using System.Windows.Data;
+using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class ItemContextVisitor : IDataGridContextVisitor
+  internal sealed class ItemContextVisitor : IDataGridContextVisitor
   {
-    public ItemContextVisitor( bool isTableFlowView )
+    internal ItemContextVisitor( TableflowViewItemsHost itemsHost, double firstItemHiddenRatio )
     {
-      m_isTableFlowView = isTableFlowView;
+      m_itemsHost = itemsHost;
+      m_firstItemHiddenRatio = firstItemHiddenRatio;
     }
 
     #region ParentDataGridContext
 
-    private DataGridContext m_parentDataGridContext;
-
     public DataGridContext ParentDataGridContext
     {
       get
@@ -40,11 +39,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ParentDataGridContext
+    private DataGridContext m_parentDataGridContext;
 
-    #region Item Property
+    #endregion
 
-    private object m_item;
+    #region Item Property
 
     public object Item
     {
@@ -54,7 +53,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Item Property
+    private object m_item;
+
+    #endregion
 
     #region VisitSuccessful Property
 
@@ -84,39 +85,46 @@ namespace Xceed.Wpf.DataGrid
 
     public void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
     {
-      if( !m_isTableFlowView )
+      // In TableflowView, we must consider that sticky headers may hide the item.
+      if( m_itemsHost != null )
       {
-        m_item = item;
-        m_parentDataGridContext = sourceContext;
-        m_success = true;
-        stopVisit = true;
-        return;
-      }
-
-      UIElement dataRow = sourceContext.CustomItemContainerGenerator.ContainerFromItem( item ) as UIElement;
-
-      if( dataRow != null )
-      {
-        if( !ScrollTip.IsItemInView( dataRow, sourceContext.DataGridControl.ItemsHost ) )
+        if( m_isFirstItem )
         {
-          stopVisit = true;
+          m_isFirstItem = false;
+
+          // At least half the item is hidden.
+          if( m_firstItemHiddenRatio > 0.5d )
+            return;
         }
-        else if( !ScrollTip.IsDataItemHiddenBySticky( sourceContext, item ) )
+
+        var areHeadersSticky = TableflowView.GetAreHeadersSticky( sourceContext );
+        var areGroupHeadersSticky = TableflowView.GetAreGroupHeadersSticky( sourceContext );
+        var areParentRowsSticky = TableflowView.GetAreParentRowsSticky( sourceContext );
+
+        if( areHeadersSticky || areGroupHeadersSticky || areParentRowsSticky )
         {
-          m_item = item;
-          m_parentDataGridContext = sourceContext;
-          m_success = true;
-          stopVisit = true;
+          var stickyHeadersCount = sourceContext.CustomItemContainerGenerator.GetStickyHeaderCountForIndex( sourceDataItemIndex, areHeadersSticky, areGroupHeadersSticky, areParentRowsSticky );
+
+          if( stickyHeadersCount > m_stickyHeadersSkipped )
+          {
+            m_stickyHeadersSkipped++;
+            return;
+          }
         }
       }
+
+      m_item = item;
+      m_parentDataGridContext = sourceContext;
+      m_success = true;
+      stopVisit = true;
     }
 
-    public void Visit( DataGridContext sourceContext, System.Windows.Data.CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
+    public void Visit( DataGridContext sourceContext, CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
     {
       throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
     }
 
-    public void Visit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter, ref bool stopVisit )
+    public void Visit( DataGridContext sourceContext, DataTemplate headerFooter, ref bool stopVisit )
     {
       throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
     }
@@ -128,6 +136,9 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    private bool m_isTableFlowView;
+    private readonly TableflowViewItemsHost m_itemsHost;
+    private readonly double m_firstItemHiddenRatio;
+    private bool m_isFirstItem = true;
+    private int m_stickyHeadersSkipped; //0
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
index 8431c83f..5a107b4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
@@ -16,36 +16,25 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal partial class ItemsGeneratorNode : CollectionGeneratorNode
   {
-    public ItemsGeneratorNode( IList list, GeneratorNode parent )
+    internal ItemsGeneratorNode( IList list, GeneratorNode parent )
       : base( list, parent )
     {
-
     }
 
     internal override int ItemCount
     {
       get
       {
-        GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-        if( parentGroup != null )
-        {
-          int totalItemCount = 0;
-
-          if( parentGroup.IsExpanded == true )
-          {
-            totalItemCount = this.Items.Count + this.ComputeDetailsCount();
-          }
+        var parentGroup = this.Parent as GroupGeneratorNode;
+        if( ( parentGroup == null ) || parentGroup.IsExpanded )
+          return this.Items.Count + this.ComputeDetailsCount();
 
-          return totalItemCount;
-        }
-
-        return this.Items.Count + this.ComputeDetailsCount();
+        return 0;
       }
     }
 
@@ -57,7 +46,7 @@ namespace Xceed.Wpf.DataGrid
       {
         this.OnExpansionStateChanged( isParentExpanded, 0, this.Items.Count + this.ComputeDetailsCount() );
 
-        if( isParentExpanded == true )
+        if( isParentExpanded )
         {
           this.Parent.AdjustItemCount( this.Items.Count + this.ComputeDetailsCount() );
         }
@@ -72,13 +61,11 @@ namespace Xceed.Wpf.DataGrid
     {
       base.AdjustItemCountOverride( delta );
 
-      GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-      if( ( parentGroup != null ) && ( parentGroup.IsExpanded == false ) )
-      {
-        return 0;
-      }
+      var parentGroup = this.Parent as GroupGeneratorNode;
+      if( ( parentGroup == null ) || parentGroup.IsExpanded )
+        return delta;
 
-      return delta;
+      return 0;
     }
 
     public override object GetAt( int index )
@@ -86,59 +73,48 @@ namespace Xceed.Wpf.DataGrid
       if( index < 0 )
         return null;
 
-      if( ( m_detailsMapping == null )
-        || ( m_detailsMapping.Count == 0 ) )
-      {
-        //If there are no details, call base (quicker)
+      //If there are no details, call base (quicker)
+      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
         return base.GetAt( index );
-      }
 
       int masterIndex;
       int detailIndex;
       int detailNodeIndex;
-      DetailGeneratorNode detailNode = this.GetDetailNodeForIndex( index, out masterIndex, out detailIndex, out detailNodeIndex );
 
+      var detailNode = this.GetDetailNodeForIndex( index, out masterIndex, out detailIndex, out detailNodeIndex );
       if( detailNode == null )
-      {
         return this.Items[ masterIndex ];
-      }
 
       return detailNode.DetailGenerator.ItemFromIndex( detailIndex );
     }
 
     public override int IndexOf( object item )
     {
-      if( ( m_detailsMapping == null )
-        || ( m_detailsMapping.Count == 0 ) )
-      {
+      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
         return base.IndexOf( item );
-      }
 
-      int tmpIndex = this.Items.IndexOf( item );
-      if( tmpIndex != -1 )
-      {
+      var tmpIndex = this.Items.IndexOf( item );
+      if( tmpIndex >= 0 )
         return tmpIndex + this.CountDetailsBeforeDataIndex( tmpIndex );
-      }
 
       int runningDetailCount = 0;
 
       foreach( KeyValuePair<int, List<DetailGeneratorNode>> pair in m_detailsMapping )
       {
-        List<DetailGeneratorNode> detailNodeList = pair.Value;
-
-        int currentIndex = pair.Key;
-        int runningIndex = ( currentIndex + runningDetailCount );
+        var detailNodeList = pair.Value;
+        var currentIndex = pair.Key;
+        var runningIndex = ( currentIndex + runningDetailCount );
 
-        int count = detailNodeList.Count;
+        var count = detailNodeList.Count;
         for( int i = 0; i < count; i++ )
         {
-          DetailGeneratorNode detailNode = detailNodeList[ i ];
-          int detailIndex = detailNode.DetailGenerator.IndexFromItem( item );
+          var detailNode = detailNodeList[ i ];
+          var detailIndex = detailNode.DetailGenerator.IndexFromItem( item );
 
-          if( detailIndex > -1 )
+          if( detailIndex >= 0 )
             return runningIndex + detailIndex + 1;
 
-          int detailItemCount = detailNode.ItemCount;
+          var detailItemCount = detailNode.ItemCount;
 
           runningDetailCount += detailItemCount;
           runningIndex += detailItemCount;
@@ -154,10 +130,11 @@ namespace Xceed.Wpf.DataGrid
 
       if( m_detailsMapping != null )
       {
-        foreach( List<DetailGeneratorNode> detail in m_detailsMapping.Values )
+        foreach( var detail in m_detailsMapping.Values )
         {
           detail.Clear();
         }
+
         m_detailsMapping.Clear();
         m_detailsMapping = null;
       }
@@ -179,34 +156,36 @@ namespace Xceed.Wpf.DataGrid
 
     private int ComputeDetailsCount()
     {
-      int retval = 0;
-      if( m_detailsMapping != null )
+      if( m_detailsMapping == null )
+        return 0;
+
+      var count = 0;
+
+      foreach( var detailsList in m_detailsMapping.Values )
       {
-        foreach( List<DetailGeneratorNode> detailsList in m_detailsMapping.Values )
+        foreach( var detail in detailsList )
         {
-          foreach( DetailGeneratorNode detail in detailsList )
-          {
-            retval += detail.ItemCount;
-          }
+          count += detail.ItemCount;
         }
       }
-      return retval;
+
+      return count;
     }
 
     internal int CountDetailsBeforeDataIndex( int dataIndex )
     {
-      if( this.Details == null )
+      if( m_detailsMapping == null )
         return 0;
 
-      int retval = 0;
+      var count = 0;
 
       foreach( KeyValuePair<int, List<DetailGeneratorNode>> indexToDetails in m_detailsMapping )
       {
         if( indexToDetails.Key < dataIndex )
         {
-          foreach( DetailGeneratorNode node in indexToDetails.Value )
+          foreach( var node in indexToDetails.Value )
           {
-            retval += node.ItemCount;
+            count += node.ItemCount;
           }
 
           continue;
@@ -218,7 +197,7 @@ namespace Xceed.Wpf.DataGrid
         break;
       }
 
-      return retval;
+      return count;
     }
 
     internal int CountDetailsBeforeGlobalIndex( int globalIndex )
@@ -226,11 +205,11 @@ namespace Xceed.Wpf.DataGrid
       if( ( m_detailsMapping == null ) || ( globalIndex == 0 ) )
         return 0;
 
-      int retval = 0;
+      var retval = 0;
 
       foreach( KeyValuePair<int, List<DetailGeneratorNode>> indexToDetails in m_detailsMapping )
       {
-        int key = indexToDetails.Key;
+        var key = indexToDetails.Key;
 
         // Since the details list is now a SortedDictionary, we can assume
         // that if the key is greater or equal than the reference index,
@@ -238,9 +217,9 @@ namespace Xceed.Wpf.DataGrid
         if( key >= globalIndex )
           break;
 
-        foreach( DetailGeneratorNode node in indexToDetails.Value )
+        foreach( var node in indexToDetails.Value )
         {
-          int itemCount = node.ItemCount;
+          var itemCount = node.ItemCount;
           globalIndex -= itemCount;
 
           if( key >= globalIndex )
@@ -255,9 +234,10 @@ namespace Xceed.Wpf.DataGrid
 
     public DetailGeneratorNode GetDetailNodeForIndex( int targetIndex )
     {
-      int masterIndex = -1;
-      int detailIndex = -1;
-      int detailNodeIndex = -1;
+      int masterIndex;
+      int detailIndex;
+      int detailNodeIndex;
+
       return this.GetDetailNodeForIndex( targetIndex, out masterIndex, out detailIndex, out detailNodeIndex );
     }
 
@@ -267,21 +247,19 @@ namespace Xceed.Wpf.DataGrid
       detailIndex = -1;
       detailNodeIndex = -1;
 
-      if( ( m_detailsMapping == null )
-        || ( m_detailsMapping.Count == 0 ) )
+      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
       {
         masterIndex = targetIndex;
         return null;
       }
 
-      int runningDetailCount = 0;
+      var runningDetailCount = 0;
 
       foreach( KeyValuePair<int, List<DetailGeneratorNode>> pair in m_detailsMapping )
       {
-        List<DetailGeneratorNode> detailNodeList = pair.Value;
-        int currentIndex = pair.Key;
-
-        int runningIndex = ( currentIndex + runningDetailCount );
+        var detailNodeList = pair.Value;
+        var currentIndex = pair.Key;
+        var runningIndex = ( currentIndex + runningDetailCount );
 
         if( targetIndex < runningIndex )
         {
@@ -295,11 +273,11 @@ namespace Xceed.Wpf.DataGrid
           return null;
         }
 
-        int count = detailNodeList.Count;
+        var count = detailNodeList.Count;
         for( int i = 0; i < count; i++ )
         {
-          DetailGeneratorNode detailNode = detailNodeList[ i ];
-          int detailItemCount = detailNode.ItemCount;
+          var detailNode = detailNodeList[ i ];
+          var detailItemCount = detailNode.ItemCount;
 
           if( targetIndex <= ( runningIndex + detailItemCount ) )
           {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs
deleted file mode 100644
index 1b477e4d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class NamesTreeGroupFinderVisitor : IDataGridContextVisitor
-  {
-    public NamesTreeGroupFinderVisitor( object[] namesTree )
-    {
-      if( namesTree == null )
-        throw new ArgumentNullException( "namesTree" );
-
-      if( namesTree.Length == 0 )
-        throw new ArgumentException( "namesTree should not be an empty array", "namesTree" );
-
-      m_groupNamesTreeKey = new GroupNamesTreeKey( namesTree );
-    }
-
-    #region CollectionViewGroup Group
-
-    public CollectionViewGroup Group
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IDataGridContextVisitor Members
-
-    public void Visit( DataGridContext sourceContext, System.Windows.Data.CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
-    {
-      if( this.Group == null )
-      {
-        GroupNamesTreeKey currentGroupKey = new GroupNamesTreeKey( namesTree );
-
-        if( currentGroupKey.Equals( m_groupNamesTreeKey ) == true )
-          this.Group = group;
-
-      }
-    }
-
-    public void Visit( DataGridContext sourceContext, ref bool stopVisit )
-    {
-      throw new NotSupportedException();
-    }
-
-    public void Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit )
-    {
-      throw new NotSupportedException();
-    }
-
-    public void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
-    {
-      throw new NotSupportedException();
-    }
-
-    public void Visit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException();
-    }
-
-    public void Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-
-    private GroupNamesTreeKey m_groupNamesTreeKey;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
index 11f005bb..c6e09415 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
@@ -15,7 +15,6 @@
   ***********************************************************************************/
 
 using System.Collections.Specialized;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -30,10 +29,11 @@ namespace Xceed.Wpf.DataGrid
 
     public void OnCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      if( this.CollectionChanged != null )
-      {
-        this.CollectionChanged( this, e );
-      }
+      var handler = this.CollectionChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
index 175a11b8..aab7e77d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
@@ -57,11 +57,6 @@ namespace Xceed.Wpf.DataGrid
           if( intersectionSelectionRange.IsEmpty )
             continue;
 
-#if DEBUG
-          string action = ( m_unselect ) ? "Removing" : "Adding";
-          Debug.WriteLine( "Selection : " + action + " cell : (" + startSourceDataItemIndex.ToString() + " - " + endSourceDataItemIndex.ToString() + ") - ("
-             + intersectionSelectionRange.StartIndex.ToString() + " - " + intersectionSelectionRange.EndIndex.ToString() + ")" );
-#endif
 
           var cellRange = new SelectionCellRangeWithItems( new SelectionRange( startSourceDataItemIndex, endSourceDataItemIndex ), null, intersectionSelectionRange );
 
@@ -77,10 +72,6 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-#if DEBUG
-        string action = ( m_unselect ) ? "Removing" : "Adding";
-        Debug.WriteLine( "Selection : " + action + " Adding item : " + startSourceDataItemIndex.ToString() + " - " + endSourceDataItemIndex.ToString() );
-#endif
         var itemRange = new SelectionRangeWithItems( new SelectionRange( startSourceDataItemIndex, endSourceDataItemIndex ), null );
 
         if( m_unselect )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs
new file mode 100644
index 00000000..6c4beb1d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs
@@ -0,0 +1,46 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal delegate void RecyclingCandidatesCleanedEventHandler( object sender, RecyclingCandidatesCleanedEventArgs e );
+
+  internal class RecyclingCandidatesCleanedEventArgs : EventArgs
+  {
+    public RecyclingCandidatesCleanedEventArgs( IList<DependencyObject> recyclingCandidates )
+    {
+      if( recyclingCandidates == null )
+        throw new ArgumentNullException( "recyclingCandidates" );
+
+      m_recyclingCandidates = recyclingCandidates;
+    }
+
+    public IList<DependencyObject> RecyclingCandidates
+    {
+      get
+      {
+        return m_recyclingCandidates;
+      }
+    }
+
+    private IList<DependencyObject> m_recyclingCandidates;
+  }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
index 8ab24f65..7c385052 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
@@ -129,36 +129,24 @@ namespace Xceed.Wpf.DataGrid
         {
           for( int i = 0; i < m_itemsToExpand.Count; i++ )
           {
-            object dataItemToExpand = m_itemsToExpand[ i ].Target;
+            var dataItemToExpand = m_itemsToExpand[ i ].Target;
+            if( dataItemToExpand == null )
+              continue;
 
-            if( dataItemToExpand != null )
+            // Verify if we have a System.Data.DataView as ItemsSource to 
+            // ensure to restore the System.Data.DataRowView that represents
+            // the System.Data.DataRow saved previously
+            System.Data.DataView dataView = ItemsSourceHelper.TryGetDataViewFromDataGridContext( m_rootDataGridContext );
+
+            if( ( dataView != null ) && ( dataItemToExpand is System.Data.DataRow ) )
             {
-              try
+              foreach( System.Data.DataRowView dataRowView in dataView )
               {
-                // Verify if we have a System.Data.DataView as ItemsSource to 
-                // ensure to restore the System.Data.DataRowView that represents
-                // the System.Data.DataRow saved previously
-                System.Data.DataView dataView = 
-                  ItemsSourceHelper.TryGetDataViewFromDataGridContext( m_rootDataGridContext );
-
-                if( ( dataView != null ) 
-                    && ( dataItemToExpand is System.Data.DataRow ) )
+                if( dataRowView.Row == dataItemToExpand )
                 {
-                  foreach( System.Data.DataRowView dataRowView in dataView )
-                  {
-                    if( dataRowView.Row == dataItemToExpand )
-                    {
-                      dataItemToExpand = dataRowView;
-                      break;
-                    }
-                  }
+                  dataItemToExpand = dataRowView;
+                  break;
                 }
-
-                m_rootDataGridContext.ExpandDetails( dataItemToExpand );
-              }
-              catch
-              {
-                System.Diagnostics.Debug.Assert( false, "Item has moved in the source ?" );
               }
             }
           }
@@ -218,16 +206,16 @@ namespace Xceed.Wpf.DataGrid
       {
         if( wasExpanded )
         {
-          sourceContext.ExpandGroupCore( group, true );
+          sourceContext.ExpandGroup( group, true );
         }
         else
         {
-          sourceContext.CollapseGroupCore( group, true );
+          sourceContext.CollapseGroup( group, true );
         }
       }
       else if( m_stopAtFirstCollapsedGroup )
       {
-        sourceContext.CollapseGroupCore( group, true );
+        sourceContext.CollapseGroup( group, true );
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
index 727a9316..edb805a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
@@ -14,36 +14,34 @@
 
   ***********************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class SaveRestoreGlobalStateVisitor : SaveRestoreStateVisitor
   {
-    #region CONSTRUCTORS
-
-    public SaveRestoreGlobalStateVisitor( bool stopAtFirstCollapsedGroup )
+    internal SaveRestoreGlobalStateVisitor( bool stopAtFirstCollapsedGroup )
     {
       m_stopAtFirstCollapsedGroup = stopAtFirstCollapsedGroup;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region StopAtFirstCollapsedGroup PROPERTY
-
-    private bool m_stopAtFirstCollapsedGroup;
+    #region StopAtFirstCollapsedGroup Property
 
-    public bool StopAtFirstCollapsedGroup
+    internal bool StopAtFirstCollapsedGroup
     {
-      get { return m_stopAtFirstCollapsedGroup; }
-      set { m_stopAtFirstCollapsedGroup = value; }
+      get
+      {
+        return m_stopAtFirstCollapsedGroup;
+      }
+      set
+      {
+        m_stopAtFirstCollapsedGroup = value;
+      }
     }
 
-    #endregion StopAtFirstCollapsedGroup PROPERTY
+    private bool m_stopAtFirstCollapsedGroup;
 
-    #region PROTECTED METHODS
+    #endregion
 
     protected override void InitializeCore()
     {
@@ -52,34 +50,27 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void SaveStateCore( IDataGridContextVisitable dataGridContextVisitable )
     {
-      DataGridContext rootDataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
+      var dataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
 
-      this.RecursiveSaveDataGridContextsState( rootDataGridContext );
+      this.RecursiveSaveDataGridContextsState( dataGridContext );
     }
 
     protected override void RestoreStateCore( IDataGridContextVisitable dataGridContextVisitable )
     {
-      DataGridContext rootDataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
+      var dataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
 
-      this.RecursiveRestoreDataGridContextsState( rootDataGridContext );
+      this.RecursiveRestoreDataGridContextsState( dataGridContext );
     }
 
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE METHODS
-
     private void RecursiveSaveDataGridContextsState( DataGridContext dataGridContext )
     {
-      SaveRestoreDataGridContextStateVisitor saveRestoreDataGridContextStateVisitor
-        = new SaveRestoreDataGridContextStateVisitor( true, int.MaxValue, m_stopAtFirstCollapsedGroup );
+      var saveRestoreDataGridContextStateVisitor = new SaveRestoreDataGridContextStateVisitor( true, int.MaxValue, m_stopAtFirstCollapsedGroup );
 
       saveRestoreDataGridContextStateVisitor.SaveState( dataGridContext as IDataGridContextVisitable );
 
       m_dataGridContextsStateDictionary.Add( new WeakDataGridContextKey( dataGridContext ), saveRestoreDataGridContextStateVisitor );
 
-      IEnumerable<DataGridContext> subDataGridContexts = dataGridContext.GetChildContexts();
-
-      foreach( DataGridContext subDataGridContext in subDataGridContexts )
+      foreach( var subDataGridContext in dataGridContext.GetChildContextsCore() )
       {
         this.RecursiveSaveDataGridContextsState( subDataGridContext );
       }
@@ -87,9 +78,8 @@ namespace Xceed.Wpf.DataGrid
 
     private void RecursiveRestoreDataGridContextsState( DataGridContext dataGridContext )
     {
-      WeakDataGridContextKey weakDataGridContextKey = new WeakDataGridContextKey( dataGridContext );
-
-      SaveRestoreDataGridContextStateVisitor saveRestoreDataGridContextStateVisitor;
+      var weakDataGridContextKey = new WeakDataGridContextKey( dataGridContext );
+      var saveRestoreDataGridContextStateVisitor = default( SaveRestoreDataGridContextStateVisitor );
 
       if( m_dataGridContextsStateDictionary.TryGetValue( weakDataGridContextKey, out saveRestoreDataGridContextStateVisitor ) )
       {
@@ -103,19 +93,12 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      IEnumerable<DataGridContext> subDataGridContexts = dataGridContext.GetChildContexts();
-      foreach( DataGridContext subDataGridContext in subDataGridContexts )
+      foreach( var subDataGridContext in dataGridContext.GetChildContextsCore() )
       {
         this.RecursiveRestoreDataGridContextsState( subDataGridContext );
       }
     }
 
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor> m_dataGridContextsStateDictionary;
-
-    #endregion PRIVATE FIELDS
+    private Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor> m_dataGridContextsStateDictionary;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs
deleted file mode 100644
index 493ea869..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VisibilityChangedEventManager : WeakEventManager
-  {
-    private VisibilityChangedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var columnCollection = ( ColumnCollection )source;
-      columnCollection.ColumnVisibilityChanged += new EventHandler( this.OnColumnVisibilityChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var columnCollection = ( ColumnCollection )source;
-      columnCollection.ColumnVisibilityChanged -= new EventHandler( this.OnColumnVisibilityChanged );
-    }
-
-    private static VisibilityChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VisibilityChangedEventManager );
-        VisibilityChangedEventManager currentManager = ( VisibilityChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new VisibilityChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnColumnVisibilityChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs
deleted file mode 100644
index 3a07257e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VisibleColumnsUpdatedEventManager : WeakEventManager
-  {
-    private VisibleColumnsUpdatedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.VisibleColumnsUpdated += new EventHandler( this.OnVisibleColumnsUpdated );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.VisibleColumnsUpdated -= new EventHandler( this.OnVisibleColumnsUpdated );
-    }
-
-    private static VisibleColumnsUpdatedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VisibleColumnsUpdatedEventManager );
-        VisibleColumnsUpdatedEventManager currentManager = ( VisibleColumnsUpdatedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new VisibleColumnsUpdatedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVisibleColumnsUpdated( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
index 1466ab01..7467129b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
@@ -15,28 +15,26 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class WeakDataGridContextKey
+  internal sealed class WeakDataGridContextKey
   {
-    public WeakDataGridContextKey( DataGridContext dataGridContext )
+    internal WeakDataGridContextKey( DataGridContext dataGridContext )
     {
-      DataGridContext parentDataGridContext = dataGridContext.ParentDataGridContext;
-      int level = 0;
+      var parentDataGridContext = dataGridContext.ParentDataGridContext;
+      var level = 0;
+
       while( parentDataGridContext != null )
       {
         level++;
         parentDataGridContext = parentDataGridContext.ParentDataGridContext;
       }
 
-      System.Diagnostics.Debug.Assert( ( ( level == 0 ) || ( dataGridContext.SourceDetailConfiguration != null ) ),
-        "A child dataGridContext must have a SourceDetailConfiguration." );
+      Debug.Assert( ( ( level == 0 ) || ( dataGridContext.SourceDetailConfiguration != null ) ), "A child dataGridContext must have a SourceDetailConfiguration." );
 
-      m_sourceDetailConfigurationRelationName = ( dataGridContext.SourceDetailConfiguration != null ) ?
-        dataGridContext.SourceDetailConfiguration.RelationName : string.Empty;
+      m_sourceDetailConfigurationRelationName = ( dataGridContext.SourceDetailConfiguration != null ) ? dataGridContext.SourceDetailConfiguration.RelationName : string.Empty;
 
       if( level > 0 )
       {
@@ -45,13 +43,13 @@ namespace Xceed.Wpf.DataGrid
         // Build the tree of master items.
         m_weakItemsTree = new WeakReference[ level ];
 
-        DataGridContext tempDataGridContext = dataGridContext;
+        var tempDataGridContext = dataGridContext;
         for( int i = level - 1; i >= 0; i-- )
         {
           // Ensure to get a reference to the System.Data.DataRow when doing a 
           // save/restore of a System.Data.DataRowView since the view is recreated
           // for every detail views
-          object parentItem = ItemsSourceHelper.TryGetDataRowFromDataItem( tempDataGridContext.ParentItem );
+          var parentItem = ItemsSourceHelper.TryGetDataRowFromDataItem( tempDataGridContext.ParentItem );
 
           m_weakItemsTree[ i ] = new WeakReference( parentItem );
 
@@ -59,67 +57,33 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      this.Initialize();
+      m_hashCode = WeakDataGridContextKey.CalculateHashCode( m_sourceDetailConfigurationRelationName, m_weakItemsTree );
     }
 
-    private void Initialize()
-    {
-      m_cachedHash = 0;
-
-      if( !string.IsNullOrEmpty( m_sourceDetailConfigurationRelationName ) )
-        m_cachedHash = m_sourceDetailConfigurationRelationName.GetHashCode();
-
-      if( m_weakItemsTree != null )
-      {
-        // We use this hashing algorithm in order to get a different hashCode
-        // when the same values are in a different order in the object array.
-        int weakItemsTreeLength = m_weakItemsTree.Length;
-        for( int i = 0; i < weakItemsTreeLength; i++ )
-        {
-          object item = m_weakItemsTree[ i ].Target;
-
-          System.Diagnostics.Debug.Assert( item != null, "Item should still be referenced by the Child DataGridContext at this point!." );
-
-          m_cachedHash ^= item.GetHashCode();
-          m_cachedHash += ( m_cachedHash << 10 );
-          m_cachedHash ^= ( m_cachedHash >> 6 );
-        }
-      }
-    }
-
-    private int m_cachedHash;
-
     public override int GetHashCode()
     {
-      return m_cachedHash;
+      return m_hashCode;
     }
 
-    private WeakReference[] m_weakItemsTree;
-    private string m_sourceDetailConfigurationRelationName;
-
     public override bool Equals( object obj )
     {
-      WeakDataGridContextKey weakDataGridContextKey = obj as WeakDataGridContextKey;
-
-      if( weakDataGridContextKey == null )
+      var target = obj as WeakDataGridContextKey;
+      if( ( target == null ) || ( m_hashCode != target.m_hashCode ) )
         return false;
 
-      if( m_cachedHash != weakDataGridContextKey.m_cachedHash )
+      if( m_sourceDetailConfigurationRelationName != target.m_sourceDetailConfigurationRelationName )
         return false;
 
-      if( m_sourceDetailConfigurationRelationName != weakDataGridContextKey.m_sourceDetailConfigurationRelationName )
-        return false;
-
-      int dataGridContextStatusKeyLength = ( weakDataGridContextKey.m_weakItemsTree == null ) ? 0 : weakDataGridContextKey.m_weakItemsTree.Length;
-      int myLength = ( m_weakItemsTree == null ) ? 0 : m_weakItemsTree.Length;
+      var dataGridContextStatusKeyLength = ( target.m_weakItemsTree == null ) ? 0 : target.m_weakItemsTree.Length;
+      var myLength = ( m_weakItemsTree == null ) ? 0 : m_weakItemsTree.Length;
 
       if( myLength != dataGridContextStatusKeyLength )
         return false;
 
-      for( int i = 0; i < dataGridContextStatusKeyLength; i++ )
+      for( var i = 0; i < dataGridContextStatusKeyLength; i++ )
       {
-        object sourceItem = m_weakItemsTree[ i ].Target;
-        object targetItem = weakDataGridContextKey.m_weakItemsTree[ i ].Target;
+        var sourceItem = m_weakItemsTree[ i ].Target;
+        var targetItem = target.m_weakItemsTree[ i ].Target;
 
         if( !object.Equals( sourceItem, targetItem ) )
           return false;
@@ -127,6 +91,34 @@ namespace Xceed.Wpf.DataGrid
 
       return true;
     }
-  }
 
+    private static int CalculateHashCode( string relationName, WeakReference[] items )
+    {
+      var hashCode = ( !string.IsNullOrEmpty( relationName ) ) ? relationName.GetHashCode() : 0;
+
+      if( items != null )
+      {
+        // We use this hashing algorithm in order to get a different hashCode
+        // when the same values are in a different order in the object array.
+        for( var i = 0; i < items.Length; i++ )
+        {
+          var item = items[ i ].Target;
+          Debug.Assert( item != null, "Item should still be referenced by the Child DataGridContext at this point!." );
+
+          if( item == null )
+            continue;
+
+          hashCode ^= item.GetHashCode();
+          hashCode += ( hashCode << 10 );
+          hashCode ^= ( hashCode >> 6 );
+        }
+      }
+
+      return hashCode;
+    }
+
+    private readonly WeakReference[] m_weakItemsTree;
+    private readonly string m_sourceDetailConfigurationRelationName;
+    private readonly int m_hashCode;
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs
new file mode 100644
index 00000000..96f85cfe
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs
@@ -0,0 +1,25 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid
+{
+  public enum ColumnDraggableStatus
+  {
+    Draggable = 0,
+    FirstUndraggable,
+    LastUndraggable,
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs
similarity index 89%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs
index 1b50e898..f0783ca8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs
@@ -1,29 +1,29 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum InsertionMode
-  {
-    Default,
-    Continuous,
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public enum DataGridDragBehavior
+  {
+    DragDrop = 0,
+    Select
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs
deleted file mode 100644
index cbe2d8f3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  /// <summary>
-  /// The precedence value of an expression operator determining the order in which the
-  /// parameters of the expression will be consumed. A smaller value means a greater
-  /// priority. The values closely follows the standard operator precedences. This type
-  /// should not be confused with the FilterTokenPriority enum.
-  /// </summary>
-  internal enum FilterOperatorPrecedence
-  {
-    /// <summary>
-    /// 0: RelationalOperator (=, &gt;, &lt;, ...)
-    /// </summary>
-    RelationalOperator,
-    /// <summary>
-    /// 1: Not operator
-    /// </summary>
-    NotOperator,
-    /// <summary>
-    /// 2: And operator
-    /// </summary>
-    AndOperator,
-    /// <summary>
-    /// 3: Or operator
-    /// </summary>
-    OrOperator,
-    /// <summary>
-    /// 4: Default priority
-    /// </summary>
-    Default
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs
deleted file mode 100644
index 702627fd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  /// <summary>
-  /// The priority value of an expression operator determining the order in which the
-  /// operator will be parsed. A smaller value means a greater priority. The operator
-  /// having an impact on the interpretation of its surrounding operators should have
-  /// a greater priority than those that do not. This type should not be confused with 
-  /// the FilterOperatorPrecedence enum.
-  /// </summary>
-  internal enum FilterTokenPriority
-  {
-    /// <summary>
-    /// 0: And operator
-    /// </summary>
-    AndOperator,
-    /// <summary>
-    /// 1: Or operator
-    /// </summary>
-    OrOperator,
-    /// <summary>
-    /// 2: Not operator
-    /// </summary>
-    NotOperator,
-    /// <summary>
-    /// 3: RelationalOperator (=, &gt;, &lt;, ...)
-    /// </summary>
-    RelationalOperator,
-    /// <summary>
-    /// 4: Default priority
-    /// </summary>
-    Default
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs
similarity index 73%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs
index 67ea8ba4..93651a88 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs
@@ -1,30 +1,28 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  // Defines the way the filter acts on Filter defined on each column of a Row
-  internal enum AutoFilterMode
-  {
-    None,
-    And,
-    Or
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal enum LocationType
+  {
+    Column,
+    Start,
+    End,
+    Splitter,
+    Orphan,
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs
new file mode 100644
index 00000000..506316aa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs
@@ -0,0 +1,27 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal enum PropertyRouteSegmentType : byte
+  {
+    Self,
+    Property,
+    Indexer,
+    Other,
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs
similarity index 87%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs
index 1a23c1f2..5cec2603 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs
@@ -1,27 +1,25 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum FilterCriteriaMode
-  {
-    None,
-    And,
-    Or
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid
+{
+  public enum SelectionBehavior
+  {
+    Default,
+    None,
+    All
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
index 86729f0c..c12a30d1 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.2";
+  public const string BaseVersion = "3.3";
   [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/AutoResetFlagFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs
index fd06a03b..29221f10 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs
@@ -59,10 +59,9 @@ namespace Xceed.Wpf.DataGrid
 
       private void Dispose( bool disposing )
       {
-        var target = m_target;
-
         // The disposed method has already been called at least once.
-        if( Interlocked.CompareExchange<IAutoResetFlag>( ref m_target, null, target ) == null )
+        var target = Interlocked.Exchange( ref m_target, null );
+        if( target == null )
           return;
 
         Debug.Assert( m_target == null );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs
deleted file mode 100644
index 842fd91b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation;
-using System.Windows.Automation.Provider;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  internal static class AutomationPeerExtensions
-  {
-    internal static object GetPropertyValue( this AutomationPeer itemPeer, int id )
-    {
-      if( AutomationElementIdentifiers.NameProperty.Id == id )
-      {
-        return itemPeer.GetName();
-      }
-      else if( AutomationElementIdentifiers.AutomationIdProperty.Id == id )
-      {
-        return itemPeer.GetAutomationId();
-      }
-      else if( AutomationElementIdentifiers.ControlTypeProperty.Id == id )
-      {
-        return AutomationPeerExtensions.GetControlType( itemPeer ).Id;
-      }
-      else if( SelectionItemPatternIdentifiers.IsSelectedProperty.Id == id )
-      {
-        ISelectionItemProvider selectionItemProvider = itemPeer.GetPattern( PatternInterface.SelectionItem ) as ISelectionItemProvider;
-
-        if( selectionItemProvider == null )
-          return null;
-
-        return selectionItemProvider.IsSelected;
-      }
-
-      return null;
-    }
-
-    private static ControlType GetControlType( AutomationPeer itemPeer )
-    {
-      switch( itemPeer.GetAutomationControlType() )
-      {
-        case AutomationControlType.Button:
-          return ControlType.Button;
-
-        case AutomationControlType.Calendar:
-          return ControlType.Calendar;
-
-        case AutomationControlType.CheckBox:
-          return ControlType.CheckBox;
-
-        case AutomationControlType.ComboBox:
-          return ControlType.ComboBox;
-
-        case AutomationControlType.Edit:
-          return ControlType.Edit;
-
-        case AutomationControlType.Hyperlink:
-          return ControlType.Hyperlink;
-
-        case AutomationControlType.Image:
-          return ControlType.Image;
-
-        case AutomationControlType.ListItem:
-          return ControlType.ListItem;
-
-        case AutomationControlType.List:
-          return ControlType.List;
-
-        case AutomationControlType.Menu:
-          return ControlType.Menu;
-
-        case AutomationControlType.MenuBar:
-          return ControlType.MenuBar;
-
-        case AutomationControlType.MenuItem:
-          return ControlType.MenuItem;
-
-        case AutomationControlType.ProgressBar:
-          return ControlType.ProgressBar;
-
-        case AutomationControlType.RadioButton:
-          return ControlType.RadioButton;
-
-        case AutomationControlType.ScrollBar:
-          return ControlType.ScrollBar;
-
-        case AutomationControlType.Slider:
-          return ControlType.Slider;
-
-        case AutomationControlType.Spinner:
-          return ControlType.Spinner;
-
-        case AutomationControlType.StatusBar:
-          return ControlType.StatusBar;
-
-        case AutomationControlType.Tab:
-          return ControlType.Tab;
-
-        case AutomationControlType.TabItem:
-          return ControlType.TabItem;
-
-        case AutomationControlType.Text:
-          return ControlType.Text;
-
-        case AutomationControlType.ToolBar:
-          return ControlType.ToolBar;
-
-        case AutomationControlType.ToolTip:
-          return ControlType.ToolTip;
-
-        case AutomationControlType.Tree:
-          return ControlType.Tree;
-
-        case AutomationControlType.TreeItem:
-          return ControlType.TreeItem;
-
-        case AutomationControlType.Custom:
-          return ControlType.Custom;
-
-        case AutomationControlType.Group:
-          return ControlType.Group;
-
-        case AutomationControlType.Thumb:
-          return ControlType.Thumb;
-
-        case AutomationControlType.DataGrid:
-          return ControlType.DataGrid;
-
-        case AutomationControlType.DataItem:
-          return ControlType.DataItem;
-
-        case AutomationControlType.Document:
-          return ControlType.Document;
-
-        case AutomationControlType.SplitButton:
-          return ControlType.SplitButton;
-
-        case AutomationControlType.Window:
-          return ControlType.Window;
-
-        case AutomationControlType.Pane:
-          return ControlType.Pane;
-
-        case AutomationControlType.Header:
-          return ControlType.Header;
-
-        case AutomationControlType.HeaderItem:
-          return ControlType.HeaderItem;
-
-        case AutomationControlType.Table:
-          return ControlType.Table;
-
-        case AutomationControlType.TitleBar:
-          return ControlType.TitleBar;
-
-        case AutomationControlType.Separator:
-          return ControlType.Separator;
-      }
-
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs
deleted file mode 100644
index 3bc1d6ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public static class AutomationQueryEvents
-  {
-    #region QueryAutomationIdForDetail Event
-
-    public static readonly RoutedEvent QueryAutomationIdForDetailEvent =
-      EventManager.RegisterRoutedEvent( "QueryAutomationIdForDetail", RoutingStrategy.Bubble, typeof( QueryAutomationIdRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryAutomationIdForDetailHandler( DependencyObject d, QueryAutomationIdRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryAutomationIdForDetailEvent, handler );
-    }
-
-    public static void RemoveQueryAutomationIdForDetailHandler( DependencyObject d, QueryAutomationIdRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryAutomationIdForDetailEvent, handler );
-    }
-
-    #endregion QueryAutomationIdForDetail Event
-
-    #region QueryHelpTextForDetail Event
-
-    public static readonly RoutedEvent QueryHelpTextForDetailEvent =
-      EventManager.RegisterRoutedEvent( "QueryHelpTextForDetail", RoutingStrategy.Bubble, typeof( QueryHelpTextRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryHelpTextForDetailHandler( DependencyObject d, QueryHelpTextRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryHelpTextForDetailEvent, handler );
-    }
-
-    public static void RemoveQueryHelpTextForDetailHandler( DependencyObject d, QueryHelpTextRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryHelpTextForDetailEvent, handler );
-    }
-
-    #endregion QueryHelpTextForDetail Event
-
-    #region QueryItemStatusForDetail Event
-
-    public static readonly RoutedEvent QueryItemStatusForDetailEvent =
-      EventManager.RegisterRoutedEvent( "QueryItemStatusForDetail", RoutingStrategy.Bubble, typeof( QueryItemStatusRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryItemStatusForDetailHandler( DependencyObject d, QueryItemStatusRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryItemStatusForDetailEvent, handler );
-    }
-
-    public static void RemoveQueryItemStatusForDetailHandler( DependencyObject d, QueryItemStatusRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryItemStatusForDetailEvent, handler );
-    }
-
-    #endregion QueryItemStatusForDetail Event
-
-    #region QueryItemTypeForDetail Event
-
-    public static readonly RoutedEvent QueryItemTypeForDetailEvent =
-      EventManager.RegisterRoutedEvent( "QueryItemTypeForDetail", RoutingStrategy.Bubble, typeof( QueryItemTypeRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryItemTypeForDetailHandler( DependencyObject d, QueryItemTypeRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryItemTypeForDetailEvent, handler );
-    }
-
-    public static void RemoveQueryItemTypeForDetailHandler( DependencyObject d, QueryItemTypeRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryItemTypeForDetailEvent, handler );
-    }
-
-    #endregion QueryItemTypeForDetail Event
-
-    #region QueryNameForDetail Event
-
-    public static readonly RoutedEvent QueryNameForDetailEvent =
-      EventManager.RegisterRoutedEvent( "QueryNameForDetail", RoutingStrategy.Bubble, typeof( QueryNameRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryNameForDetailHandler( DependencyObject d, QueryNameRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryNameForDetailEvent, handler );
-    }
-
-    public static void RemoveQueryNameForDetailHandler( DependencyObject d, QueryNameRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryNameForDetailEvent, handler );
-    }
-
-    #endregion QueryNameForDetail Event
-
-    #region QueryAutomationIdForGroup Event
-
-    public static readonly RoutedEvent QueryAutomationIdForGroupEvent =
-      EventManager.RegisterRoutedEvent( "QueryAutomationIdForGroup", RoutingStrategy.Bubble, typeof( QueryAutomationIdRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryAutomationIdForGroupHandler( DependencyObject d, QueryAutomationIdRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryAutomationIdForGroupEvent, handler );
-    }
-
-    public static void RemoveQueryAutomationIdForGroupHandler( DependencyObject d, QueryAutomationIdRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryAutomationIdForGroupEvent, handler );
-    }
-
-    #endregion QueryAutomationIdForGroup Event
-
-    #region QueryHelpTextForGroup Event
-
-    public static readonly RoutedEvent QueryHelpTextForGroupEvent =
-      EventManager.RegisterRoutedEvent( "QueryHelpTextForGroup", RoutingStrategy.Bubble, typeof( QueryHelpTextRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryHelpTextForGroupHandler( DependencyObject d, QueryHelpTextRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryHelpTextForGroupEvent, handler );
-    }
-
-    public static void RemoveQueryHelpTextForGroupHandler( DependencyObject d, QueryHelpTextRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryHelpTextForGroupEvent, handler );
-    }
-
-    #endregion QueryHelpTextForGroup Event
-
-    #region QueryItemStatusForGroup Event
-
-    public static readonly RoutedEvent QueryItemStatusForGroupEvent =
-      EventManager.RegisterRoutedEvent( "QueryItemStatusForGroup", RoutingStrategy.Bubble, typeof( QueryItemStatusRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryItemStatusForGroupHandler( DependencyObject d, QueryItemStatusRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryItemStatusForGroupEvent, handler );
-    }
-
-    public static void RemoveQueryItemStatusForGroupHandler( DependencyObject d, QueryItemStatusRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryItemStatusForGroupEvent, handler );
-    }
-
-    #endregion QueryItemStatusForGroup Event
-
-    #region QueryItemTypeForGroup Event
-
-    public static readonly RoutedEvent QueryItemTypeForGroupEvent =
-      EventManager.RegisterRoutedEvent( "QueryItemTypeForGroup", RoutingStrategy.Bubble, typeof( QueryItemTypeRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryItemTypeForGroupHandler( DependencyObject d, QueryItemTypeRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryItemTypeForGroupEvent, handler );
-    }
-
-    public static void RemoveQueryItemTypeForGroupHandler( DependencyObject d, QueryItemTypeRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryItemTypeForGroupEvent, handler );
-    }
-
-    #endregion QueryItemTypeForGroup Event
-
-    #region QueryNameForGroup Event
-
-    public static readonly RoutedEvent QueryNameForGroupEvent =
-      EventManager.RegisterRoutedEvent( "QueryNameForGroup", RoutingStrategy.Bubble, typeof( QueryNameRoutedEventHandler ), typeof( AutomationQueryEvents ) );
-
-    public static void AddQueryNameForGroupHandler( DependencyObject d, QueryNameRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.AddHandler( AutomationQueryEvents.QueryNameForGroupEvent, handler );
-    }
-
-    public static void RemoveQueryNameForGroupHandler( DependencyObject d, QueryNameRoutedEventHandler handler )
-    {
-      UIElement element = d as UIElement;
-
-      if( element != null )
-        element.RemoveHandler( AutomationQueryEvents.QueryNameForGroupEvent, handler );
-    }
-
-    #endregion QueryNameForGroup Event
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs
deleted file mode 100644
index f3b5daa6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Globalization;
-using System.Diagnostics;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Automation;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class CellAutomationPeer : FrameworkElementAutomationPeer, IValueProvider
-  {
-    public CellAutomationPeer( Cell owner )
-      : base( owner )
-    {
-    }
-
-    public new Cell Owner
-    {
-      get
-      {
-        return base.Owner as Cell;
-      }
-    }
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      switch( patternInterface )
-      {
-        case PatternInterface.Value:
-          return this;
-      }
-
-      return base.GetPattern( patternInterface );
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "HeaderFooterCell";
-    }
-
-    protected override string GetNameCore()
-    {
-      string name = AutomationProperties.GetName(this.Owner);
-
-      if( !string.IsNullOrEmpty( name ) )
-        return name;
-
-      object title = null;
-      ColumnBase column = this.Owner.ParentColumn;
-
-      if( column != null )
-        title = column.Title;
-
-      if( title == null )
-        return string.Empty;
-
-      return string.Format( CultureInfo.CurrentCulture, "{0}", title );
-    }
-
-    private void GetTextFromVisualChildren( DependencyObject parentObject, StringBuilder text )
-    {
-      int count = VisualTreeHelper.GetChildrenCount( parentObject );
-
-      for (int i = 0; i < count; i++)
-			{
-        DependencyObject child = VisualTreeHelper.GetChild( parentObject, i );
-
-        TextBlock childText = child as TextBlock;
-
-        if( childText != null && childText.IsVisible )
-        {
-          if( text.Length > 0 )
-            text.Append( ' ' );
-
-          text.Append( childText.Text );
-        }
-        else
-        {
-          TextBox childTextBox = child as TextBox;
-
-          if( childTextBox != null && childTextBox.IsVisible )
-          {
-            if( text.Length > 0 )
-              text.Append( ' ' );
-
-            text.Append( childTextBox.Text );
-          }
-          else
-          {
-            this.GetTextFromVisualChildren( child, text );
-          }
-        }
-			}
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      string automationId = null;
-      automationId = base.GetAutomationIdCore();
-
-      if( string.IsNullOrEmpty( automationId ) )
-      {
-        ColumnBase parentColumn = this.Owner.ParentColumn;
-
-        if( parentColumn != null )
-        {
-          automationId = "Cell_" + this.Owner.ParentColumn.FieldName;
-        }
-        else
-        {
-          automationId = string.Empty;
-        }
-      }
-
-      return automationId;
-    }
-
-    #region IValueProvider Members
-
-    public bool IsReadOnly
-    {
-      get { return true; }
-    }
-
-    public void SetValue( string value )
-    {
-      throw new NotSupportedException( "Value is read only." );
-    }
-
-    public string Value
-    {
-      get 
-      {
-        // Get all the TextBlocks in our children and concatenate them.
-        StringBuilder text = new StringBuilder( 256 );
-        this.GetTextFromVisualChildren( this.Owner, text );
-        return text.ToString();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs
deleted file mode 100644
index 638d30c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs
+++ /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
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class ColumnManagerCellAutomationPeer : FrameworkElementAutomationPeer, IInvokeProvider, ITransformProvider
-  {
-    public ColumnManagerCellAutomationPeer( ColumnManagerCell owner )
-      : base( owner )
-    {
-    }
-
-    public new ColumnManagerCell Owner
-    {
-      get
-      {
-        return base.Owner as ColumnManagerCell;
-      }
-    }
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      switch( patternInterface )
-      {
-        case PatternInterface.Invoke:
-        case PatternInterface.Transform:
-          return this;
-      }
-
-      return base.GetPattern( patternInterface );
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "ColumnManagerCell";
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      return false;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.HeaderItem;
-    }
-
-    protected override string GetNameCore()
-    {
-      ColumnBase parentColumn = this.Owner.ParentColumn;
-
-      if( parentColumn == null )
-        return string.Empty;
-
-      object title = this.Owner.ParentColumn.Title;
-
-      if( title == null )
-        return string.Empty;
-
-      return string.Format( CultureInfo.CurrentCulture, "{0}", title );
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      string automationId = null;
-      automationId = base.GetAutomationIdCore();
-
-      if( string.IsNullOrEmpty( automationId ) )
-      {
-        ColumnBase parentColumn = this.Owner.ParentColumn;
-
-        if( parentColumn == null )
-          return string.Empty;
-
-        return "Cell_" + parentColumn.FieldName;
-      }
-
-      return string.Empty;
-    }
-
-    #region IInvokeProvider Members
-
-    void IInvokeProvider.Invoke()
-    {
-      this.Owner.DoSort( true );
-    }
-
-    #endregion IInvokeProvider Members
-
-    #region ITransformProvider Members
-
-    bool ITransformProvider.CanMove
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    bool ITransformProvider.CanResize
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    bool ITransformProvider.CanRotate
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void ITransformProvider.Move( double x, double y )
-    {
-      return;
-    }
-
-    void ITransformProvider.Resize( double width, double height )
-    {
-      ColumnBase parentColumn = this.Owner.ParentColumn;
-      if( parentColumn == null )
-        return;
-
-      this.Owner.DoResize( width, parentColumn );
-    }
-
-    void ITransformProvider.Rotate( double degrees )
-    {
-      return;
-    }
-
-    #endregion ITransformProvider
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs
deleted file mode 100644
index ef0d65bf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class ColumnManagerRowAutomationPeer : RowAutomationPeer
-  {
-    public ColumnManagerRowAutomationPeer( ColumnManagerRow owner )
-      : base( owner )
-    {
-    }
-
-    public new ColumnManagerRow Owner
-    {
-      get
-      {
-        return base.Owner as ColumnManagerRow;
-      }
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      return false;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.Header;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs
deleted file mode 100644
index 6c180993..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs
+++ /dev/null
@@ -1,1287 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Collections.ObjectModel;
-using System.Collections;
-using System.Windows;
-using System.Windows.Automation;
-using System.Collections.Specialized;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class DataGridContextAutomationPeer : AutomationPeer, ISelectionProvider, ITableProvider, IExpandCollapseProvider, IItemContainerProvider
-  {
-    internal DataGridContextAutomationPeer(
-      DataGridControl dataGridControl,
-      DataGridContext parentDataGridContext,
-      object parentItem,
-      DetailConfiguration detailConfiguration )
-    {
-      if( dataGridControl == null )
-        throw new ArgumentNullException( "dataGridControl" );
-
-      if( parentDataGridContext == null )
-      {
-        m_dataGridContext = dataGridControl.DataGridContext;
-      }
-      else
-      {
-        m_dataGridContext = parentDataGridContext.GetChildContext( parentItem, detailConfiguration );
-      }
-
-      if( m_dataGridContext != null )
-        m_dataGridContext.Peer = this;
-
-      m_dataGridControl = dataGridControl;
-      m_parentDataGridContext = parentDataGridContext;
-      m_parentItem = parentItem;
-      m_detailConfiguration = detailConfiguration;
-
-      m_dataChildren = new Hashtable( 0 );
-      m_headerFooterChildren = new Hashtable( 0 );
-    }
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-      internal set
-      {
-        if( m_dataGridContext == value )
-          return;
-
-        if( ( m_oldColumnCount != -1 ) && ( m_dataGridContext != null ) )
-        {
-          // We only remove unsubscribe from the event, since it is when we get the child list that we 
-          // subscribe to be aware of the column modification.
-          m_dataGridContext.Columns.VisibleColumnsUpdated -= new EventHandler( Columns_VisibleColumnsUpdated );
-          m_oldColumnCount = -1;
-        }
-
-        m_dataGridContext = value;
-
-        this.RaiseAutomationEvent( AutomationEvents.StructureChanged );
-      }
-    }
-
-    #endregion
-
-    #region ItemPeers Property
-
-    internal Hashtable ItemPeers
-    {
-      get
-      {
-        return m_dataChildren;
-      }
-    }
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      switch( patternInterface )
-      {
-        case PatternInterface.Table:
-        case PatternInterface.Grid:
-        case PatternInterface.Selection:
-        case PatternInterface.ExpandCollapse:
-        case PatternInterface.ItemContainer:
-          return this;
-
-        default:
-          return null;
-      }
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.DataGrid;
-    }
-
-    protected virtual DataGridItemAutomationPeer CreateItemAutomationPeer( object item, int index )
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      return new DataGridItemAutomationPeer( item, m_dataGridContext, index );
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      if( m_oldColumnCount == -1 )
-      {
-        m_oldColumnCount = m_dataGridContext.VisibleColumns.Count;
-        m_dataGridContext.Columns.VisibleColumnsUpdated += new EventHandler( Columns_VisibleColumnsUpdated );
-      }
-
-      CustomItemContainerGenerator itemGenerator = m_dataGridContext.CustomItemContainerGenerator;
-      IEnumerable items;
-      int itemsCount;
-      bool itemsIsAllItems = false;
-
-      // The way Microsoft check if we are called by an automation that support Virtualization.
-      if( ( ItemContainerPatternIdentifiers.Pattern != null ) && ( m_dataGridControl.ItemsHost is DataGridItemsHost ) )
-      {
-        List<object> realizedItems = itemGenerator.GetRealizedDataItems();
-        items = realizedItems;
-        itemsCount = realizedItems.Count;
-      }
-      else
-      {
-        CollectionView viewItems = m_dataGridContext.Items;
-        items = viewItems;
-        itemsCount = viewItems.Count;
-        itemsIsAllItems = true;
-      }
-
-      Hashtable oldDataChildren = m_dataChildren;
-      Hashtable oldHeaderFooterChildren = m_headerFooterChildren;
-
-      // Get header count
-      HeadersFootersGeneratorNode headerNode = itemGenerator.Header;
-      int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-
-      // Get footer count
-      HeadersFootersGeneratorNode footerNode = itemGenerator.Footer;
-      int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-
-      int childrenCount = headersCount + footersCount;
-
-      if( m_parentDataGridContext == null )
-      {
-        // Add the fixed header / footer count to the children
-        Panel fixedPanel = m_dataGridControl.FixedHeadersHostPanel;
-
-        if( fixedPanel != null )
-        {
-          childrenCount += fixedPanel.Children.Count;
-        }
-
-        fixedPanel = m_dataGridControl.FixedFootersHostPanel;
-
-        if( fixedPanel != null )
-        {
-          childrenCount += fixedPanel.Children.Count;
-        }
-      }
-
-      ReadOnlyObservableCollection<object> groups = m_dataGridContext.Items.Groups;
-
-      if( groups != null )
-      {
-        // Add the group count to the children
-        childrenCount += groups.Count;
-      }
-      else
-      {
-        childrenCount += itemsCount;
-      }
-
-      m_dataChildren = new Hashtable( itemsCount );
-      m_headerFooterChildren = new Hashtable( headersCount + footersCount );
-
-      if( childrenCount == 0 )
-        return null;
-
-      List<AutomationPeer> list = new List<AutomationPeer>( childrenCount );
-      this.AddChildrenHeaders( headerNode, oldHeaderFooterChildren, list );
-
-      if( groups != null )
-      {
-        CustomItemContainerGenerator customItemContainerGenerator = m_dataGridContext.CustomItemContainerGenerator;
-        DataGridGroupAutomationPeer peer;
-        itemsCount = groups.Count;
-
-        for( int i = 0; i < itemsCount; i++ )
-        {
-          CollectionViewGroup collectionViewGroup = groups[ i ] as CollectionViewGroup;
-
-          if( collectionViewGroup != null )
-          {
-            Group uiGroup =
-              customItemContainerGenerator.GetGroupFromCollectionViewGroup( null, collectionViewGroup );
-
-            if( uiGroup != null )
-            {
-              peer = uiGroup.CreateAutomationPeer() as DataGridGroupAutomationPeer;
-
-              if( peer != null )
-                list.Add( peer );
-            }
-          }
-        }
-      }
-      else
-      {
-        int index = 0;
-
-        foreach( object item in ( IEnumerable )items )
-        {
-          DataGridItemAutomationPeer itemAutomationPeer =
-            oldDataChildren[ item ] as DataGridItemAutomationPeer;
-
-          if( itemAutomationPeer == null )
-          {
-            if( itemsIsAllItems )
-            {
-              itemAutomationPeer = this.CreateItemAutomationPeer( item, index );
-              index++;
-            }
-            else
-            {
-              itemAutomationPeer = this.CreateItemAutomationPeer( item, -1 );
-            }
-          }
-          else
-          {
-            if( itemsIsAllItems )
-            {
-              itemAutomationPeer.SetIndex( index );
-              index++;
-            }
-            else
-            {
-              itemAutomationPeer.SetIndex( -1 );
-            }
-          }
-
-          // Force EventsSource to be updated
-          itemAutomationPeer.GetWrapperPeer();
-
-          if( m_dataChildren[ item ] == null )
-          {
-            list.Add( itemAutomationPeer );
-            m_dataChildren[ item ] = itemAutomationPeer;
-          }
-        }
-      }
-
-      this.AddChildrenFooters( footerNode, oldHeaderFooterChildren, list );
-      return list;
-    }
-
-    protected override string GetAcceleratorKeyCore()
-    {
-      return string.Empty;
-    }
-
-    protected override string GetAccessKeyCore()
-    {
-      return string.Empty;
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      string automationId = null;
-
-      if( m_dataGridContext != null )
-      {
-        QueryAutomationIdRoutedEventArgs args = new QueryAutomationIdRoutedEventArgs(
-          AutomationQueryEvents.QueryAutomationIdForDetailEvent, m_dataGridContext );
-
-        m_dataGridControl.RaiseEvent( args );
-
-        if( args.Handled )
-          automationId = args.AutomationId;
-      }
-
-      if( automationId == null )
-        return "Detail_" + m_detailConfiguration.RelationName;
-
-      return automationId;
-    }
-
-    protected override Rect GetBoundingRectangleCore()
-    {
-      return Rect.Empty;
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "DataGridContext";
-    }
-
-    protected override Point GetClickablePointCore()
-    {
-      return new Point( double.NaN, double.NaN );
-    }
-
-    protected override string GetHelpTextCore()
-    {
-      if( m_dataGridContext == null )
-        return string.Empty;
-
-      QueryHelpTextRoutedEventArgs args = new QueryHelpTextRoutedEventArgs(
-        AutomationQueryEvents.QueryHelpTextForDetailEvent, m_dataGridContext );
-
-      m_dataGridControl.RaiseEvent( args );
-      string helpText = null;
-
-      if( args.Handled )
-        helpText = args.HelpText;
-
-      return ( helpText ?? string.Empty );
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      if( m_dataGridContext == null )
-        return string.Empty;
-
-      QueryItemStatusRoutedEventArgs args = new QueryItemStatusRoutedEventArgs(
-        AutomationQueryEvents.QueryItemStatusForDetailEvent, m_dataGridContext );
-
-      m_dataGridControl.RaiseEvent( args );
-      string itemStatus = null;
-
-      if( args.Handled )
-        itemStatus = args.ItemStatus;
-
-      return ( itemStatus ?? string.Empty );
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      if( m_dataGridContext == null )
-        return string.Empty;
-
-      QueryItemTypeRoutedEventArgs args = new QueryItemTypeRoutedEventArgs(
-        AutomationQueryEvents.QueryItemTypeForDetailEvent, m_dataGridContext );
-
-      m_dataGridControl.RaiseEvent( args );
-      string itemType = null;
-
-      if( args.Handled )
-        itemType = args.ItemType;
-
-      return ( itemType ?? string.Empty );
-    }
-
-    protected override AutomationPeer GetLabeledByCore()
-    {
-      return null;
-    }
-
-    protected override string GetNameCore()
-    {
-      if( m_dataGridContext == null )
-        return string.Empty;
-
-      QueryNameRoutedEventArgs args = new QueryNameRoutedEventArgs(
-        AutomationQueryEvents.QueryNameForDetailEvent, m_dataGridContext );
-
-      m_dataGridControl.RaiseEvent( args );
-      string name = null;
-
-      if( args.Handled )
-      {
-        name = args.Name;
-      }
-      else
-      {
-        name = m_dataGridContext.SourceDetailConfiguration.Title as string;
-      }
-
-      return ( name ?? string.Empty );
-    }
-
-    protected override AutomationOrientation GetOrientationCore()
-    {
-      return AutomationOrientation.None;
-    }
-
-    protected override bool HasKeyboardFocusCore()
-    {
-      return false;
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      return true;
-    }
-
-    protected override bool IsControlElementCore()
-    {
-      return true;
-    }
-
-    protected override bool IsEnabledCore()
-    {
-      return true;
-    }
-
-    protected override bool IsKeyboardFocusableCore()
-    {
-      return false;
-    }
-
-    protected override bool IsOffscreenCore()
-    {
-      if( m_dataGridContext == null )
-        return true;
-
-      if( m_parentDataGridContext == null )
-        return false;
-
-      return ( m_parentDataGridContext.CustomItemContainerGenerator.ContainerFromItem( m_dataGridContext.ParentItem ) == null );
-    }
-
-    protected override bool IsPasswordCore()
-    {
-      return false;
-    }
-
-    protected override bool IsRequiredForFormCore()
-    {
-      return false;
-    }
-
-    protected override void SetFocusCore()
-    {
-    }
-
-    internal DataGridItemAutomationPeer FindOrCreateItemAutomationPeer( object item, int index )
-    {
-      DataGridItemAutomationPeer itemAutomationPeer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-
-      if( itemAutomationPeer == null )
-      {
-        itemAutomationPeer = this.CreateItemAutomationPeer( item, index );
-      }
-      else
-      {
-        itemAutomationPeer.SetIndex( index );
-      }
-
-      // Force EventsSource to be updated
-      itemAutomationPeer.GetWrapperPeer();
-      return itemAutomationPeer;
-    }
-
-    internal IRawElementProviderSimple GetRawElementProviderSimple()
-    {
-      return this.ProviderFromPeer( this );
-    }
-
-    internal DataGridItemAutomationPeer GetItemAutomationPeer( object item )
-    {
-      // Force the creation of the Children.
-      this.GetChildren();
-      return m_dataChildren[ item ] as DataGridItemAutomationPeer;
-    }
-
-    internal DataGridItemAutomationPeer CreateItemAutomationPeerInternal( object item, int index )
-    {
-      return this.CreateItemAutomationPeer( item, index );
-    }
-
-    internal void RaiseSelectionEvents( IList<object> unselectedItems, IList<object> selectedItems )
-    {
-      if( m_dataChildren.Count == 0 )
-      {
-        this.RaiseAutomationEvent( AutomationEvents.SelectionPatternOnInvalidated );
-        return;
-      }
-
-      int currentSelectedItemCount = ( m_dataGridContext == null ) ? 0 : m_dataGridContext.SelectedItemsStore.Count;
-      int selectedItemsCount = selectedItems.Count;
-      int unselectedItemsCount = unselectedItems.Count;
-
-      if( currentSelectedItemCount == 1 )
-      {
-        object item;
-
-        try
-        {
-          // GetItem() can throw if the DataVirtualizing source don't have that item anymore.
-          item = m_dataGridContext.SelectedItemsStore[ 0 ].GetItem( m_dataGridContext, 0 );
-        }
-        catch
-        {
-          item = null;
-        }
-
-        if( item != null )
-        {
-          DataGridItemAutomationPeer peer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-
-          if( peer != null )
-            peer.RaiseAutomationEvent( AutomationEvents.SelectionItemPatternOnElementSelected );
-        }
-        else
-        {
-          this.RaiseAutomationEvent( AutomationEvents.SelectionPatternOnInvalidated );
-        }
-      }
-      else if( ( selectedItemsCount + unselectedItemsCount ) > 20 )
-      {
-        this.RaiseAutomationEvent( AutomationEvents.SelectionPatternOnInvalidated );
-      }
-      else
-      {
-        for( int i = 0; i < selectedItemsCount; i++ )
-        {
-          object item;
-
-          try
-          {
-            // Underlying GetItem() can throw if the DataVirtualizing source don't have that item anymore.
-            item = selectedItems[ i ];
-          }
-          catch
-          {
-            item = null;
-          }
-
-          if( item != null )
-          {
-            DataGridItemAutomationPeer peer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-
-            if( peer != null )
-              peer.RaiseAutomationEvent( AutomationEvents.SelectionItemPatternOnElementAddedToSelection );
-          }
-          else
-          {
-            this.RaiseAutomationEvent( AutomationEvents.SelectionPatternOnInvalidated );
-            return;
-          }
-        }
-
-        for( int i = 0; i < unselectedItemsCount; i++ )
-        {
-          object item;
-
-          try
-          {
-            // Underlying GetItem() can throw if the DataVirtualizing source don't have that item anymore.
-            item = unselectedItems[ i ];
-          }
-          catch
-          {
-            item = null;
-          }
-
-          if( item != null )
-          {
-            DataGridItemAutomationPeer peer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-
-            if( peer != null )
-              peer.RaiseAutomationEvent( AutomationEvents.SelectionItemPatternOnElementRemovedFromSelection );
-          }
-          else
-          {
-            this.RaiseAutomationEvent( AutomationEvents.SelectionPatternOnInvalidated );
-            return;
-          }
-        }
-      }
-    }
-
-    internal DataGridContextAutomationPeer GetDetailPeer( object parentItem, DetailConfiguration detailConfig )
-    {
-      DataGridItemAutomationPeer itemAutomationPeer = m_dataChildren[ parentItem ] as DataGridItemAutomationPeer;
-
-      if( itemAutomationPeer == null )
-        return null;
-
-      return itemAutomationPeer.GetDetailPeer( detailConfig );
-    }
-
-    internal List<AutomationPeer> GetColumnHeadersPeer()
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      List<AutomationPeer> list = new List<AutomationPeer>( 16 );
-      this.AddChildrenHeaders( m_dataGridContext.CustomItemContainerGenerator.Header, m_headerFooterChildren, list );
-      this.AddChildrenFooters( m_dataGridContext.CustomItemContainerGenerator.Footer, m_headerFooterChildren, list );
-      int listCount = list.Count;
-
-      List<AutomationPeer> columnHeaders = new List<AutomationPeer>( listCount );
-
-      for( int i = 0; i < listCount; i++ )
-      {
-        HeaderFooterItemAutomationPeer headerFooterItemPeer = list[ i ] as HeaderFooterItemAutomationPeer;
-
-        if( headerFooterItemPeer == null )
-          continue;
-
-        if( headerFooterItemPeer.GetAutomationControlType() == AutomationControlType.Header )
-          columnHeaders.Add( headerFooterItemPeer );
-      }
-
-      return columnHeaders;
-    }
-
-    private void Columns_VisibleColumnsUpdated( object sender, EventArgs e )
-    {
-      if( m_dataGridContext == null )
-        return;
-
-      int newCount = m_dataGridContext.VisibleColumns.Count;
-
-      if( newCount != m_oldColumnCount )
-        this.RaisePropertyChangedEvent( GridPatternIdentifiers.ColumnCountProperty, m_oldColumnCount, newCount );
-
-      m_oldColumnCount = newCount;
-
-      // Invalidate the cell peer of all the row to resync with the new column.
-      foreach( AutomationPeer peer in m_dataChildren.Values )
-      {
-        peer.InvalidatePeer();
-      }
-    }
-
-    private void AddChildrenHeaders(
-      HeadersFootersGeneratorNode headerNode,
-      Hashtable oldHeaderFooterChildren,
-      List<AutomationPeer> list )
-    {
-      if( m_parentDataGridContext == null )
-      {
-        // Add fixed header to the children list
-        Panel fixedHeaderPanel = m_dataGridControl.FixedHeadersHostPanel;
-
-        if( fixedHeaderPanel != null )
-        {
-          int index = 0;
-
-          foreach( DependencyObject headerFooter in fixedHeaderPanel.Children )
-          {
-            HeaderFooterItem headerFooterItem = headerFooter as HeaderFooterItem;
-
-            if( headerFooterItem != null )
-            {
-              HeaderFooterItemAutomationPeer automationPeer = oldHeaderFooterChildren[ headerFooter ] as HeaderFooterItemAutomationPeer;
-
-              if( automationPeer == null )
-              {
-                automationPeer = new HeaderFooterItemAutomationPeer( m_dataGridContext, headerFooter );
-              }
-
-              automationPeer.SetExtraInfo( HeaderFooterItemAutomationPeer.HeaderFooterType.FixedHeader, index );
-              m_headerFooterChildren[ headerFooter ] = automationPeer;
-              list.Add( automationPeer );
-            }
-
-            index++;
-          }
-        }
-      }
-
-      if( headerNode != null )
-      {
-        DataGridGroupAutomationPeer.AddHeaderPeer( m_dataGridContext, headerNode, list, m_headerFooterChildren, oldHeaderFooterChildren );
-      }
-    }
-
-    private void AddChildrenFooters(
-      HeadersFootersGeneratorNode footerNode,
-      Hashtable oldHeaderFooterChildren,
-      List<AutomationPeer> list )
-    {
-      if( m_parentDataGridContext == null )
-      {
-        // Add fixed header to the children list
-        Panel fixedFooterPanel = m_dataGridControl.FixedFootersHostPanel;
-
-        if( fixedFooterPanel != null )
-        {
-          int index = 0;
-
-          foreach( DependencyObject headerFooter in fixedFooterPanel.Children )
-          {
-            HeaderFooterItem headerFooterItem = headerFooter as HeaderFooterItem;
-
-            if( headerFooterItem != null )
-            {
-              HeaderFooterItemAutomationPeer automationPeer = oldHeaderFooterChildren[ headerFooter ] as HeaderFooterItemAutomationPeer;
-
-              if( automationPeer == null )
-              {
-                automationPeer = new HeaderFooterItemAutomationPeer( m_dataGridContext, headerFooter );
-              }
-
-              automationPeer.SetExtraInfo( HeaderFooterItemAutomationPeer.HeaderFooterType.FixedFooter, index );
-              m_headerFooterChildren[ headerFooter ] = automationPeer;
-              list.Add( automationPeer );
-            }
-
-            index++;
-          }
-        }
-      }
-
-      if( footerNode != null )
-      {
-        DataGridGroupAutomationPeer.AddFooterPeer( m_dataGridContext, footerNode, list, m_headerFooterChildren, oldHeaderFooterChildren );
-      }
-    }
-
-    #region ISelectionProvider Members
-
-    bool ISelectionProvider.CanSelectMultiple
-    {
-      get
-      {
-        return m_dataGridControl.SelectionModeToUse != SelectionMode.Single;
-      }
-    }
-
-    IRawElementProviderSimple[] ISelectionProvider.GetSelection()
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      IList<object> selectedItems = m_dataGridContext.SelectedItems;
-      int count = m_dataGridContext.SelectedItems.Count;
-
-      if( ( count <= 0 ) || ( m_dataChildren.Count <= 0 ) )
-        return null;
-
-      List<IRawElementProviderSimple> list = new List<IRawElementProviderSimple>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        DataGridItemAutomationPeer peer =
-          m_dataChildren[ selectedItems[ i ] ] as DataGridItemAutomationPeer;
-
-        if( peer != null )
-          list.Add( this.ProviderFromPeer( peer ) );
-      }
-
-      return list.ToArray();
-    }
-
-    bool ISelectionProvider.IsSelectionRequired
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion ISelectionProvider Members
-
-    #region ITableProvider Members
-
-    IRawElementProviderSimple[] ITableProvider.GetColumnHeaders()
-    {
-      List<AutomationPeer> list = this.GetColumnHeadersPeer();
-      IRawElementProviderSimple[] rawElementProviderSimples = new IRawElementProviderSimple[ list.Count ];
-
-      for( int i = 0; i < rawElementProviderSimples.Length; i++ )
-      {
-        rawElementProviderSimples[ i ] = this.ProviderFromPeer( list[ i ] );
-      }
-
-      return rawElementProviderSimples;
-    }
-
-    IRawElementProviderSimple[] ITableProvider.GetRowHeaders()
-    {
-      return new IRawElementProviderSimple[ 0 ];
-    }
-
-    RowOrColumnMajor ITableProvider.RowOrColumnMajor
-    {
-      get
-      {
-        return RowOrColumnMajor.RowMajor;
-      }
-    }
-
-    #endregion
-
-    #region IGridProvider Members
-
-    int IGridProvider.ColumnCount
-    {
-      get
-      {
-        if( m_dataGridContext == null )
-          return 0;
-
-        return m_dataGridContext.VisibleColumns.Count;
-      }
-    }
-
-    IRawElementProviderSimple IGridProvider.GetItem( int row, int column )
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      // Here we only consider data item.  No header / footer are part of the IGridProvider.
-      CollectionView items = m_dataGridContext.Items;
-
-      if( ( row < 0 ) || ( row >= items.Count ) )
-        throw new ArgumentOutOfRangeException( "row" );
-
-      ReadOnlyObservableCollection<ColumnBase> visibleColumns = m_dataGridContext.VisibleColumns;
-
-      if( ( column < 0 ) || ( column >= visibleColumns.Count ) )
-        throw new ArgumentOutOfRangeException( "column" );
-
-      object item = m_dataGridContext.Items.GetItemAt( row );
-      DataGridItemAutomationPeer itemPeer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-
-      if( itemPeer == null )
-      {
-        // If the item is not found in the cache, try to force is creation in the caching.
-        CollectionViewGroup[] groups;
-        this.GetParentGroupsContainingItemIndex( row, out groups );
-
-        this.ForceChildrenCaching( groups );
-        itemPeer = m_dataChildren[ item ] as DataGridItemAutomationPeer;
-      }
-
-      if( itemPeer == null )
-        return null;
-
-      DataGridItemCellAutomationPeer cellPeer = itemPeer.GetDataGridItemCellPeer( visibleColumns[ column ] );
-
-      if( cellPeer == null )
-        return null;
-
-      return this.ProviderFromPeer( cellPeer );
-    }
-
-    int IGridProvider.RowCount
-    {
-      get
-      {
-        if( m_dataGridContext == null )
-          return 0;
-
-        return m_dataGridContext.Items.Count;
-      }
-    }
-
-    private void ForceChildrenCaching( CollectionViewGroup[] groups )
-    {
-      List<AutomationPeer> subAutomationPeers = this.GetChildren();
-
-      foreach( CollectionViewGroup group in groups )
-      {
-        Debug.Assert( !( group is DataGridCollectionViewGroupRoot ) );
-        bool groupFound = false;
-
-        foreach( AutomationPeer automationPeer in subAutomationPeers )
-        {
-          DataGridGroupAutomationPeer groupAutomationPeer = automationPeer as DataGridGroupAutomationPeer;
-
-          if( groupAutomationPeer == null )
-            continue;
-
-          if( groupAutomationPeer.Owner.CollectionViewGroup == group )
-          {
-            subAutomationPeers = groupAutomationPeer.GetChildren();
-            groupFound = true;
-            break;
-          }
-        }
-
-        if( !groupFound )
-          break;
-      }
-    }
-
-    private void GetParentGroupsContainingItemIndex( int index, out CollectionViewGroup[] parentGroups )
-    {
-      DataGridCollectionView collectionView = m_dataGridContext.ItemsSourceCollection as DataGridCollectionView;
-
-      if( collectionView != null )
-      {
-        RawItem rawItem = collectionView.GetRawItemAt( index );
-        List<CollectionViewGroup> groupList = new List<CollectionViewGroup>( 16 );
-        DataGridCollectionViewGroup parentGroup = rawItem.ParentGroup;
-
-        while( ( parentGroup != null ) && !( parentGroup is DataGridCollectionViewGroupRoot ) )
-        {
-          groupList.Add( parentGroup );
-          parentGroup = parentGroup.Parent;
-        }
-
-        groupList.Reverse();
-        parentGroups = groupList.ToArray();
-      }
-      else
-      {
-        CollectionView items = m_dataGridContext.Items;
-        ReadOnlyObservableCollection<object> groups = items.Groups;
-
-        if( groups != null )
-        {
-          List<CollectionViewGroup> groupList = new List<CollectionViewGroup>( 16 );
-          this.GetParentGroupsContainingItemIndex( index, groups, groupList );
-          parentGroups = groupList.ToArray();
-        }
-        else
-        {
-          parentGroups = new DataGridCollectionViewGroup[ 0 ];
-        }
-      }
-    }
-
-    private void GetParentGroupsContainingItemIndex(
-      int indexOffset,
-      ReadOnlyObservableCollection<object> rootGroups,
-      List<CollectionViewGroup> parentGroups )
-    {
-      int oldCurrentCount = 0;
-      int currentCount = 0;
-
-      foreach( CollectionViewGroup group in rootGroups )
-      {
-        currentCount += group.GetItemCount();
-
-        if( currentCount > indexOffset )
-        {
-          parentGroups.Add( group );
-
-          if( !group.IsBottomLevel )
-          {
-            this.GetParentGroupsContainingItemIndex(
-              indexOffset - oldCurrentCount,
-              ( ReadOnlyObservableCollection<object> )group.GetItems(),
-              parentGroups );
-          }
-
-          return;
-        }
-
-        oldCurrentCount = currentCount;
-      }
-    }
-
-    #endregion
-
-    #region IExpandCollapseProvider Members
-
-    void IExpandCollapseProvider.Collapse()
-    {
-      if( m_parentDataGridContext == null )
-        return;
-
-      m_parentDataGridContext.CollapseDetails( m_parentItem );
-      this.DataGridContext = null;
-    }
-
-    void IExpandCollapseProvider.Expand()
-    {
-      if( m_parentDataGridContext == null )
-        return;
-
-      m_parentDataGridContext.ExpandDetails( m_parentItem );
-      Debug.Assert( m_dataGridContext != null );
-    }
-
-    ExpandCollapseState IExpandCollapseProvider.ExpandCollapseState
-    {
-      get
-      {
-        if( m_parentDataGridContext == null )
-          return ExpandCollapseState.Expanded;
-
-        return ( m_dataGridContext == null ) ?
-          ExpandCollapseState.Collapsed : ExpandCollapseState.Expanded;
-      }
-    }
-
-    #endregion
-
-    #region IItemContainerProvider Members
-
-    public IRawElementProviderSimple FindItemByProperty( IRawElementProviderSimple startAfter, int propertyId, object value )
-    {
-      if( ( propertyId != 0 ) && ( !DataGridContextAutomationPeer.IsPropertySupportedForFindItem( propertyId ) ) )
-      {
-        throw new ArgumentException( "Property not supported" );
-      }
-
-      if( m_dataGridContext == null )
-        return null;
-
-      CollectionView items = m_dataGridContext.Items;
-      int itemsCount = ( items == null ) ? 0 : items.Count;
-
-      DataGridItemAutomationPeer startAfterItemPeer = null;
-      HeaderFooterItemAutomationPeer startAfterHeaderFooterPeer = null;
-
-      if( startAfter != null )
-      {
-        AutomationPeer startAfterPeer = this.PeerFromProvider( startAfter );
-
-        if( startAfterPeer == null )
-          return null;
-
-        startAfterItemPeer = startAfterPeer as DataGridItemAutomationPeer;
-        startAfterHeaderFooterPeer = startAfterPeer as HeaderFooterItemAutomationPeer;
-      }
-
-      int startIndex = 0;
-
-      // Get header count
-      HeadersFootersGeneratorNode headerNode = m_dataGridContext.CustomItemContainerGenerator.Header;
-      int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-      int fixedHeadersCount = 0;
-      Panel fixedHeadersPanel = null;
-
-      // Get footer count
-      HeadersFootersGeneratorNode footerNode = m_dataGridContext.CustomItemContainerGenerator.Footer;
-      int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-      int fixedFootersCount = 0;
-      Panel fixedFootersPanel = null;
-
-      if( m_parentDataGridContext == null )
-      {
-        // Add the fixed header / footer count to the children
-        fixedHeadersPanel = m_dataGridControl.FixedHeadersHostPanel;
-        fixedHeadersCount = ( fixedHeadersPanel != null ) ? fixedHeadersPanel.Children.Count : 0;
-        fixedFootersPanel = m_dataGridControl.FixedFootersHostPanel;
-        fixedFootersCount = ( fixedFootersPanel != null ) ? fixedFootersPanel.Children.Count : 0;
-      }
-
-      int childrenCount = headersCount + fixedHeadersCount + footersCount + fixedFootersCount + itemsCount;
-
-      if( startAfterItemPeer != null )
-      {
-        startIndex = fixedHeadersCount + headersCount + startAfterItemPeer.Index + 1;
-      }
-      else if( startAfterHeaderFooterPeer != null )
-      {
-        startIndex = startAfterHeaderFooterPeer.Index + 1;
-
-        switch( startAfterHeaderFooterPeer.Type )
-        {
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.FixedHeader:
-            {
-              break;
-            }
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.Header:
-            {
-              startIndex += fixedHeadersCount;
-              break;
-            }
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.Footer:
-            {
-              startIndex += fixedHeadersCount + headersCount + itemsCount;
-              break;
-            }
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.FixedFooter:
-            {
-              startIndex += fixedHeadersCount + headersCount + footersCount + itemsCount;
-              break;
-            }
-        }
-      }
-
-      // Force a children refresh and update our inner caching
-      this.GetChildren();
-
-      if( propertyId == 0 )
-      {
-        AutomationPeer peer = this.GetPeerForChildrenIndex( startIndex );
-
-        if( peer == null )
-          return null;
-
-        return this.ProviderFromPeer( peer );
-      }
-
-      object propertyValue = null;
-
-      // Search in footer/Fixed footer first
-      if( footersCount + fixedFootersCount > 0 )
-      {
-        int footerStartIndex = Math.Max( startIndex, childrenCount - footersCount - fixedFootersCount );
-
-        for( int i = startIndex; i < childrenCount; i++ )
-        {
-          AutomationPeer peer = this.GetPeerForChildrenIndex( i );
-
-          if( peer != null )
-          {
-            try
-            {
-              propertyValue = peer.GetPropertyValue( propertyId );
-            }
-            catch( Exception exception )
-            {
-              if( exception is ElementNotAvailableException )
-              {
-                continue;
-              }
-            }
-
-            if( object.Equals( value, propertyValue ) )
-            {
-              return this.ProviderFromPeer( peer );
-            }
-          }
-        }
-
-        childrenCount -= footersCount + fixedFootersCount;
-      }
-
-      // Search in the header/Fixed header and data item
-      for( int i = startIndex; i < childrenCount; i++ )
-      {
-        AutomationPeer peer = this.GetPeerForChildrenIndex( i );
-
-        if( peer != null )
-        {
-          try
-          {
-            propertyValue = peer.GetPropertyValue( propertyId );
-          }
-          catch( Exception exception )
-          {
-            if( exception is ElementNotAvailableException )
-            {
-              continue;
-            }
-          }
-
-          if( object.Equals( value, propertyValue ) )
-          {
-            return this.ProviderFromPeer( peer );
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private AutomationPeer GetPeerForChildrenIndex( int index )
-    {
-      int fixedHeadersCount = 0;
-      Panel fixedHeadersPanel = null;
-      int fixedFootersCount = 0;
-      Panel fixedFootersPanel = null;
-
-      if( m_parentDataGridContext == null )
-      {
-        fixedHeadersPanel = m_dataGridControl.FixedHeadersHostPanel;
-        fixedHeadersCount = ( fixedHeadersPanel != null ) ? fixedHeadersPanel.Children.Count : 0;
-        fixedFootersPanel = m_dataGridControl.FixedFootersHostPanel;
-        fixedFootersCount = ( fixedFootersPanel != null ) ? fixedFootersPanel.Children.Count : 0;
-      }
-
-      if( index < fixedHeadersCount )
-      {
-        UIElement element = fixedHeadersPanel.Children[ index ];
-        AutomationPeer automationPeer = m_headerFooterChildren[ element ] as AutomationPeer;
-        Debug.Assert( automationPeer != null );
-
-        if( automationPeer == null )
-          return null;
-
-        return automationPeer;
-      }
-      else
-      {
-        index -= fixedHeadersCount;
-        HeadersFootersGeneratorNode headerNode = m_dataGridContext.CustomItemContainerGenerator.Header;
-        int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-
-        if( index < headersCount )
-        {
-          object item = headerNode.GetAt( index );
-          AutomationPeer automationPeer = m_headerFooterChildren[ item ] as AutomationPeer;
-          Debug.Assert( automationPeer != null );
-          return automationPeer;
-        }
-        else
-        {
-          index -= headersCount;
-          CollectionView items = m_dataGridContext.Items;
-          int itemsCount = ( items == null ) ? 0 : items.Count;
-
-          if( index < itemsCount )
-          {
-            return this.FindOrCreateItemAutomationPeer( items.GetItemAt( index ), index );
-          }
-          else
-          {
-            index -= itemsCount;
-            HeadersFootersGeneratorNode footerNode = m_dataGridContext.CustomItemContainerGenerator.Footer;
-            int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-
-            if( index < footersCount )
-            {
-              object item = footerNode.GetAt( index );
-              AutomationPeer automationPeer = m_headerFooterChildren[ item ] as AutomationPeer;
-              Debug.Assert( automationPeer != null );
-              return automationPeer;
-            }
-            else
-            {
-              index -= footersCount;
-
-              if( index < fixedFootersCount )
-              {
-                UIElement element = fixedFootersPanel.Children[ index ];
-                AutomationPeer automationPeer = m_headerFooterChildren[ element ] as AutomationPeer;
-                Debug.Assert( automationPeer != null );
-                return automationPeer;
-              }
-            }
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private static bool IsPropertySupportedForFindItem( int id )
-    {
-      return ( ( AutomationElementIdentifiers.NameProperty.Id == id )
-        || ( AutomationElementIdentifiers.AutomationIdProperty.Id == id )
-        || ( AutomationElementIdentifiers.ControlTypeProperty.Id == id )
-        || ( SelectionItemPatternIdentifiers.IsSelectedProperty.Id == id ) );
-    }
-
-    #endregion
-
-    private DataGridControl m_dataGridControl;
-    private DataGridContext m_dataGridContext;
-    private DataGridContext m_parentDataGridContext;
-    private object m_parentItem;
-    private DetailConfiguration m_detailConfiguration;
-
-    private Hashtable m_dataChildren;
-    private Hashtable m_headerFooterChildren;
-    private int m_oldColumnCount = -1;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs
deleted file mode 100644
index 4f449eaa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Collections;
-using System.Windows.Data;
-using System.Windows.Automation.Provider;
-using System.Collections.ObjectModel;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class DataGridControlAutomationPeer : FrameworkElementAutomationPeer
-  {
-    public DataGridControlAutomationPeer( DataGridControl owner )
-      : base( owner )
-    {
-      m_innerDataGridContextAutomationPeer = new DataGridContextAutomationPeer( owner, null, null, null );
-      m_innerDataGridContextAutomationPeer.EventsSource = this;
-    }
-
-    #region DataGridControl Property
-
-    public DataGridControl DataGridControl
-    {
-      get
-      {
-        return this.Owner as DataGridControl;
-      }
-    }
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      if( patternInterface == PatternInterface.Scroll )
-      {
-        DataGridControl owner = this.DataGridControl;
-        ScrollViewer scrollViewer = owner.ScrollViewer;
-
-        if( scrollViewer != null )
-        {
-          AutomationPeer peer = UIElementAutomationPeer.CreatePeerForElement( scrollViewer );
-
-          if( ( peer != null ) && ( peer is IScrollProvider ) )
-          {
-            peer.EventsSource = this;
-            return peer;
-          }
-        }
-      }
-
-      return m_innerDataGridContextAutomationPeer.GetPattern( patternInterface );
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      return m_innerDataGridContextAutomationPeer.GetChildren();
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "DataGridControl";
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return m_innerDataGridContextAutomationPeer.GetAutomationControlType();
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      return m_innerDataGridContextAutomationPeer.GetItemType();
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      return m_innerDataGridContextAutomationPeer.GetItemStatus();
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      string automationId = null;
-      automationId = base.GetAutomationIdCore();
-
-      if( string.IsNullOrEmpty( automationId ) )
-      {
-        automationId = "DataGridControl";
-      }
-
-      return automationId;
-    }
-
-    private DataGridContextAutomationPeer m_innerDataGridContextAutomationPeer;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs
deleted file mode 100644
index 0765d04b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.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.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class DataGridGroupAutomationPeer : AutomationPeer, IExpandCollapseProvider, IItemContainerProvider, IWeakEventListener
-  {
-    #region Static Fields
-
-    private static readonly string GroupIsExpandedPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.IsExpanded );
-
-    #endregion
-
-    public DataGridGroupAutomationPeer( Group uiGroupOwner )
-    {
-      if( uiGroupOwner == null )
-        throw new ArgumentNullException( "uiGroupOwner" );
-
-      m_uiGroupOwner = uiGroupOwner;
-      m_dataChildren = new Hashtable( 0 );
-      m_headerFooterChildren = new Hashtable( 0 );
-
-      PropertyChangedEventManager.AddListener( uiGroupOwner, this, DataGridGroupAutomationPeer.GroupIsExpandedPropertyName );
-    }
-
-    #region Owner Property
-
-    public Group Owner
-    {
-      get
-      {
-        return m_uiGroupOwner;
-      }
-    }
-
-    private readonly Group m_uiGroupOwner;
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      if( patternInterface == PatternInterface.ExpandCollapse )
-        return this;
-
-      return null;
-    }
-
-    protected override string GetAcceleratorKeyCore()
-    {
-      return string.Empty;
-    }
-
-    protected override string GetAccessKeyCore()
-    {
-      return string.Empty;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.Group;
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      QueryAutomationIdRoutedEventArgs args = new QueryAutomationIdRoutedEventArgs(
-        AutomationQueryEvents.QueryAutomationIdForGroupEvent, m_uiGroupOwner );
-
-      m_uiGroupOwner.DataGridContext.DataGridControl.RaiseEvent( args );
-
-      string automationId = null;
-
-      if( args.Handled )
-        automationId = args.AutomationId;
-
-      if( automationId == null )
-      {
-        if( m_uiGroupOwner.Value != null )
-        {
-          return string.Format(
-            CultureInfo.InvariantCulture,
-            "Group_{0}:{1}_{2}",
-            m_uiGroupOwner.Level, m_uiGroupOwner.GroupBy, m_uiGroupOwner.Value );
-        }
-
-        return string.Empty;
-      }
-
-      return automationId;
-    }
-
-    protected override Rect GetBoundingRectangleCore()
-    {
-      return Rect.Empty;
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      Group owner = this.Owner;
-      GroupGeneratorNode generatorNode = owner.GeneratorNode;
-
-      if( generatorNode == null )
-        return null;
-
-      DataGridContext dataGridContext = owner.DataGridContext;
-
-      if( dataGridContext == null )
-        return null;
-
-      CustomItemContainerGenerator customItemContainerGenerator = dataGridContext.CustomItemContainerGenerator;
-      IList<object> items;
-      bool itemsIsAllItems = false;
-
-      // The way Microsoft check if we are called by an automation that support Virtualization.
-      if( ( ItemContainerPatternIdentifiers.Pattern != null ) && ( owner.IsBottomLevel ) && ( dataGridContext.DataGridControl.ItemsHost is DataGridItemsHost ) )
-      {
-        items = customItemContainerGenerator.GetRealizedDataItemsForGroup( generatorNode );
-      }
-      else
-      {
-        items = owner.GetItems();
-        itemsIsAllItems = true;
-      }
-
-      int itemsCount = ( items == null ) ? 0 : items.Count;
-      Hashtable oldDataChildren = m_dataChildren;
-      Hashtable oldHeaderFooterChildren = m_headerFooterChildren;
-
-      // Get header count
-      HeadersFootersGeneratorNode headerNode = generatorNode.GetHeaderNode();
-      int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-
-      // Get footer count
-      HeadersFootersGeneratorNode footerNode = generatorNode.GetFooterNode();
-      int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-
-      int childrenCount = itemsCount + headersCount + footersCount;
-      m_dataChildren = new Hashtable( itemsCount );
-      m_headerFooterChildren = new Hashtable( headersCount + footersCount );
-
-      if( childrenCount == 0 )
-        return null;
-
-      DataGridContextAutomationPeer dataGridContextAutomationPeer = dataGridContext.Peer;
-      Hashtable dataGridContextItemsPeer = dataGridContextAutomationPeer.ItemPeers;
-
-      DataGridGroupAutomationPeer groupAutomationPeer;
-      DataGridItemAutomationPeer itemAutomationPeer;
-      List<AutomationPeer> list = new List<AutomationPeer>( childrenCount );
-
-      if( headerNode != null )
-      {
-        DataGridGroupAutomationPeer.AddHeaderPeer( dataGridContext, headerNode, list, m_headerFooterChildren, oldHeaderFooterChildren );
-      }
-
-      int index = 0;
-
-      for( int i = 0; i < itemsCount; i++ )
-      {
-        object item = items[ i ];
-        CollectionViewGroup collectionViewGroup = item as CollectionViewGroup;
-
-        if( collectionViewGroup == null )
-        {
-          if( ( i == 0 ) && ( itemsIsAllItems ) )
-          {
-            GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( generatorNode, 0, 0 );
-            nodeHelper.ReverseCalculateIndex();
-            index = nodeHelper.SourceDataIndex;
-          }
-
-          itemAutomationPeer = oldDataChildren[ item ] as DataGridItemAutomationPeer;
-
-          if( itemAutomationPeer == null )
-          {
-            if( itemsIsAllItems )
-            {
-              itemAutomationPeer = dataGridContextAutomationPeer.CreateItemAutomationPeerInternal( item, index + i );
-            }
-            else
-            {
-              itemAutomationPeer = dataGridContextAutomationPeer.CreateItemAutomationPeerInternal( item, -1 );
-            }
-          }
-          else
-          {
-            if( itemsIsAllItems )
-            {
-              itemAutomationPeer.SetIndex( index + i );
-            }
-            else
-            {
-              itemAutomationPeer.SetIndex( -1 );
-            }
-          }
-
-          // Force EventsSource to be updated
-          itemAutomationPeer.GetWrapperPeer();
-
-          if( m_dataChildren[ item ] == null )
-          {
-            Debug.Assert( itemAutomationPeer != null );
-            list.Add( itemAutomationPeer );
-            m_dataChildren[ item ] = itemAutomationPeer;
-
-            if( dataGridContextItemsPeer[ item ] == null )
-              dataGridContextItemsPeer[ item ] = itemAutomationPeer;
-          }
-        }
-        else
-        {
-          Group uiGroup =
-            customItemContainerGenerator.GetGroupFromCollectionViewGroup( this.Owner, collectionViewGroup );
-
-          if( uiGroup != null )
-          {
-            groupAutomationPeer = uiGroup.CreateAutomationPeer() as DataGridGroupAutomationPeer;
-
-            if( groupAutomationPeer != null )
-              list.Add( groupAutomationPeer );
-          }
-        }
-      }
-
-      if( footerNode != null )
-      {
-        DataGridGroupAutomationPeer.AddFooterPeer( dataGridContext, footerNode, list, m_headerFooterChildren, oldHeaderFooterChildren );
-      }
-
-      return list;
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "DataGridCollectionViewGroup";
-    }
-
-    protected override Point GetClickablePointCore()
-    {
-      return new Point( double.NaN, double.NaN );
-    }
-
-    protected override string GetHelpTextCore()
-    {
-      QueryHelpTextRoutedEventArgs args = new QueryHelpTextRoutedEventArgs(
-        AutomationQueryEvents.QueryHelpTextForGroupEvent, m_uiGroupOwner );
-
-      m_uiGroupOwner.DataGridContext.DataGridControl.RaiseEvent( args );
-
-      string helpText = null;
-
-      if( args.Handled )
-        helpText = args.HelpText;
-
-      return ( helpText ?? string.Empty );
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      QueryItemStatusRoutedEventArgs args = new QueryItemStatusRoutedEventArgs(
-        AutomationQueryEvents.QueryItemStatusForGroupEvent, m_uiGroupOwner );
-
-      m_uiGroupOwner.DataGridContext.DataGridControl.RaiseEvent( args );
-
-      string itemStatus = null;
-
-      if( args.Handled )
-        itemStatus = args.ItemStatus;
-
-      return ( itemStatus ?? string.Empty );
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      QueryItemTypeRoutedEventArgs args = new QueryItemTypeRoutedEventArgs(
-        AutomationQueryEvents.QueryItemTypeForGroupEvent, m_uiGroupOwner );
-
-      m_uiGroupOwner.DataGridContext.DataGridControl.RaiseEvent( args );
-
-      string itemType = null;
-
-      if( args.Handled )
-        itemType = args.ItemType;
-
-      return ( itemType ?? string.Empty );
-    }
-
-    protected override AutomationPeer GetLabeledByCore()
-    {
-      return null;
-    }
-
-    protected override string GetNameCore()
-    {
-      QueryNameRoutedEventArgs args = new QueryNameRoutedEventArgs(
-        AutomationQueryEvents.QueryNameForGroupEvent, m_uiGroupOwner );
-
-      m_uiGroupOwner.DataGridContext.DataGridControl.RaiseEvent( args );
-
-      string name = null;
-
-      if( args.Handled )
-        name = args.Name;
-
-      return ( name ?? string.Empty );
-    }
-
-    protected override AutomationOrientation GetOrientationCore()
-    {
-      return AutomationOrientation.None;
-    }
-
-    protected override bool HasKeyboardFocusCore()
-    {
-      return false;
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      return true;
-    }
-
-    protected override bool IsControlElementCore()
-    {
-      return true;
-    }
-
-    protected override bool IsEnabledCore()
-    {
-      return true;
-    }
-
-    protected override bool IsKeyboardFocusableCore()
-    {
-      return false;
-    }
-
-    protected override bool IsOffscreenCore()
-    {
-      return false;
-    }
-
-    protected override bool IsPasswordCore()
-    {
-      return false;
-    }
-
-    protected override bool IsRequiredForFormCore()
-    {
-      return false;
-    }
-
-    protected override void SetFocusCore()
-    {
-      throw new NotSupportedException();
-    }
-
-    private void OnOwnerPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( !AutomationPeer.ListenerExists( AutomationEvents.PropertyChanged ) )
-        return;
-
-      Debug.Assert( sender == this.Owner );
-
-      if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridGroupAutomationPeer.GroupIsExpandedPropertyName ) )
-      {
-        if( this.Owner.IsExpanded )
-        {
-          this.RaisePropertyChangedEvent( ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty, ExpandCollapseState.Collapsed, ExpandCollapseState.Expanded );
-        }
-        else
-        {
-          this.RaisePropertyChangedEvent( ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty, ExpandCollapseState.Expanded, ExpandCollapseState.Collapsed );
-        }
-      }
-    }
-
-    internal static void AddHeaderPeer(
-      DataGridContext dataGridContext,
-      HeadersFootersGeneratorNode node,
-      List<AutomationPeer> list,
-      Hashtable children,
-      Hashtable oldChildren )
-    {
-      int headersCount = node.ItemCount;
-
-      for( int i = 0; i < headersCount; i++ )
-      {
-        // We use GetAt since it does not return the same thing as .Items.
-        // We need to get a GroupHeaderFooterItem.
-        object item = node.GetAt( i );
-
-        if( item != null )
-        {
-          HeaderFooterItemAutomationPeer automationPeer =
-            oldChildren[ item ] as HeaderFooterItemAutomationPeer;
-
-          if( automationPeer == null )
-          {
-            automationPeer = new HeaderFooterItemAutomationPeer( dataGridContext, item );
-          }
-
-          Debug.Assert( automationPeer != null );
-
-          // we set ExtraInfo even if the header was already created since the position can change.
-          automationPeer.SetExtraInfo( HeaderFooterItemAutomationPeer.HeaderFooterType.Header, i );
-
-          // Force EventsSource to be updated
-          automationPeer.GetWrapperPeer();
-
-          list.Add( automationPeer );
-          children[ item ] = automationPeer;
-        }
-      }
-    }
-
-    internal static void AddFooterPeer(
-      DataGridContext dataGridContext,
-      HeadersFootersGeneratorNode node,
-      List<AutomationPeer> list,
-      Hashtable children,
-      Hashtable oldChildren )
-    {
-      int headersCount = node.ItemCount;
-
-      for( int i = 0; i < headersCount; i++ )
-      {
-        // We use GetAt since it does not return the same thing as .Items.
-        // We need to get a GroupHeaderFooterItem.
-        object item = node.GetAt( i );
-
-        if( item != null )
-        {
-          HeaderFooterItemAutomationPeer automationPeer =
-            oldChildren[ item ] as HeaderFooterItemAutomationPeer;
-
-          if( automationPeer == null )
-          {
-            automationPeer = new HeaderFooterItemAutomationPeer( dataGridContext, item );
-          }
-
-          Debug.Assert( automationPeer != null );
-
-          // we set ExtraInfo even if the header was already created since the position can change.
-          automationPeer.SetExtraInfo( HeaderFooterItemAutomationPeer.HeaderFooterType.Footer, i );
-
-          // Force EventsSource to be updated
-          automationPeer.GetWrapperPeer();
-
-          list.Add( automationPeer );
-          children[ item ] = automationPeer;
-        }
-      }
-    }
-
-    #region IExpandCollapseProvider Members
-
-    void IExpandCollapseProvider.Collapse()
-    {
-      m_uiGroupOwner.IsExpanded = false;
-    }
-
-    void IExpandCollapseProvider.Expand()
-    {
-      m_uiGroupOwner.IsExpanded = true;
-    }
-
-    ExpandCollapseState IExpandCollapseProvider.ExpandCollapseState
-    {
-      get
-      {
-        return ( m_uiGroupOwner.IsExpanded ) ?
-          ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed;
-      }
-    }
-
-    #endregion
-
-    #region IItemContainerProvider Members
-
-    public IRawElementProviderSimple FindItemByProperty( IRawElementProviderSimple startAfter, int propertyId, object value )
-    {
-      if( ( propertyId != 0 ) && ( !DataGridGroupAutomationPeer.IsPropertySupportedForFindItem( propertyId ) ) )
-      {
-        throw new ArgumentException( "Property not supported" );
-      }
-
-      Group owner = this.Owner;
-      GroupGeneratorNode generatorNode = owner.GeneratorNode;
-
-      if( generatorNode == null )
-        return null;
-
-      DataGridContext dataGridContext = owner.DataGridContext;
-
-      if( dataGridContext == null )
-        return null;
-
-      this.ResetChildrenCache();
-      IList<object> items = owner.GetItems();
-      int itemsCount = ( items == null ) ? 0 : items.Count;
-
-      DataGridItemAutomationPeer startAfterItemPeer = null;
-      HeaderFooterItemAutomationPeer startAfterHeaderFooterPeer = null;
-
-      if( startAfter != null )
-      {
-        AutomationPeer startAfterPeer = this.PeerFromProvider( startAfter );
-
-        if( startAfterPeer == null )
-          return null;
-
-        startAfterItemPeer = startAfterPeer as DataGridItemAutomationPeer;
-        startAfterHeaderFooterPeer = startAfterPeer as HeaderFooterItemAutomationPeer;
-      }
-
-      int startIndex = 0;
-
-      // Get header count
-      HeadersFootersGeneratorNode headerNode = generatorNode.GetHeaderNode();
-      int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-
-      // Get footer count
-      HeadersFootersGeneratorNode footerNode = generatorNode.GetFooterNode();
-      int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-
-      int childrenCount = headersCount + footersCount + itemsCount;
-
-      if( startAfterItemPeer != null )
-      {
-        startIndex = headersCount + startAfterItemPeer.Index + 1;
-      }
-      else if( startAfterHeaderFooterPeer != null )
-      {
-        startIndex = startAfterHeaderFooterPeer.Index + 1;
-
-        switch( startAfterHeaderFooterPeer.Type )
-        {
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.Header:
-            {
-              break;
-            }
-          case HeaderFooterItemAutomationPeer.HeaderFooterType.Footer:
-            {
-              startIndex += headersCount + itemsCount;
-              break;
-            }
-        }
-      }
-
-      if( propertyId == 0 )
-      {
-        AutomationPeer peer = this.GetPeerForChildrenIndex( startIndex );
-
-        if( peer == null )
-          return null;
-
-        return this.ProviderFromPeer( peer );
-      }
-
-      object propertyValue = null;
-
-      for( int i = startIndex; i < childrenCount; i++ )
-      {
-        AutomationPeer peer = this.GetPeerForChildrenIndex( i );
-
-        if( peer != null )
-        {
-          try
-          {
-            propertyValue = peer.GetPropertyValue( propertyId );
-          }
-          catch( Exception exception )
-          {
-            if( exception is ElementNotAvailableException )
-            {
-              continue;
-            }
-          }
-
-          if( object.Equals( value, propertyValue ) )
-          {
-            return this.ProviderFromPeer( peer );
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private AutomationPeer GetPeerForChildrenIndex( int index )
-    {
-      Group owner = this.Owner;
-      GroupGeneratorNode generatorNode = owner.GeneratorNode;
-
-      if( generatorNode == null )
-        return null;
-
-      DataGridContext dataGridContext = owner.DataGridContext;
-
-      if( dataGridContext == null )
-        return null;
-
-      DataGridContextAutomationPeer dataGridContextAutomationPeer = dataGridContext.Peer;
-      HeadersFootersGeneratorNode headerNode = generatorNode.GetHeaderNode();
-      int headersCount = ( headerNode == null ) ? 0 : headerNode.ItemCount;
-
-      if( index < headersCount )
-      {
-        object item = headerNode.GetAt( index );
-        AutomationPeer automationPeer = m_headerFooterChildren[ item ] as AutomationPeer;
-        Debug.Assert( automationPeer != null );
-        return automationPeer;
-      }
-      else
-      {
-        index -= headersCount;
-        IList<object> items = owner.GetItems();
-        int itemsCount = ( items == null ) ? 0 : items.Count;
-
-        if( index < itemsCount )
-        {
-          return dataGridContextAutomationPeer.FindOrCreateItemAutomationPeer( items[ index ], -1 );
-        }
-        else
-        {
-          index -= itemsCount;
-          HeadersFootersGeneratorNode footerNode = generatorNode.GetFooterNode();
-          int footersCount = ( footerNode == null ) ? 0 : footerNode.ItemCount;
-
-          if( index < footersCount )
-          {
-            object item = footerNode.GetAt( index );
-            AutomationPeer automationPeer = m_headerFooterChildren[ item ] as AutomationPeer;
-            Debug.Assert( automationPeer != null );
-            return automationPeer;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private static bool IsPropertySupportedForFindItem( int id )
-    {
-      return ( ( AutomationElementIdentifiers.NameProperty.Id == id )
-        || ( AutomationElementIdentifiers.AutomationIdProperty.Id == id )
-        || ( AutomationElementIdentifiers.ControlTypeProperty.Id == id )
-        || ( SelectionItemPatternIdentifiers.IsSelectedProperty.Id == id ) );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( typeof( PropertyChangedEventManager ) == managerType )
-      {
-        if( sender == this.Owner )
-        {
-          this.OnOwnerPropertyChanged( sender, ( PropertyChangedEventArgs )e );
-        }
-
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private Hashtable m_dataChildren;
-    private Hashtable m_headerFooterChildren;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs
deleted file mode 100644
index 2aa31081..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @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.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Controls;
-using System.Windows.Automation;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows.Controls.Primitives;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class DataGridItemAutomationPeer : AutomationPeer, ISelectionItemProvider, IVirtualizedItemProvider, IScrollItemProvider
-  {
-    public DataGridItemAutomationPeer( object item, DataGridContext dataGridContext, int index )
-    {
-      // if index = -1, it will be calculated later calling indexof on dataGridContext.Items.
-
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      m_item = item;
-      m_dataGridContext = dataGridContext;
-      m_index = index;
-      m_dataChildren = new Hashtable( 0 );
-    }
-
-    #region Item Property
-
-    public object Item
-    {
-      get
-      {
-        return m_item;
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region Index Property
-
-    internal int Index
-    {
-      get
-      {
-        if( m_index == -1 )
-          m_index = m_dataGridContext.Items.IndexOf( m_item );
-
-        return m_index;
-      }
-    }
-
-    internal void SetIndex( int value )
-    {
-      m_index = value;
-    }
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      if( ( patternInterface == PatternInterface.SelectionItem )
-        || ( patternInterface == PatternInterface.VirtualizedItem )
-        || ( patternInterface == PatternInterface.ScrollItem ) )
-      {
-        return this;
-      }
-
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetPattern( patternInterface );
-
-      return null;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.DataItem;
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "DataRow";
-    }
-
-    protected override string GetAcceleratorKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAcceleratorKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAccessKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAccessKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      string automationId = null;
-
-      if( wrapperPeer != null )
-        automationId = wrapperPeer.GetAutomationId();
-
-      if( !string.IsNullOrEmpty( automationId ) )
-        return automationId;
-
-      return "Row_" + this.Index.ToString( CultureInfo.InvariantCulture );
-    }
-
-    protected override Rect GetBoundingRectangleCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetBoundingRectangle();
-
-      return new Rect();
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      DataRow dataRow = m_dataGridContext.CustomItemContainerGenerator.ContainerFromItem( m_item ) as DataRow;
-
-      if( dataRow == null )
-        return null;
-
-      // Get child context ( Detail )
-      DetailConfigurationCollection detailConfigurations = m_dataGridContext.DetailConfigurations;
-      int detailConfigurationsCount = detailConfigurations.Count;
-
-      ReadOnlyObservableCollection<ColumnBase> visibleColumns = m_dataGridContext.VisibleColumns;
-      int visibleColumnsCount = visibleColumns.Count;
-
-      if( visibleColumnsCount + detailConfigurationsCount <= 0 )
-        return null;
-
-      Hashtable oldDataChildren = m_dataChildren;
-      List<AutomationPeer> list = new List<AutomationPeer>( visibleColumnsCount + detailConfigurationsCount );
-      m_dataChildren = new Hashtable( visibleColumnsCount + detailConfigurationsCount );
-
-      for( int i = 0; i < visibleColumnsCount; i++ )
-      {
-        ColumnBase column = visibleColumns[ i ];
-
-        DataGridItemCellAutomationPeer cellAutomationPeer =
-          oldDataChildren[ column ] as DataGridItemCellAutomationPeer;
-
-        if( cellAutomationPeer == null )
-          cellAutomationPeer = new DataGridItemCellAutomationPeer( this, column );
-
-        // Always resetting the ColumnIndex since the visible position can have changed
-        cellAutomationPeer.ColumnIndex = i;
-
-        list.Add( cellAutomationPeer );
-        m_dataChildren[ column ] = cellAutomationPeer;
-      }
-
-      for( int i = 0; i < detailConfigurationsCount; i++ )
-      {
-        DetailConfiguration detailConfiguration = detailConfigurations[ i ];
-        DataGridContextAutomationPeer detailDataGridContextAutomationPeer = null;
-
-        detailDataGridContextAutomationPeer =
-          oldDataChildren[ detailConfiguration ] as DataGridContextAutomationPeer;
-
-        if( detailDataGridContextAutomationPeer == null )
-        {
-          detailDataGridContextAutomationPeer = new DataGridContextAutomationPeer(
-            m_dataGridContext.DataGridControl, m_dataGridContext, m_item, detailConfiguration );
-        }
-
-        list.Add( detailDataGridContextAutomationPeer );
-        m_dataChildren[ detailConfiguration ] = detailDataGridContextAutomationPeer;
-      }
-
-      return list;
-    }
-
-    protected override Point GetClickablePointCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetClickablePoint();
-
-      return new Point( double.NaN, double.NaN );
-    }
-
-    protected override string GetHelpTextCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetHelpText();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetItemStatus();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetItemType();
-
-      return string.Empty;
-    }
-
-    protected override AutomationPeer GetLabeledByCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetLabeledBy();
-
-      return null;
-    }
-
-    protected override string GetNameCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      string name = null;
-
-      if( wrapperPeer != null )
-        name = wrapperPeer.GetName();
-
-      if( ( name == null ) && ( m_item is string ) )
-        name = ( string )m_item;
-
-      if( !string.IsNullOrEmpty( name ) )
-        return name;
-
-      Column mainColumn = this.DataGridContext.Columns.MainColumn as Column;
-
-      if( ( mainColumn == null ) || ( !mainColumn.Visible ) )
-        return string.Empty;
-
-      BindingPathValueExtractor valueExtractor = this.DataGridContext.GetBindingPathExtractorForColumn( mainColumn, m_item );
-      object mainColumnValue = valueExtractor.GetValueFromItem( m_item );
-
-      if( mainColumnValue == null )
-        return string.Empty;
-
-      return string.Format( CultureInfo.CurrentCulture, "{0}", mainColumnValue );
-    }
-
-    protected override AutomationOrientation GetOrientationCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetOrientation();
-
-      return AutomationOrientation.None;
-    }
-
-    protected override bool HasKeyboardFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.HasKeyboardFocus() ) );
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsContentElement();
-
-      return true;
-    }
-
-    protected override bool IsControlElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsControlElement();
-
-      return true;
-    }
-
-    protected override bool IsEnabledCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer == null ) || wrapperPeer.IsEnabled() );
-    }
-
-    protected override bool IsKeyboardFocusableCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && wrapperPeer.IsKeyboardFocusable() );
-    }
-
-    protected override bool IsOffscreenCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsOffscreen();
-
-      return true;
-    }
-
-    protected override bool IsPasswordCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsPassword() ) );
-    }
-
-    protected override bool IsRequiredForFormCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsRequiredForForm() ) );
-    }
-
-    protected override void SetFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        wrapperPeer.SetFocus();
-    }
-
-    internal UIElement GetWrapper()
-    {
-      if( m_dataGridContext.DataGridControl.IsItemItsOwnContainer( m_item ) )
-        return m_item as UIElement;
-
-      return m_dataGridContext.CustomItemContainerGenerator.ContainerFromItem( m_item ) as UIElement;
-    }
-
-    internal AutomationPeer GetWrapperPeer()
-    {
-      UIElement wrapper = this.GetWrapper();
-
-      if( wrapper == null )
-        return null;
-
-      AutomationPeer peer = UIElementAutomationPeer.CreatePeerForElement( wrapper );
-
-      if( peer != null )
-      {
-        peer.EventsSource = this;
-        return peer;
-      }
-
-      return null;
-    }
-
-    internal DataGridItemCellAutomationPeer GetDataGridItemCellPeer( ColumnBase column )
-    {
-      // Force the creation of the children caching (m_dataChildren).
-      this.GetChildren();
-
-      return m_dataChildren[ column ] as DataGridItemCellAutomationPeer;
-    }
-
-    internal DataGridContextAutomationPeer GetDetailPeer( DetailConfiguration detailConfig )
-    {
-      return m_dataChildren[ detailConfig ] as DataGridContextAutomationPeer;
-    }
-
-    #region ISelectionItemProvider Members
-
-    bool ISelectionItemProvider.IsSelected
-    {
-      get
-      {
-        return m_dataGridContext.SelectedItemsStore.Contains( this.Index );
-      }
-    }
-
-    IRawElementProviderSimple ISelectionItemProvider.SelectionContainer
-    {
-      get
-      {
-        return this.ProviderFromPeer( m_dataGridContext.PeerSource );
-      }
-    }
-
-    void ISelectionItemProvider.AddToSelection()
-    {
-      if( !this.IsEnabled() )
-        throw new ElementNotEnabledException();
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( ( dataGridControl.SelectionModeToUse == SelectionMode.Single ) && ( dataGridControl.SelectedItem != null )
-        && ( dataGridControl.SelectedItem != this.Item ) )
-      {
-        throw new InvalidOperationException( "An attempt was made to select more than 1 item." );
-      }
-
-      dataGridControl.SelectionChangerManager.Begin();
-
-      try
-      {
-        dataGridControl.SelectionChangerManager.SelectItems(
-          m_dataGridContext,
-          new SelectionRangeWithItems( this.Index, m_item ) );
-      }
-      finally
-      {
-        dataGridControl.SelectionChangerManager.End( false, true, true );
-      }
-    }
-
-    void ISelectionItemProvider.RemoveFromSelection()
-    {
-      if( !base.IsEnabled() )
-        throw new ElementNotEnabledException();
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-      dataGridControl.SelectionChangerManager.Begin();
-
-      try
-      {
-        dataGridControl.SelectionChangerManager.UnselectItems(
-          m_dataGridContext,
-          new SelectionRangeWithItems( this.Index, m_item ) );
-      }
-      finally
-      {
-        dataGridControl.SelectionChangerManager.End( false, true, true );
-      }
-    }
-
-    void ISelectionItemProvider.Select()
-    {
-      if( !this.IsEnabled() )
-        throw new ElementNotEnabledException();
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-      dataGridControl.SelectionChangerManager.Begin();
-
-      try
-      {
-        dataGridControl.SelectionChangerManager.SelectJustThisItem( m_dataGridContext, this.Index, m_item );
-      }
-      finally
-      {
-        dataGridControl.SelectionChangerManager.End( false, true, true );
-      }
-    }
-
-    internal void RaiseAutomationIsSelectedChanged( bool isSelected )
-    {
-      this.RaisePropertyChangedEvent( SelectionItemPatternIdentifiers.IsSelectedProperty, !isSelected, isSelected );
-    }
-
-    #endregion
-
-    #region IVirtualizedItemProvider Members
-
-    public void Realize()
-    {
-      this.ScrollIntoView();
-    }
-
-    #endregion
-
-    #region IScrollItemProvider Members
-
-    public void ScrollIntoView()
-    {
-      if( m_dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      if( m_dataGridContext.CustomItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated )
-      {
-        dataGridControl.BringItemIntoViewHelper( m_dataGridContext, m_item );
-      }
-      else
-      {
-        this.Dispatcher.BeginInvoke( DispatcherPriority.Loaded, new DispatcherOperationCallback( this.BringItemIntoViewHelper ), m_item );
-      }
-    }
-
-    private object BringItemIntoViewHelper( object item )
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( dataGridControl == null )
-        return null;
-
-      dataGridControl.BringItemIntoViewHelper( m_dataGridContext, item );
-      return null;
-    }
-
-    #endregion
-
-    private Hashtable m_dataChildren;
-    private object m_item;
-    private int m_index;
-    private DataGridContext m_dataGridContext;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs
deleted file mode 100644
index 44a4c367..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @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.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Controls;
-using System.Windows.Automation;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  internal class DataGridItemCellAutomationPeer : AutomationPeer, ITableItemProvider
-  {
-    public DataGridItemCellAutomationPeer( DataGridItemAutomationPeer itemAutomationPeer, ColumnBase column )
-    {
-
-      if( itemAutomationPeer == null )
-        throw new ArgumentNullException( "itemAutomationPeer" );
-
-      if( column == null )
-        throw new ArgumentNullException( "column" );
-
-      m_itemAutomationPeer = itemAutomationPeer;
-      m_column = column;
-
-      // Call the GetWrapperPeer since it will force the events of the wrapped peer to be rerooted to us.
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-    }
-
-    #region ItemAutomationPeer Property
-
-    public DataGridItemAutomationPeer ItemAutomationPeer
-    {
-      get
-      {
-        return m_itemAutomationPeer;
-      }
-    }
-
-    #endregion
-
-    #region Column Property
-
-    public ColumnBase Column
-    {
-      get
-      {
-        return m_column;
-      }
-    }
-
-    #endregion
-
-    #region ColumnIndex Property
-
-    internal int ColumnIndex
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      switch( patternInterface )
-      {
-        case PatternInterface.GridItem:
-        case PatternInterface.TableItem:
-          return this;
-      }
-
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetPattern( patternInterface );
-
-      return null;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.Pane;
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "Cell";
-    }
-
-    protected override string GetAcceleratorKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAcceleratorKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAccessKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAccessKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      string automationId = null;
-
-      if( wrapperPeer != null )
-        automationId = wrapperPeer.GetAutomationId();
-
-      if( automationId == null )
-        automationId = string.Empty;
-
-      return automationId;
-    }
-
-    protected override Rect GetBoundingRectangleCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetBoundingRectangle();
-
-      return new Rect();
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetChildren();
-
-      return null;
-    }
-
-    protected override Point GetClickablePointCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetClickablePoint();
-
-      return new Point( double.NaN, double.NaN );
-    }
-
-    protected override string GetHelpTextCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetHelpText();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetItemStatus();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetItemType();
-
-      return string.Empty;
-    }
-
-    protected override AutomationPeer GetLabeledByCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetLabeledBy();
-
-      return null;
-    }
-
-    protected override string GetNameCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      string name = null;
-
-      if( wrapperPeer != null )
-        name = wrapperPeer.GetName();
-
-      if( name == null )
-        name = string.Empty;
-
-      return name;
-    }
-
-    protected override AutomationOrientation GetOrientationCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetOrientation();
-
-      return AutomationOrientation.None;
-    }
-
-    protected override bool HasKeyboardFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.HasKeyboardFocus() ) );
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsContentElement();
-
-      return true;
-    }
-
-    protected override bool IsControlElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsControlElement();
-
-      return true;
-    }
-
-    protected override bool IsEnabledCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer == null ) || wrapperPeer.IsEnabled() );
-    }
-
-    protected override bool IsKeyboardFocusableCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && wrapperPeer.IsKeyboardFocusable() );
-    }
-
-    protected override bool IsOffscreenCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsOffscreen();
-
-      return true;
-    }
-
-    protected override bool IsPasswordCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsPassword() ) );
-    }
-
-    protected override bool IsRequiredForFormCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsRequiredForForm() ) );
-    }
-
-    protected override void SetFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        wrapperPeer.SetFocus();
-    }
-
-    internal UIElement GetWrapper()
-    {
-      if( m_itemAutomationPeer == null )
-        return null;
-
-      Row row = m_itemAutomationPeer.GetWrapper() as Row;
-
-      if( row == null )
-        return null;
-
-      return row.Cells[ m_column ];
-    }
-
-    internal AutomationPeer GetWrapperPeer()
-    {
-      UIElement wrapper = this.GetWrapper();
-
-      if( wrapper == null )
-        return null;
-
-      AutomationPeer peer = UIElementAutomationPeer.CreatePeerForElement( wrapper );
-
-      if( peer != null )
-      {
-        peer.EventsSource = this;
-        return peer;
-      }
-
-      return null;
-    }
-
-    #region IGridItemProvider Members
-
-    int IGridItemProvider.Column
-    {
-      get
-      {
-        return this.ColumnIndex;
-      }
-    }
-
-    int IGridItemProvider.ColumnSpan
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    IRawElementProviderSimple IGridItemProvider.ContainingGrid
-    {
-      get
-      {
-        return this.ProviderFromPeer( this.ItemAutomationPeer.DataGridContext.PeerSource );
-      }
-    }
-
-    int IGridItemProvider.Row
-    {
-      get
-      {
-        return m_itemAutomationPeer.Index;
-      }
-    }
-
-    int IGridItemProvider.RowSpan
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    #endregion
-
-    #region ITableItemProvider Members
-
-    IRawElementProviderSimple[] ITableItemProvider.GetColumnHeaderItems()
-    {
-      DataGridItemAutomationPeer dataGridItemAutomationPeer = m_itemAutomationPeer;
-
-      if( dataGridItemAutomationPeer == null )
-        return new IRawElementProviderSimple[ 0 ];
-
-      DataGridContext dataGridContext = dataGridItemAutomationPeer.DataGridContext;
-
-      if( dataGridContext == null )
-        return new IRawElementProviderSimple[ 0 ];
-
-      List<AutomationPeer> headersFootersPeer = dataGridContext.Peer.GetColumnHeadersPeer();
-
-      if( headersFootersPeer == null )
-        return new IRawElementProviderSimple[ 0 ];
-
-      int headersFootersPeerCount = headersFootersPeer.Count;
-      List<IRawElementProviderSimple> rawElementProviderSimples = new List<IRawElementProviderSimple>( headersFootersPeerCount );
-
-      for( int i = 0; i < headersFootersPeerCount; i++ )
-      {
-        RowAutomationPeer rowPeer = headersFootersPeer[ i ] as RowAutomationPeer;
-
-        if( rowPeer != null )
-        {
-          Cell cell = rowPeer.Owner.Cells[ m_column ];
-
-          if( cell != null )
-          {
-            AutomationPeer automationPeer = FrameworkElementAutomationPeer.CreatePeerForElement( cell );
-            Debug.Assert( automationPeer != null );
-
-            if( automationPeer != null )
-            {
-              rawElementProviderSimples.Add( this.ProviderFromPeer( automationPeer ) );
-            }
-          }
-        }
-      }
-
-      return rawElementProviderSimples.ToArray();
-    }
-
-    IRawElementProviderSimple[] ITableItemProvider.GetRowHeaderItems()
-    {
-      return new IRawElementProviderSimple[ 0 ];
-    }
-
-    #endregion ITableItemProvider Members
-
-    private DataGridItemAutomationPeer m_itemAutomationPeer;
-    private ColumnBase m_column;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs
deleted file mode 100644
index 78ccef4c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs
+++ /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
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Controls.Primitives;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  internal class HeaderFooterItemAutomationPeer : AutomationPeer, IVirtualizedItemProvider, IScrollItemProvider
-  {
-    public HeaderFooterItemAutomationPeer( DataGridContext dataGridContext, object owner )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      Debug.Assert( ( owner is GroupHeaderFooterItem ) || ( owner is DataTemplate ) || ( owner is HeaderFooterItem ) );
-
-      m_owner = owner;
-      m_dataGridContext = dataGridContext;
-    }
-
-    #region Owner Property
-
-    public object Owner
-    {
-      get
-      {
-        return m_owner;
-      }
-    }
-
-    #endregion
-
-    #region Type Property
-
-    internal HeaderFooterType Type
-    {
-      get
-      {
-        return m_headerFooterType;
-      }
-    }
-
-    #endregion
-
-    #region Index Property
-
-    internal int Index
-    {
-      get
-      {
-        return m_index;
-      }
-    }
-
-    #endregion
-
-    public override object GetPattern( PatternInterface patternInterface )
-    {
-      if( ( patternInterface == PatternInterface.VirtualizedItem )
-        || ( patternInterface == PatternInterface.ScrollItem ) )
-      {
-        return this;
-      }
-
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetPattern( patternInterface );
-
-      return null;
-    }
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAutomationControlType();
-
-      return AutomationControlType.Custom;
-    }
-
-    protected override string GetClassNameCore()
-    {
-      return "HeaderFooterItem";
-    }
-
-    protected override string GetAcceleratorKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAcceleratorKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAccessKeyCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetAccessKey();
-
-      return string.Empty;
-    }
-
-    protected override string GetAutomationIdCore()
-    {
-      switch( m_headerFooterType )
-      {
-        case HeaderFooterType.FixedHeader:
-          return "FixedHeader_" + m_index.ToString( CultureInfo.InvariantCulture );
-
-        case HeaderFooterType.Header:
-          return "Header_" + m_index.ToString( CultureInfo.InvariantCulture );
-
-        case HeaderFooterType.FixedFooter:
-          return "FixedFooter_" + m_index.ToString( CultureInfo.InvariantCulture );
-
-        default: // HeaderFooterType.Footer
-          return "Footer_" + m_index.ToString( CultureInfo.InvariantCulture );
-      }
-    }
-
-    protected override Rect GetBoundingRectangleCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetBoundingRectangle();
-
-      return Rect.Empty;
-    }
-
-    protected override List<AutomationPeer> GetChildrenCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetChildren();
-
-      return null;
-    }
-
-    protected override Point GetClickablePointCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetClickablePoint();
-
-      return new Point( double.NaN, double.NaN );
-    }
-
-    protected override string GetHelpTextCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetHelpText();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemStatusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetItemStatus();
-
-      return string.Empty;
-    }
-
-    protected override string GetItemTypeCore()
-    {
-      return string.Empty;
-    }
-
-    protected override AutomationPeer GetLabeledByCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetLabeledBy();
-
-      return null;
-    }
-
-    protected override string GetNameCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetName();
-
-      return string.Empty;
-    }
-
-    protected override AutomationOrientation GetOrientationCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.GetOrientation();
-
-      return AutomationOrientation.None;
-    }
-
-    protected override bool HasKeyboardFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.HasKeyboardFocus() ) );
-    }
-
-    protected override bool IsContentElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsContentElement();
-
-      return true;
-    }
-
-    protected override bool IsControlElementCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsControlElement();
-
-      return true;
-    }
-
-    protected override bool IsEnabledCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer == null ) || wrapperPeer.IsEnabled() );
-    }
-
-    protected override bool IsKeyboardFocusableCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && wrapperPeer.IsKeyboardFocusable() );
-    }
-
-    protected override bool IsOffscreenCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        return wrapperPeer.IsOffscreen();
-
-      return true;
-    }
-
-    protected override bool IsPasswordCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsPassword() ) );
-    }
-
-    protected override bool IsRequiredForFormCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-      return ( ( wrapperPeer != null ) && ( wrapperPeer.IsRequiredForForm() ) );
-    }
-
-    protected override void SetFocusCore()
-    {
-      AutomationPeer wrapperPeer = this.GetWrapperPeer();
-
-      if( wrapperPeer != null )
-        wrapperPeer.SetFocus();
-    }
-
-    internal void SetExtraInfo( HeaderFooterType headerFooterType, int index )
-    {
-      m_headerFooterType = headerFooterType;
-      m_index = index;
-    }
-
-    internal UIElement GetWrapper()
-    {
-      HeaderFooterItem headerFooterItem = m_owner as HeaderFooterItem;
-      if( headerFooterItem == null )
-      {
-        headerFooterItem = m_dataGridContext.GetContainerFromItem( m_owner ) as HeaderFooterItem;
-      }
-
-      if( headerFooterItem == null )
-        return null;
-
-      var container = headerFooterItem.GetTemplatedDescendantDataGridItemContainers().FirstOrDefault();
-      if( container != null )
-        return container as UIElement;
-
-      return headerFooterItem;
-    }
-
-    internal AutomationPeer GetWrapperPeer()
-    {
-      UIElement wrapper = this.GetWrapper();
-
-      if( wrapper == null )
-        return null;
-
-      AutomationPeer peer = UIElementAutomationPeer.CreatePeerForElement( wrapper );
-
-      if( peer != null )
-      {
-        peer.EventsSource = this;
-        return peer;
-      }
-
-      return null;
-    }
-
-    #region IVirtualizedItemProvider Members
-
-    public void Realize()
-    {
-      this.ScrollIntoView();
-    }
-
-    #endregion
-
-    #region IScrollItemProvider Members
-
-    public void ScrollIntoView()
-    {
-      if( m_dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      if( m_dataGridContext.CustomItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated )
-      {
-        dataGridControl.BringItemIntoViewHelper( m_dataGridContext, m_owner );
-      }
-      else
-      {
-        this.Dispatcher.BeginInvoke( DispatcherPriority.Loaded, new DispatcherOperationCallback( this.BringItemIntoViewHelper ), m_owner );
-      }
-    }
-
-    private object BringItemIntoViewHelper( object item )
-    {
-      if( m_dataGridContext == null )
-        return null;
-
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( dataGridControl == null )
-        return null;
-
-      dataGridControl.BringItemIntoViewHelper( m_dataGridContext, item );
-      return null;
-    }
-
-    #endregion
-
-    private DataGridContext m_dataGridContext;
-    private object m_owner;
-    private HeaderFooterType m_headerFooterType;
-    private int m_index;
-
-    public enum HeaderFooterType
-    {
-      FixedHeader,
-      Header,
-      Footer,
-      FixedFooter
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs
deleted file mode 100644
index 3885a042..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public delegate void QueryAutomationIdRoutedEventHandler( object sender, QueryAutomationIdRoutedEventArgs e );
-
-  public class QueryAutomationIdRoutedEventArgs : RoutedEventArgs
-  {
-    public QueryAutomationIdRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region AutomationId Property
-
-    public string AutomationId
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs
deleted file mode 100644
index 62250112..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public delegate void QueryItemTypeRoutedEventHandler( object sender, QueryItemTypeRoutedEventArgs e );
-
-  public class QueryItemTypeRoutedEventArgs : RoutedEventArgs
-  {
-    public QueryItemTypeRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region ItemType Property
-
-    public string ItemType
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs
deleted file mode 100644
index cb13e8a6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public delegate void QueryNameRoutedEventHandler( object sender, QueryNameRoutedEventArgs e );
-
-  public class QueryNameRoutedEventArgs : RoutedEventArgs
-  {
-    public QueryNameRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region Name Property
-
-    public string Name
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs
deleted file mode 100644
index 0956bc76..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.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.Linq;
-using System.Text;
-using System.Windows.Automation.Peers;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public class RowAutomationPeer : FrameworkElementAutomationPeer
-  {
-    public RowAutomationPeer( Row owner )
-      : base( owner )
-    {
-    }
-
-    #region Owner Property
-
-    public new Row Owner
-    {
-      get
-      {
-        return base.Owner as Row;
-      }
-    }
-
-    #endregion
-
-    protected override AutomationControlType GetAutomationControlTypeCore()
-    {
-      return AutomationControlType.Pane;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs
new file mode 100644
index 00000000..d8d3dd82
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs
@@ -0,0 +1,60 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.ComponentModel;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  [Browsable( false )]
+  [EditorBrowsable( EditorBrowsableState.Never )]
+  public class BindingProxy : Freezable
+  {
+    #region Value Property
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+      "Value",
+      typeof( object ),
+      typeof( BindingProxy ),
+      new UIPropertyMetadata( null ) );
+
+    public object Value
+    {
+      get
+      {
+        return this.GetValue( BindingProxy.ValueProperty );
+      }
+      set
+      {
+        this.SetValue( BindingProxy.ValueProperty, value );
+      }
+    }
+
+    #endregion
+
+    protected override Freezable CreateInstanceCore()
+    {
+      return new BindingProxy();
+    }
+
+    protected sealed override bool FreezeCore( bool isChecking )
+    {
+      // Only derived from Freezable to have DataContext and ElementName binding.
+      // So we don't want to be freezable.
+      return false;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs
deleted file mode 100644
index 0171d10a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CanBeCurrentWhenReadOnlyChangedEventManager: WeakEventManager
-  {
-    private CanBeCurrentWhenReadOnlyChangedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CanBeCurrentWhenReadOnlyChanged += new EventHandler( this.OnCanBeCurrentWhenReadOnlyChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CanBeCurrentWhenReadOnlyChanged -= new EventHandler( this.OnCanBeCurrentWhenReadOnlyChanged );
-    }
-
-    private static CanBeCurrentWhenReadOnlyChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( CanBeCurrentWhenReadOnlyChangedEventManager );
-        CanBeCurrentWhenReadOnlyChangedEventManager currentManager = ( CanBeCurrentWhenReadOnlyChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CanBeCurrentWhenReadOnlyChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCanBeCurrentWhenReadOnlyChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
index f739c00b..64490444 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
@@ -32,7 +32,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Automation;
+using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.ValidationRules;
 using Xceed.Wpf.DataGrid.Views;
 using Xceed.Wpf.Toolkit.Core;
@@ -42,6 +42,8 @@ namespace Xceed.Wpf.DataGrid
   [TemplatePart( Name = "PART_CellContentPresenter", Type = typeof( ContentPresenter ) )]
   public class Cell : ContentControl, INotifyPropertyChanged, IWeakEventListener
   {
+    internal static readonly string FieldNamePropertyName = PropertyHelper.GetPropertyName( ( Cell c ) => c.FieldName );
+
     // This validation rule is meant to be used as the rule in error set in a Cell's ValidationError when the CellEditor's HasError attached property returns true.
     private static readonly CellEditorErrorValidationRule CellEditorErrorValidationRule = new CellEditorErrorValidationRule();
 
@@ -53,9 +55,7 @@ namespace Xceed.Wpf.DataGrid
     static Cell()
     {
       Cell.ContentProperty.OverrideMetadata( typeof( Cell ),
-          new FrameworkPropertyMetadata(
-          new PropertyChangedCallback( OnContentChanged ),
-          new CoerceValueCallback( OnCoerceContent ) ) );
+          new FrameworkPropertyMetadata( new PropertyChangedCallback( OnContentChanged ), new CoerceValueCallback( OnCoerceContent ) ) );
 
       //This configures the TAB key to go trough the controls of the cell once... then continue with other controls
       KeyboardNavigation.TabNavigationProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( KeyboardNavigationMode.None ) );
@@ -84,7 +84,6 @@ namespace Xceed.Wpf.DataGrid
 
       Cell.IsBeingEditedProperty = Cell.IsBeingEditedPropertyKey.DependencyProperty;
       Cell.IsDirtyProperty = Cell.IsDirtyPropertyKey.DependencyProperty;
-      Cell.IsDirtyFromInitializingInsertionRowProperty = Cell.IsDirtyFromInitializingInsertionRowPropertyKey.DependencyProperty;
 
       // We do this last to ensure all the Static content of the cell is done before using 
       // any static read-only field of the row.
@@ -135,8 +134,8 @@ namespace Xceed.Wpf.DataGrid
       // Remove the error template by default.
       this.SetValue( Validation.ErrorTemplateProperty, null );
 
-      Validation.AddErrorHandler( this, Cell.ContentBinding_ValidationError );
-      this.TargetUpdated += new EventHandler<DataTransferEventArgs>( this.ContentBinding_TargetUpdated );
+      Validation.AddErrorHandler( this, Cell.OnContentBindingNotifyValidationError );
+      this.TargetUpdated += new EventHandler<DataTransferEventArgs>( this.OnContentBindingTargetUpdated );
       this.LayoutUpdated += new EventHandler( this.Cell_LayoutUpdated );
     }
 
@@ -282,19 +281,19 @@ namespace Xceed.Wpf.DataGrid
           cellState.SetIsBeingEdited( value );
         }
 
-        if( !this.ParentRow.IsClearingContainer )
-        {
-          //If cell is being edited
-          if( value )
-          {
-            //Raise the RoutedEvent that notifies any Row that the cell is being edited.
-            RoutedEventArgs eventArgs = new RoutedEventArgs( Cell.IsBeingEditedEvent );
-            this.RaiseEvent( eventArgs );
-            this.FocusEditor = true;
-          }
+        if( this.ParentRow.IsClearingContainer )
+          return;
 
-          this.RefreshDisplayedTemplate();
+        //If cell is being edited
+        if( value )
+        {
+          //Raise the RoutedEvent that notifies any Row that the cell is being edited.
+          RoutedEventArgs eventArgs = new RoutedEventArgs( Cell.IsBeingEditedEvent );
+          this.RaiseEvent( eventArgs );
+          this.FocusEditor = true;
         }
+
+        this.RefreshDisplayedTemplate();
       }
     }
 
@@ -344,41 +343,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion IsDirty Read-Only Property
 
-    #region IsDirtyFromInitializingInsertionRow Read-Only Property
-
-    private static readonly DependencyPropertyKey IsDirtyFromInitializingInsertionRowPropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsDirtyFromInitializingInsertionRow",
-      typeof( bool ),
-      typeof( Cell ),
-      new PropertyMetadata( false ) );
-
-    internal static readonly DependencyProperty IsDirtyFromInitializingInsertionRowProperty;
-
-    internal bool IsDirtyFromInitializingInsertionRow
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.IsDirtyFromInitializingInsertionRowProperty );
-      }
-    }
-
-    internal void SetIsDirtyFromInitializingInsertionRow( bool value )
-    {
-      if( value != this.IsDirtyFromInitializingInsertionRow )
-      {
-        if( value )
-        {
-          this.SetValue( Cell.IsDirtyFromInitializingInsertionRowPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Cell.IsDirtyFromInitializingInsertionRowPropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    #endregion IsDirtyFromInitializingInsertionRow Read-Only Property
-
     #region IsCellEditorDisplayed Read-Only Property
 
     public bool IsCellEditorDisplayed
@@ -402,8 +366,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region CurrentBackground Property
 
-    public static readonly DependencyProperty CurrentBackgroundProperty =
-      DependencyProperty.Register( "CurrentBackground",
+    public static readonly DependencyProperty CurrentBackgroundProperty = DependencyProperty.Register(
+      "CurrentBackground",
       typeof( Brush ),
       typeof( Cell ),
       new FrameworkPropertyMetadata( null ) );
@@ -463,8 +427,7 @@ namespace Xceed.Wpf.DataGrid
 
     #region CellErrorStyle Property
 
-    public static readonly DependencyProperty CellErrorStyleProperty =
-      DataGridControl.CellErrorStyleProperty.AddOwner( typeof( Cell ) );
+    public static readonly DependencyProperty CellErrorStyleProperty = DataGridControl.CellErrorStyleProperty.AddOwner( typeof( Cell ) );
 
     public Style CellErrorStyle
     {
@@ -483,17 +446,13 @@ namespace Xceed.Wpf.DataGrid
 
     #region HasValidationError Read-Only Property
 
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey =
-      DependencyProperty.RegisterReadOnly(
+    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
       "HasValidationError",
       typeof( bool ),
       typeof( Cell ),
-      new UIPropertyMetadata(
-        false,
-        new PropertyChangedCallback( Cell.OnHasValidationErrorChanged ) ) );
+      new UIPropertyMetadata( false, new PropertyChangedCallback( Cell.OnHasValidationErrorChanged ) ) );
 
-    public static readonly DependencyProperty HasValidationErrorProperty =
-      HasValidationErrorPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty HasValidationErrorProperty = HasValidationErrorPropertyKey.DependencyProperty;
 
     public bool HasValidationError
     {
@@ -523,13 +482,12 @@ namespace Xceed.Wpf.DataGrid
       Cell cell = ( Cell )sender;
 
       // If we are in the process of clearing the cell, don't refresh the error style.
-      // It is imperative to take care of resetting all the flags used by the DelayedRefreshErrorStyle architecture in the
-      // Cell's ClearContainer method though.
-      if( ( cell.ParentRow != null ) && ( cell.ParentRow.IsClearingContainer ) )
+      // It is imperative to take care of resetting all the flags used by the DelayedRefreshErrorStyle architecture in the Cell's ClearContainer method though.
+      var parentRow = cell.ParentRow;
+      if( ( parentRow != null ) && parentRow.IsClearingContainer )
         return;
 
-      // This flag is used to optimize the synchronization of error flags on the parent row/column so that
-      // it is done only once at the end of the UpdateHasErrorFlags method.
+      // This flag is used to optimize the synchronization of error flags on the parent row/column so that it is done only once at the end of the UpdateHasErrorFlags method.
       cell.HasPendingSyncParentErrorFlags = true;
 
       if( cell.HasPendingErrorStyleRefresh )
@@ -575,7 +533,7 @@ namespace Xceed.Wpf.DataGrid
     {
       m_delayedRefreshErrorStyleDispatcherOperation = null;
       System.Diagnostics.Debug.Assert( this.HasPendingErrorStyleRefresh, "The operation should have been aborted." );
-      System.Diagnostics.Debug.Assert( ( this.ParentRow != null ) && ( !this.ParentRow.IsClearingContainer ), "The operation should have been aborted." );
+      System.Diagnostics.Debug.Assert( ( ( this.ParentRow != null ) && !this.ParentRow.IsClearingContainer ), "The operation should have been aborted." );
 
       if( !this.IsLoaded )
       {
@@ -641,8 +599,7 @@ namespace Xceed.Wpf.DataGrid
       typeof( Cell ),
       new PropertyMetadata( false ) );
 
-    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty =
-      Cell.IsValidationErrorRestrictivePropertyKey.DependencyProperty;
+    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty = Cell.IsValidationErrorRestrictivePropertyKey.DependencyProperty;
 
     public bool IsValidationErrorRestrictive
     {
@@ -677,7 +634,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region ValidationError Read-Only Property
 
-    public static readonly RoutedEvent ValidationErrorChangingEvent = EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( CellValidationErrorRoutedEventHandler ), typeof( Cell ) );
+    public static readonly RoutedEvent ValidationErrorChangingEvent =
+                  EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( CellValidationErrorRoutedEventHandler ), typeof( Cell ) );
 
     public event CellValidationErrorRoutedEventHandler ValidationErrorChanging
     {
@@ -696,15 +654,13 @@ namespace Xceed.Wpf.DataGrid
       this.RaiseEvent( e );
     }
 
-    private static readonly DependencyPropertyKey ValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "ValidationError", typeof( CellValidationError ), typeof( Cell ),
-        new FrameworkPropertyMetadata(
-          null,
-          new PropertyChangedCallback( Cell.OnValidationErrorChanged ),
-          new CoerceValueCallback( Cell.OnCoerceValidationError ) ) );
+    private static readonly DependencyPropertyKey ValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
+      "ValidationError",
+      typeof( CellValidationError ),
+      typeof( Cell ),
+      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Cell.OnValidationErrorChanged ), new CoerceValueCallback( Cell.OnCoerceValidationError ) ) );
 
-    public static readonly DependencyProperty ValidationErrorProperty =
-      ValidationErrorPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty ValidationErrorProperty = ValidationErrorPropertyKey.DependencyProperty;
 
     public CellValidationError ValidationError
     {
@@ -735,12 +691,10 @@ namespace Xceed.Wpf.DataGrid
 
       CellValidationError newCellValidationError = e.NewValue as CellValidationError;
 
-      // Update the flags telling us wether or not the current validation error is CellEditor error, or a UI error and
-      // update the HasValidationError dependency property.
+      // Update the flags telling us wether or not the current validation error is CellEditor error, or a UI error and update the HasValidationError dependency property.
       cell.UpdateHasErrorFlags( newCellValidationError );
 
-      // Refresh which content template is displayed (editTemplate or not) in case there was a CellEditor validation error on the cell
-      // and now there isn't one anymore.
+      // Refresh which content template is displayed (editTemplate or not) in case there was a CellEditor validation error on the cell and now there isn't one anymore.
       cell.RefreshDisplayedTemplate();
     }
 
@@ -778,7 +732,9 @@ namespace Xceed.Wpf.DataGrid
           ColumnBase column = this.ParentColumn;
 
           if( column != null )
+          {
             column.SetHasValidationError( hasValidationError );
+          }
 
           Row row = this.ParentRow;
 
@@ -810,7 +766,9 @@ namespace Xceed.Wpf.DataGrid
         CellState cellState = this.GetEditCachedState();
 
         if( cellState != null )
+        {
           cellState.SetCellValidationError( value );
+        }
       }
     }
 
@@ -824,9 +782,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region CellDisplayEditorMatchingConditions Property
 
-    private static readonly DependencyProperty CellDisplayEditorMatchingConditionsProperty =
-        DependencyProperty.Register( "CellDisplayEditorMatchingConditions", typeof( CellEditorDisplayConditions ), typeof( Cell ),
-                                     new UIPropertyMetadata( CellEditorDisplayConditions.None, new PropertyChangedCallback( OnMatchingDisplayEditorChanged ) ) );
+    private static readonly DependencyProperty CellDisplayEditorMatchingConditionsProperty = DependencyProperty.Register(
+      "CellDisplayEditorMatchingConditions",
+      typeof( CellEditorDisplayConditions ),
+      typeof( Cell ),
+      new UIPropertyMetadata( CellEditorDisplayConditions.None, new PropertyChangedCallback( OnMatchingDisplayEditorChanged ) ) );
 
     internal void SetDisplayEditorMatchingCondition( CellEditorDisplayConditions condition )
     {
@@ -943,7 +903,9 @@ namespace Xceed.Wpf.DataGrid
     #region ParentCell Property
 
     private static readonly DependencyPropertyKey ParentCellPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "ParentCell", typeof( Cell ), typeof( Cell ),
+      "ParentCell",
+      typeof( Cell ),
+      typeof( Cell ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty ParentCellProperty;
@@ -961,7 +923,7 @@ namespace Xceed.Wpf.DataGrid
       "ParentColumn",
       typeof( ColumnBase ),
       typeof( Cell ),
-      new PropertyMetadata( null ) );
+      new PropertyMetadata( null, new PropertyChangedCallback( Cell.OnParentColumnChanged ) ) );
 
     public static readonly DependencyProperty ParentColumnProperty;
 
@@ -971,55 +933,40 @@ namespace Xceed.Wpf.DataGrid
       {
         return ( ColumnBase )this.GetValue( Cell.ParentColumnProperty );
       }
+      private set
+      {
+        this.SetValue( Cell.ParentColumnPropertyKey, value );
+      }
     }
 
-    internal virtual void SetParentColumn( ColumnBase value )
+    internal virtual void OnParentColumnChanged( ColumnBase oldColumn, ColumnBase newColumn )
     {
-      if( value == null )
-        throw new ArgumentNullException( "value" );
-
-      // There is nothing to do if the parent column is the same.
-      var parentColumn = this.ParentColumn;
-      if( value == parentColumn )
-        return;
-
-      // Unregister from the old Parent Column's event.
-      if( parentColumn != null )
+      if( oldColumn != null )
       {
-        CellEditorDisplayConditionsChangedEventManager.RemoveListener( parentColumn, this );
-        CellContentTemplateChangedEventManager.RemoveListener( parentColumn, this );
-        CanBeCurrentWhenReadOnlyChangedEventManager.RemoveListener( parentColumn, this );
-        CellContentStringFormatChangedEventManager.RemoveListener( parentColumn, this );
+        PropertyChangedEventManager.RemoveListener( oldColumn, this, string.Empty );
+      }
 
-        var dataBoundParentColumn = parentColumn as Column;
-        if( dataBoundParentColumn != null )
-        {
-          ForeignKeyConfigurationChangedEventManager.RemoveListener( dataBoundParentColumn, this );
-        }
+      if( newColumn != null )
+      {
+        PropertyChangedEventManager.AddListener( newColumn, this, string.Empty );
       }
 
-      this.SetValue( Cell.ParentColumnPropertyKey, value );
-      this.UpdateAnimatedColumnReorderingBindings( Row.GetIsTemplateCell( this ) );
+      this.UpdateFocusable();
+    }
 
-      Debug.Assert( value == this.ParentColumn );
+    private static void OnParentColumnChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as Cell;
+      if( self == null )
+        return;
 
-      // Register to the new Parent Column's event.
-      if( value != null )
-      {
-        CellEditorDisplayConditionsChangedEventManager.AddListener( value, this );
-        CellContentTemplateChangedEventManager.AddListener( value, this );
-        CanBeCurrentWhenReadOnlyChangedEventManager.AddListener( value, this );
-        CellContentStringFormatChangedEventManager.AddListener( value, this );
+      self.OnParentColumnChanged( ( ColumnBase )e.OldValue, ( ColumnBase )e.NewValue );
 
-        var dataBoundParentColumn = value as Column;
-        if( dataBoundParentColumn != null )
-        {
-          ForeignKeyConfigurationChangedEventManager.AddListener( dataBoundParentColumn, this );
-        }
-      }
+      // Since Cell.FieldName in fact returns Cell.ParentColumn.FieldName, a PropertyChanged corresponding to FieldName must be raised when the ParentColumn has changed.
+      self.OnPropertyChanged( Cell.FieldNamePropertyName );
     }
 
-    #endregion ParentColumn Read-Only Property
+    #endregion
 
     #region ParentRow Read-Only Property
 
@@ -1037,17 +984,13 @@ namespace Xceed.Wpf.DataGrid
       {
         return ( Row )this.GetValue( Cell.ParentRowProperty );
       }
+      private set
+      {
+        this.SetValue( Cell.ParentRowPropertyKey, value );
+      }
     }
 
-    private void SetParentRow( Row value )
-    {
-      if( value == null )
-        throw new ArgumentNullException( "value" );
-
-      this.SetValue( Cell.ParentRowPropertyKey, value );
-    }
-
-    #endregion ParentRow Read-Only Property
+    #endregion
 
     #region FieldName Property
 
@@ -1070,10 +1013,11 @@ namespace Xceed.Wpf.DataGrid
           throw new InvalidOperationException( "An attempt was made to change the FieldName of a cell already associated with a column." );
 
         m_fieldName = value;
+        this.OnPropertyChanged( Cell.FieldNamePropertyName );
       }
     }
 
-    internal void SetFieldName( string fieldName )
+    private void SetFieldName( string fieldName )
     {
       m_fieldName = fieldName;
     }
@@ -1121,6 +1065,14 @@ namespace Xceed.Wpf.DataGrid
       this.SetValue( Cell.CoercedContentTemplatePropertyKey, newContentTemplate );
     }
 
+    private void UpdateCoercedContentTemplate( bool force )
+    {
+      if( force || this.IsContainerPrepared )
+      {
+        this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
+      }
+    }
+
     #endregion
 
     #region ContentTemplateInternal Property (private)
@@ -1251,7 +1203,11 @@ namespace Xceed.Wpf.DataGrid
       var self = ( Cell )sender;
       Debug.Assert( self != null );
 
-      var manager = TableflowView.GetColumnReorderingDragSourceManager( self.ParentColumn );
+      var parentColumn = self.ParentColumn;
+      if( parentColumn == null )
+        return newValue;
+
+      var manager = TableflowView.GetColumnReorderingDragSourceManager( parentColumn );
       if( manager == null )
         return newValue;
 
@@ -1308,8 +1264,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region SelectionBackground Property
 
-    public static readonly DependencyProperty SelectionBackgroundProperty =
-      DependencyProperty.Register( "SelectionBackground",
+    public static readonly DependencyProperty SelectionBackgroundProperty = DependencyProperty.Register(
+      "SelectionBackground",
       typeof( Brush ),
       typeof( Cell ),
       new FrameworkPropertyMetadata( null ) );
@@ -1330,8 +1286,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region SelectionForeground Property
 
-    public static readonly DependencyProperty SelectionForegroundProperty =
-      DependencyProperty.Register( "SelectionForeground",
+    public static readonly DependencyProperty SelectionForegroundProperty = DependencyProperty.Register(
+      "SelectionForeground",
       typeof( Brush ),
       typeof( Cell ),
       new FrameworkPropertyMetadata( null ) );
@@ -1352,8 +1308,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region InactiveSelectionBackground Property
 
-    public static readonly DependencyProperty InactiveSelectionBackgroundProperty =
-      DependencyProperty.Register( "InactiveSelectionBackground",
+    public static readonly DependencyProperty InactiveSelectionBackgroundProperty = DependencyProperty.Register(
+      "InactiveSelectionBackground",
       typeof( Brush ),
       typeof( Cell ),
       new FrameworkPropertyMetadata( null ) );
@@ -1374,8 +1330,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region InactiveSelectionForeground Property
 
-    public static readonly DependencyProperty InactiveSelectionForegroundProperty =
-      DependencyProperty.Register( "InactiveSelectionForeground",
+    public static readonly DependencyProperty InactiveSelectionForegroundProperty = DependencyProperty.Register(
+      "InactiveSelectionForeground",
       typeof( Brush ),
       typeof( Cell ),
       new FrameworkPropertyMetadata( null ) );
@@ -1503,15 +1459,28 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region IsContainerPartiallyCleared Property
+
+    internal bool IsContainerPartiallyCleared
+    {
+      get
+      {
+        return m_flags[ ( int )CellFlags.IsContainerPartiallyCleared ];
+      }
+      private set
+      {
+        m_flags[ ( int )CellFlags.IsContainerPartiallyCleared ] = value;
+      }
+    }
+
+    #endregion
+
     #region CanBeRecycled Property
 
     protected internal virtual bool CanBeRecycled
     {
       get
       {
-        if( this.IsDirty || this.HasValidationError || this.HasCellEditorError )
-          return false;
-
         if( !this.IsErrorStyleApplied )
         {
           // We should not recycle the cell if the user has set a style or template explicitly.
@@ -1531,6 +1500,25 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region CanBeCollapsed Property
+
+    internal virtual bool CanBeCollapsed
+    {
+      get
+      {
+        if( this.IsCurrent || this.IsDirty || this.HasValidationError || this.IsBeingEdited || this.IsKeyboardFocused || this.IsKeyboardFocusWithin )
+          return false;
+
+        var parentColumn = this.ParentColumn;
+        if( parentColumn == null )
+          return true;
+
+        return !TableflowView.GetIsBeingDraggedAnimated( parentColumn );
+      }
+    }
+
+    #endregion
+
     #region FocusEditor Property
 
     private bool FocusEditor
@@ -1781,18 +1769,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region UpdateContentBindingTargetOnPrepareContainer Property
-
-    protected virtual bool UpdateContentBindingTargetOnPrepareContainer
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
     public static Cell FindFromChild( DependencyObject child )
     {
       return Cell.FindFromChild( ( DataGridContext )null, child );
@@ -1892,18 +1868,18 @@ namespace Xceed.Wpf.DataGrid
     [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
     public double GetFittedWidth()
     {
-      if( ( this.IsContainerPrepared ) && ( !this.IsContainerVirtualized ) && ( this.VisualChildrenCount > 0 ) )
-      {
-        UIElement element = this.GetVisualChild( 0 ) as UIElement;
+      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
+        return -1d;
 
-        if( element != null )
-        {
-          element.Measure( new Size( double.PositiveInfinity, this.ActualHeight ) );
-          return element.DesiredSize.Width;
-        }
-      }
+      this.ApplyTemplate();
+
+      var child = ( this.VisualChildrenCount > 0 ) ? this.GetVisualChild( 0 ) as UIElement : null;
+      if( child == null )
+        return -1d;
 
-      return -1;
+      child.Measure( new Size( double.PositiveInfinity, this.ActualHeight ) );
+
+      return child.DesiredSize.Width;
     }
 
     protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
@@ -1989,14 +1965,12 @@ namespace Xceed.Wpf.DataGrid
       if( e.Handled )
         return;
 
-      Row parentRow = this.ParentRow;
-
+      var parentRow = this.ParentRow;
       if( parentRow == null )
         return;
 
       //Do not try to process the Activation Gesture if the Cell is readonly!
-      bool readOnly = this.GetInheritedReadOnly();
-
+      var readOnly = this.GetInheritedReadOnly();
       if( readOnly )
         return;
 
@@ -2004,7 +1978,7 @@ namespace Xceed.Wpf.DataGrid
       if( !( parentRow.IsEditTriggerSet( EditTriggers.ActivationGesture ) ) )
         return;
 
-      CellEditor editor = this.GetCellEditor();
+      var editor = this.GetCellEditor();
 
       //This condition is more complex and is used to filter cases were a TextInput is done and there is no need to process for activation keys...
       //Condition is: Editor is not null, editor is not displaued and editor is not pending showing.
@@ -2084,33 +2058,33 @@ namespace Xceed.Wpf.DataGrid
     {
       base.OnVisualParentChanged( oldParent );
 
+      // Since the parent property isn't a DP, we must update the binding ourself.
       this.UpdateParentForeground();
     }
 
-    protected override AutomationPeer OnCreateAutomationPeer()
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
-      return new CellAutomationPeer( this );
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( e.Property.Name );
     }
 
     protected virtual void InitializeCore( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
     {
-      //Initialize the Cell's Properties.
-      this.SetParentRow( parentRow );
-      this.SetParentColumn( parentColumn );
+      this.ParentRow = parentRow;
+      this.ParentColumn = parentColumn;
+
+      this.UpdateAnimatedColumnReorderingBindings( dataGridContext, Row.GetIsTemplateCell( this ) );
 
       if( !this.IsInternalyInitialized )
       {
         Binding rowMatchingConditionsBinding = new Binding();
-        rowMatchingConditionsBinding.Path = new PropertyPath( "(0).(1)",
-          Cell.ParentRowProperty,
-          Row.RowDisplayEditorMatchingConditionsProperty );
+        rowMatchingConditionsBinding.Path = new PropertyPath( "(0).(1)", Cell.ParentRowProperty, Row.RowDisplayEditorMatchingConditionsProperty );
         rowMatchingConditionsBinding.Source = this;
         rowMatchingConditionsBinding.Mode = BindingMode.OneWay;
 
         //Initialize the RowDisplayEditorMatchingConditions binding to the ParentRow
-        BindingOperations.SetBinding(
-          this, Cell.RowDisplayEditorMatchingConditionsProperty,
-          rowMatchingConditionsBinding );
+        BindingOperations.SetBinding( this, Cell.RowDisplayEditorMatchingConditionsProperty, rowMatchingConditionsBinding );
 
         // Clear the FieldName since it will be taken from the column instead of directly from the Cell.
         this.SetFieldName( string.Empty );
@@ -2122,46 +2096,49 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsInternalyInitialized )
         return null;
 
-      ColumnBase parentColumn = this.ParentColumn;
+      var parentColumnBase = this.ParentColumn;
 
-      if( parentColumn == null )
+      if( parentColumnBase == null )
         return null;
 
-      if( parentColumn.CellEditor != null )
-        return parentColumn.CellEditor;
+      //Since the CellEditor property is set by default, first verify if the CelLEditorSelector property has been explicitly set.
+      if( parentColumnBase.CellEditorSelector != null )
+        return parentColumnBase.CellEditorSelector.SelectCellEditor( parentColumnBase, this.DataContext );
+
+      if( parentColumnBase.CellEditor != null )
+        return parentColumnBase.CellEditor;
 
-      Column column = parentColumn as Column;
+      var parentColumn = parentColumnBase as Column;
 
-      if( column != null )
+      if( parentColumn != null )
       {
         // Try to get a CellEditor from the ParentColumn.ForeignKeyConfiguration
-        ForeignKeyConfiguration configuration = column.ForeignKeyConfiguration;
+        var foreignKeyConfiguration = parentColumn.ForeignKeyConfiguration;
 
-        if( configuration != null )
+        if( foreignKeyConfiguration != null )
         {
-          return configuration.DefaultCellEditor;
+          return foreignKeyConfiguration.DefaultCellEditor;
         }
       }
 
-      object content = this.Content;
+      var content = this.Content;
 
       if( content == null )
         return null;
 
-      Type contentType = content.GetType();
+      var contentType = content.GetType();
 
-      CellEditor cellEditor = DefaultCellEditorSelector.SelectCellEditor( contentType );
+      var cellEditor = DefaultCellEditorSelector.SelectCellEditor( contentType );
 
       if( cellEditor != null )
         return cellEditor;
 
-      TypeConverter typeConverter = TypeDescriptor.GetConverter( contentType );
+      var typeConverter = TypeDescriptor.GetConverter( contentType );
 
       if( typeConverter == null )
         return null;
 
-      if( typeConverter.CanConvertFrom( typeof( string ) )
-        && ( typeConverter.CanConvertTo( typeof( string ) ) ) )
+      if( typeConverter.CanConvertFrom( typeof( string ) ) && typeConverter.CanConvertTo( typeof( string ) ) )
       {
         return DefaultCellEditorSelector.TextBoxEditor;
       }
@@ -2225,51 +2202,47 @@ namespace Xceed.Wpf.DataGrid
 
     protected internal virtual void PrepareContainer( DataGridContext dataGridContext, object item )
     {
-      object dataContext = this.DataContext;
+      this.IsContainerPartiallyCleared = false;
 
       // If the container is already prepared and not virtualized and the DataContext is the same, just ignore this call.
       // For example, a cell generated through the xaml parser can already be prepared (went through this method once) but
       // still have its DataContext set only after it has been prepared, thus the need to excute this method once more.
-      if( ( this.IsContainerPrepared ) && ( !this.IsContainerVirtualized ) &&
-        ( ( dataContext == item ) || ( ( dataContext is UnboundDataItem ) && ( this.IsSameUnboundItem( dataContext, item ) ) ) ) )
+      var dataContext = this.DataContext;
+      if( this.IsContainerPrepared && !this.IsContainerVirtualized &&
+        ( ( dataContext == item ) || ( ( dataContext is UnboundDataItem ) && this.IsSameUnboundItem( dataContext, item ) ) ) )
         return;
 
       //Make sure that the DataGridContext is set appropriatly on the cells that are already created.
-      //This is to ensure that teh value is appropriate when the container is recycled within another DataGridContext ( another detail on the same level ).
+      //This is to ensure that the value is appropriate when the container is recycled within another DataGridContext ( another detail on the same level ).
       DataGridControl.SetDataGridContext( this, dataGridContext );
 
-      bool isNewDataContext;
-      ColumnBase parentColumn = this.ParentColumn;
-
-      Cell.AssignDataContext( this, item, null, parentColumn, out isNewDataContext );
+      var parentColumn = this.ParentColumn;
+      var isSameDataContext = Cell.AssignDataContext( this, item, null, parentColumn );
 
-      if( !isNewDataContext && this.UpdateContentBindingTargetOnPrepareContainer )
+      // In some scenarios, there may be validation errors on the content binding that is not reflected on the cell or the row, so make sure it is.
+      if( isSameDataContext && ( item is IDataErrorInfo ) && ( Validation.GetErrors( this ).Count > 0 ) && !this.HasValidationError
+          && !this.IsDirty)
       {
-        // The DataContext is already this item, update the cell's Content binding target in order for the validation to be once again evaluated.
-        this.UpdateContentBindingTarget();
+        this.NotifyContentBindingValidationError();
       }
 
-      Row parentRow = this.ParentRow;
-      ColumnBase currentColumn = dataGridContext.CurrentColumn;
-
       // If there is a current column on the DataGridContext, try to restore the currency of the cell
+      var parentRow = this.ParentRow;
+      var currentColumn = dataGridContext.CurrentColumn;
       if( ( parentRow != null ) && ( parentRow.IsCurrent ) && ( currentColumn != null ) && ( currentColumn == parentColumn ) )
       {
         this.SetIsCurrent( true );
       }
 
       // This will force invalidation of the CoercedContentTemplate, only if the content is null after the prepare
-      // and if the content template is set to somethign else than default. However, when binded to an EmptyDataItem,
-      // our content will always be null but a CellContentTemplate will be applied. In this case, we do NOT want to 
-      // reapplied the template every time.
+      // and if the content template is set to something else than default. However, when binded to an EmptyDataItem,
+      // our content will always be null but a CellContentTemplate will be applied. In this case, we do NOT want to  reapplied the template every time.
       if( ( this.Content == null ) && ( !( this.GetRealDataContext() is EmptyDataItem ) ) )
       {
         this.ClearValue( Cell.CoercedContentTemplatePropertyKey );
       }
 
-      //Determine the default CellContentTemplate for the cell.
-      this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
-
+      this.UpdateCoercedContentTemplate( true );
       this.UpdateMatchingDisplayConditions();
 
       // Ensure to reset both container recycling flags
@@ -2287,47 +2260,70 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       this.IsContainerPrepared = false;
+      this.IsContainerPartiallyCleared = false;
+
+      this.AbortRefreshErrorStyle();
+      this.AbortHideEditTemplate();
+
+      if( m_loadedRoutedEventHandler != null )
+      {
+        this.Loaded -= m_loadedRoutedEventHandler;
+        m_loadedRoutedEventHandler = null;
+      }
 
-      // In DP's PropertyChanged Callbacks, for the sake of performance, you could
-      // return immediatly if the cell is in process of being cleared.
+      // In DP's PropertyChanged Callbacks, for the sake of performance, you could return immediatly if the cell is in process of being cleared.
 
+      this.ClearValue( Cell.StyleProperty );
       this.ClearValue( Cell.IsCurrentPropertyKey );
+      this.ClearValue( Cell.IsSelectedPropertyKey );
       this.ClearValue( Cell.IsBeingEditedPropertyKey );
-      this.SetIsSelected( false );
-      this.SetIsCellEditorDisplayed( false );
+      this.ClearValue( Cell.ValidationErrorPropertyKey );
+      this.ClearValue( Cell.HasValidationErrorPropertyKey );
+      this.ClearValue( Cell.IsValidationErrorRestrictivePropertyKey );
+
+      // We must not clear the IsDirty flag of the Cell here since its Content could have been edited and this flag is checked
+      // to determine if the new value is commited or not in the source
+
+      // No need to clear the Cell.CellDisplayEditorMatchingConditionsProperty neither DataGridControl.CellEditorDisplayConditionsProperty since
+      // both will be updated when Cell.PrepareContainer is called again
+
+      m_cellValidationRules = null;
+      m_styleBeforeError = DependencyProperty.UnsetValue;
       this.CurrentEditorPendingDisplayState = EditorDisplayState.None;
       this.IsContainerVirtualized = true;
 
-      // We must not clear the IsDirty flag of the Cell here since its
-      // Content could have been edited and this flag is checked
-      // to determine if the new value is commited or not in the source
+      this.SetIsCellEditorDisplayed( false );
 
-      this.ClearValue( Cell.ValidationErrorPropertyKey );
+      // This will reset every flags maintained in m_flags
+      this.ResetNonTransientFlags();
+    }
 
-      // No need to clear the Cell.CellDisplayEditorMatchingConditionsProperty
-      // neither DataGridControl.CellEditorDisplayConditionsProperty since
-      // both will be updated when Cell.PrepareContainer is called again
+    protected internal virtual void PartialClearContainer()
+    {
+      // If the container is not prepared just ignore this call.
+      if( !this.IsContainerPrepared )
+        return;
+
+      this.IsContainerPartiallyCleared = true;
 
       this.AbortRefreshErrorStyle();
       this.AbortHideEditTemplate();
 
-      if( m_loadedRoutedEventHandler != null )
-      {
-        this.Loaded -= m_loadedRoutedEventHandler;
-        m_loadedRoutedEventHandler = null;
-      }
-
+      this.ClearValue( Cell.StyleProperty );
+      this.ClearValue( Cell.IsCurrentPropertyKey );
+      this.ClearValue( Cell.IsSelectedPropertyKey );
+      this.ClearValue( Cell.IsBeingEditedPropertyKey );
+      this.ClearValue( Cell.ValidationErrorPropertyKey );
       this.ClearValue( Cell.HasValidationErrorPropertyKey );
       this.ClearValue( Cell.IsValidationErrorRestrictivePropertyKey );
 
       m_styleBeforeError = DependencyProperty.UnsetValue;
-      this.ClearValue( Cell.StyleProperty );
-      this.ClearValue( Cell.IsSelectedPropertyKey );
+      this.CurrentEditorPendingDisplayState = EditorDisplayState.None;
+
+      this.SetIsCellEditorDisplayed( false );
 
       // This will reset every flags maintained in m_flags
       this.ResetNonTransientFlags();
-
-      m_cellValidationRules = null;
     }
 
     protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
@@ -2347,6 +2343,21 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
+    protected internal virtual void CleanUpOnRemove()
+    {
+      this.AbortRefreshErrorStyle();
+      this.AbortHideEditTemplate();
+
+      if( m_loadedRoutedEventHandler != null )
+      {
+        this.Loaded -= m_loadedRoutedEventHandler;
+        m_loadedRoutedEventHandler = null;
+      }
+
+      //This is done so the WeakEventListener on ParentColumn is removed.
+      this.ParentColumn = null;
+    }
+
     internal static Cell FindFromChildOrSelf( DataGridControl dataGridControl, DependencyObject child )
     {
       var cell = child as Cell;
@@ -2472,24 +2483,16 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal static void AssignDataContext( Cell cell, object dataContext, UnboundDataItem unboundDataItemContext, ColumnBase parentColumn, out bool isNewDataContext )
+    internal static bool AssignDataContext( Cell cell, object dataContext, UnboundDataItem unboundDataItemContext, ColumnBase parentColumn )
     {
-      Column column = parentColumn as Column;
-
+      var column = parentColumn as Column;
       if( ( column != null ) && ( column.IsBoundToDataGridUnboundItemProperty ) )
       {
-        if( unboundDataItemContext == null )
-        {
-          UnboundDataItem.GetUnboundDataItemNode( dataContext, out unboundDataItemContext );
-        }
-
-        dataContext = unboundDataItemContext;
+        dataContext = unboundDataItemContext ?? UnboundDataItem.GetUnboundDataItem( dataContext );
       }
 
-      // Read the LocalValue of the DataContext to avoid
-      // getting the one inherited from the ParentRow.
-      // This prevent the DataContext to become null
-      // when the Cell is virtualized.
+      // Read the LocalValue of the DataContext to avoid getting the one inherited from the ParentRow.
+      // This prevent the DataContext to become null when the Cell is virtualized.
       object localDataContext = cell.ReadLocalValue( Cell.DataContextProperty );
 
       if( localDataContext != dataContext )
@@ -2502,12 +2505,11 @@ namespace Xceed.Wpf.DataGrid
           cell.DataContext = null;
         }
         cell.DataContext = dataContext;
-        isNewDataContext = true;
-      }
-      else
-      {
-        isNewDataContext = false;
+
+        return false;
       }
+
+      return true;
     }
 
     //This ensures the CellEditorContext is set on the Cell to avoid problems with RelativeSource causing undesired behaviors when ComboBox is used as default CellEditor
@@ -2515,27 +2517,26 @@ namespace Xceed.Wpf.DataGrid
     {
       ForeignKeyConfiguration configuration = null;
 
-      Column parentColumn = this.ParentColumn as Column;
+      var parentColumn = this.ParentColumn as Column;
 
       if( parentColumn != null )
       {
         configuration = parentColumn.ForeignKeyConfiguration;
-        CellEditorContext context = new CellEditorContext( this.ParentColumn, configuration );
+        CellEditorContext context = new CellEditorContext( parentColumn, configuration );
         Cell.SetCellEditorContext( this, context );
       }
     }
 
     internal void RefreshDisplayedTemplate()
     {
-      // Never refresh any templates when the Cell is not prepared
-      // or virtualized
+      // Never refresh any templates when the Cell is not prepared or virtualized
       if( !this.IsContainerPrepared || this.IsContainerVirtualized )
         return;
 
       Row parentRow = this.ParentRow;
 
       // Never refresh template while clearing container
-      if( ( parentRow == null ) || ( parentRow.IsClearingContainer ) )
+      if( ( parentRow == null ) || parentRow.IsClearingContainer )
         return;
 
       if( this.ShouldDisplayEditor )
@@ -2590,16 +2591,14 @@ namespace Xceed.Wpf.DataGrid
       }
 
       this.SetIsDirty( false );
-      this.SetIsDirtyFromInitializingInsertionRow( false );
     }
 
     internal void UpdateContentBindingTarget()
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
       // Never update the target of a binding to a an item if the Cell is dirty
-      if( ( !this.IsDirty ) && ( !this.IsDirtyFromInitializingInsertionRow ) )
+      if( ( !this.IsDirty ) )
       {
+        // We need to refresh the Cell.Content target binding in case the dataObject value was coerced to something else.
         BindingExpressionBase bindingExpression = this.GetContentBindingExpression();
 
         if( bindingExpression != null )
@@ -2647,7 +2646,7 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      if( ( savedState.IsBeingEdited ) && ( this.ParentColumn == currentColumn ) )
+      if( ( savedState.IsBeingEdited ) && ( parentColumn == currentColumn ) )
         this.BeginEdit();
 
 
@@ -2656,20 +2655,19 @@ namespace Xceed.Wpf.DataGrid
 
     internal void OnIsTemplateCellChanged( bool newValue )
     {
-      this.UpdateAnimatedColumnReorderingBindings( newValue );
+      this.UpdateAnimatedColumnReorderingBindings( DataGridControl.GetDataGridContext( this ), newValue );
     }
 
     internal ValidationResult UpdateContentBindingSource( out Exception exception, out CellValidationRule ruleInErrorWrapper )
     {
-      Debug.Assert( ( ( this.IsDirty ) || ( this.IsDirtyFromInitializingInsertionRow ) || ( this.IsInCascadingValidation ) ),
+      Debug.Assert( ( ( this.IsDirty ) || ( this.IsInCascadingValidation ) ),
         "UpdateContentBindingSource should not be called when the cell isn't dirty beside when cascading validation.  Call ValidateContentBindingRules instead." );
 
       exception = null;
       ruleInErrorWrapper = null;
 
-      ValidationResult validationResult = ValidationResult.ValidResult;
-
-      BindingExpressionBase contentBindingExpression = this.GetContentBindingExpression();
+      var validationResult = ValidationResult.ValidResult;
+      var contentBindingExpression = this.GetContentBindingExpression();
 
       if( contentBindingExpression != null )
       {
@@ -2693,13 +2691,9 @@ namespace Xceed.Wpf.DataGrid
       if( ( validationResult.IsValid ) || ( !( Cell.GetIsRuleInErrorRestrictive( ruleInErrorWrapper ) ) ) )
       {
         this.ContentCommitted();
-
-        //Update StatsCells right away.
-        this.InvalidateStatsFunctions();
       }
 
-      // The dirty flag will only be lowered when the row ends or cancels edition, or if the cell cancels edition and it wasn't dirty
-      // when begining edition.
+      // The dirty flag will only be lowered when the row ends or cancels edition, or if the cell cancels edition and it wasn't dirty when begining edition.
       return validationResult;
     }
 
@@ -2758,51 +2752,21 @@ namespace Xceed.Wpf.DataGrid
 
     internal virtual bool GetCalculatedCanBeCurrent()
     {
-      if( this.GetInheritedReadOnly() )
-        return ParentColumn.CanBeCurrentWhenReadOnly;
-      else
+      var column = this.ParentColumn;
+      if( ( column == null ) || ( this.ParentRow == null ) )
+        return false;
+
+      if( column.CanBeCurrentWhenReadOnly )
         return true;
-    }
 
-    internal virtual void ContentCommitted()
-    {
+      return !this.GetInheritedReadOnly();
     }
 
-    internal virtual void UpdateAnimatedColumnReorderingBindings( bool isTemplateCell )
+    internal virtual void ContentCommitted()
     {
-      // Only set the Binding if the View is a TableflowView
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        TableflowView tableflowView = dataGridContext.DataGridControl.GetView() as TableflowView;
-
-        if( tableflowView == null )
-          return;
-      }
-
-      if( isTemplateCell )
-      {
-        // No need to enable animated Column reordering when TemplateCell is used
-        BindingOperations.ClearBinding( this, Cell.RenderTransformProperty );
-        BindingOperations.ClearBinding( this, Cell.ParentColumnIsBeingDraggedProperty );
-        BindingOperations.ClearBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty );
-        this.AnimatedColumnReorderingBindingApplied = false;
-      }
-      else
-      {
-        if( !this.AnimatedColumnReorderingBindingApplied )
-        {
-          // To enable animated Column reordering
-          BindingOperations.SetBinding( this, Cell.RenderTransformProperty, Cell.ParentColumnTranslationBinding );
-          BindingOperations.SetBinding( this, Cell.ParentColumnIsBeingDraggedProperty, Cell.ParentColumnIsBeingDraggedBinding );
-          BindingOperations.SetBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty, Cell.ParentColumnReorderingDragSourceManagerBinding );
-          this.AnimatedColumnReorderingBindingApplied = true;
-        }
-      }
     }
 
-    internal virtual void EnsureInVisualTree()
+    internal void EnsureInVisualTree()
     {
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
       if( dataGridContext == null )
@@ -2852,11 +2816,11 @@ namespace Xceed.Wpf.DataGrid
 
     private static object OnCoerceContent( DependencyObject sender, object value )
     {
-      Cell cell = sender as Cell;
+      var cell = sender as Cell;
 
       // If we are updating the Content binding source and content is refreshed as a result, hold-on.
       // We will manually update Content from the source by calling UpdateTarget on the binding later.
-      if( cell.IsUpdatingContentBindingSource )
+      if( ( cell != null ) && cell.IsUpdatingContentBindingSource )
         return DependencyProperty.UnsetValue;
 
       return value;
@@ -2864,23 +2828,25 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnContentChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell cell = ( Cell )sender;
-      Row parentRow = cell.ParentRow;
+      var cell = sender as Cell;
+      if( cell == null )
+        return;
 
+      var parentRow = cell.ParentRow;
       if( parentRow == null )
         return;
 
-      bool doCellValidation = false;
-      ColumnBase parentColumn = cell.ParentColumn;
+      var doCellValidation = false;
+      var parentColumn = cell.ParentColumn;
 
-      bool changeDuringRowIsInEdit = ( cell.IsInternalyInitialized )
+      var changeDuringRowIsInEdit = ( cell.IsInternalyInitialized )
         && ( !cell.IsContainerRecycled )
         && ( !parentRow.IsBeginningEdition )
         && ( !cell.IsUpdatingContentBindingSource )
         && ( !cell.IsRestoringEditionState )
         && ( parentRow.IsBeingEdited );
 
-      if( ( changeDuringRowIsInEdit ) || ( parentRow.IsInitializingInsertionRow ) )
+      if( changeDuringRowIsInEdit )
       {
         if( parentColumn != null )
         {
@@ -2896,19 +2862,7 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      if( parentRow.IsInitializingInsertionRow )
-      {
-        Nullable<DataGridUpdateSourceTrigger> dataGridUpdateSourceTrigger = cell.GetContentBindingUpdateSourceTrigger();
-
-        if( ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged )
-          || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit ) )
-        {
-          doCellValidation = true;
-        }
-
-        cell.SetIsDirtyFromInitializingInsertionRow( true );
-      }
-      else if( changeDuringRowIsInEdit )
+      if( changeDuringRowIsInEdit )
       {
         if( !object.Equals( e.OldValue, e.NewValue ) )
         {
@@ -2917,9 +2871,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( !cell.PreventValidateAndSetAllErrors )
         {
-          Nullable<DataGridUpdateSourceTrigger> dataGridUpdateSourceTrigger = cell.GetContentBindingUpdateSourceTrigger();
-
-          if( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged )
+          if( cell.GetContentBindingUpdateSourceTrigger() == DataGridUpdateSourceTrigger.CellContentChanged )
           {
             doCellValidation = true;
           }
@@ -2933,31 +2885,35 @@ namespace Xceed.Wpf.DataGrid
         // We would be surprised of such a usage, but this fail-safe will take care of this possibility.
         if( !cell.GetIsSiblingUpdatingContentBindingSource() )
         {
+          // The CellEditorRules must not be ckecked when UpdateSourceTrigger is set to CellContentChanged because the editor's HasValidationError property
+          // changes only AFTER the new cell value is commited.  It would thus result in nothing being processed here if it were to be checked.
+
           Exception exception;
           CellValidationRule ruleInError;
-
-
-
-          ValidationResult validationResult = cell.ValidateCellRules( out exception, out ruleInError );
-
+          var validationResult = cell.ValidateCellRules( out exception, out ruleInError );
           if( validationResult.IsValid )
+          {
             cell.ValidateAndSetAllErrors( false, false, true, true, out exception, out ruleInError );
+          }
         }
       }
 
       //When the content changes, check if the CellContentTemplateSelector needs to be updated.
       //This depdends on several factor, including if a Selector is present and if the editor is not displayed
-      if( cell.ShouldInvalidateCellContentTemplateSelector() )
+      if( cell.ShouldInvalidateCellContentTemplateSelector( parentColumn ) )
       {
-        cell.SetCoercedContentTemplate( cell.GetCoercedCellContentTemplate(), null );
+        cell.UpdateCoercedContentTemplate( false );
       }
     }
 
     private static void OnIsDirtyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
+      var cell = sender as Cell;
+      if( cell == null )
+        return;
+
       if( ( bool )e.NewValue )
       {
-        Cell cell = ( Cell )sender;
         //Raise the RoutedEvent that notifies any Row that the cell is becoming dirty.
         RoutedEventArgs eventArgs = new RoutedEventArgs( Cell.IsDirtyEvent );
         cell.RaiseEvent( eventArgs );
@@ -2966,22 +2922,27 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnMatchingDisplayEditorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell obj = ( Cell )sender;
+      var cell = sender as Cell;
+      if( cell == null )
+        return;
 
       //performing this check because at the end of the Initializing function, I will call this explicitelly, to ensure 
       //proper display of the Editor if the appropriate conditions are met.
-      if( obj.IsInternalyInitialized )
+      if( cell.IsInternalyInitialized )
       {
-        obj.RefreshDisplayedTemplate();
+        cell.RefreshDisplayedTemplate();
       }
     }
 
     private static void OnCellEditorDisplayConditionsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell cell = ( Cell )sender;
+      var cell = sender as Cell;
+      if( cell == null )
+        return;
 
       // The cell.ParentRow can be null if this Cell is a TemplateCell
-      if( ( cell.ParentRow != null ) && cell.ParentRow.IsClearingContainer )
+      var parentRow = cell.ParentRow;
+      if( ( parentRow != null ) && parentRow.IsClearingContainer )
         return;
 
       cell.UpdateMatchingDisplayConditions();
@@ -2989,9 +2950,7 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnContentTemplateChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell cell = sender as Cell;
-      Debug.Assert( cell != null );
-
+      var cell = sender as Cell;
       if( cell == null )
         return;
 
@@ -2999,15 +2958,13 @@ namespace Xceed.Wpf.DataGrid
 
       if( ( cell.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) && ( !cell.IsCellEditorDisplayed ) )
       {
-        cell.SetCoercedContentTemplate( cell.GetCoercedCellContentTemplate(), null );
+        cell.UpdateCoercedContentTemplate( false );
       }
     }
 
     private static void OnContentTemplateSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell cell = sender as Cell;
-      Debug.Assert( cell != null );
-
+      var cell = sender as Cell;
       if( cell == null )
         return;
 
@@ -3015,18 +2972,17 @@ namespace Xceed.Wpf.DataGrid
 
       if( ( cell.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) && ( !cell.IsCellEditorDisplayed ) )
       {
-        cell.SetCoercedContentTemplate( cell.GetCoercedCellContentTemplate(), null );
+        cell.UpdateCoercedContentTemplate( false );
       }
     }
 
     private static void OnIsTemplateCellChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      Cell cell = sender as Cell;
+      var cell = sender as Cell;
+      if( cell == null )
+        return;
 
-      if( cell != null )
-      {
-        cell.OnIsTemplateCellChanged( ( bool )e.NewValue );
-      }
+      cell.OnIsTemplateCellChanged( ( bool )e.NewValue );
     }
 
     private bool GetInheritedReadOnly()
@@ -3084,7 +3040,7 @@ namespace Xceed.Wpf.DataGrid
         isReadOnly = this.ReadOnly;
       }
 
-      if( ( bool )isReadOnly )
+      if( isReadOnly )
         return true;
 
       var contentBindingExpression = this.GetContentBindingExpression();
@@ -3104,48 +3060,36 @@ namespace Xceed.Wpf.DataGrid
       return ( contentBindingMode.HasValue ) && ( contentBindingMode.Value != BindingMode.TwoWay );
     }
 
-    private bool ShouldInvalidateCellContentTemplateSelector()
+    private bool ShouldInvalidateCellContentTemplateSelector( ColumnBase parentColumn )
     {
-      ColumnBase parentColumn = this.ParentColumn;
-
-      bool onlyInternalContentTemplateSelectorAvailable =
-        ( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal != null ) );
-
-      bool onlyColumnContentTemplateSelectorAvailable =
-        ( ( parentColumn.CellContentTemplate == null ) && ( parentColumn.CellContentTemplateSelector != null ) );
-
-      bool onlyTemplateSelectorAvailable = onlyColumnContentTemplateSelectorAvailable
-        || onlyInternalContentTemplateSelectorAvailable;
+      if( parentColumn == null )
+        return false;
 
-      bool editorHiddenAndNotPendingShow = !this.IsCellEditorDisplayed
-        && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow );
+      var onlyInternalContentTemplateSelectorAvailable = ( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal != null ) );
+      var onlyColumnContentTemplateSelectorAvailable = ( ( parentColumn.CellContentTemplate == null ) && ( parentColumn.CellContentTemplateSelector != null ) );
+      var onlyTemplateSelectorAvailable = onlyColumnContentTemplateSelectorAvailable || onlyInternalContentTemplateSelectorAvailable;
+      var editorHiddenAndNotPendingShow = !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow );
 
-      // Only TemplateSelectors are avaiable and editor is not hidden and pending showing
+      // Only TemplateSelectors are available and editor is not hidden and pending showing
       return ( onlyTemplateSelectorAvailable && editorHiddenAndNotPendingShow );
     }
 
     private bool GetIsContentBindingSupportingSourceUpdate()
     {
-      BindingExpressionBase binding = this.GetContentBindingExpression();
-
+      var binding = this.GetContentBindingExpression();
       if( binding == null )
         return false;
 
       BindingMode mode;
-      Binding singleBinding = binding.ParentBindingBase as Binding;
+      var singleBinding = binding.ParentBindingBase as Binding;
 
       if( singleBinding == null )
       {
-        MultiBinding multiBinding = binding.ParentBindingBase as MultiBinding;
-
+        var multiBinding = binding.ParentBindingBase as MultiBinding;
         if( multiBinding == null )
-        {
           return false;
-        }
-        else
-        {
-          mode = multiBinding.Mode;
-        }
+
+        mode = multiBinding.Mode;
       }
       else
       {
@@ -3160,8 +3104,7 @@ namespace Xceed.Wpf.DataGrid
       // This method is called to make sure we are not calling ValidateAndSetAllErrors at all nor triggering a cascade validation
       // as a side-effect of updating a cell's content binding source while another cell is bound to the very same source.
       // We would be surprised of such a usage, but this fail-safe will take care of this possibility.
-      Row parentRow = this.ParentRow;
-
+      var parentRow = this.ParentRow;
       if( parentRow != null )
       {
         foreach( Cell siblingCell in parentRow.CreatedCells )
@@ -3200,7 +3143,7 @@ namespace Xceed.Wpf.DataGrid
       var parentColumn = this.ParentColumn;
 
       //If there was no ContentTemplateSelector on Cell or if the output of the selector was Null.
-      if( ( !this.OverrideColumnCellContentTemplate ) && ( contentTemplate == null ) )
+      if( ( !this.OverrideColumnCellContentTemplate ) && ( contentTemplate == null ) && ( parentColumn != null ) )
       {
         contentTemplate = this.GetForeignKeyDataTemplate();
         if( contentTemplate != null )
@@ -3230,15 +3173,12 @@ namespace Xceed.Wpf.DataGrid
         contentTemplate = GenericContentTemplateSelector.Instance.SelectTemplate( content, this );
       }
 
-      if( contentTemplate != null )
+      if( ( contentTemplate != null ) && ( parentColumn != null ) && !string.IsNullOrEmpty( parentColumn.CellContentStringFormat ) )
       {
-        if( ( parentColumn != null ) && !string.IsNullOrEmpty( parentColumn.CellContentStringFormat ) )
+        var newContentTemplate = this.GetCellStringFormatDataTemplate( contentTemplate );
+        if( newContentTemplate != null )
         {
-          var newContentTemplate = this.GetCellStringFormatDataTemplate( contentTemplate );
-          if( newContentTemplate != null )
-          {
-            contentTemplate = newContentTemplate;
-          }
+          contentTemplate = newContentTemplate;
         }
       }
 
@@ -3302,6 +3242,32 @@ namespace Xceed.Wpf.DataGrid
       return unboundDataItem.DataItem == item;
     }
 
+    private void UpdateAnimatedColumnReorderingBindings( DataGridContext dataGridContext, bool isTemplateCell )
+    {
+      // Only set the Binding if the view is a TableflowView.
+      var setBindings = ( !isTemplateCell )
+                     && ( dataGridContext != null )
+                     && ( dataGridContext.DataGridControl.GetView() is TableflowView );
+
+      if( setBindings == this.AnimatedColumnReorderingBindingApplied )
+        return;
+
+      if( setBindings )
+      {
+        BindingOperations.SetBinding( this, Cell.RenderTransformProperty, Cell.ParentColumnTranslationBinding );
+        BindingOperations.SetBinding( this, Cell.ParentColumnIsBeingDraggedProperty, Cell.ParentColumnIsBeingDraggedBinding );
+        BindingOperations.SetBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty, Cell.ParentColumnReorderingDragSourceManagerBinding );
+      }
+      else
+      {
+        BindingOperations.ClearBinding( this, Cell.RenderTransformProperty );
+        BindingOperations.ClearBinding( this, Cell.ParentColumnIsBeingDraggedProperty );
+        BindingOperations.ClearBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty );
+      }
+
+      this.AnimatedColumnReorderingBindingApplied = setBindings;
+    }
+
     private void ShowEditTemplate()
     {
       this.AbortHideEditTemplate();
@@ -3310,11 +3276,9 @@ namespace Xceed.Wpf.DataGrid
       if( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow )
       {
         // If it is not displayed or pending hiding
-        if( !this.IsCellEditorDisplayed
-            || ( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingHide ) )
+        if( !this.IsCellEditorDisplayed || ( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingHide ) || m_forceEditorRefresh )
         {
-          CellEditor cellEditor = this.GetCellEditor();
-
+          var cellEditor = this.GetCellEditor();
           if( cellEditor != null )
           {
             this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), cellEditor.EditTemplate );
@@ -3340,8 +3304,7 @@ namespace Xceed.Wpf.DataGrid
       if( ( !this.IsCellEditorDisplayed ) && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
         return;
 
-      m_delayedHideEditTemplateDispatcherOperation = this.Dispatcher.BeginInvoke(
-        new Action( this.HideEditTemplate ), DispatcherPriority.DataBind );
+      m_delayedHideEditTemplateDispatcherOperation = this.Dispatcher.BeginInvoke( new Action( this.HideEditTemplate ), DispatcherPriority.DataBind );
     }
 
     private void AbortHideEditTemplate()
@@ -3364,8 +3327,7 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsContainerPrepared || this.IsContainerVirtualized )
         return;
 
-      if( ( !this.IsCellEditorDisplayed )
-          && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
+      if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
         return;
 
       this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
@@ -3427,32 +3389,51 @@ namespace Xceed.Wpf.DataGrid
       this.SetValue( Cell.CellDisplayEditorMatchingConditionsProperty, newEffectiveValue );
     }
 
-    private void InvalidateStatsFunctions()
+    private void UpdateFocusable()
     {
-      //Make sure to update StatFunctions as soon as cell content changes (this part of the code is executed only if UpdateSourceTrigger is set to CellContentChanged).
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
+      var isFocusable = false;
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      if( dataGridControl != null )
+      if( dataGridContext != null )
       {
-        DataGridCollectionView dataGridCollectionView = dataGridControl.ItemsSource as DataGridCollectionView;
+        var column = this.ParentColumn;
+        var dataGridControl = dataGridContext.DataGridControl;
 
-        if( ( dataGridCollectionView != null ) && ( dataGridCollectionView.StatFunctions.Count > 0 ) )
-        {
-          int currentIndex;
+        Debug.Assert( dataGridControl != null );
 
-          //If -1 is returned, it means the corresponding data item is not yet in the source (e.g insertion cell), so no stats to update at this point.
-          if( ( currentIndex = dataGridCollectionView.IndexOf( this.ParentRow.DataContext ) ) == -1 )
-            return;
-
-          RawItem item = dataGridCollectionView.GetRawItemAt( currentIndex );
+        if( ( !this.GetCalculatedCanBeCurrent() ) && ( column != null ) && ( column == dataGridContext.CurrentColumn ) )
+        {
+          try
+          {
+            dataGridContext.SetCurrentColumnCore( null, false, dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged );
+          }
+          catch( DataGridException )
+          {
+            // We swallow the exception if it occurs because of a validation error or Cell was read-only or
+            // any other GridException.
+          }
+        }
 
-          DataGridCollectionViewGroup parentGroup = item.ParentGroup;
+        isFocusable = true;
 
-          if( parentGroup != null )
-            dataGridCollectionView.DeferredOperationManager.InvalidateGroupStats( parentGroup );
+        if( !this.IsBeingEdited )
+        {
+          var row = this.ParentRow;
+          if( row != null )
+          {
+            switch( row.NavigationBehavior )
+            {
+              case NavigationBehavior.None:
+              case NavigationBehavior.RowOnly:
+                isFocusable = false;
+                break;
+            }
+          }
         }
       }
+
+      //force an update of the NavigationBehavior characteristics
+      this.Focusable = isFocusable && this.GetCalculatedCanBeCurrent();
     }
 
     private void OnBeginEditExecuted( object sender, ExecutedRoutedEventArgs e )
@@ -3482,8 +3463,9 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          e.CanExecute = ( !this.IsBeingEdited ) && ( !this.GetInheritedReadOnly() )
-            && ( this.ParentRow.IsEditTriggerSet( EditTriggers.BeginEditCommand ) );
+          e.CanExecute = ( !this.IsBeingEdited )
+                      && ( !this.GetInheritedReadOnly() )
+                      && ( this.ParentRow.IsEditTriggerSet( EditTriggers.BeginEditCommand ) );
         }
       }
     }
@@ -3519,13 +3501,7 @@ namespace Xceed.Wpf.DataGrid
         //If the Cell is marked to be pending the display of the editor, then
         //this LayoutUpdated means that Editor has been effectively displayed
 
-        // Notify the UIAutomation if any children have changed.
-        AutomationPeer automationPeer = UIElementAutomationPeer.FromElement( this );
 
-        if( automationPeer != null )
-        {
-          automationPeer.ResetChildrenCache();
-        }
 
         //Change the IsCellEditorDisplayed flag accordingly
         this.SetIsCellEditorDisplayed( true );
@@ -3535,13 +3511,7 @@ namespace Xceed.Wpf.DataGrid
         //If the Cell is marked to be pending the Display of the viewer, then
         //this LayoutUpdated means that Editor has been effectively hidden
 
-        // Notify the UIAutomation if any children have changed.
-        AutomationPeer automationPeer = UIElementAutomationPeer.FromElement( this );
 
-        if( automationPeer != null )
-        {
-          automationPeer.ResetChildrenCache();
-        }
 
         //Change the IsCellEditorDisplayed flag accordingly
         this.SetIsCellEditorDisplayed( false );
@@ -3732,19 +3702,16 @@ namespace Xceed.Wpf.DataGrid
       if( this.IsBeingEdited )
         return;
 
-      bool readOnly = this.GetInheritedReadOnly();
-
+      var readOnly = this.GetInheritedReadOnly();
       if( readOnly )
         throw new DataGridException( "An attempt was made to edit a read-only cell or the cell content is not bound using two way binding." );
 
       // If there is no dataItem mapped to this container, we don't want to
       // enter in edition
       var dataGridContext = DataGridControl.GetDataGridContext( this );
-
       if( dataGridContext != null )
       {
-        object dataItem = dataGridContext.GetItemFromContainer( this );
-
+        var dataItem = dataGridContext.GetItemFromContainer( this );
         if( dataItem == null )
           return;
       }
@@ -3823,7 +3790,9 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsBeingEdited )
         return;
 
-      bool updateContentBindingSource = this.GetContentBindingUpdateSourceTrigger() == DataGridUpdateSourceTrigger.CellEndingEdit;
+      var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
+      var updateContentBindingSource = ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
+                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
 
       this.EndEdit( true, true, updateContentBindingSource );
     }
@@ -3873,11 +3842,9 @@ namespace Xceed.Wpf.DataGrid
             this.PreventValidateAndSetAllErrors = false;
           }
 
-          Nullable<DataGridUpdateSourceTrigger> dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
-
-          bool updateContentBindingSource =
-            ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit ) ||
-            ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
+          var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
+          var updateContentBindingSource = ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
+                                           || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
 
           Exception exception;
           CellValidationRule ruleInError;
@@ -3893,7 +3860,6 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      this.SetIsDirtyFromInitializingInsertionRow( false );
       this.SetIsBeingEdited( false );
       this.OnEditCanceled();
     }
@@ -3937,10 +3903,10 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsBeingEdited )
         return;
 
-      CancelRoutedEventArgs e = new CancelRoutedEventArgs( Cell.EditEndingEvent, this );
-
       try
       {
+        var e = new CancelRoutedEventArgs( Cell.EditEndingEvent, this );
+
         this.OnEditEnding( e );
 
         // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
@@ -3951,15 +3917,14 @@ namespace Xceed.Wpf.DataGrid
         //This has been identified, and only the places where it caused problems were fixed... This comment is only here to remind developpers of the flaw
         if( ( !this.IsKeyboardFocused ) && ( this.IsKeyboardFocusWithin ) )
         {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+          var dataGridContext = DataGridControl.GetDataGridContext( this );
 
           if( ( dataGridContext != null ) && ( !dataGridContext.DataGridControl.IsSetFocusInhibited ) )
           {
             // Prevent the focus to make a RequestBringIntoView
             using( this.InhibitMakeVisible() )
             {
-              // We want to try to focus the Cell before we continue the EndEdit to ensure 
-              // any validation or process in the lost focus is done
+              // We want to try to focus the Cell before we continue the EndEdit to ensure  any validation or process in the lost focus is done
               if( !dataGridContext.DataGridControl.SetFocusHelper( this.ParentRow, this.ParentColumn, false, false ) )
                 throw new DataGridFocusException( "Unable to set focus on the Cell." );
             }
@@ -3969,7 +3934,9 @@ namespace Xceed.Wpf.DataGrid
       catch( Exception exception )
       {
         if( exception is TargetInvocationException )
+        {
           exception = exception.InnerException;
+        }
 
         // In the case it's the focus that failed, we don't want to make that a ValidationError since it 
         // must be retained by the editor itself with his own error mechanic.
@@ -3980,11 +3947,7 @@ namespace Xceed.Wpf.DataGrid
         if( exception is DataGridFocusException )
           throw;
 
-        this.SetValidationError( new CellValidationError(
-          Cell.CustomCellValidationExceptionValidationRule,
-          this,
-          exception.Message,
-          exception ) );
+        this.SetValidationError( new CellValidationError( Cell.CustomCellValidationExceptionValidationRule, this, exception.Message, exception ) );
 
         // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
         throw new DataGridValidationException( "An error occurred while attempting to end the edit process.", exception );
@@ -3992,17 +3955,15 @@ namespace Xceed.Wpf.DataGrid
 
       Exception notUsed;
       CellValidationRule ruleInError;
+      var result = this.ValidateAndSetAllErrors( validateCellEditorRules, validateUIRules, updateContentBindingSource, true, out notUsed, out ruleInError );
 
-      ValidationResult result =
-        this.ValidateAndSetAllErrors( validateCellEditorRules, validateUIRules, updateContentBindingSource, true, out notUsed, out ruleInError );
-
-
-      CellState cellState = this.GetEditCachedState();
-
+      var cellState = this.GetEditCachedState();
       if( cellState != null )
       {
         if( result.IsValid )
+        {
           cellState.SetContentBeforeCellEdition( DependencyProperty.UnsetValue );
+        }
 
         cellState.SetIsDirtyBeforeEdition( null );
       }
@@ -4077,7 +4038,7 @@ namespace Xceed.Wpf.DataGrid
               DataGridControl.GetDataGridContext( this ).DataGridControl );
       }
 
-      ValidationResult result = ValidationResult.ValidResult;
+      var result = ValidationResult.ValidResult;
       exception = null;
       ruleInError = null;
 
@@ -4104,16 +4065,14 @@ namespace Xceed.Wpf.DataGrid
       {
         // Only need to update the Content binding source if the cell is dirty or if we are cascading the validation.
         if( ( updateContentBindingSource )
-          && ( ( this.IsDirty ) || ( this.IsDirtyFromInitializingInsertionRow ) || ( this.IsInCascadingValidation ) ) )
+          && ( ( this.IsDirty ) || ( this.IsInCascadingValidation ) ) )
         {
           // Update the Content binding's source and check for errors.
           result = this.UpdateContentBindingSource( out exception, out ruleInError );
         }
         else
         {
-          // Just check for errors.
-          // We must validate even if the cell isn't dirty since its value might have been in error even before
-          // entering edit on the row. 
+          // Just check for errors. We must validate even if the cell isn't dirty since its value might have been in error even before entering edit on the row. 
           // ie: DataErrorInfo or any other non-restrictive validation error.
           result = this.ValidateContentBindingRules( out exception, out ruleInError );
         }
@@ -4126,7 +4085,9 @@ namespace Xceed.Wpf.DataGrid
         this.SetAllError( result, exception, ruleInError );
 
         if( cascadeValidate )
+        {
           this.CascadeValidation();
+        }
       }
 
       return result;
@@ -4159,50 +4120,50 @@ namespace Xceed.Wpf.DataGrid
       this.SetAllError( ValidationResult.ValidResult, null, null );
     }
 
-    private static void ContentBinding_ValidationError( object sender, ValidationErrorEventArgs e )
+    private static void OnContentBindingNotifyValidationError( object sender, ValidationErrorEventArgs e )
     {
       Cell cell = ( Cell )sender;
 
-      if( cell.PreventValidateAndSetAllErrors )
+      cell.NotifyContentBindingValidationError();
+    }
+
+    internal void NotifyContentBindingValidationError()
+    {
+      if( this.PreventValidateAndSetAllErrors )
         return;
 
       // Proceed only if the isn't any UI ValidationRules error flagged since last UI validation pass.
-      if( cell.HasUIValidationError )
+      if( this.HasUIValidationError )
         return;
 
-      ValidationError cellContentBindingValidationError = cell.GetContentBindingValidationError();
+      var validationError = this.GetContentBindingValidationError();
 
-      // In order to minimize switching of styles when we need to update the Content Binding's source,
-      // the SetAllError method will not do anything while it is being prevented.
-      //
-      // ie: When we need to update the ContentBinding's source manually through EndEdit.
-      if( cellContentBindingValidationError != null )
+      // In order to minimize switching of styles when we need to update the Content Binding's source, the SetAllError method will not do anything while it is being prevented.
+      // e.g. : When we need to update the ContentBinding's source manually through EndEdit.
+      if( validationError != null )
       {
-        cell.SetAllError(
-          new ValidationResult( false, cellContentBindingValidationError.ErrorContent ),
-          cellContentBindingValidationError.Exception,
-          new CellContentBindingValidationRule( cellContentBindingValidationError.RuleInError ) );
+        this.SetAllError( new ValidationResult( false, validationError.ErrorContent ), validationError.Exception,
+                          new CellContentBindingValidationRule( validationError.RuleInError ) );
       }
       else
       {
-        cell.SetAllError( ValidationResult.ValidResult, null, null );
+        this.SetAllError( ValidationResult.ValidResult, null, null );
       }
     }
 
-    private void ContentBinding_TargetUpdated( object sender, DataTransferEventArgs e )
+    private void OnContentBindingTargetUpdated( object sender, DataTransferEventArgs e )
     {
       if( e.Property != Cell.ContentProperty )
         return;
 
-      Cell cell = e.TargetObject as Cell;
+      var cell = e.TargetObject as Cell;
 
-      // Under certain circumstances which have not yet been clearly identified, the TargetObject
-      // is the ContentPresenter of the ScrollTip. This would raise a NullReferenceException when
-      // trying to access cell's members, as the previous cast would return null.
+      // Under certain circumstances which have not yet been clearly identified, the TargetObject is the ContentPresenter of the ScrollTip.
+      // This would raise a NullReferenceException when trying to access cell's members, as the previous cast would return null.
       if( cell == null )
         return;
 
-      Row parentRow = cell.ParentRow;
+      var parentRow = cell.ParentRow;
 
       if( ( cell.IsUpdatingContentBindingSource ) || ( cell.PreventValidateAndSetAllErrors )
         || ( parentRow == null ) || ( !parentRow.IsBeingEdited ) || ( !parentRow.IsDirty ) )
@@ -4218,24 +4179,23 @@ namespace Xceed.Wpf.DataGrid
 
       Exception exception;
       CellValidationRule ruleInError;
-
       cell.ValidateAndSetAllErrors( false, true, false, true, out exception, out ruleInError );
     }
 
     private void CascadeValidation()
     {
-      Row parentRow = this.ParentRow;
+      var parentRow = this.ParentRow;
 
       if( parentRow == null )
         return;
 
-      bool updateContentBindingSource = ( parentRow.IsEndingEdition || parentRow.IsCancelingEdition )
-        || ( this.GetContentBindingUpdateSourceTrigger() == DataGridUpdateSourceTrigger.CellEndingEdit )
-        || ( this.GetContentBindingUpdateSourceTrigger() == DataGridUpdateSourceTrigger.CellContentChanged );
+      var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
+      var updateContentBindingSource = ( parentRow.IsEndingEdition || parentRow.IsCancelingEdition )
+                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
+                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
 
-      // Create a clone of the list to avoid concurrent access when iterating 
-      // and a Cell is added to CreatedCells because of ColumnVirtualization
-      List<Cell> createdCells = new List<Cell>( parentRow.CreatedCells );
+      // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
+      var createdCells = new List<Cell>( parentRow.CreatedCells );
 
       foreach( Cell siblingCell in createdCells )
       {
@@ -4252,7 +4212,6 @@ namespace Xceed.Wpf.DataGrid
         {
           Exception exception;
           CellValidationRule ruleInError;
-
           siblingCell.ValidateAndSetAllErrors( false, true, updateContentBindingSource, false, out exception, out ruleInError );
         }
         finally
@@ -4268,8 +4227,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( invalid )
       {
-        CellValidationError validationError =
-          new CellValidationError( ruleInError, this, result.ErrorContent, validationException );
+        CellValidationError validationError = new CellValidationError( ruleInError, this, result.ErrorContent, validationException );
 
         this.SetValidationError( validationError );
       }
@@ -4285,8 +4243,7 @@ namespace Xceed.Wpf.DataGrid
       ruleInError = null;
       validationException = null;
 
-      CellValidationContext cellValidationContext =
-        new CellValidationContext( this.GetRealDataContext(), this );
+      CellValidationContext cellValidationContext = new CellValidationContext( this.GetRealDataContext(), this );
 
       CultureInfo culture = this.Language.GetSpecificCulture();
 
@@ -4382,142 +4339,82 @@ namespace Xceed.Wpf.DataGrid
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      return this.OnReceivedWeakEvent( managerType, sender, e );
+      return this.OnReceiveWeakEvent( managerType, sender, e );
     }
 
-    protected internal virtual bool OnReceivedWeakEvent( Type managerType, object sender, EventArgs e )
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      bool retval = false;
-
-      if( managerType == typeof( CanBeCurrentWhenReadOnlyChangedEventManager ) )
-      {
-        ColumnBase column = sender as ColumnBase;
-
-        if( this.ProcessEvent( column, out retval ) )
-        {
-          this.OnParentColumnCanBeCurrentWhenReadOnlyChanged( column );
-        }
-      }
-      else if( managerType == typeof( CellEditorDisplayConditionsChangedEventManager ) )
+      if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        ColumnBase column = sender as ColumnBase;
-
-        if( this.ProcessEvent( column, out retval ) )
-        {
-          this.OnParentColumnCellEditorDisplayConditionsChanged();
-        }
-      }
-      else if( managerType == typeof( CellContentTemplateChangedEventManager ) )
-      {
-        ColumnBase column = sender as ColumnBase;
-
-        if( this.ProcessEvent( column, out retval ) )
+        var column = sender as ColumnBase;
+        if( ( column != null ) && ( column == this.ParentColumn ) )
         {
-          this.OnParentColumnCellContentTemplateChanged( false );
+          this.OnParentColumnPropertyChanged( ( PropertyChangedEventArgs )e );
         }
       }
-      else if( managerType == typeof( CellContentStringFormatChangedEventManager ) )
-      {
-        ColumnBase column = sender as ColumnBase;
-
-        if( this.ProcessEvent( column, out retval ) )
-        {
-          this.OnParentColumnCellContentTemplateChanged( true );
-        }
-      }
-      else if( managerType == typeof( ForeignKeyConfigurationChangedEventManager ) )
+      else
       {
-        Column column = sender as Column;
-
-        if( this.ProcessEvent( column, out retval ) )
-        {
-          this.OnParentColumnForeignKeyConfigurationChanged();
-        }
+        return false;
       }
 
-      return retval;
+      return true;
     }
 
-    private bool ProcessEvent( ColumnBase column, out bool handled )
+    internal virtual void OnParentColumnPropertyChanged( PropertyChangedEventArgs e )
     {
-      handled = ( column != null ) && ( column.DataGridControl != null );
-
-      return ( handled ) && ( this.IsContainerPrepared ) && ( !this.IsContainerVirtualized );
-    }
+      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
+        return;
 
-    private void OnParentColumnCanBeCurrentWhenReadOnlyChanged( ColumnBase column )
-    {
-      DataGridControl dataGridControl = column.DataGridControl;
-      DataGridContext dataGridContext = dataGridControl.DataGridContext;
+      var propertyName = e.PropertyName;
 
-      if( ( !this.GetCalculatedCanBeCurrent() ) && ( column == dataGridContext.CurrentColumn ) )
+      if( string.IsNullOrEmpty( propertyName ) )
       {
-        try
+        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
         {
-          dataGridContext.SetCurrentColumnCore( null, false, dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged );
-        }
-        catch( DataGridException )
-        {
-          // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-          // any other GridException.
+          this.UpdateCoercedContentTemplate( false );
         }
-      }
 
-      bool cellFocusable = true;
-
-      if( !this.IsBeingEdited )
+        this.UpdateFocusable();
+        this.UpdateMatchingDisplayConditions();
+      }
+      else if( propertyName == ColumnBase.CanBeCurrentWhenReadOnlyProperty.Name )
+      {
+        this.UpdateFocusable();
+      }
+      else if( propertyName == ColumnBase.CellEditorDisplayConditionsProperty.Name )
       {
-        switch( this.ParentRow.NavigationBehavior )
+        this.UpdateMatchingDisplayConditions();
+      }
+      else if( ( propertyName == ColumnBase.CellContentTemplateProperty.Name )
+            || ( propertyName == ColumnBase.CellContentTemplateSelectorProperty.Name ) )
+      {
+        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
         {
-          case NavigationBehavior.None:
-            cellFocusable = false;
-            break;
-          case NavigationBehavior.RowOnly:
-            cellFocusable = false;
-            break;
-          case NavigationBehavior.RowOrCell:
-            cellFocusable = true;
-            break;
-          case NavigationBehavior.CellOnly:
-            cellFocusable = true;
-            break;
+          if( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal == null ) )
+          {
+            this.UpdateCoercedContentTemplate( false );
+          }
         }
       }
-
-      //force an update of the NavigationBehavior characteristics
-      this.Focusable = ( cellFocusable && this.GetCalculatedCanBeCurrent() );
-    }
-
-    private void OnParentColumnCellEditorDisplayConditionsChanged()
-    {
-      this.UpdateMatchingDisplayConditions();
-    }
-
-    private void OnParentColumnCellContentTemplateChanged( bool ignoreTemplateConditions )
-    {
-      //If the editor is displayed, I want to take no actions for this event.
-      if( ( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingShow ) || ( this.IsCellEditorDisplayed ) )
-        return;
-
-      //If there is no local value for the ContentTemplate and ContentTemplateSelector properties, then it is possible that
-      //the template to use changed.
-      if( ignoreTemplateConditions
-        || ( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal == null ) ) )
+      else if( ( propertyName == ColumnBase.CellContentStringFormatProperty.Name )
+            || ( propertyName == ColumnBase.DefaultCultureProperty.Name )
+            || ( propertyName == Column.ForeignKeyConfigurationProperty.Name ) )
       {
-        //force a re-evaluation of the CellContentTemplate.
-        this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
+        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
+        {
+          this.UpdateCoercedContentTemplate( false );
+        }
       }
-    }
-
-    private void OnParentColumnForeignKeyConfigurationChanged()
-    {
-      if( ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) && ( !this.IsCellEditorDisplayed ) )
+      else if( propertyName == ColumnBase.CellEditorSelectorProperty.Name )
       {
-        this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
+        //Make sure the editor is refreshed even if it is currently displayed.
+        m_forceEditorRefresh = true;
+        this.RefreshDisplayedTemplate();
+        m_forceEditorRefresh = false;
       }
     }
 
-    #endregion IWeakEventListener Members
+    #endregion
 
     private KeyActivationGesture m_keyGesture; // = null
     private TextCompositionEventArgs m_textInputArgs; // = null
@@ -4529,6 +4426,7 @@ namespace Xceed.Wpf.DataGrid
     private DispatcherOperation m_delayedHideEditTemplateDispatcherOperation;
 
     private BitVector32 m_flags = new BitVector32();
+    private bool m_forceEditorRefresh;
 
     // Binding used by the animated Column reordering feature
     private static Binding ParentColumnTranslationBinding;
@@ -4564,7 +4462,8 @@ namespace Xceed.Wpf.DataGrid
       IsContainerVirtualized = 32768,
       AnimatedColumnReorderingBindingApplied = 65536,
       PreventMakeVisible = 131072,
-      IsContainerRecycled = 262144
+      IsContainerRecycled = 262144,
+      IsContainerPartiallyCleared = 524288
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
index 2a2cbae8..e0bd4aff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
@@ -14,15 +14,10 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Diagnostics;
-using System.Windows.Threading;
 using System.Windows.Data;
+using System.Windows.Documents;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -30,6 +25,13 @@ namespace Xceed.Wpf.DataGrid
   {
     static CellContentPresenter()
     {
+      CellContentPresenter.MinHeightProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( CellContentPresenter.CoerceMinHeight ) ) );
+      TextElement.FontFamilyProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
+      TextElement.FontSizeProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
+      TextElement.FontStretchProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
+      TextElement.FontStyleProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
+      TextElement.FontWeightProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
+
       m_sContentBinding = new Binding();
       m_sContentBinding.RelativeSource = RelativeSource.TemplatedParent;
       m_sContentBinding.Mode = BindingMode.OneWay;
@@ -59,12 +61,15 @@ namespace Xceed.Wpf.DataGrid
       m_sTextBlockStyle = new Style( typeof( TextBlock ) );
       m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextTrimmingProperty, trimmingBinding ) );
       m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextWrappingProperty, wrappingBinding ) );
+      m_sTextBlockStyle.Seal();
     }
 
     public CellContentPresenter()
     {
       this.Resources.Add( typeof( TextBlock ), m_sTextBlockStyle );
       this.DataContext = null;
+
+      this.SetCurrentValue( CellContentPresenter.MinHeightProperty, 0d );
     }
 
     public override void EndInit()
@@ -75,11 +80,26 @@ namespace Xceed.Wpf.DataGrid
       BindingOperations.SetBinding( this, CellContentPresenter.ContentTemplateProperty, m_sContentTemplateBinding );
     }
 
+    private static object CoerceMinHeight( DependencyObject sender, object value )
+    {
+      var self = sender as CellContentPresenter;
+      if( self == null )
+        return value;
+
+      return self.CoerceMinHeight( new Thickness(), value );
+    }
+
+    private static void InvalidateMinHeight( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as CellContentPresenter;
+      if( self == null )
+        return;
+
+      self.CoerceValue( CellContentPresenter.MinHeightProperty );
+    }
+
     private static Binding m_sContentTemplateBinding;
     private static Binding m_sContentBinding;
-
     private static Style m_sTextBlockStyle;
   }
-
-
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentStringFormatChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentStringFormatChangedEventManager.cs
deleted file mode 100644
index c3414964..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentStringFormatChangedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CellContentStringFormatChangedEventManager : WeakEventManager
-  {
-    private CellContentStringFormatChangedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CellContentStringFormatChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CellContentStringFormatChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var column = ( ColumnBase )source;
-
-      column.CellContentStringFormatChanged += new EventHandler( this.OnCellContentStringFormatChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var column = ( ColumnBase )source;
-
-      column.CellContentStringFormatChanged -= new EventHandler( this.OnCellContentStringFormatChanged );
-    }
-
-    private static CellContentStringFormatChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( CellContentStringFormatChangedEventManager );
-        var currentManager = ( CellContentStringFormatChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CellContentStringFormatChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCellContentStringFormatChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs
deleted file mode 100644
index f2d46f09..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CellContentTemplateChangedEventManager : WeakEventManager
-  {
-    private CellContentTemplateChangedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CellContentTemplateChanged += new EventHandler( this.OnCellContentTemplateChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CellContentTemplateChanged -= new EventHandler( this.OnCellContentTemplateChanged );
-    }
-
-    private static CellContentTemplateChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( CellContentTemplateChangedEventManager );
-        CellContentTemplateChangedEventManager currentManager = ( CellContentTemplateChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CellContentTemplateChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCellContentTemplateChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs
deleted file mode 100644
index 91a1c3aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CellEditorDisplayConditionsChangedEventManager : WeakEventManager
-  {
-    private CellEditorDisplayConditionsChangedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnBase source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CellEditorDisplayConditionsChanged += new EventHandler( this.OnCellEditorDisplayConditionsChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnBase column = ( ColumnBase )source;
-      column.CellEditorDisplayConditionsChanged -= new EventHandler( this.OnCellEditorDisplayConditionsChanged );
-    }
-
-    private static CellEditorDisplayConditionsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( CellEditorDisplayConditionsChangedEventManager );
-        CellEditorDisplayConditionsChangedEventManager currentManager = ( CellEditorDisplayConditionsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CellEditorDisplayConditionsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCellEditorDisplayConditionsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs
similarity index 68%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs
index 39ba63ba..39d6984a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs
@@ -1,38 +1,26 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid.Stats
-{
-  internal class StatResult
-  {
-    public StatResult( object value )
-    {
-      m_value = value;
-    }
-
-    private object m_value;
-
-    public object Value
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid
+{
+  public abstract class CellEditorSelector
+  {
+    public virtual CellEditor SelectCellEditor( ColumnBase column, object item )
+    {
+      return null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ChildColumnVisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ChildColumnVisibilityChangedEventManager.cs
deleted file mode 100644
index cbec599a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ChildColumnVisibilityChangedEventManager.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ChildColumnVisibilityChangedEventManager : WeakEventManager
-  {
-    private ChildColumnVisibilityChangedEventManager()
-    {
-    }
-
-    internal static void AddListener( ObservableColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ObservableColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var columnCollection = ( ObservableColumnCollection )source;
-      columnCollection.ColumnVisibilityChanged += new EventHandler( this.OnColumnVisibilityChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var columnCollection = ( ObservableColumnCollection )source;
-      columnCollection.ColumnVisibilityChanged -= new EventHandler( this.OnColumnVisibilityChanged );
-    }
-
-    private static ChildColumnVisibilityChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ChildColumnVisibilityChangedEventManager );
-        ChildColumnVisibilityChangedEventManager currentManager = ( ChildColumnVisibilityChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ChildColumnVisibilityChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnColumnVisibilityChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
index d6574901..48b7010d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
@@ -20,12 +20,24 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Data;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
   [DebuggerDisplay( "FieldName = {FieldName}" )]
   public class Column : ColumnBase
   {
+    #region Static Fields
+
+    internal static readonly string AllowSortPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.AllowSort );
+    internal static readonly string AllowGroupPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.AllowGroup );
+#pragma warning disable 618
+    internal static readonly string DisplayMemberBindingPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.DisplayMemberBinding );
+#pragma warning restore 618
+    internal static readonly string DisplayMemberBindingInfoPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.DisplayMemberBindingInfo );
+
+    #endregion
+
     public Column()
     {
     }
@@ -68,7 +80,7 @@ namespace Xceed.Wpf.DataGrid
 
         m_displayMemberBinding = value;
 
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "DisplayMemberBinding" ) );
+        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.DisplayMemberBindingPropertyName ) );
       }
     }
 
@@ -110,7 +122,7 @@ namespace Xceed.Wpf.DataGrid
           m_displayMemberBindingInfo = value;
           m_displayMemberBinding = m_displayMemberBindingInfo.GetBinding();
 
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "DisplayMemberBindingInfo" ) );
+          this.OnPropertyChanged( new PropertyChangedEventArgs( Column.DisplayMemberBindingInfoPropertyName ) );
         }
       }
     }
@@ -131,7 +143,7 @@ namespace Xceed.Wpf.DataGrid
           return;
 
         m_allowSort = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "AllowSort" ) );
+        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.AllowSortPropertyName ) );
       }
     }
 
@@ -153,7 +165,7 @@ namespace Xceed.Wpf.DataGrid
           return;
 
         m_allowGroup = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "AllowGroup" ) );
+        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.AllowGroupPropertyName ) );
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
index b230fc38..a9968741 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -24,7 +25,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using Xceed.Utils.Collections;
+using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.ValidationRules;
 using Xceed.Wpf.DataGrid.Views;
 
@@ -52,15 +53,35 @@ namespace Xceed.Wpf.DataGrid
       this.Title = title;
     }
 
-    #region CellContentTemplate Property
+    #region Description Property
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+      "Description",
+      typeof( string ),
+      typeof( ColumnBase ),
+      new UIPropertyMetadata( null ) );
+
+    public string Description
+    {
+      get
+      {
+        return ( string )this.GetValue( ColumnBase.DescriptionProperty );
+      }
+      set
+      {
+        this.SetValue( ColumnBase.DescriptionProperty, value );
+      }
+    }
 
-    internal event EventHandler CellContentTemplateChanged;
+    #endregion
 
-    public static readonly DependencyProperty CellContentTemplateProperty =
-        DependencyProperty.Register( "CellContentTemplate",
-        typeof( DataTemplate ),
-        typeof( ColumnBase ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( ColumnBase.OnCellContentTemplateChanged ) ) );
+    #region CellContentTemplate Property
+
+    public static readonly DependencyProperty CellContentTemplateProperty = DependencyProperty.Register(
+      "CellContentTemplate",
+      typeof( DataTemplate ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( ColumnBase.OnCellContentTemplateChanged ) ) );
 
     public DataTemplate CellContentTemplate
     {
@@ -74,18 +95,26 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellContentTemplate Property
+    private static void OnCellContentTemplateChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as ColumnBase;
+      if( self == null )
+        return;
+
+      //Make sure cells pertaining to this group are assigned to the correct recycle bin.
+      //The recycle bin based on the previous key value will be clean up later by the FixedCellPanel, if no other column uses it.
+      self.ResetDefaultCellRecyclingGroup();
+    }
+
+    #endregion
 
     #region CellContentTemplateSelector Property
 
-    public static readonly DependencyProperty CellContentTemplateSelectorProperty =
-      DependencyProperty.Register(
-        "CellContentTemplateSelector",
-        typeof( DataTemplateSelector ),
-        typeof( ColumnBase ),
-        new FrameworkPropertyMetadata(
-          GenericContentTemplateSelector.Instance,
-          new PropertyChangedCallback( ColumnBase.OnCellContentTemplateSelectorChanged ) ) );
+    public static readonly DependencyProperty CellContentTemplateSelectorProperty = DependencyProperty.Register(
+      "CellContentTemplateSelector",
+      typeof( DataTemplateSelector ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( GenericContentTemplateSelector.Instance, new PropertyChangedCallback( ColumnBase.OnCellContentTemplateSelectorChanged ) ) );
 
     public DataTemplateSelector CellContentTemplateSelector
     {
@@ -99,15 +128,26 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellContentTemplateSelector Property
+    private static void OnCellContentTemplateSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as ColumnBase;
+      if( self == null )
+        return;
+
+      //Make sure cells pertaining to this group are assigned to the correct recycle bin.
+      //The recycle bin based on the previous key value will be clean up later by the FixedCellPanel, if no other column uses it.
+      self.ResetDefaultCellRecyclingGroup();
+    }
+
+    #endregion
 
     #region CellHorizontalContentAlignment Property
 
-    public static readonly DependencyProperty CellHorizontalContentAlignmentProperty =
-        DependencyProperty.Register( "CellHorizontalContentAlignment",
-        typeof( HorizontalAlignment ),
-        typeof( ColumnBase ),
-        new FrameworkPropertyMetadata( HorizontalAlignment.Stretch ) );
+    public static readonly DependencyProperty CellHorizontalContentAlignmentProperty = DependencyProperty.Register(
+      "CellHorizontalContentAlignment",
+      typeof( HorizontalAlignment ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( HorizontalAlignment.Stretch ) );
 
     public HorizontalAlignment CellHorizontalContentAlignment
     {
@@ -121,15 +161,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellHorizontalContentAlignment
+    #endregion
 
     #region CellVerticalContentAlignment Property
 
-    public static readonly DependencyProperty CellVerticalContentAlignmentProperty =
-        DependencyProperty.Register( "CellVerticalContentAlignment",
-        typeof( VerticalAlignment ),
-        typeof( ColumnBase ),
-        new FrameworkPropertyMetadata( VerticalAlignment.Stretch ) );
+    public static readonly DependencyProperty CellVerticalContentAlignmentProperty = DependencyProperty.Register(
+      "CellVerticalContentAlignment",
+      typeof( VerticalAlignment ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( VerticalAlignment.Stretch ) );
 
     public VerticalAlignment CellVerticalContentAlignment
     {
@@ -143,16 +183,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellVerticalContentAlignment
+    #endregion
 
     #region CellContentStringFormat Property
 
-    //StringFormat to use when in ViewMode (not editing)
-    public static readonly DependencyProperty CellContentStringFormatProperty =
-        DependencyProperty.Register( "CellContentStringFormat",
-        typeof( string ),
-        typeof( ColumnBase ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( ColumnBase.OnCellContentStringFormatChanged ) ) );
+    public static readonly DependencyProperty CellContentStringFormatProperty = DependencyProperty.Register(
+      "CellContentStringFormat",
+      typeof( string ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( null ) );
 
     public string CellContentStringFormat
     {
@@ -166,9 +205,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal event EventHandler CellContentStringFormatChanged;
-
-    #endregion CellContentStringFormat Property
+    #endregion
 
     #region Title Property
 
@@ -176,9 +213,7 @@ namespace Xceed.Wpf.DataGrid
       "Title",
       typeof( object ),
       typeof( ColumnBase ),
-      new UIPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ColumnBase.OnTitleChanged ) ) );
+      new UIPropertyMetadata( null ) );
 
     public object Title
     {
@@ -192,20 +227,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnTitleChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( ColumnBase )sender;
-      var handler = column.TitleChanged;
-
-      if( handler != null )
-      {
-        handler.Invoke( column, EventArgs.Empty );
-      }
-    }
-
-    internal event EventHandler TitleChanged;
-
-    #endregion Title Property
+    #endregion
 
     #region TitleTemplate Property
 
@@ -227,7 +249,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion TitleTemplate Property
+    #endregion
 
     #region TitleTemplateSelector Property
 
@@ -249,7 +271,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion TitleTemplateSelector Property
+    #endregion
 
     #region ActualWidth Property
 
@@ -320,7 +342,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ActualWidth Property
+    #endregion
 
     #region Width Property
 
@@ -380,12 +402,11 @@ namespace Xceed.Wpf.DataGrid
       column.UpdateActualWidth();
     }
 
-    #endregion Width Property
+    #endregion
 
     #region MinWidth Property
 
-    public static readonly DependencyProperty MinWidthProperty =
-        FrameworkElement.MinWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
+    public static readonly DependencyProperty MinWidthProperty = FrameworkElement.MinWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
 
     public double MinWidth
     {
@@ -399,12 +420,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion MinWidth Property
+    #endregion
 
     #region MaxWidth Property
 
-    public static readonly DependencyProperty MaxWidthProperty =
-        FrameworkElement.MaxWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
+    public static readonly DependencyProperty MaxWidthProperty = FrameworkElement.MaxWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
 
     public double MaxWidth
     {
@@ -418,12 +438,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion MaxWidth Property
+    #endregion
 
     #region DesiredWidth Property
 
-    internal static readonly DependencyProperty DesiredWidthProperty =
-        DependencyProperty.Register( "DesiredWidth", typeof( double ), typeof( ColumnBase ), new PropertyMetadata( -1d, new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
+    internal static readonly DependencyProperty DesiredWidthProperty = DependencyProperty.Register( "DesiredWidth", typeof( double ), typeof( ColumnBase ), new PropertyMetadata( -1d, new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
 
     internal double DesiredWidth
     {
@@ -437,7 +456,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion DesiredWidth Property
+    #endregion
 
     #region TextTrimming Property
 
@@ -459,7 +478,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion TextTrimming Property
+    #endregion
 
     #region TextWrapping Property
 
@@ -481,7 +500,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion TextWrapping Property
+    #endregion
 
     #region HasFixedWidth Read-Only Property
 
@@ -505,12 +524,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion HasFixedWidth Read-Only Property
+    #endregion
 
     #region VisiblePosition Property
 
-    public static readonly DependencyProperty VisiblePositionProperty =
-      DependencyProperty.Register(
+    public static readonly DependencyProperty VisiblePositionProperty = DependencyProperty.Register(
       "VisiblePosition",
       typeof( int ),
       typeof( ColumnBase ),
@@ -556,10 +574,9 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnVisiblePositionChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      ColumnBase column = ( ColumnBase )sender;
-
-      int oldValue = ( int )e.OldValue;
-      int newValue = ( int )e.NewValue;
+      var column = ( ColumnBase )sender;
+      var oldValue = ( int )e.OldValue;
+      var newValue = ( int )e.NewValue;
 
       var handler = column.VisiblePositionChanged;
       if( handler != null )
@@ -589,7 +606,7 @@ namespace Xceed.Wpf.DataGrid
 
     private readonly AutoResetFlag m_inhibitVisiblePositionChanging = AutoResetFlagFactory.Create( false );
 
-    #endregion VisiblePosition Property
+    #endregion
 
     #region IsFirstVisible Read-Only Property
 
@@ -619,7 +636,7 @@ namespace Xceed.Wpf.DataGrid
       this.ClearValue( ColumnBase.IsFirstVisiblePropertyKey );
     }
 
-    #endregion IsFirstVisible Read-Only Property
+    #endregion
 
     #region IsLastVisible Read-Only Property
 
@@ -649,7 +666,7 @@ namespace Xceed.Wpf.DataGrid
       this.ClearValue( ColumnBase.IsLastVisiblePropertyKey );
     }
 
-    #endregion IsLastVisible Read-Only Property
+    #endregion
 
     #region FieldName Property
 
@@ -683,7 +700,7 @@ namespace Xceed.Wpf.DataGrid
       return requestedValue;
     }
 
-    #endregion FieldName Property
+    #endregion
 
     #region Visible Property
 
@@ -691,7 +708,7 @@ namespace Xceed.Wpf.DataGrid
       "Visible",
       typeof( bool ),
       typeof( ColumnBase ),
-      new UIPropertyMetadata( true, new PropertyChangedCallback( ColumnBase.OnVisibilityChanged ) ) );
+      new UIPropertyMetadata( true ) );
 
     public bool Visible
     {
@@ -705,20 +722,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnVisibilityChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( ColumnBase )sender;
-
-      var handler = column.VisibleChanged;
-      if( handler != null )
-      {
-        handler.Invoke( column, EventArgs.Empty );
-      }
-    }
-
-    internal event EventHandler VisibleChanged;
-
-    #endregion Visible Property
+    #endregion
 
     #region Index Property
 
@@ -733,7 +737,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Index Property
+    #endregion
 
     #region DataGridControl Property
 
@@ -750,10 +754,12 @@ namespace Xceed.Wpf.DataGrid
 
     internal void NotifyDataGridControlChanged()
     {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "DataGridControl" ) );
+      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.DataGridControlPropertyName ) );
     }
 
-    #endregion DataGridControl Property
+    internal static readonly string DataGridControlPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.DataGridControl );
+
+    #endregion
 
     #region ParentDetailConfiguration Property
 
@@ -768,7 +774,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ParentDetailConfiguration Property
+    #endregion
 
     #region ContainingCollection Property
 
@@ -780,7 +786,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ContainingCollection Property
+    private ColumnCollection m_containingCollection; //null
+
+    #endregion
 
     #region AllowSort Property
 
@@ -796,7 +804,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AllowSort Property
+    #endregion
 
     #region AllowGroup Property
 
@@ -812,7 +820,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AllowGroup Property
+    #endregion
 
     #region GroupValueTemplate Property
 
@@ -834,7 +842,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupValueTemplate Property
+    #endregion
 
     #region GroupValueTemplateSelector Property
 
@@ -856,7 +864,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupValueTemplateSelector Property
+    #endregion
 
     #region GroupValueStringFormat Property
 
@@ -878,7 +886,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupValueStringFormat Property
+    #endregion
 
     #region CellEditor Property
 
@@ -900,46 +908,47 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellEditor Property
-
-    #region CellEditorDisplayConditions Property
+    #endregion
 
-    public static readonly DependencyProperty CellEditorDisplayConditionsProperty =
-        DataGridControl.CellEditorDisplayConditionsProperty.AddOwner( typeof( ColumnBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ColumnBase.OnCellEditorDisplayConditionsChanged ) ) );
+    #region CellEditorSelector Property
 
-    private CellEditorDisplayConditions m_cellEditorDisplayConditions;
+    public static readonly DependencyProperty CellEditorSelectorProperty = DependencyProperty.Register(
+      "CellEditorSelector",
+      typeof( CellEditorSelector ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( null ) );
 
-    public CellEditorDisplayConditions CellEditorDisplayConditions
+    public CellEditorSelector CellEditorSelector
     {
       get
       {
-        return m_cellEditorDisplayConditions;
+        return ( CellEditorSelector )this.GetValue( ColumnBase.CellEditorSelectorProperty );
       }
       set
       {
-        this.SetValue( ColumnBase.CellEditorDisplayConditionsProperty, value );
+        this.SetValue( ColumnBase.CellEditorSelectorProperty, value );
       }
     }
 
-    internal event EventHandler CellEditorDisplayConditionsChanged;
-
-    private static void OnCellEditorDisplayConditionsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ColumnBase column = ( ColumnBase )sender;
+    #endregion
 
-      if( column == null )
-        return;
+    #region CellEditorDisplayConditions Property
 
-      if( e.NewValue != null )
-        column.m_cellEditorDisplayConditions = ( CellEditorDisplayConditions )e.NewValue;
+    public static readonly DependencyProperty CellEditorDisplayConditionsProperty = DataGridControl.CellEditorDisplayConditionsProperty.AddOwner( typeof( ColumnBase ) );
 
-      if( column.CellEditorDisplayConditionsChanged != null )
+    public CellEditorDisplayConditions CellEditorDisplayConditions
+    {
+      get
       {
-        column.CellEditorDisplayConditionsChanged( column, EventArgs.Empty );
+        return ( CellEditorDisplayConditions )this.GetValue( ColumnBase.CellEditorDisplayConditionsProperty );
+      }
+      set
+      {
+        this.SetValue( ColumnBase.CellEditorDisplayConditionsProperty, value );
       }
     }
 
-    #endregion CellEditorDisplayConditions Property
+    #endregion
 
     #region CellValidationRules Property
 
@@ -948,7 +957,9 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_cellValidationRules == null )
+        {
           m_cellValidationRules = new Collection<CellValidationRule>();
+        }
 
         return m_cellValidationRules;
       }
@@ -956,12 +967,11 @@ namespace Xceed.Wpf.DataGrid
 
     private Collection<CellValidationRule> m_cellValidationRules; // = null
 
-    #endregion CellValidationRules Property
+    #endregion
 
     #region CellErrorStyle Property
 
-    public static readonly DependencyProperty CellErrorStyleProperty =
-      DataGridControl.CellErrorStyleProperty.AddOwner( typeof( ColumnBase ) );
+    public static readonly DependencyProperty CellErrorStyleProperty = DataGridControl.CellErrorStyleProperty.AddOwner( typeof( ColumnBase ) );
 
     public Style CellErrorStyle
     {
@@ -976,18 +986,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellErrorStyle Property
+    #endregion
 
     #region CanBeCurrentWhenReadOnly Property
 
-    internal event EventHandler CanBeCurrentWhenReadOnlyChanged;
-
-    public static readonly DependencyProperty CanBeCurrentWhenReadOnlyProperty =
-      DependencyProperty.Register(
+    public static readonly DependencyProperty CanBeCurrentWhenReadOnlyProperty = DependencyProperty.Register(
       "CanBeCurrentWhenReadOnly",
       typeof( bool ),
       typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( ( bool )true, new PropertyChangedCallback( ColumnBase.OnCanBeCurrentWhenReadOnlyChanged ) ) );
+      new FrameworkPropertyMetadata( true ) );
 
     public bool CanBeCurrentWhenReadOnly
     {
@@ -1001,20 +1008,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnCanBeCurrentWhenReadOnlyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ColumnBase column = sender as ColumnBase;
-
-      if( column == null )
-        return;
-
-      if( column.CanBeCurrentWhenReadOnlyChanged != null )
-      {
-        column.CanBeCurrentWhenReadOnlyChanged( sender, EventArgs.Empty );
-      }
-    }
-
-    #endregion CanBeCurrentWhenReadOnly
+    #endregion
 
     #region HasValidationError Property
 
@@ -1044,12 +1038,12 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          this.SetValue( ColumnBase.HasValidationErrorPropertyKey, DependencyProperty.UnsetValue );
+          this.ClearValue( ColumnBase.HasValidationErrorPropertyKey );
         }
       }
     }
 
-    #endregion HasValidationError Property
+    #endregion
 
     #region SortDirection Property
 
@@ -1073,7 +1067,7 @@ namespace Xceed.Wpf.DataGrid
     {
       if( value == SortDirection.None )
       {
-        this.SetValue( ColumnBase.SortDirectionPropertyKey, DependencyProperty.UnsetValue );
+        this.ClearValue( ColumnBase.SortDirectionPropertyKey );
       }
       else
       {
@@ -1081,7 +1075,38 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SortDirection Property
+    #endregion
+
+    #region SortDirectionCycle Property
+
+    private static readonly SortDirectionCycleCollection DefaultSortDirectionCycle = new SortDirectionCycleCollection(
+                                                                                       new ReadOnlyCollection<SortDirection>(
+                                                                                         new List<SortDirection>()
+                                                                                           {
+                                                                                             SortDirection.Ascending,
+                                                                                             SortDirection.Descending,
+                                                                                             SortDirection.None,
+                                                                                           } ) );
+
+    public static readonly DependencyProperty SortDirectionCycleProperty = DependencyProperty.Register(
+      "SortDirectionCycle",
+      typeof( SortDirectionCycleCollection ),
+      typeof( ColumnBase ),
+      new PropertyMetadata( ColumnBase.DefaultSortDirectionCycle ) );
+
+    public SortDirectionCycleCollection SortDirectionCycle
+    {
+      get
+      {
+        return ( SortDirectionCycleCollection )this.GetValue( ColumnBase.SortDirectionCycleProperty );
+      }
+      set
+      {
+        this.SetValue( ColumnBase.SortDirectionCycleProperty, value );
+      }
+    }
+
+    #endregion
 
     #region SortIndex Read-Only Property
 
@@ -1105,7 +1130,7 @@ namespace Xceed.Wpf.DataGrid
     {
       if( value == -1 )
       {
-        this.SetValue( ColumnBase.SortIndexPropertyKey, DependencyProperty.UnsetValue );
+        this.ClearValue( ColumnBase.SortIndexPropertyKey );
       }
       else
       {
@@ -1113,12 +1138,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SortIndex Read-Only Property
+    #endregion
 
     #region GroupDescription Property
 
-    public static readonly DependencyProperty GroupDescriptionProperty =
-        DependencyProperty.Register( "GroupDescription", typeof( GroupDescription ), typeof( ColumnBase ), new UIPropertyMetadata( null ) );
+    public static readonly DependencyProperty GroupDescriptionProperty = DependencyProperty.Register(
+      "GroupDescription",
+      typeof( GroupDescription ),
+      typeof( ColumnBase ),
+      new UIPropertyMetadata( null ) );
 
     public GroupDescription GroupDescription
     {
@@ -1132,12 +1160,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupDescription Property
+    #endregion
 
     #region GroupConfiguration Property
 
-    public static readonly DependencyProperty GroupConfigurationProperty =
-        DependencyProperty.Register( "GroupConfiguration", typeof( GroupConfiguration ), typeof( ColumnBase ), new UIPropertyMetadata( null ) );
+    public static readonly DependencyProperty GroupConfigurationProperty = DependencyProperty.Register(
+      "GroupConfiguration",
+      typeof( GroupConfiguration ),
+      typeof( ColumnBase ),
+      new UIPropertyMetadata( null ) );
 
     public GroupConfiguration GroupConfiguration
     {
@@ -1151,18 +1182,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupConfiguration Property
+    #endregion
 
     #region IsMainColumn Property
 
-    private Nullable<bool> m_isMainColumn = null;
-
     public virtual bool IsMainColumn
     {
       get
       {
-        ColumnCollection containingCollection = this.ContainingCollection;
-
+        var containingCollection = this.ContainingCollection;
         if( containingCollection == null )
           return ( m_isMainColumn.HasValue ? m_isMainColumn.Value : false );
 
@@ -1170,42 +1198,41 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        this.SetIsMainColumnInternal( value );
-      }
-    }
-
-    internal virtual void SetIsMainColumnInternal( bool value )
-    {
-      ColumnCollection containingCollection = this.ContainingCollection;
-
-      if( containingCollection == null )
-      {
-        if( ( !m_isMainColumn.HasValue ) || ( m_isMainColumn.Value != value ) )
+        var containingCollection = this.ContainingCollection;
+        if( containingCollection == null )
         {
+          if( m_isMainColumn == value )
+            return;
+
           m_isMainColumn = value;
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "IsMainColumn" ) );
-        }
-      }
-      else
-      {
-        ColumnBase oldMainColumn = containingCollection.MainColumn;
 
-        if( oldMainColumn != this )
+          this.RaiseIsMainColumnChanged();
+        }
+        else if( value )
         {
           containingCollection.MainColumn = this;
-          // These two PropertyChanged are done in this order to be consistent with
-          // the events' order when adding a Column already "IsMainColumn".
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "IsMainColumn" ) );
+        }
+        else
+        {
+          if( containingCollection.MainColumn != this )
+            return;
 
-          if( oldMainColumn != null )
-          {
-            oldMainColumn.OnPropertyChanged( new PropertyChangedEventArgs( "IsMainColumn" ) );
-          }
+          containingCollection.MainColumn = null;
         }
       }
     }
 
-    #endregion IsMainColumn Property
+    internal void RaiseIsMainColumnChanged()
+    {
+      this.RefreshDraggableStatus();
+      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.IsMainColumnPropertyName ) );
+    }
+
+    internal static readonly string IsMainColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.IsMainColumn );
+
+    private Nullable<bool> m_isMainColumn = null;
+
+    #endregion
 
     #region ReadOnly Property
 
@@ -1249,7 +1276,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion OverrideReadOnlyForInsertion Property
+    #endregion
 
     #region PreviousVisibleColumn Property
 
@@ -1262,9 +1289,9 @@ namespace Xceed.Wpf.DataGrid
         if( this.DataGridControl == null )
           return null;
 
-        var columnsByVisiblePosition =
-          ( this.ParentDetailConfiguration != null ) ? this.ParentDetailConfiguration.ColumnsByVisiblePosition : this.DataGridControl.ColumnsByVisiblePosition;
-
+        var columnsByVisiblePosition = ( this.ParentDetailConfiguration != null )
+                                         ? this.ParentDetailConfiguration.ColumnsByVisiblePosition
+                                         : this.DataGridControl.ColumnsByVisiblePosition;
         var previousColumnNode = columnsByVisiblePosition.Find( this ).Previous;
 
         while( previousColumnNode != null )
@@ -1283,9 +1310,11 @@ namespace Xceed.Wpf.DataGrid
 
     internal void InvalidatePreviousVisibleColumnProperty()
     {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "PreviousVisibleColumn" ) );
+      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.PreviousVisibleColumnPropertyName ) );
     }
 
+    internal static readonly string PreviousVisibleColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.PreviousVisibleColumn );
+
     #endregion
 
     #region NextVisibleColumn Property
@@ -1298,8 +1327,9 @@ namespace Xceed.Wpf.DataGrid
         if( this.DataGridControl == null )
           return null;
 
-        var columnsByVisiblePosition =
-          ( this.ParentDetailConfiguration != null ) ? this.ParentDetailConfiguration.ColumnsByVisiblePosition : this.DataGridControl.ColumnsByVisiblePosition;
+        var columnsByVisiblePosition = ( this.ParentDetailConfiguration != null )
+                                         ? this.ParentDetailConfiguration.ColumnsByVisiblePosition
+                                         : this.DataGridControl.ColumnsByVisiblePosition;
 
         var nextColumnNode = columnsByVisiblePosition.Find( this );
 
@@ -1357,7 +1387,7 @@ namespace Xceed.Wpf.DataGrid
       return defaultCellRecyclingGroup;
     }
 
-    #endregion CellRecyclingGroup Property
+    #endregion
 
     #region DefaultCellRecyclingGroupDataType Internal Property
 
@@ -1382,7 +1412,7 @@ namespace Xceed.Wpf.DataGrid
 
     private Type m_defaultCellRecyclingGroupDataType = typeof( object );
 
-    #endregion DefaultCellRecyclingGroupDataType Internal Property
+    #endregion
 
     #region DefaultCellRecyclingGroup Private Property
 
@@ -1413,20 +1443,14 @@ namespace Xceed.Wpf.DataGrid
 
     private object m_defaultCellRecyclingGroup;
 
-    #endregion DefaultCellRecyclingGroup Private Property
+    #endregion
 
     #region CurrentRowInEditionCellState Property
 
     internal CellState CurrentRowInEditionCellState
     {
-      get
-      {
-        return m_currentRowInEditionCellState;
-      }
-      set
-      {
-        m_currentRowInEditionCellState = value;
-      }
+      get;
+      set;
     }
 
     #endregion
@@ -1464,10 +1488,10 @@ namespace Xceed.Wpf.DataGrid
     #region DefaultCulture Property
 
     public static readonly DependencyProperty DefaultCultureProperty = DependencyProperty.Register(
-     "DefaultCulture",
-     typeof( CultureInfo ),
-     typeof( ColumnBase ),
-     new UIPropertyMetadata( CultureInfo.CurrentCulture ) );
+      "DefaultCulture",
+      typeof( CultureInfo ),
+      typeof( ColumnBase ),
+      new FrameworkPropertyMetadata( CultureInfo.CurrentCulture ) );
 
     public CultureInfo DefaultCulture
     {
@@ -1483,6 +1507,48 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region DraggableStatus Property
+
+    public static readonly DependencyProperty DraggableStatusProperty = DependencyProperty.Register(
+      "DraggableStatus",
+      typeof( ColumnDraggableStatus ),
+      typeof( ColumnBase ),
+      new UIPropertyMetadata( ColumnDraggableStatus.Draggable, null, new CoerceValueCallback( ColumnBase.CoerceDraggableStatus ) ) );
+
+    public ColumnDraggableStatus DraggableStatus
+    {
+      get
+      {
+        return ( ColumnDraggableStatus )this.GetValue( ColumnBase.DraggableStatusProperty );
+      }
+      set
+      {
+        this.SetValue( ColumnBase.DraggableStatusProperty, value );
+      }
+    }
+
+    internal void RefreshDraggableStatus()
+    {
+      this.CoerceValue( ColumnBase.DraggableStatusProperty );
+    }
+
+    private static object CoerceDraggableStatus( DependencyObject sender, object value )
+    {
+      var self = sender as ColumnBase;
+      var collection = ( self != null ) ? self.ContainingCollection : null;
+      if( collection == null )
+        return value;
+
+      var dataGridControl = collection.DataGridControl;
+      if( ( dataGridControl == null ) || !dataGridControl.AreDetailsFlatten || !self.IsMainColumn )
+        return value;
+
+      // The main column is always locked in first position when details are flatten.
+      return ColumnDraggableStatus.FirstUndraggable;
+    }
+
+    #endregion
+
     #region RealizedContainersRequested Event
 
     internal event RealizedContainersRequestedEventHandler RealizedContainersRequested;
@@ -1491,7 +1557,7 @@ namespace Xceed.Wpf.DataGrid
 
     #region ActualWidthChanged Event
 
-    internal event ColumnActualWidthChangedHandler ActualWidthChanged;
+    internal event ColumnActualWidthChangedEventHandler ActualWidthChanged;
 
     #endregion
 
@@ -1537,14 +1603,15 @@ namespace Xceed.Wpf.DataGrid
     public virtual double GetFittedWidth()
     {
       var fittedWidth = this.RequestFittedWidth().GetValueOrDefault( -1d );
+      var e = new RealizedContainersRequestedEventArgs();
 
-      var eventArgs = new RealizedContainersRequestedEventArgs();
-      if( this.RealizedContainersRequested != null )
+      var handler = this.RealizedContainersRequested;
+      if( handler != null )
       {
-        this.RealizedContainersRequested( this, eventArgs );
+        handler.Invoke( this, e );
       }
 
-      var realizedContainers = eventArgs.RealizedContainers;
+      var realizedContainers = e.RealizedContainers;
       if( realizedContainers.Count > 0 )
       {
         fittedWidth = Math.Max( fittedWidth, this.GetElementCollectionFittedWidth( realizedContainers ) );
@@ -1553,11 +1620,10 @@ namespace Xceed.Wpf.DataGrid
       return fittedWidth;
     }
 
-    // Not to be confused with the DependencyObject.OnPropertyChanged(DependencyPropertyChangedEventArgs) !!! This is an overload.
-    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, e );
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( new PropertyChangedEventArgs( e.Property.Name ) );
     }
 
     protected override Freezable CreateInstanceCore()
@@ -1603,40 +1669,6 @@ namespace Xceed.Wpf.DataGrid
       this.AttachToContainingCollectionCore( columnCollection );
     }
 
-    internal void AttachToContainingCollectionCore( ColumnCollection columnCollection )
-    {
-      m_containingCollection = columnCollection;
-      this.NotifyDataGridControlChanged();
-
-      this.RealizedContainersRequested += m_containingCollection.OnRealizedContainersRequested;
-      this.ActualWidthChanged += m_containingCollection.OnActualWidthChanged;
-      this.DistinctValuesRequested += columnCollection.OnDistinctValuesRequested;
-
-      if( m_isMainColumn.HasValue )
-      {
-        if( m_isMainColumn.Value )
-        {
-          ColumnBase oldMainColumn = columnCollection.MainColumn;
-          columnCollection.MainColumn = this;
-
-          if( oldMainColumn != null )
-          {
-            oldMainColumn.OnPropertyChanged( new PropertyChangedEventArgs( "IsMainColumn" ) );
-          }
-          // The PropertyChanged of this instance has already been fired before it was added to the collection.
-        }
-
-        m_isMainColumn = null;
-      }
-      else
-      {
-        if( columnCollection.Count == 0 )
-        {
-          this.SetIsMainColumnInternal( true );
-        }
-      }
-    }
-
     internal void DetachFromContainingCollection()
     {
       if( m_containingCollection == null )
@@ -1645,61 +1677,13 @@ namespace Xceed.Wpf.DataGrid
       this.DetachFromContainingCollectionCore();
     }
 
-    internal void DetachFromContainingCollectionCore()
-    {
-      this.RealizedContainersRequested -= m_containingCollection.OnRealizedContainersRequested;
-      this.ActualWidthChanged -= m_containingCollection.OnActualWidthChanged;
-      this.DistinctValuesRequested -= m_containingCollection.OnDistinctValuesRequested;
-
-      if( this == m_containingCollection.MainColumn )
-        m_containingCollection.MainColumn = null;
-
-      m_containingCollection = null;
-      this.NotifyDataGridControlChanged();
-    }
-
     internal void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs e )
     {
-      if( this.DistinctValuesRequested != null )
-        this.DistinctValuesRequested( this, e );
-    }
-
-    internal bool GetIsSettingFixedColumnCount()
-    {
-      var detailConfiguration = this.ParentDetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        return detailConfiguration.IsSettingFixedColumnCount;
-      }
-
-      return this.DataGridControl.DataGridContext.IsSettingFixedColumnCount;
-    }
-
-    internal int GetFixedColumnCount()
-    {
-      var detailConfiguration = this.ParentDetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        return ( int )TableView.GetFixedColumnCount( detailConfiguration );
-      }
-
-      return ( int )TableView.GetFixedColumnCount( this.DataGridControl.DataGridContext );
-    }
-
-    internal void SetFixedColumnCountInfo( FixedColumnUpdateType updateType )
-    {
-      FixedColumnCountInfoEventArgs infoEventArgs = new FixedColumnCountInfoEventArgs( this, updateType );
-
-      var detailConfiguration = this.ParentDetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.RaiseFixedColumnCountChanged( infoEventArgs );
+      var handler = this.DistinctValuesRequested;
+      if( handler == null )
         return;
-      }
 
-      TableViewColumnVirtualizationManagerBase columnVirtualizationManager =
-                                         this.DataGridControl.DataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-      columnVirtualizationManager.UpdateFixedColumnCountInfo( infoEventArgs );
+      handler.Invoke( this, e );
     }
 
     internal CultureInfo GetCulture( CultureInfo value )
@@ -1719,6 +1703,21 @@ namespace Xceed.Wpf.DataGrid
       return CultureInfo.CurrentCulture;
     }
 
+    private void AttachToContainingCollectionCore( ColumnCollection columnCollection )
+    {
+      m_containingCollection = columnCollection;
+      m_isMainColumn = null;
+
+      this.NotifyDataGridControlChanged();
+    }
+
+    private void DetachFromContainingCollectionCore()
+    {
+      m_containingCollection = null;
+
+      this.NotifyDataGridControlChanged();
+    }
+
     private double GetElementCollectionFittedWidth( IEnumerable collection )
     {
       if( collection == null )
@@ -1730,12 +1729,10 @@ namespace Xceed.Wpf.DataGrid
 
       foreach( object item in collection )
       {
-        Row row = item as Row;
-
+        var row = item as Row;
         if( row == null )
         {
-          HeaderFooterItem headerFooter = item as HeaderFooterItem;
-
+          var headerFooter = item as HeaderFooterItem;
           if( headerFooter != null )
           {
             row = headerFooter.AsVisual() as Row;
@@ -1754,25 +1751,28 @@ namespace Xceed.Wpf.DataGrid
 
     private bool TryGetCellFittedWidth( Row row, out double fittedWidth )
     {
-      fittedWidth = -1;
+      fittedWidth = -1d;
 
       if( row == null )
         return false;
 
       Cell cell;
-      CellCollection cells = row.Cells;
-      VirtualizingCellCollection virtualCells = cells as VirtualizingCellCollection;
+      var cells = row.Cells;
+      var virtualCells = cells as VirtualizingCellCollection;
       bool releaseCell = false;
 
       if( virtualCells != null )
       {
-        if( !virtualCells.TryGetCell( this, out cell ) )
+        if( !virtualCells.TryGetBindedCell( this, out cell ) )
         {
           releaseCell = true;
           cell = virtualCells[ this ];
 
-          Debug.Assert( cell != null );
+          if( cell == null )
+            return false;
 
+          // A created cell doesn't have a template applied yet.
+          // The call to Cell.GetFittedWidth will fail unless we force the creation of the child element by measuring the cell.
           if( !cell.IsMeasureValid )
           {
             cell.Measure( Size.Empty );
@@ -1787,8 +1787,7 @@ namespace Xceed.Wpf.DataGrid
       Debug.Assert( cell != null );
       fittedWidth = cell.GetFittedWidth();
 
-      // A cell that was created or recycled to calculate the fitted width must be released
-      // in order to minimize the number of cells created overall.
+      // A cell that was created or recycled to calculate the fitted width must be released in order to minimize the number of cells created overall.
       if( releaseCell )
       {
         Debug.Assert( virtualCells != null );
@@ -1798,89 +1797,37 @@ namespace Xceed.Wpf.DataGrid
       return true;
     }
 
-    private void SetIsSettingFixedColumnCount()
-    {
-      var detailConfiguration = this.ParentDetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.IsSettingFixedColumnCount = true;
-        return;
-      }
-
-      this.DataGridControl.DataGridContext.IsSettingFixedColumnCount = true;
-    }
-
-    private void SetFixedColumnCountInfo()
-    {
-      FixedColumnUpdateType updateType;
-      if( this.Visible )
-      {
-        updateType = FixedColumnUpdateType.Show;
-      }
-      else
-      {
-        updateType = FixedColumnUpdateType.Hide;
-      }
+    #region INotifyPropertyChanged Members
 
-      this.SetFixedColumnCountInfo( updateType );
-    }
+    public event PropertyChangedEventHandler PropertyChanged;
 
-    private static void OnCellContentStringFormatChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
     {
-      ColumnBase column = ( ColumnBase )sender;
-
-      if( string.IsNullOrEmpty( ( string )e.OldValue ) && string.IsNullOrEmpty( ( string )e.NewValue ) )
+      var handler = this.PropertyChanged;
+      if( handler == null )
         return;
 
-      if( column.CellContentStringFormatChanged != null )
-      {
-        column.CellContentStringFormatChanged( sender, EventArgs.Empty );
-      }
+      Debug.Assert( e != null );
+      handler.Invoke( this, e );
     }
 
-    private static void OnCellContentTemplateChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( ColumnBase )sender;
-
-      //Make sure cells pertaining to this group are assigned to the correct recycle bin.
-      //The recycle bin based on the previous key value will be clean up later by the FixedCellPanel, if no other column uses it.
-      column.ResetDefaultCellRecyclingGroup();
+    #endregion
 
-      var handler = column.CellContentTemplateChanged;
-      if( handler != null )
-      {
-        handler.Invoke( column, EventArgs.Empty );
-      }
-    }
+    #region IWeakEventListener Members
 
-    private static void OnCellContentTemplateSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      var column = ( ColumnBase )sender;
-      var handler = column.CellContentTemplateChanged;
-
-      if( handler != null )
-      {
-        handler.Invoke( column, EventArgs.Empty );
-      }
+      return this.OnReceiveWeakEvent( managerType, sender, e );
     }
 
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    #endregion INotifyPropertyChanged Members
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       return false;
     }
 
     #endregion
 
-    private ColumnCollection m_containingCollection; // = null
-    private CellState m_currentRowInEditionCellState;
+    #region CellRecyclingGroupKey Private Class
 
     private sealed class CellRecyclingGroupKey
     {
@@ -1904,7 +1851,7 @@ namespace Xceed.Wpf.DataGrid
 
       public override bool Equals( object obj )
       {
-        CellRecyclingGroupKey key = obj as CellRecyclingGroupKey;
+        var key = obj as CellRecyclingGroupKey;
         if( key == null )
           return false;
 
@@ -1920,5 +1867,7 @@ namespace Xceed.Wpf.DataGrid
       private readonly DataTemplate m_contentTemplate;
       private readonly Type m_dataType;
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
index a265445e..e599683f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
@@ -15,28 +15,30 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Windows.Threading;
-using System.Threading;
+using System.Diagnostics;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
-  public class ColumnCollection : ObservableCollection<ColumnBase>
+  public class ColumnCollection : ObservableColumnCollection
   {
+    #region Static Fields
+
+    internal static readonly string MainColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnCollection c ) => c.MainColumn );
+
+    #endregion
+
 
     internal ColumnCollection( DataGridControl dataGridControl, DetailConfiguration parentDetailConfiguration )
-      : base()
     {
-      this.DataGridControl = dataGridControl;
-      this.ParentDetailConfiguration = parentDetailConfiguration;
+      m_dataGridControl = dataGridControl;
+      m_parentDetailConfiguration = parentDetailConfiguration;
     }
 
     #region MainColumn Property
 
-    public ColumnBase MainColumn
+    public virtual ColumnBase MainColumn
     {
       get
       {
@@ -44,31 +46,37 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( m_mainColumn == value )
+        if( value == m_mainColumn )
           return;
 
-        m_mainColumn = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "MainColumn" ) );
-      }
-    }
+        if( ( value != null ) && !this.Contains( value ) )
+          throw new ArgumentException( "The column was not found in the collection." );
 
-    private ColumnBase m_mainColumn;
+        using( this.DeferColumnsUpdate() )
+        {
+          var oldMainColumn = m_mainColumn;
+          m_mainColumn = value;
 
-    #endregion
+          if( m_mainColumn != null )
+          {
+            m_mainColumn.RaiseIsMainColumnChanged();
+          }
 
-    #region FieldNameToColumnDictionary Property
+          if( oldMainColumn != null )
+          {
+            oldMainColumn.RaiseIsMainColumnChanged();
+          }
+        }
 
-    internal Dictionary<string, ColumnBase> FieldNameToColumnDictionary
-    {
-      get
-      {
-        return m_fieldNameToColumns;
+        this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnCollection.MainColumnPropertyName ) );
       }
     }
 
-    #endregion FieldNameToColumnDictionary Property
+    private ColumnBase m_mainColumn;
 
-    #region DataGridControl Property
+    #endregion
+
+    #region DataGridControl Internal Property
 
     internal DataGridControl DataGridControl
     {
@@ -78,9 +86,12 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
+        if( value == m_dataGridControl )
+          return;
+
         m_dataGridControl = value;
 
-        foreach( ColumnBase column in this )
+        foreach( var column in this )
         {
           column.NotifyDataGridControlChanged();
         }
@@ -89,412 +100,190 @@ namespace Xceed.Wpf.DataGrid
 
     private DataGridControl m_dataGridControl;
 
-    #endregion DataGridControl Property
+    #endregion
 
-    #region ParentDetailConfiguration Property
+    #region ParentDetailConfiguration Internal Property
 
     internal DetailConfiguration ParentDetailConfiguration
-    {
-      get;
-      set;
-    }
-
-    #endregion ParentDetailConfiguration Property
-
-    #region ProcessingVisibleColumnsUpdate Property
-
-    internal AutoResetFlag ProcessingVisibleColumnsUpdate
     {
       get
       {
-        return m_processingVisibleColumnsUpdate;
+        return m_parentDetailConfiguration;
       }
-    }
-
-    private readonly AutoResetFlag m_processingVisibleColumnsUpdate = AutoResetFlagFactory.Create();
-
-    #endregion
-
-    public ColumnBase this[ string fieldName ]
-    {
-      get
+      set
       {
-        ColumnBase column = null;
-
-        m_fieldNameToColumns.TryGetValue( fieldName, out column );
-
-        return column;
+        m_parentDetailConfiguration = value;
       }
     }
 
-    #region IsDeferVisibleColumnsUpdate Internal Property
-
-    internal bool IsDeferVisibleColumnsUpdate
-    {
-      get
-      {
-        return ( m_deferVisibleColumnsUpdateCount > 0 );
-      }
-    }
+    private DetailConfiguration m_parentDetailConfiguration;
 
     #endregion
 
-    public IDisposable DeferVisibleColumnsUpdate()
-    {
-      return new DeferedColumnsVisibleUpdateDisposable( this );
-    }
+    #region RealizedContainersRequested Internal Event
 
-    protected override void RemoveItem( int index )
+    internal event RealizedContainersRequestedEventHandler RealizedContainersRequested;
+
+    private void OnRealizedContainersRequested( RealizedContainersRequestedEventArgs e )
     {
-      ColumnBase column = this[ index ];
+      var handler = this.RealizedContainersRequested;
+      if( handler == null )
+        return;
 
-      if( column != null )
-      {
-        this.UnregisterColumnChangedEvent( column );
+      handler.Invoke( this, e );
+    }
 
-        column.DetachFromContainingCollection();
+    #endregion
 
-        m_fieldNameToColumns.Remove( column.FieldName );
-      }
+    #region DistinctValuesRequested Internal Event
 
-      base.RemoveItem( index );
-    }
+    internal event DistinctValuesRequestedEventHandler DistinctValuesRequested;
 
-    protected override void InsertItem( int index, ColumnBase item )
+    private void OnDistinctValuesRequested( DistinctValuesRequestedEventArgs e )
     {
-      if( item != null )
-      {
-        if( ( string.IsNullOrEmpty( item.FieldName ) == true ) && ( !DesignerProperties.GetIsInDesignMode( item ) ) )
-          throw new ArgumentException( "A column must have a fieldname.", "item" );
-
-        if( m_fieldNameToColumns.ContainsKey( item.FieldName ) )
-          throw new DataGridException( "A column with same field name already exists in collection." );
+      var handler = this.DistinctValuesRequested;
+      if( handler == null )
+        return;
 
-        m_fieldNameToColumns.Add( item.FieldName, item );
+      handler.Invoke( this, e );
+    }
 
-        item.AttachToContainingCollection( this );
+    #endregion
 
-        this.RegisterColumnChangedEvent( item );
-      }
+    #region ActualWidthChanged Internal Event
 
-      base.InsertItem( index, item );
-    }
+    internal event ColumnActualWidthChangedEventHandler ActualWidthChanged;
 
-    protected override void ClearItems()
+    private void OnActualWidthChanged( ColumnActualWidthChangedEventArgs e )
     {
-      foreach( ColumnBase column in this )
-      {
-        this.UnregisterColumnChangedEvent( column );
-
-        column.DetachFromContainingCollection();
-      }
-
-      m_fieldNameToColumns.Clear();
+      var handler = this.ActualWidthChanged;
+      if( handler == null )
+        return;
 
-      base.ClearItems();
+      handler.Invoke( this, e );
     }
 
-    protected override void SetItem( int index, ColumnBase item )
-    {
-      if( ( item != null ) && ( string.IsNullOrEmpty( item.FieldName ) == true ) )
-        throw new ArgumentException( "A column must have a fieldname.", "item" );
+    #endregion
 
-      if( m_fieldNameToColumns.ContainsKey( item.FieldName ) )
-        throw new DataGridException( "A column with same field name already exists in collection." );
+    protected override void OnItemAdding( ColumnBase item )
+    {
+      base.OnItemAdding( item );
 
-      ColumnBase column = this[ index ];
+      Debug.Assert( item != null );
 
-      if( ( column != null ) && ( column != item ) )
+      if( item.IsMainColumn )
       {
-        this.UnregisterColumnChangedEvent( column );
-
-        column.DetachFromContainingCollection();
-
-        m_fieldNameToColumns.Remove( column.FieldName );
+        m_nextMainColumn = item;
       }
 
-      if( ( item != null ) && ( column != item ) )
-      {
-        m_fieldNameToColumns.Add( item.FieldName, item );
-
-        item.AttachToContainingCollection( this );
+      item.AttachToContainingCollection( this );
 
-        this.RegisterColumnChangedEvent( item );
-      }
-
-      base.SetItem( index, item );
+      item.PropertyChanged += new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
+      item.RealizedContainersRequested += new RealizedContainersRequestedEventHandler( this.OnColumnRealizedContainersRequested );
+      item.ActualWidthChanged += new ColumnActualWidthChangedEventHandler( this.OnColumnActualWidthChanged );
+      item.DistinctValuesRequested += new DistinctValuesRequestedEventHandler( this.OnColumnDistinctValuesRequested );
     }
 
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
+    protected override void OnItemAdded( ColumnBase item )
     {
-      if( ( m_columnAdditionMessagesDeferedCount > 0 ) && ( e.Action == NotifyCollectionChangedAction.Add ) && ( e.NewStartingIndex == ( this.Count - e.NewItems.Count ) ) )
-      {
-        if( m_deferedColumnAdditionMessageStartIndex == -1 )
-        {
-          m_deferedColumnAdditionMessageStartIndex = e.NewStartingIndex;
-        }
-
-        foreach( object item in e.NewItems )
-        {
-          m_deferedColumns.Add( ( ColumnBase )item );
-        }
-      }
-      else
-      {
-        base.OnCollectionChanged( e );
-      }
-    }
+      base.OnItemAdded( item );
 
-    internal IDisposable DeferColumnAdditionMessages()
-    {
-      return new DeferedColumnAdditionMessageDisposable( this );
+      this.UpdateMainColumn();
     }
 
-    internal void NotifyVisibleColumnsUpdating()
+    protected override void OnItemRemoving( ColumnBase item )
     {
-      if( this.VisibleColumnsUpdating != null )
-      {
-        this.VisibleColumnsUpdating( this, EventArgs.Empty );
-      }
-    }
+      Debug.Assert( item != null );
 
-    internal event EventHandler VisibleColumnsUpdating;
+      item.PropertyChanged -= new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
+      item.RealizedContainersRequested -= new RealizedContainersRequestedEventHandler( this.OnColumnRealizedContainersRequested );
+      item.ActualWidthChanged -= new ColumnActualWidthChangedEventHandler( this.OnColumnActualWidthChanged );
+      item.DistinctValuesRequested -= new DistinctValuesRequestedEventHandler( this.OnColumnDistinctValuesRequested );
 
-    internal void DispatchNotifyVisibleColumnsUpdated()
-    {
-      //In all cases, make sure the ColumnVitualizationManager is flaged as outdate, but prevent to make updates to FixedCellPanels right away.
-      this.NotifyVisibleColumnsUpdated( true );
+      item.DetachFromContainingCollection();
 
-      //In all cases, make sure we dipatch an operation to update the FixedCellPanels in case the update is not tiggered by other means (e.g. no scrolling, no DataRow in the grid).
-      if( m_visibleColumnsUpdatedDispatcherOperation == null && m_dataGridControl != null )
-      {
-        ////# Will be null at first in the case of a detail, so process directly
-
-        //This permits less updates = better performance.
-        m_visibleColumnsUpdatedDispatcherOperation =
-          m_dataGridControl.Dispatcher.BeginInvoke( DispatcherPriority.Render, new Action<bool>( this.NotifyVisibleColumnsUpdated ), false );
-      }
+      base.OnItemRemoving( item );
     }
 
-    internal event EventHandler VisibleColumnsUpdated;
-
-    internal void OnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs e )
+    protected override void OnItemRemoved( ColumnBase item )
     {
-      if( this.RealizedContainersRequested != null )
-      {
-        this.RealizedContainersRequested( this, e );
-      }
-    }
+      base.OnItemRemoved( item );
 
-    internal event RealizedContainersRequestedEventHandler RealizedContainersRequested;
+      this.UpdateMainColumn();
+    }
 
-    internal void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs e )
+    private void UpdateMainColumn()
     {
-      if( this.DistinctValuesRequested != null )
+      switch( this.Count )
       {
-        this.DistinctValuesRequested( this, e );
-      }
-    }
+        case 0:
+          this.MainColumn = null;
+          break;
 
-    internal event DistinctValuesRequestedEventHandler DistinctValuesRequested;
+        case 1:
+          this.MainColumn = this[ 0 ];
+          break;
 
-    internal void OnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs e )
-    {
-      if( this.ActualWidthChanged != null )
-      {
-        this.ActualWidthChanged( this, e );
+        default:
+          {
+            var column = m_nextMainColumn ?? m_mainColumn;
+
+            m_nextMainColumn = null;
+
+            if( ( column != null ) && this.Contains( column ) )
+            {
+              this.MainColumn = column;
+            }
+            else
+            {
+              this.MainColumn = null;
+            }
+          }
+          break;
       }
     }
 
-    internal event ColumnActualWidthChangedHandler ActualWidthChanged;
-
-    internal event EventHandler ColumnVisibilityChanging;
-    internal event EventHandler ColumnVisibilityChanged;
-
-    private void RegisterColumnChangedEvent( ColumnBase column )
+    private IDisposable DeferColumnsUpdate()
     {
-      column.PropertyChanged += new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
-      column.TitleChanged += new EventHandler( this.OnColumnValueChanged );
-      column.VisiblePositionChanging += new EventHandler( this.OnColumnVisibilityChanging );
-      column.VisiblePositionChanged += new EventHandler( this.OnColumnValueChanged );
-      column.VisiblePositionChanged += new EventHandler( this.OnColumnVisibilityChanged );
-      column.VisibleChanged += new EventHandler( this.OnColumnVisibilityChanged );
-    }
+      if( m_parentDetailConfiguration != null )
+        return m_parentDetailConfiguration.DeferColumnsUpdate();
 
-    private void UnregisterColumnChangedEvent( ColumnBase column )
-    {
-      column.PropertyChanged -= new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
-      column.TitleChanged -= new EventHandler( this.OnColumnValueChanged );
-      column.VisiblePositionChanging -= new EventHandler( this.OnColumnVisibilityChanging );
-      column.VisiblePositionChanged -= new EventHandler( this.OnColumnValueChanged );
-      column.VisiblePositionChanged -= new EventHandler( this.OnColumnVisibilityChanged );
-      column.VisibleChanged -= new EventHandler( this.OnColumnVisibilityChanged );
-    }
+      if( m_dataGridControl != null )
+        return m_dataGridControl.DeferColumnsUpdate();
 
-    private void OnColumnPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( string.IsNullOrEmpty( e.PropertyName ) || e.PropertyName == "IsMainColumn" )
-      {
-        // The ColumnBase.IsMainColumn property impacts the columns visibility when details are flatten.
-        var dataGridControl = this.DataGridControl;
-        if( ( dataGridControl != null ) && ( dataGridControl.AreDetailsFlatten ) )
-        {
-          this.OnColumnVisibilityChanged( sender, EventArgs.Empty );
-        }
-      }
+      return new EmptyDisposable();
     }
 
-    private void OnColumnVisibilityChanging( object sender, EventArgs e )
+    private void OnColumnPropertyChanged( object sender, PropertyChangedEventArgs e )
     {
-      if( this.ColumnVisibilityChanging != null )
-      {
-        this.ColumnVisibilityChanging( this, new WrappedEventEventArgs( sender, e ) );
-      }
     }
 
-    private void OnColumnVisibilityChanged( object sender, EventArgs e )
+    private void OnColumnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs e )
     {
-      if( this.ColumnVisibilityChanged != null )
-      {
-        this.ColumnVisibilityChanged( this, new WrappedEventEventArgs( sender, e ) );
-      }
+      this.OnRealizedContainersRequested( e );
     }
 
-    private void OnColumnValueChanged( object sender, EventArgs e )
+    private void OnColumnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs e )
     {
-      ColumnBase column = ( ColumnBase )sender;
+      this.OnDistinctValuesRequested( e );
     }
 
-    private void NotifyVisibleColumnsUpdated( bool onlyIncrementFlag )
+    private void OnColumnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs e )
     {
-      if( this.VisibleColumnsUpdated != null )
-      {
-        this.VisibleColumnsUpdated( this, new VisibleColumnsUpdatedEventArgs( onlyIncrementFlag ) );
-      }
-
-      //If only updating the flag, don't reset the DispatcherOperation, since if it is still alive, another call will be made which will reset it.
-      if( onlyIncrementFlag )
-        return;
-
-      m_visibleColumnsUpdatedDispatcherOperation = null;
+      this.OnActualWidthChanged( e );
     }
 
-    private int m_columnAdditionMessagesDeferedCount = 0;
-    private int m_deferVisibleColumnsUpdateCount = 0;
-    private int m_deferedColumnAdditionMessageStartIndex = -1;
-    private List<ColumnBase> m_deferedColumns = new List<ColumnBase>();
-    private Dictionary<string, ColumnBase> m_fieldNameToColumns = new Dictionary<string, ColumnBase>(); // To optimize indexing speed for FieldName
-    private DispatcherOperation m_visibleColumnsUpdatedDispatcherOperation;
-
-    private sealed class DeferedColumnAdditionMessageDisposable : IDisposable
-    {
-      public DeferedColumnAdditionMessageDisposable( ColumnCollection columns )
-      {
-        if( columns == null )
-          throw new ArgumentNullException( "columns" );
-
-        m_columns = columns;
-
-        m_columns.m_columnAdditionMessagesDeferedCount++;
-      }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      #endregion
-
-      private void Dispose( bool disposing )
-      {
-        m_columns.m_columnAdditionMessagesDeferedCount--;
-
-        if( m_columns.m_columnAdditionMessagesDeferedCount == 0 )
-        {
-          if( m_columns.m_deferedColumns.Count > 0 )
-          {
-            m_columns.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, m_columns.m_deferedColumns, m_columns.m_deferedColumnAdditionMessageStartIndex ) );
-          }
+    private ColumnBase m_nextMainColumn; //null
 
-          m_columns.m_deferedColumnAdditionMessageStartIndex = -1;
-          m_columns.m_deferedColumns.Clear();
-        }
-      }
+    #region EmptyDisposable Private Class
 
-      ~DeferedColumnAdditionMessageDisposable()
-      {
-        this.Dispose( false );
-      }
-
-      private ColumnCollection m_columns; // = null
-    }
-
-    private sealed class DeferedColumnsVisibleUpdateDisposable : IDisposable
+    private sealed class EmptyDisposable : IDisposable
     {
-      public DeferedColumnsVisibleUpdateDisposable( ColumnCollection columns )
+      void IDisposable.Dispose()
       {
-        if( columns == null )
-          throw new ArgumentNullException( "columns" );
-
-        m_columns = columns;
-
-        Interlocked.Increment( ref m_columns.m_deferVisibleColumnsUpdateCount );
       }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      #endregion
-
-      private void Dispose( bool disposing )
-      {
-        if( Interlocked.Decrement( ref m_columns.m_deferVisibleColumnsUpdateCount ) != 0 )
-          return;
-
-        m_columns.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-      }
-
-      ~DeferedColumnsVisibleUpdateDisposable()
-      {
-        this.Dispose( false );
-      }
-
-      private ColumnCollection m_columns; // = null
     }
 
-    internal class WrappedEventEventArgs : EventArgs
-    {
-      public WrappedEventEventArgs( object sender, EventArgs eventArgs )
-      {
-        if( sender == null )
-          throw new ArgumentNullException( "sender" );
-
-        if( eventArgs == null )
-          throw new ArgumentNullException( "eventArgs" );
-
-        this.WrappedSender = sender;
-        this.WrappedEventArgs = eventArgs;
-      }
-
-      public object WrappedSender
-      {
-        get;
-        private set;
-      }
-
-      public object WrappedEventArgs
-      {
-        get;
-        private set;
-      }
-    }
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs
new file mode 100644
index 00000000..0406cdc6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs
@@ -0,0 +1,2916 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+using Xceed.Utils.Wpf;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class ColumnHierarchyManager : IWeakEventListener
+  {
+    internal ColumnHierarchyManager( ColumnCollection columns)
+    {
+      if( columns == null )
+        throw new ArgumentNullException( "columns" );
+
+      m_columns = columns;
+      m_visibleColumns = new ReadOnlyColumnCollection( new ObservableColumnCollection() );
+      m_columnsByVisiblePosition = new HashedLinkedList<ColumnBase>();
+
+      m_model.LayoutChanging += new EventHandler<ColumnHierarchyModel.LayoutChangingEventArgs>( this.OnViewLayoutChanging );
+      m_model.LayoutChanged += new EventHandler<ColumnHierarchyModel.LayoutChangedEventArgs>( this.OnViewLayoutChanged );
+      m_model.StatusChanged += new EventHandler<ColumnHierarchyModel.StatusChangedEventArgs>( this.OnViewStatusChanged );
+    }
+
+    #region Columns Property
+
+    internal ColumnCollection Columns
+    {
+      get
+      {
+        return m_columns;
+      }
+    }
+
+    private readonly ColumnCollection m_columns;
+
+    #endregion
+
+    #region VisibleColumns Property
+
+    internal ReadOnlyColumnCollection VisibleColumns
+    {
+      get
+      {
+        return m_visibleColumns;
+      }
+    }
+
+    private readonly ReadOnlyColumnCollection m_visibleColumns;
+
+    #endregion
+
+    #region ColumnsByVisiblePosition Property
+
+    internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
+    {
+      get
+      {
+        return m_columnsByVisiblePosition;
+      }
+    }
+
+    private readonly HashedLinkedList<ColumnBase> m_columnsByVisiblePosition;
+
+    #endregion
+
+    #region IsUpdateDeferred Property
+
+    internal bool IsUpdateDeferred
+    {
+      get
+      {
+        lock( this.SyncRoot )
+        {
+          return ( m_deferUpdateCount != 0 );
+        }
+      }
+    }
+
+    #endregion
+
+    #region SyncRoot Private Property
+
+    private object SyncRoot
+    {
+      get
+      {
+        return m_model;
+      }
+    }
+
+    #endregion
+
+    #region LayoutChanging Event
+
+    internal event EventHandler LayoutChanging;
+
+    private void OnLayoutChanging()
+    {
+      var handler = this.LayoutChanging;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
+    }
+
+    #endregion
+
+    #region LayoutChanged Event
+
+    internal event EventHandler LayoutChanged;
+
+    private void OnLayoutChanged()
+    {
+      var handler = this.LayoutChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
+    }
+
+    #endregion
+
+    internal void Initialize( DataGridControl dataGridControl )
+    {
+      if( dataGridControl == null )
+        throw new ArgumentNullException( "dataGridControl" );
+
+      if( m_dataGridControl == dataGridControl )
+        return;
+
+      if( m_dataGridControl != null )
+        throw new InvalidOperationException( "The current object is already initialized." );
+
+      m_dataGridControl = dataGridControl;
+      m_columns.DataGridControl = dataGridControl;
+
+      this.PrepareInitialLayout();
+    }
+
+    internal void Clear()
+    {
+      if( m_dataGridControl == null )
+        return;
+
+      this.ClearLayout();
+
+      m_columns.DataGridControl = null;
+
+      m_dataGridControl = null;
+      m_desiredFixedColumnCount = null;
+      m_synchronizeChildColumnNamesWithChildColumns = false;
+    }
+
+    internal IDisposable DeferUpdate()
+    {
+      return this.DeferUpdate( new UpdateOptions() );
+    }
+
+    internal IDisposable DeferUpdate( UpdateOptions options )
+    {
+      return new DeferredDisposable( new DeferUpdateState( this, options ) );
+    }
+
+    internal ILevelMarkers GetLevelMarkersFor( ColumnCollection collection )
+    {
+      if( collection == null )
+        return null;
+
+      var level = int.MinValue;
+
+      if( collection == m_columns )
+      {
+        level = 0;
+      }
+
+      if( ( level < 0 ) || ( level >= m_model.LevelCount ) )
+        return null;
+
+      return this.WrapLevelMarkers( m_model.GetLevelMarkers( level ) );
+    }
+
+    internal IColumnLocation GetColumnLocationFor( ColumnBase column )
+    {
+      return ( IColumnLocation )this.WrapLocation( m_model[ column ] );
+    }
+
+    internal int GetFixedColumnCount()
+    {
+      var levelCount = m_model.LevelCount;
+      if( levelCount == 0 )
+        return 0;
+
+      // Get the top-most level.
+      var markers = m_model.GetLevelMarkers( levelCount - 1 );
+
+      var splitterLocation = markers.Splitter;
+      if( splitterLocation == null )
+        return 0;
+
+      var count = 0;
+      var location = splitterLocation.GetPreviousSiblingOrCousin();
+
+      // Count the number of visibile columns that are located before the splitter.
+      while( location != null )
+      {
+        if( location.Type == LocationType.Column )
+        {
+          var columnLocation = ( ColumnHierarchyModel.IColumnLocation )location;
+          if( columnLocation.Column.Visible )
+          {
+            count++;
+          }
+        }
+
+        location = location.GetPreviousSiblingOrCousin();
+      }
+
+      return count;
+    }
+
+    internal void SetFixedColumnCount( int count )
+    {
+      this.Update( new UpdateOptions( count ) );
+    }
+
+    private static int ConvertLevelToMergedHeaderIndex( int level, int mergedHeaderCount )
+    {
+      if( level <= 0 )
+        throw new ArgumentException( "The level must be greater than or equal to 1.", "level" );
+
+      if( mergedHeaderCount <= 0 )
+        throw new ArgumentException( "The number of merged headers is expected to be greater than or equal to 1.", "mergedHeaderCount" );
+
+      if( level > mergedHeaderCount )
+        throw new ArgumentException( "The level must be less than or equal to the number of merged headers.", "level" );
+
+      return ( mergedHeaderCount - level );
+    }
+
+    private static int ConvertMergedHeaderIndexToLevel( int index, int mergedHeaderCount )
+    {
+      if( index < 0 )
+        throw new ArgumentException( "The index must be greater than or equal to zero.", "index" );
+
+      if( mergedHeaderCount <= 0 )
+        throw new ArgumentException( "The number of merged headers is expected to be greater than or equal to 1.", "mergedHeaderCount" );
+
+      if( index >= mergedHeaderCount )
+        throw new ArgumentException( "The index must be less than the number of merged headers.", "index" );
+
+      return ( mergedHeaderCount - index );
+    }
+
+    private void PrepareInitialLayout()
+    {
+      Debug.Assert( m_model.LevelCount == 0 );
+
+      this.RegisterEvents( m_columns );
+
+      m_model.AddLevel( 0 );
+
+      this.SetColumnsInView( 0 );    
+
+      this.UpdateLevelsInView();
+      this.Update();
+    }
+
+    private void ClearLayout()
+    {
+      for( int i = m_model.LevelCount - 1; i > 0; i-- )
+      {
+        this.RemoveLevelInView( i );
+      }
+
+      Debug.Assert( m_model.LevelCount == 1 );
+
+      foreach( var column in this.GetColumns( 0 ) )
+      {
+        this.UnregisterEvents( column );
+      }
+
+      m_model.RemoveLevel( 0 );
+
+      Debug.Assert( m_model.LevelCount == 0 );
+
+      this.UnregisterEvents( m_columns );
+    }
+
+    private void Update()
+    {
+      this.Update( new UpdateOptions() );
+    }
+
+    private void Update( UpdateOptions options )
+    {
+      lock( this.SyncRoot )
+      {
+        try
+        {
+          // The current object has not been initialized yet.
+          if( m_dataGridControl == null )
+            return;
+
+          // The update is deferred and must not be applied yet.
+          if( m_deferUpdateCount != 0 )
+            return;
+        }
+        finally
+        {
+          if( options.DesiredFixedColumnCount.HasValue )
+          {
+            m_desiredFixedColumnCount = Math.Max( 0, options.DesiredFixedColumnCount.Value );
+          }
+
+          if( !m_synchronizeChildColumnNamesWithChildColumns && ( options.SynchronizeChildColumnNamesWithChildColumns == true ) )
+          {
+            m_synchronizeChildColumnNamesWithChildColumns = true;
+
+            for( int i = m_model.LevelCount - 1; i > 0; i-- )
+            {
+              foreach( var columnLocation in this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( i ) ) )
+              {
+                this.SetPosition( columnLocation, columnLocation.Status.Position.SetChildrenTimestamp( this.GetTimestamp() ) );
+              }
+            }
+
+            this.InvalidateLayout();
+          }
+        }
+      }
+
+      // Prevent reentrancy.
+      if( m_isApplyingChanges.IsSet )
+        return;
+
+      this.UpdateLayout();
+    }
+
+    private void UpdateLayout()
+    {
+      Debug.Assert( !m_isApplyingChanges.IsSet );
+
+      if( ( m_positionVersion == m_modelPositionVersion ) && ( m_visibilityVersion == m_modelVisibilityVersion ) && ( m_layoutVersion == m_modelLayoutVersion ) )
+      {
+        // Nothing has changed, so nothing to do.
+        if( ( !m_desiredFixedColumnCount.HasValue ) || ( m_desiredFixedColumnCount == this.GetFixedColumnCount() ) )
+        {
+          m_desiredFixedColumnCount = null;
+
+          this.ResetTimestamp();
+          return;
+        }
+      }
+
+      this.OnLayoutChanging();
+
+      this.ResetMainColumn();
+
+      while( true )
+      {
+        if( m_positionVersion != m_modelPositionVersion )
+        {
+          m_positionVersion = m_modelPositionVersion;
+          this.ApplyPosition();
+        }
+        else if( m_visibilityVersion != m_modelVisibilityVersion )
+        {
+          m_visibilityVersion = m_modelVisibilityVersion;
+          this.ApplyVisibility();
+        }
+        else if( m_desiredFixedColumnCount.HasValue )
+        {
+          var fixedColumnCount = m_desiredFixedColumnCount.Value;
+          m_desiredFixedColumnCount = null;
+
+          this.ApplyFixedColumnCount( fixedColumnCount );
+        }
+        else if( m_layoutVersion != m_modelLayoutVersion )
+        {
+          m_layoutVersion = m_modelLayoutVersion;
+          this.ApplyLayout();
+        }
+        else
+        {
+          this.ResetTimestamp();
+          break;
+        }
+      }
+
+      Debug.Assert( m_timestamp == 0u );
+      Debug.Assert( !m_desiredFixedColumnCount.HasValue );
+      Debug.Assert( m_positionVersion == m_modelPositionVersion );
+      Debug.Assert( m_visibilityVersion == m_modelVisibilityVersion );
+      Debug.Assert( m_layoutVersion == m_modelLayoutVersion );
+
+      this.OnLayoutChanged();
+    }
+
+    private void ApplyLayout()
+    {
+      if( m_isApplyingChanges.IsSet )
+        throw new InvalidOperationException( "The columns' layout is already being applied." );
+
+      using( m_isApplyingChanges.Set() )
+      {
+        for( int i = m_model.LevelCount - 1; i >= 0; i-- )
+        {
+          this.ApplyColumnsLayoutFromView( i );
+
+          if( i == 0 )
+          {
+            this.SetVisibleColumnsFromView( i, m_visibleColumns, m_columnsByVisiblePosition );
+          }
+        }
+      }
+    }
+
+    private void ApplyPosition()
+    {
+      if( m_isApplyingChanges.IsSet )
+        throw new InvalidOperationException( "The columns' relations are already being applied." );
+
+      var levelCount = m_model.LevelCount;
+      if( levelCount <= 0 )
+        return;
+
+      using( m_isApplyingChanges.Set() )
+      {
+        this.UpdateLevelsInView();
+      }
+    }
+
+    private void ApplyVisibility()
+    {
+      if( m_isApplyingChanges.IsSet )
+        throw new InvalidOperationException( "The columns' visibility is already being applied." );
+
+      var levelCount = m_model.LevelCount;
+      if( levelCount <= 0 )
+        return;
+
+      using( m_isApplyingChanges.Set() )
+      {
+        foreach( var location in this.GetLocationsOnLevel( levelCount - 1 ) )
+        {
+          // We must redo a visibility pass if the layout has changed while applying the visiblity.
+          if( !this.ApplyColumnsVisibilityFromView( location ) )
+            return;
+        }
+      }
+    }
+
+    private void ApplyFixedColumnCount( int count )
+    {
+      Debug.Assert( count >= 0 );
+
+      // There is no level or the splitter is already at the proper location.
+      var levelCount = m_model.LevelCount;
+      if( ( levelCount == 0 ) || ( count == this.GetFixedColumnCount() ) )
+        return;
+
+      // Get the top-most level.
+      var markers = m_model.GetLevelMarkers( levelCount - 1 );
+
+      var startLocation = markers.Start;
+      Debug.Assert( startLocation != null );
+      Debug.Assert( startLocation.Type == LocationType.Start );
+
+      var splitterLocation = markers.Splitter;
+      Debug.Assert( splitterLocation != null );
+      Debug.Assert( splitterLocation.Type == LocationType.Splitter );
+
+      var targetLocation = default( ColumnHierarchyModel.ILocation );
+      var moveBefore = false;
+
+      if( count <= 0 )
+      {
+        targetLocation = startLocation;
+      }
+      else
+      {
+        var remaining = count;
+        var currentLocation = startLocation;
+        var found = false;
+
+        while( !found )
+        {
+          currentLocation = currentLocation.GetNextSiblingOrCousin();
+          if( currentLocation == null )
+            throw new InvalidOperationException( "Unexpected location." );
+
+          switch( currentLocation.Type )
+          {
+            case LocationType.Column:
+              {
+                var column = ( ( ColumnHierarchyModel.IColumnLocation )currentLocation ).Column;
+                Debug.Assert( column != null );
+
+                if( column.Visible )
+                {
+                  remaining--;
+
+                  if( remaining == 0 )
+                  {
+                    targetLocation = currentLocation;
+                    found = true;
+                    break;
+                  }
+                }
+              }
+              break;
+
+            // The splitter cannot be set past the orphan section.
+            case LocationType.Orphan:
+              {
+                targetLocation = currentLocation;
+                moveBefore = true;
+                found = true;
+              }
+              break;
+          }
+        }
+      }
+
+      Debug.Assert( targetLocation != null );
+
+      if( moveBefore )
+      {
+        if( !splitterLocation.CanMoveBefore( targetLocation ) )
+          throw new InvalidOperationException( "The fixed-column splitter cannot be moved." );
+
+        splitterLocation.MoveBefore( targetLocation );
+      }
+      else
+      {
+        if( !splitterLocation.CanMoveAfter( targetLocation ) )
+          throw new InvalidOperationException( "The fixed-column splitter cannot be moved." );
+
+        splitterLocation.MoveAfter( targetLocation );
+      }
+    }
+
+    private void ResetStatus()
+    {
+      if( ( m_timestamp == 0u ) || ( m_model.LevelCount <= 0 ) )
+        return;
+
+      foreach( var location in this.GetLocationsOnLevel( m_model.LevelCount - 1 ) )
+      {
+        this.ResetStatusOnLocation( location );
+      }
+    }
+
+    private void ResetStatusOnLocation( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        return;
+
+      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
+      if( columnLocation != null )
+      {
+        this.SetStatus( columnLocation, new ColumnStatus( ColumnPositionStatus.Default, ColumnVisibilityStatus.Create( columnLocation.Column.Visible ) ) );
+      }
+
+      foreach( var childLocation in this.GetChildLocations( location ) )
+      {
+        this.ResetStatusOnLocation( childLocation );
+      }
+    }
+
+    private void InsertLevelInView( int level )
+    {
+      Debug.Assert( ( level > 0 ) && ( level <= m_model.LevelCount ) );
+
+      m_model.AddLevel( level );
+
+      this.SetColumnsInView( level );
+    }
+
+    private void RemoveLevelInView( int level )
+    {
+      Debug.Assert( ( level > 0 ) && ( level < m_model.LevelCount ) );
+
+      foreach( var location in this.GetLocationsOnLevel( level ) )
+      {
+        var parentColumnLocation = location.GetParent() as ColumnHierarchyModel.IColumnLocation;
+        if( parentColumnLocation != null )
+        {
+          this.UpdateVisibility( parentColumnLocation );
+        }
+
+        var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
+        if( columnLocation != null )
+        {
+          this.UnregisterEvents( columnLocation.Column );
+        }
+      }
+
+      m_model.RemoveLevel( level );
+    }
+
+    private void UpdateLevelsInView()
+    {
+      var levelCount = m_model.LevelCount;
+      if( levelCount == 0 )
+        return;
+
+      if( levelCount > 1 )
+      {
+        var movedLocations = new HashSet<ColumnHierarchyModel.IColumnLocation>();
+        var childLocationsToMove = new Queue<ColumnHierarchyModel.IColumnLocation>();
+        var parentLocationsToInspect = new Queue<ColumnHierarchyModel.IColumnLocation>();
+        var relationsHistory = new List<ParentChildRelationshipSnapshot>[ levelCount ];
+        var relationsHistoryComparer = new ParentChildRelationshipSnapshotComparer();
+
+        for( int i = 0; i < levelCount; i++ )
+        {
+          relationsHistory[ i ] = new List<ParentChildRelationshipSnapshot>();
+
+          foreach( var columnLocation in this.GetColumnsLocation( this.GetLocationsOnLevel( i ) ) )
+          {
+            var positionStatus = columnLocation.Status.Position;
+
+            if( ( positionStatus.ParentTimestamp != 0u ) && ( i < levelCount - 1 ) )
+            {
+              childLocationsToMove.Enqueue( columnLocation );
+            }
+
+            if( ( positionStatus.ChildrenTimestamp != 0u ) && ( i > 0 ) )
+            {
+              parentLocationsToInspect.Enqueue( columnLocation );
+
+              foreach( var childColumnLocation in this.GetColumnsLocation( this.GetChildLocations( columnLocation ) ) )
+              {
+                childLocationsToMove.Enqueue( childColumnLocation );
+              }
+
+              var entry = new ParentChildRelationshipSnapshot( columnLocation, positionStatus.ChildrenTimestamp );
+              var history = relationsHistory[ i ];
+
+              // Insert the entries in a specific order to meet the GetChildColumnLocationDestination method needs.
+              var index = history.BinarySearch( entry, relationsHistoryComparer );
+
+              if( index < 0 )
+              {
+                index = ~index;
+              }
+
+              if( index >= history.Count )
+              {
+                history.Add( entry );
+              }
+              else
+              {
+                history.Insert( index, entry );
+              }
+            }
+          }
+        }
+      }
+
+      var isAFlattenDetail = ( m_columns.ParentDetailConfiguration != null )
+                          && ( m_dataGridControl != null )
+                          && ( m_dataGridControl.AreDetailsFlatten );
+
+      // Reorder the columns on each level.
+      for( int i = 0; i < levelCount; i++ )
+      {
+        // Reorder one of the child level.
+        if( i < levelCount - 1 )
+        {
+          foreach( var parentLocation in this.GetLocationsOnLevel( i + 1 ) )
+          {
+            ColumnLocationOrderer.Reorder( this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( parentLocation ) ).ToList(), !isAFlattenDetail );
+          }
+        }
+        // Reorder the top level.
+        else
+        {
+          ColumnLocationOrderer.Reorder( this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( i ) ).ToList(), !isAFlattenDetail );
+        }
+      }
+    }
+
+    private Tuple<bool, bool> SetColumnsInView( int level )
+    {
+      var columns = m_columns;
+      var addAny = false;
+
+      Debug.Assert( columns != null );
+
+      var columnsToRemove = new HashSet<ColumnBase>( this.GetColumns( level ) );
+
+      // Add the missing columns into the view.
+      foreach( var column in columns )
+      {
+        if( !columnsToRemove.Remove( column ) )
+        {
+          var propagation = PropagationMode.None;
+
+          if( level > 0 )
+          {
+            var visibilitySource = DependencyPropertyHelper.GetValueSource( column, ColumnBase.VisibleProperty );
+
+            propagation = ( visibilitySource.BaseValueSource == BaseValueSource.Default ) ? PropagationMode.BottomUp : PropagationMode.TopDown;
+          }
+
+          this.AddColumnInView( column, propagation, level );
+          addAny = true;
+        }
+      }
+
+      var removedAny = false;
+
+      // Remove the columns that should no longer be in the view.
+      foreach( var column in columnsToRemove )
+      {
+        this.RemoveColumnInView( column );
+        removedAny = true;
+      }
+
+      return new Tuple<bool, bool>( addAny, removedAny );
+    }
+
+    private void ResetMainColumn()
+    {
+      // The main column must only be reset when details are flatten because it impact column positioning.
+      if( ( m_dataGridControl == null ) || !m_dataGridControl.AreDetailsFlatten )
+        return;
+
+      if( m_isApplyingChanges.IsSet )
+        throw new InvalidOperationException( "The columns' relations are already being applied." );
+
+      var levelCount = m_model.LevelCount;
+      if( levelCount <= 0 )
+        return;
+
+      using( m_isApplyingChanges.Set() )
+      {
+        var mainColumn = m_columns.MainColumn;
+        if( mainColumn != null )
+        {
+          // We must not reset the main column if it was set explicitly.
+          var mainColumnLocation = m_model[ mainColumn ];
+          if( ( mainColumnLocation == null ) || ( mainColumnLocation.Status.Position.MainColumnTimestamp != 0u ) )
+            return;
+
+          m_columns.MainColumn = null;
+        }
+      }
+    }
+
+    private ColumnHierarchyModel.IColumnLocation AddColumnInView( ColumnBase column, PropagationMode mode, int level )
+    {
+      Debug.Assert( column != null );
+      Debug.Assert( ( level >= 0 ) && ( level < m_model.LevelCount ) );
+
+      var location = m_model[ column ];
+      if( location == null )
+      {
+        var timestamp = this.GetTimestamp();
+        var visibilityStatus = ColumnVisibilityStatus.Create( column.Visible, mode, timestamp );
+        var positionStatus = ColumnPositionStatus.Default;
+
+        if( level > 0 )
+        {
+          positionStatus = positionStatus.SetChildrenTimestamp( timestamp );
+        }
+
+        switch( DependencyPropertyHelper.GetValueSource( column, ColumnBase.VisiblePositionProperty ).BaseValueSource )
+        {
+          case BaseValueSource.Default:
+          case BaseValueSource.Inherited:
+          case BaseValueSource.Unknown:
+            break;
+
+          default:
+            positionStatus = positionStatus.SetVisiblePositionTimestamp( timestamp );
+            break;
+        }
+
+        var columnStatus = new ColumnStatus( positionStatus, visibilityStatus );
+
+        location = m_model.Add( column, columnStatus, level );
+        Debug.Assert( location != null );
+
+        this.RegisterEvents( column );
+      }
+
+      return location;
+    }
+
+    private void RemoveColumnInView( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+
+      var location = m_model[ column ];
+      if( location == null )
+        return;
+
+      var parentColumnLocation = location.GetParent() as ColumnHierarchyModel.IColumnLocation;
+      if( parentColumnLocation != null )
+      {
+        this.UpdateVisibility( parentColumnLocation );
+      }
+
+      m_model.Remove( column );
+
+      this.UnregisterEvents( column );
+    }
+
+    private ColumnHierarchyModel.IColumnLocation ReplaceColumnInView( ColumnBase oldColumn, ColumnBase newColumn )
+    {
+      Debug.Assert( ( oldColumn != null ) && ( newColumn != null ) );
+
+      var oldColumnLocation = m_model[ oldColumn ];
+      if( ( oldColumn == newColumn ) || ( oldColumnLocation == null ) )
+        return oldColumnLocation;
+
+      var newColumnLocation = m_model[ newColumn ];
+      if( newColumnLocation == null )
+      {
+        newColumnLocation = this.AddColumnInView( newColumn, PropagationMode.BottomUp, oldColumnLocation.Level );
+        Debug.Assert( newColumnLocation != null );
+      }
+      else if( newColumnLocation.Level != oldColumnLocation.Level )
+      {
+        throw new InvalidOperationException( "The replaced column is not on the same level." );
+      }
+
+      Debug.Assert( newColumnLocation.CanMoveAfter( oldColumnLocation ) );
+      newColumnLocation.MoveAfter( oldColumnLocation );
+
+      // Update the location timestamp to keep the column under the parent column.
+      this.SetPosition( newColumnLocation, newColumnLocation.Status.Position.SetLocationTimestamp( this.GetTimestamp() ) );
+      this.SetPosition( newColumnLocation, newColumnLocation.Status.Position.SetDraggableStatusTimestamp( this.GetTimestamp() ) );
+
+      var lastChildColumnLocation = this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( newColumnLocation ) ).FirstOrDefault();
+      var childColumnLocations = this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( oldColumnLocation ) ).ToList();
+
+      // Move the columns under the new column and keep them in the same order.
+      foreach( var childColumnLocation in childColumnLocations )
+      {
+        if( lastChildColumnLocation != null )
+        {
+          Debug.Assert( childColumnLocation.CanMoveAfter( lastChildColumnLocation ) );
+          childColumnLocation.MoveAfter( lastChildColumnLocation );
+        }
+        else
+        {
+          Debug.Assert( childColumnLocation.CanMoveUnder( newColumnLocation ) );
+          childColumnLocation.MoveUnder( newColumnLocation );
+        }
+
+        lastChildColumnLocation = childColumnLocation;
+      }
+
+      // Reserve a timestamp that is going to be used to keep child columns under their new parent column.
+      // We want that timestamp to be of "lower priority" than any visible position timestamp update
+      // on the child columns so a reordering may be done.
+      var locationTimestamp = this.GetTimestamp();
+
+      // Update the timestamps on the transfered child columns to keep them under their new parent column.
+      foreach( var entry in ( from childColumnLocation in childColumnLocations
+                              let positionStatus = childColumnLocation.Status.Position
+                              orderby positionStatus.VisiblePositionTimestamp
+                              select new
+                              {
+                                Location = childColumnLocation,
+                                Status = positionStatus
+                              } ) )
+      {
+        var positionStatus = entry.Status.SetLocationTimestamp( locationTimestamp );
+
+        if( positionStatus.VisiblePositionTimestamp != 0u )
+        {
+          // Since a visible position reordering was scheduled before the parent column was replaced,
+          // we must update the visible position timestamp to apply the reordering in the same order
+          // under the new parent column.
+          positionStatus = positionStatus.SetVisiblePositionTimestamp( this.GetTimestamp() );
+        }
+
+        this.SetPosition( entry.Location, positionStatus );
+      }
+
+      this.RemoveColumnInView( oldColumn );
+
+      return newColumnLocation;
+    }
+
+    private bool MoveChildColumnUnderLocationInView( ColumnHierarchyModel.IColumnLocation location, ColumnHierarchyModel.ILocation pivot )
+    {
+      if( ( location == null ) || ( pivot == null ) )
+        return false;
+
+      // The column is already at the proper location.
+      if( object.Equals( location.GetParent(), pivot ) )
+        return false;
+
+      Debug.Assert( location.CanMoveUnder( pivot ) );
+      location.MoveUnder( pivot );
+
+      var positionStatus = location.Status.Position;
+      if( positionStatus.VisiblePositionTimestamp == 0u )
+      {
+        // Update the child column status to move it at the right place under its new parent location.
+        this.SetPosition( location, positionStatus.SetVisiblePositionTimestamp( this.GetTimestamp() ) );
+      }
+
+      return true;
+    }
+
+    private ColumnHierarchyModel.ILocation GetChildColumnLocationDestination( ColumnHierarchyModel.IColumnLocation location, IList<ParentChildRelationshipSnapshot> relationsHistory )
+    {
+      Debug.Assert( location != null );
+      Debug.Assert( ( location.Level >= 0 ) && ( location.Level < m_model.LevelCount - 1 ) );
+
+
+      var column = location.Column;
+      var positionStatus = location.Status.Position;
+      var orphanLocation = m_model.GetLevelMarkers( location.Level + 1 ).Orphan;
+      Debug.Assert( orphanLocation != null );
+
+      var fallbackParentLocation = location.GetParent();
+      var fallbackTimestamp = 0u;
+
+      // Since the target column wants to be under a specific column (or orphan), we must consider the new parent location
+      // as a possible candidate if it is not one already.
+      if( ( positionStatus.ParentTimestamp != 0u ) || ( positionStatus.LocationTimestamp != 0u ) )
+      {
+        if( positionStatus.ParentTimestamp > positionStatus.LocationTimestamp )
+        {         
+          fallbackParentLocation = orphanLocation;
+          fallbackTimestamp = positionStatus.ParentTimestamp;
+        }
+        else
+        {
+
+          fallbackParentLocation = location.GetParent();
+          fallbackTimestamp = positionStatus.LocationTimestamp;
+
+          Debug.Assert( object.Equals( fallbackParentLocation, location.GetParent() ) );
+        }
+      }
+
+      // Figure out if one of the candidates wants the column.
+      foreach( var relationHistory in relationsHistory )
+      {
+        // Since the fallback parent location wants the column and it has an higher priority than any remaining
+        // candidates, there is no need to look for a candidate.
+        if( relationHistory.Timestamp < fallbackTimestamp )
+          break;
+
+        // Since the fallback location is the candidate and it does not want the child column anymore,
+        // the column should become orphan.
+        if( object.Equals( fallbackParentLocation, relationHistory.Location ) )
+          return orphanLocation;
+      }
+
+      Debug.Assert( fallbackParentLocation != null );
+      return fallbackParentLocation;
+    }
+
+    private void ApplyColumnsLayoutFromView( int level )
+    {
+      var location = this.GetLocationsOnLevelFromFirstToLast( level ).FirstOrDefault();
+      var position = 0;
+
+      while( location != null )
+      {
+        var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
+        if( columnLocation == null )
+        {
+          location = location.GetNextSiblingOrCousin();
+          continue;
+        }
+
+        var parentColumnLocation = columnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
+        var column = columnLocation.Column;
+
+        column.VisiblePosition = position;
+
+        if( position == 0 )
+        {
+          var columns = column.ContainingCollection;
+          if( columns != null )
+          {
+            if( ( columns.MainColumn == null ) || ( ( m_dataGridControl != null ) && m_dataGridControl.AreDetailsFlatten ) )
+            {
+              columns.MainColumn = column;
+            }
+          }
+        }
+
+        location = location.GetNextSiblingOrCousin();
+        position++;
+      }
+    }
+
+    private bool ApplyColumnsVisibilityFromView( ColumnHierarchyModel.ILocation location )
+    {
+      Debug.Assert( location != null );
+
+      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
+      var childrenLocation = this.GetChildLocations( location ).ToList();
+      var visibilityStatus = this.GetStatus( location ).Visibility;
+
+      // Apply visibility changes top-down.
+      if( childrenLocation.Count > 0 )
+      {
+        if( visibilityStatus.Mode == PropagationMode.TopDown )
+        {
+          var childVisibilityStatus = visibilityStatus.SetMode( PropagationMode.TopDown );
+
+          foreach( var childLocation in ( from l in childrenLocation
+                                          let cl = l as ColumnHierarchyModel.IColumnLocation
+                                          where ( cl != null )
+                                             && ( cl.Status.Visibility.Timestamp <= childVisibilityStatus.Timestamp )
+                                          select cl ) )
+          {
+            this.SetVisibility( childLocation, childVisibilityStatus );
+          }
+
+          // The current column will need to query its child column visibility to determine its visibility.
+          if( columnLocation != null )
+          {
+            this.SetVisibility( columnLocation, visibilityStatus.SetMode( PropagationMode.BottomUp ) );
+          }
+        }
+
+        // Apply the child columns visibility.
+        foreach( var childLocation in childrenLocation )
+        {
+          // The layout has been modified while we were updating a child column's visibility.
+          // A new visibility pass must be done.
+          if( !this.ApplyColumnsVisibilityFromView( childLocation ) )
+            return false;
+        }
+
+        // Refresh the status in case it changed while applying the child columns visibility.
+        visibilityStatus = this.GetStatus( location ).Visibility;
+      }
+
+      // Update the current column's visibility based on its children.
+      if( columnLocation != null )
+      {
+        if( childrenLocation.Count > 0 )
+        {
+          // Make sure the child columns visible state is not dirty because a user did some changes while we were updating
+          // the child columns visibility.
+          if( visibilityStatus.Mode == PropagationMode.BottomUp )
+          {
+            // One of the children is not up-to-date.  We need redo the visibility pass.
+            // We return true because the layout is still the same.
+            if( !childrenLocation.All( l => this.GetStatus( l ).Visibility.Mode == PropagationMode.None ) )
+              return true;
+
+            visibilityStatus = ColumnVisibilityStatus.Create( childrenLocation.Any( l => this.GetStatus( l ).Visibility.Visible ) );
+            this.SetVisibility( columnLocation, visibilityStatus );
+          }
+        }
+        else
+        {
+          // A merged column must be hidden when it contains no child column.
+          visibilityStatus = ColumnVisibilityStatus.Create( visibilityStatus.Visible && ( location.Level == 0 ) );
+          this.SetVisibility( columnLocation, visibilityStatus );
+        }
+      }
+
+      // A new visibility pass is required when the visibility needs to be progagated.
+      if( ( visibilityStatus.Mode != PropagationMode.None ) || ( columnLocation == null ) )
+        return true;
+
+      var column = columnLocation.Column;
+      Debug.Assert( column != null );
+
+      // Nothing to do.
+      if( column.Visible == visibilityStatus.Visible )
+        return true;
+
+      // The layout is no longer the same since the columns is now hidden or displayed.
+      this.InvalidateLayout();
+
+      var layoutVersion = m_modelLayoutVersion;
+
+      column.Visible = visibilityStatus.Visible;
+
+      // The versions will be different if the user altered the layout while we were updating the column's visibility.
+      return ( layoutVersion == m_modelLayoutVersion );
+    }
+
+    private void SetVisibleColumnsFromView( int level, ReadOnlyColumnCollection visibleColumns, HashedLinkedList<ColumnBase> columnsByVisiblePosition )
+    {
+      Debug.Assert( visibleColumns != null );
+      Debug.Assert( columnsByVisiblePosition != null );
+
+      using( visibleColumns.DeferNotifications() )
+      {
+        // Prevent a Reset event for nothing.
+        if( visibleColumns.Count != 0 )
+        {
+          visibleColumns.InternalClear();
+        }
+
+        columnsByVisiblePosition.Clear();
+
+        foreach( var column in this.GetColumns( this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( level ) ) ) )
+        {
+          columnsByVisiblePosition.AddLast( column );
+
+          using( column.InhibitVisiblePositionChanging() )
+          {
+            if( column.Visible )
+            {
+              visibleColumns.InternalAdd( column );
+            }
+          }
+        }
+      }
+
+      var firstVisibleColumn = default( ColumnBase );
+      var lastVisibleColumn = default( ColumnBase );
+
+      foreach( var column in columnsByVisiblePosition )
+      {
+        if( column.Visible )
+        {
+          if( firstVisibleColumn == null )
+          {
+            firstVisibleColumn = column;
+          }
+          else
+          {
+            column.ClearIsFirstVisible();
+          }
+
+          if( lastVisibleColumn != null )
+          {
+            lastVisibleColumn.ClearIsLastVisible();
+          }
+
+          lastVisibleColumn = column;
+        }
+        else
+        {
+          column.ClearIsFirstVisible();
+          column.ClearIsLastVisible();
+        }
+      }
+
+      if( firstVisibleColumn != null )
+      {
+        firstVisibleColumn.SetIsFirstVisible( true );
+      }
+
+      if( lastVisibleColumn != null )
+      {
+        lastVisibleColumn.SetIsLastVisible( true );
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevelFromFirstToLast( int level )
+    {
+      var location = ( ColumnHierarchyModel.ILocation )m_model.GetLevelMarkers( level ).Start;
+      Debug.Assert( location.GetPreviousSiblingOrCousin() == null );
+
+      while( location != null )
+      {
+        yield return location;
+
+        location = location.GetNextSiblingOrCousin();
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevelFromLastToFirst( int level )
+    {
+      var location = ( ColumnHierarchyModel.ILocation )m_model.GetLevelMarkers( level ).End;
+      Debug.Assert( location.GetNextSiblingOrCousin() == null );
+
+      while( location != null )
+      {
+        yield return location;
+
+        location = location.GetPreviousSiblingOrCousin();
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevel( int level )
+    {
+      return this.GetLocationsOnLevelFromFirstToLast( level );
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsFromFirstToLast( ColumnHierarchyModel.ILocation parentLocation )
+    {
+      if( parentLocation != null )
+      {
+        var location = parentLocation.GetFirstChild();
+
+        while( location != null )
+        {
+          yield return location;
+
+          location = location.GetNextSibling();
+        }
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsFromLastToFirst( ColumnHierarchyModel.ILocation parentLocation )
+    {
+      return this.GetChildLocationsFromFirstToLast( parentLocation ).Reverse();
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocations( ColumnHierarchyModel.ILocation parentLocation )
+    {
+      return this.GetChildLocationsFromFirstToLast( parentLocation );
+    }
+
+    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetColumnsLocation( IEnumerable<ColumnHierarchyModel.ILocation> locations )
+    {
+      return ( from location in locations
+               let columnLocation = location as ColumnHierarchyModel.IColumnLocation
+               where ( columnLocation != null )
+               select columnLocation );
+    }
+
+    private IEnumerable<ColumnBase> GetColumns( IEnumerable<ColumnHierarchyModel.IColumnLocation> locations )
+    {
+      return ( from location in locations
+               select location.Column );
+    }
+
+    private IEnumerable<ColumnBase> GetColumns( int level )
+    {
+      return this.GetColumns( this.GetColumnsLocation( this.GetLocationsOnLevel( level ) ) );
+    }
+
+    private ColumnStatus GetStatus( ColumnHierarchyModel.ILocation location )
+    {
+      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
+      if( columnLocation != null )
+        return columnLocation.Status;
+
+      return new ColumnStatus( ColumnVisibilityStatus.Create( false ) );
+    }
+
+    private void InvalidateLayout()
+    {
+      unchecked
+      {
+        m_modelLayoutVersion++;
+      }
+    }
+
+    private void InvalidatePosition()
+    {
+      unchecked
+      {
+        m_modelPositionVersion++;
+      }
+    }
+
+    private void InvalidateVisibility()
+    {
+      unchecked
+      {
+        m_modelVisibilityVersion++;
+      }
+    }
+
+    private uint GetTimestamp()
+    {
+      checked
+      {
+        m_timestamp++;
+      }
+
+      return m_timestamp;
+    }
+
+    private void ResetTimestamp()
+    {
+      if( m_timestamp == 0u )
+        return;
+
+      this.ResetStatus();
+
+      // The position and visibility counter are reset here since a call to ResetStatus may update them.  These updates may be safely ignored.
+      m_positionVersion = m_modelPositionVersion;
+      m_visibilityVersion = m_modelVisibilityVersion;
+
+      // The counter is reset to lower the chance of an overflow.
+      m_timestamp = 0u;
+    }
+
+    private void UpdateVisibility( ColumnHierarchyModel.IColumnLocation location )
+    {
+      if( location == null )
+        return;
+
+      // An update is already scheduled.
+      var visibilityStatus = location.Status.Visibility;
+      if( visibilityStatus.Mode != PropagationMode.None )
+        return;
+
+      this.SetVisibility( location, visibilityStatus.SetMode( PropagationMode.BottomUp ) );
+    }
+
+    private void SetVisibility( ColumnHierarchyModel.IColumnLocation location, ColumnVisibilityStatus visibilityStatus )
+    {
+      if( location == null )
+        return;
+
+      var status = location.Status;
+
+      this.SetStatus( location, status.SetVisibilityStatus( visibilityStatus ) );
+    }
+
+    private void SetPosition( ColumnHierarchyModel.IColumnLocation location, ColumnPositionStatus positionStatus )
+    {
+      if( location == null )
+        return;
+
+      var status = location.Status;
+
+      this.SetStatus( location, status.SetPositionStatus( positionStatus ) );
+    }
+
+    private void SetStatus( ColumnHierarchyModel.IColumnLocation location, ColumnStatus status )
+    {
+      if( ( location == null ) || object.Equals( location.Status, status ) )
+        return;
+
+      location.Status = status;
+    }
+
+    private ILevelMarkers WrapLevelMarkers( ColumnHierarchyModel.IMarkers markers )
+    {
+      if( markers == null )
+        return null;
+
+      return new Markers( this, markers );
+    }
+
+    private ILocation WrapLocation( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        return null;
+
+      if( location.Type == LocationType.Column )
+      {
+        Debug.Assert( location is ColumnHierarchyModel.IColumnLocation );
+        return new ColumnLocation( this, ( ColumnHierarchyModel.IColumnLocation )location );
+      }
+
+      return new Location( this, location );
+    }
+
+    private void RegisterEvents( ColumnCollection collection )
+    {
+      Debug.Assert( collection != null );
+
+      CollectionChangedEventManager.AddListener( collection, this );
+      PropertyChangedEventManager.AddListener( collection, this, string.Empty );
+    }
+
+    private void UnregisterEvents( ColumnCollection collection )
+    {
+      Debug.Assert( collection != null );
+
+      CollectionChangedEventManager.RemoveListener( collection, this );
+      PropertyChangedEventManager.RemoveListener( collection, this, string.Empty );
+    }
+
+    private void RegisterEvents( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+      PropertyChangedEventManager.AddListener( column, this, string.Empty );
+    }
+
+    private void UnregisterEvents( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+
+      PropertyChangedEventManager.RemoveListener( column, this, string.Empty );
+    }
+
+    private void OnColumnsChanged( NotifyCollectionChangedEventArgs e )
+    {
+      Debug.Assert( m_model.LevelCount > 0 );
+
+      var resetFixedRegions = false;
+      var resetItemContainerGenerator = false;
+
+      switch( e.Action )
+      {
+        case NotifyCollectionChangedAction.Add:
+          {
+            var items = e.NewItems;
+            if( ( items == null ) || ( items.Count <= 0 ) )
+              return;
+
+            Debug.Assert( m_model.LevelCount > 0 );
+
+            // Only reset the fixed headers/footers if columns are at the master level.
+            resetFixedRegions = ( m_columns.ParentDetailConfiguration == null );
+
+            foreach( ColumnBase column in items )
+            {
+              this.AddColumnInView( column, PropagationMode.None, 0 );
+            }
+          }
+          break;
+
+        case NotifyCollectionChangedAction.Remove:
+          {
+            var items = e.OldItems;
+            if( ( items == null ) || ( items.Count <= 0 ) )
+              return;
+
+            resetItemContainerGenerator = true;
+
+            foreach( ColumnBase column in items )
+            {
+              this.RemoveColumnInView( column );
+            }
+          }
+          break;
+
+        case NotifyCollectionChangedAction.Move:
+          // Nothing to do.
+          return;
+
+        case NotifyCollectionChangedAction.Replace:
+          {
+            var oldItems = e.OldItems;
+            if( ( oldItems == null ) || ( oldItems.Count <= 0 ) )
+              return;
+
+            var newItems = e.NewItems;
+            if( ( newItems == null ) || ( newItems.Count <= 0 ) )
+              return;
+
+            if( newItems.Count != oldItems.Count )
+              throw new NotSupportedException();
+
+            resetItemContainerGenerator = true;
+
+            for( int i = 0; i < oldItems.Count; i++ )
+            {
+              this.ReplaceColumnInView( ( ColumnBase )oldItems[ i ], ( ColumnBase )newItems[ i ] );
+            }
+          }
+          break;
+
+        case NotifyCollectionChangedAction.Reset:
+          {
+            var result = this.SetColumnsInView( 0 );
+            resetFixedRegions = result.Item1;
+            resetItemContainerGenerator = result.Item2;
+          }
+          break;
+
+        default:
+          throw new NotSupportedException();
+      }
+
+      this.Update();
+
+      if( resetFixedRegions )
+      {
+        m_dataGridControl.ResetFixedRegions();
+      }
+      // When a column is removed, we need to clear the generator from every container to avoid problem
+      // when a new instance of a column with the same field name is reinserted.
+      else if( resetItemContainerGenerator )
+      {
+        var itemContainerGenerator = m_dataGridControl.CustomItemContainerGenerator;
+        if( itemContainerGenerator != null )
+        {
+          itemContainerGenerator.RemoveAllAndNotify();
+        }
+
+        // Only reset the fixed headers/footers if columns are at the master level.
+        if( m_columns.ParentDetailConfiguration == null )
+        {
+          m_dataGridControl.ResetFixedRegions();
+        }
+      }
+    }
+
+    private void OnColumnCollectionPropertyChanged( PropertyChangedEventArgs e )
+    {
+      var mayHaveChanged = string.IsNullOrEmpty( e.PropertyName );
+
+      if( mayHaveChanged || ( e.PropertyName == ColumnCollection.MainColumnPropertyName ) )
+      {
+        // We don't want to alter the layout while it is being applied.  Furthermore, it is most likely the
+        // new layout that triggered the change notification.
+        if( !m_isApplyingChanges.IsSet )
+        {
+          // The ColumnCollection.MainColumn (ColumnBase.IsMainColumn) property impacts the columns layout when details are flatten.
+          if( ( m_dataGridControl != null ) && m_dataGridControl.AreDetailsFlatten )
+          {
+            var mainColumn = m_columns.MainColumn;
+            var mainColumnLocation = ( mainColumn != null ) ? m_model[ mainColumn ] : null;
+
+            if( mainColumnLocation != null )
+            {
+              Debug.Assert( mainColumnLocation.Level == 0 );
+
+              var columnsToMove = new Stack<ColumnBase>();
+              columnsToMove.Push( mainColumnLocation.Column );
+
+              var parentLocation = mainColumnLocation.GetParent();
+              while( parentLocation != null )
+              {
+                var parentColumnLocation = parentLocation as ColumnHierarchyModel.IColumnLocation;
+                if( parentColumnLocation == null )
+                {
+                  // The desired main column is under one of the orphan section.
+                  // It is impossible to move the column and its parent to the first location.
+                  columnsToMove.Clear();
+                  break;
+                }
+
+                columnsToMove.Push( parentColumnLocation.Column );
+                parentLocation = parentLocation.GetParent();
+              }
+
+              while( columnsToMove.Count > 0 )
+              {
+                var column = columnsToMove.Pop();
+                var columnLocation = m_model[ column ];
+                Debug.Assert( columnLocation != null );
+
+                var pivotLocation = columnLocation;
+                var previousLocation = ( ColumnHierarchyModel.ILocation )pivotLocation;
+
+                while( previousLocation != null )
+                {
+                  if( previousLocation.Type == LocationType.Column )
+                  {
+                    pivotLocation = ( ColumnHierarchyModel.IColumnLocation )previousLocation;
+                  }
+
+                  previousLocation = previousLocation.GetPreviousSibling();
+                }
+
+                if( !object.Equals( columnLocation, pivotLocation ) )
+                {
+                  Debug.Assert( columnLocation.CanMoveBefore( pivotLocation ) );
+                  columnLocation.MoveBefore( pivotLocation );
+
+                  this.SetPosition( columnLocation, columnLocation.Status.Position.SetLocationTimestamp( this.GetTimestamp() ) );
+                }
+              }
+            }
+          }
+        }
+
+        this.InvalidateLayout();
+        this.Update();
+      }
+    }
+
+    private void OnColumnPropertyChanged( ColumnBase column, PropertyChangedEventArgs e )
+    {
+      var mayHaveChanged = string.IsNullOrEmpty( e.PropertyName );
+      var columnLocation = m_model[ column ];
+      var needUpdate = false;
+
+      Debug.Assert( columnLocation != null );
+
+      if( mayHaveChanged || ( e.PropertyName == ColumnBase.VisibleProperty.Name ) )
+      {
+        if( column.Visible != columnLocation.Status.Visibility.Visible )
+        {
+          this.SetVisibility( columnLocation, ColumnVisibilityStatus.Create( column.Visible, PropagationMode.TopDown, this.GetTimestamp() ) );
+        }
+
+        needUpdate = true;
+      }
+
+      if( mayHaveChanged || ( e.PropertyName == ColumnBase.VisiblePositionProperty.Name ) )
+      {
+        this.SetPosition( columnLocation, columnLocation.Status.Position.SetVisiblePositionTimestamp( this.GetTimestamp() ) );
+
+        // We must invalidate the layout no matter what to make sure the column's visible position is recalculated and reapplied.
+        this.InvalidateLayout();
+
+        needUpdate = true;
+      }
+
+      if( mayHaveChanged || ( e.PropertyName == ColumnBase.DraggableStatusProperty.Name ) )
+      {
+        this.SetPosition( columnLocation, columnLocation.Status.Position.SetDraggableStatusTimestamp( this.GetTimestamp() ) );
+
+        needUpdate = true;
+      }
+
+      if( mayHaveChanged || ( e.PropertyName == ColumnBase.IsMainColumnPropertyName ) )
+      {
+        this.SetPosition( columnLocation, columnLocation.Status.Position.SetMainColumnTimestamp( this.GetTimestamp() ) );
+
+        needUpdate = true;
+      }
+
+      if( mayHaveChanged)
+      {
+        ColumnHierarchyModel parentColumnLocation =  null;
+
+        if( !object.Equals( columnLocation.GetParent(), parentColumnLocation ) )
+        {
+          this.SetPosition( columnLocation, columnLocation.Status.Position.SetParentTimestamp( this.GetTimestamp() ) );
+        }
+
+        needUpdate = true;
+      }
+
+      if( needUpdate )
+      {
+        this.Update();
+      }
+    }
+
+    private void OnViewLayoutChanging( object sender, ColumnHierarchyModel.LayoutChangingEventArgs e )
+    {
+      switch( e.Action )
+      {
+        case ColumnHierarchyModel.LayoutChangingAction.ChangingParent:
+        case ColumnHierarchyModel.LayoutChangingAction.ChangingFirstChild:
+        case ColumnHierarchyModel.LayoutChangingAction.Removing:
+          {
+            var location = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
+            if( location != null )
+            {
+              this.UpdateVisibility( location );
+            }
+          }
+          break;
+      }
+
+      this.InvalidateLayout();
+    }
+
+    private void OnViewLayoutChanged( object sender, ColumnHierarchyModel.LayoutChangedEventArgs e )
+    {
+      switch( e.Action )
+      {
+        case ColumnHierarchyModel.LayoutChangedAction.ParentChanged:
+        case ColumnHierarchyModel.LayoutChangedAction.FirstChildChanged:
+          {
+            var location = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
+            if( location != null )
+            {
+              this.UpdateVisibility( location );
+            }
+          }
+          break;
+      }
+
+      this.InvalidateLayout();
+    }
+
+    private void OnViewStatusChanged( object sender, ColumnHierarchyModel.StatusChangedEventArgs e )
+    {
+      var oldStatus = e.OldValue;
+      var oldVisibilityStatus = oldStatus.Visibility;
+      var oldPositionStatus = oldStatus.Position;
+      var newStatus = e.NewValue;
+      var newVisibilityStatus = newStatus.Visibility;
+      var newPositionStatus = newStatus.Position;
+
+      if( oldVisibilityStatus.Visible != newVisibilityStatus.Visible )
+      {
+        var parentColumnLocation = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
+        if( parentColumnLocation != null )
+        {
+          this.UpdateVisibility( parentColumnLocation );
+        }
+
+        // The layout is no longer the same since a columns is now hidden or displayed.
+        this.InvalidateLayout();
+      }
+
+      if( !object.Equals( oldPositionStatus, newPositionStatus ) )
+      {
+        this.InvalidatePosition();
+      }
+
+      this.InvalidateVisibility();
+    }
+
+    #region IWeakEventListener Members
+
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( CollectionChangedEventManager ) )
+      {
+        Debug.Assert( m_dataGridControl != null, "The current object should be initialized." );
+
+        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
+
+        if( sender == m_columns )
+        {
+          this.OnColumnsChanged( eventArgs );
+        }
+      }
+      else if( managerType == typeof( PropertyChangedEventManager ) )
+      {
+        Debug.Assert( m_dataGridControl != null, "The current object should be initialized." );
+
+        var eventArgs = ( PropertyChangedEventArgs )e;
+
+        if( sender is ColumnBase )
+        {
+          this.OnColumnPropertyChanged( ( ColumnBase )sender, eventArgs );
+        }
+        else if( sender == m_columns )
+        {
+          this.OnColumnCollectionPropertyChanged( eventArgs );
+        }
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
+    }
+
+    #endregion
+
+    private readonly ColumnHierarchyModel m_model = new ColumnHierarchyModel();
+    private readonly AutoResetFlag m_isApplyingChanges = AutoResetFlagFactory.Create( true );
+    private DataGridControl m_dataGridControl;
+    private int m_deferUpdateCount; //0
+    private int? m_desiredFixedColumnCount; //null
+    private bool m_synchronizeChildColumnNamesWithChildColumns; //false
+    private uint m_timestamp; //0
+    private int m_modelLayoutVersion; //0
+    private int m_modelPositionVersion; //0
+    private int m_modelVisibilityVersion; //0
+    private int m_layoutVersion; //0
+    private int m_positionVersion; //0
+    private int m_visibilityVersion; //0
+
+    #region ILevelMarkers Internal Interface
+
+    internal interface ILevelMarkers
+    {
+      ILocation Start
+      {
+        get;
+      }
+
+      ILocation End
+      {
+        get;
+      }
+
+      ILocation Splitter
+      {
+        get;
+      }
+
+      ILocation Orphan
+      {
+        get;
+      }
+    }
+
+    #endregion
+
+    #region ILocation Internal Interface
+
+    internal interface ILocation
+    {
+      LocationType Type
+      {
+        get;
+      }
+
+      ILocation GetParent();
+      ILocation GetFirstChild();
+      ILocation GetLastChild();
+
+      ILocation GetPreviousSibling();
+      ILocation GetNextSibling();
+
+      ILocation GetPreviousSiblingOrCousin();
+      ILocation GetNextSiblingOrCousin();
+
+      bool CanMoveBefore( ILocation location );
+      bool CanMoveAfter( ILocation location );
+      bool CanMoveUnder( ILocation location );
+
+      void MoveBefore( ILocation location );
+      void MoveAfter( ILocation location );
+      void MoveUnder( ILocation location );
+    }
+
+    #endregion
+
+    #region IColumnLocation Internal Interface
+
+    internal interface IColumnLocation : ILocation
+    {
+      ColumnBase Column
+      {
+        get;
+      }
+    }
+
+    #endregion
+
+    #region UpdateOptions Internal Struct
+
+    internal struct UpdateOptions
+    {
+      internal UpdateOptions( int desiredFixedColumnCount )
+      {
+        m_desiredFixedColumnCount = desiredFixedColumnCount;
+        m_synchronizeChildColumnNamesWithChildColumns = default( bool? );
+      }
+
+      internal UpdateOptions( int desiredFixedColumnCount, bool synchronizeChildColumnNamesWithChildColumns )
+      {
+        m_desiredFixedColumnCount = desiredFixedColumnCount;
+        m_synchronizeChildColumnNamesWithChildColumns = synchronizeChildColumnNamesWithChildColumns;
+      }
+
+      internal int? DesiredFixedColumnCount
+      {
+        get
+        {
+          return m_desiredFixedColumnCount;
+        }
+        set
+        {
+          m_desiredFixedColumnCount = value;
+        }
+      }
+
+      internal bool? SynchronizeChildColumnNamesWithChildColumns
+      {
+        get
+        {
+          return m_synchronizeChildColumnNamesWithChildColumns;
+        }
+        set
+        {
+          m_synchronizeChildColumnNamesWithChildColumns = value;
+        }
+      }
+
+      private int? m_desiredFixedColumnCount;
+      private bool? m_synchronizeChildColumnNamesWithChildColumns;
+    }
+
+    #endregion
+
+    #region Markers Private Class
+
+    private sealed class Markers : ILevelMarkers
+    {
+      internal Markers( ColumnHierarchyManager owner, ColumnHierarchyModel.IMarkers markers )
+      {
+        Debug.Assert( owner != null );
+        Debug.Assert( markers != null );
+
+        m_owner = owner;
+        m_markers = markers;
+      }
+
+      public ILocation Start
+      {
+        get
+        {
+          return m_owner.WrapLocation( m_markers.Start );
+        }
+      }
+
+      public ILocation End
+      {
+        get
+        {
+          return m_owner.WrapLocation( m_markers.End );
+        }
+      }
+
+      public ILocation Splitter
+      {
+        get
+        {
+          return m_owner.WrapLocation( m_markers.Splitter );
+        }
+      }
+
+      public ILocation Orphan
+      {
+        get
+        {
+          return m_owner.WrapLocation( m_markers.Orphan );
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_markers.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as Markers;
+        if( target == null )
+          return false;
+
+        return ( m_owner == target.m_owner )
+            && ( object.Equals( m_markers, target.m_markers ) );
+      }
+
+      private readonly ColumnHierarchyManager m_owner;
+      private readonly ColumnHierarchyModel.IMarkers m_markers;
+    }
+
+    #endregion
+
+    #region Location Private Class
+
+    private class Location : ILocation
+    {
+      internal Location( ColumnHierarchyManager owner, ColumnHierarchyModel.ILocation location )
+      {
+        Debug.Assert( owner != null );
+        Debug.Assert( location != null );
+
+        m_owner = owner;
+        m_location = location;
+      }
+
+      protected ColumnHierarchyManager Owner
+      {
+        get
+        {
+          return m_owner;
+        }
+      }
+
+      protected ColumnHierarchyModel.ILocation LocationCache
+      {
+        get
+        {
+          return m_location;
+        }
+      }
+
+      LocationType ILocation.Type
+      {
+        get
+        {
+          return m_location.Type;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_location.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as Location;
+        if( target == null )
+          return false;
+
+        return ( m_owner == target.m_owner )
+            && ( object.Equals( m_location, target.m_location ) );
+      }
+
+      protected virtual void OnMovedBefore( Location location )
+      {
+      }
+
+      protected virtual void OnMovedAfter( Location location )
+      {
+      }
+
+      protected virtual void OnMovedUnder( Location location )
+      {
+      }
+
+      ILocation ILocation.GetParent()
+      {
+        return m_owner.WrapLocation( m_location.GetParent() );
+      }
+
+      ILocation ILocation.GetFirstChild()
+      {
+        return m_owner.WrapLocation( m_location.GetFirstChild() );
+      }
+
+      ILocation ILocation.GetLastChild()
+      {
+        var location = m_location.GetFirstChild();
+        if( location == null )
+          return m_owner.WrapLocation( null );
+
+        var next = location.GetNextSibling();
+        while( next != null )
+        {
+          location = next;
+          next = next.GetNextSibling();
+        }
+
+        return m_owner.WrapLocation( location );
+      }
+
+      ILocation ILocation.GetPreviousSibling()
+      {
+        return m_owner.WrapLocation( m_location.GetPreviousSibling() );
+      }
+
+      ILocation ILocation.GetNextSibling()
+      {
+        return m_owner.WrapLocation( m_location.GetNextSibling() );
+      }
+
+      ILocation ILocation.GetPreviousSiblingOrCousin()
+      {
+        return m_owner.WrapLocation( m_location.GetPreviousSiblingOrCousin() );
+      }
+
+      ILocation ILocation.GetNextSiblingOrCousin()
+      {
+        return m_owner.WrapLocation( m_location.GetNextSiblingOrCousin() );
+      }
+
+      bool ILocation.CanMoveBefore( ILocation location )
+      {
+        var target = location as Location;
+        if( target == null )
+          return false;
+
+        return m_location.CanMoveBefore( target.m_location );
+      }
+
+      bool ILocation.CanMoveAfter( ILocation location )
+      {
+        var target = location as Location;
+        if( target == null )
+          return false;
+
+        return m_location.CanMoveAfter( target.m_location );
+      }
+
+      bool ILocation.CanMoveUnder( ILocation location )
+      {
+        var target = location as Location;
+        if( target == null )
+          return false;
+
+        return m_location.CanMoveUnder( target.m_location );
+      }
+
+      void ILocation.MoveBefore( ILocation location )
+      {
+        Debug.Assert( ( ( ILocation )this ).CanMoveBefore( location ) );
+
+        var pivot = ( Location )location;
+        Debug.Assert( pivot != null );
+
+        m_location.MoveBefore( pivot.m_location );
+        this.OnMovedBefore( pivot );
+
+        m_owner.Update();
+      }
+
+      void ILocation.MoveAfter( ILocation location )
+      {
+        Debug.Assert( ( ( ILocation )this ).CanMoveAfter( location ) );
+
+        var pivot = ( Location )location;
+        Debug.Assert( pivot != null );
+
+        m_location.MoveAfter( pivot.m_location );
+        this.OnMovedAfter( pivot );
+
+        m_owner.Update();
+      }
+
+      void ILocation.MoveUnder( ILocation location )
+      {
+        Debug.Assert( ( ( ILocation )this ).CanMoveUnder( location ) );
+
+        var pivot = ( Location )location;
+        Debug.Assert( pivot != null );
+
+        m_location.MoveUnder( pivot.m_location );
+        this.OnMovedUnder( pivot );
+
+        m_owner.Update();
+      }
+
+      private readonly ColumnHierarchyManager m_owner;
+      private readonly ColumnHierarchyModel.ILocation m_location;
+    }
+
+    #endregion
+
+    #region ColumnLocation Private Class
+
+    private sealed class ColumnLocation : Location, IColumnLocation
+    {
+      internal ColumnLocation( ColumnHierarchyManager owner, ColumnHierarchyModel.IColumnLocation location )
+        : base( owner, location )
+      {
+      }
+
+      private ColumnHierarchyModel.IColumnLocation TargetLocation
+      {
+        get
+        {
+          return ( ColumnHierarchyModel.IColumnLocation )this.LocationCache;
+        }
+      }
+
+      ColumnBase IColumnLocation.Column
+      {
+        get
+        {
+          return this.TargetLocation.Column;
+        }
+      }
+
+      protected override void OnMovedBefore( Location location )
+      {
+        base.OnMovedBefore( location );
+
+        this.InvalidatePosition();
+      }
+
+      protected override void OnMovedAfter( Location location )
+      {
+        base.OnMovedAfter( location );
+
+        this.InvalidatePosition();
+      }
+
+      protected override void OnMovedUnder( Location location )
+      {
+        base.OnMovedUnder( location );
+
+        this.InvalidatePosition();
+      }
+
+      private void InvalidatePosition()
+      {
+        var owner = this.Owner;
+        var columnLocation = this.TargetLocation;
+        var positionStatus = columnLocation.Status.Position.SetLocationTimestamp( owner.GetTimestamp() );
+
+        owner.SetPosition( columnLocation, positionStatus );
+      }
+    }
+
+    #endregion
+
+    #region ColumnHierarchyModel Private Class
+
+    private sealed class ColumnHierarchyModel : ColumnHierarchyModel<ColumnBase, ColumnStatus>
+    {
+    }
+
+    #endregion
+
+    #region ColumnLocationOrderer Private Class
+
+    private static class ColumnLocationOrderer
+    {
+      internal static void Reorder( IList<ColumnHierarchyModel.IColumnLocation> locations, bool useDraggableStatus )
+      {
+        if( ColumnLocationOrderer.IsUnchanged( locations ) )
+          return;
+
+        var lockedFirst = new List<int>();
+        var lockedLast = new List<int>();
+        var unlocked = new List<int>();
+
+        ColumnLocationOrderer.Split( locations, useDraggableStatus, lockedFirst, lockedLast, unlocked );
+
+        var lockedFirstStartIndex = 0;
+        var unlockedStartIndex = lockedFirstStartIndex + lockedFirst.Count;
+        var lockedLastStartIndex = unlockedStartIndex + unlocked.Count;
+
+        ColumnLocationOrderer.Reorder( locations, lockedFirst, lockedFirstStartIndex );
+        ColumnLocationOrderer.Reorder( locations, unlocked, unlockedStartIndex );
+        ColumnLocationOrderer.Reorder( locations, lockedLast, lockedLastStartIndex );
+
+        var newOrder = new int[ locations.Count ];
+
+        lockedFirst.CopyTo( newOrder, lockedFirstStartIndex );
+        unlocked.CopyTo( newOrder, unlockedStartIndex );
+        lockedLast.CopyTo( newOrder, lockedLastStartIndex );
+
+        // Move the locations to get them in the desired order.
+        ColumnLocationOrderer.Apply( locations, newOrder );
+      }
+
+      private static void Reorder( IList<ColumnHierarchyModel.IColumnLocation> locations, IList<int> indexes, int startingPosition )
+      {
+        Debug.Assert( locations != null );
+        Debug.Assert( indexes != null );
+
+        var count = indexes.Count;
+        if( count <= 1 )
+          return;
+
+        var positionsStatus = new ColumnPositionStatus[ count ];
+        var newOrder = new int[ count ];
+        var movableCount = 0;
+        var reorderCount = 0;
+
+        // Do a pass to check if a reordering is required.
+        for( int i = 0; i < positionsStatus.Length; i++ )
+        {
+          var index = indexes[ i ];
+          var positionStatus = locations[ index ].Status.Position;
+
+          positionsStatus[ i ] = positionStatus;
+
+          if( positionStatus.LocationTimestamp > positionStatus.VisiblePositionTimestamp )
+          {
+            // This location is considered fixed and will not be sorted.
+            newOrder[ i ] = index;
+          }
+          else
+          {
+            // This location is considered movable and may be sorted.
+            newOrder[ i ] = -1;
+            movableCount++;
+
+            // This location visible position has changed, so we will need to apply
+            // an algorithm to figure out where to put it.
+            if( positionStatus.VisiblePositionTimestamp != 0u )
+            {
+              reorderCount++;
+            }
+          }
+        }
+
+        // Nothing to do if all columns stay where they are.
+        if( ( reorderCount <= 0 ) || ( movableCount <= 1 ) )
+          return;
+
+        var visiblePositions = new List<int>( count );
+        var slots = new List<Slot>( movableCount );
+        var movables = new List<int>( movableCount );
+        var reorder = new List<Tuple<int, uint>>( reorderCount );
+
+        // Separate the movable locations that were updated from the ones that were not.
+        for( int i = 0; i < newOrder.Length; i++ )
+        {
+          visiblePositions.Add( locations[ indexes[ i ] ].Column.VisiblePosition );
+
+          // This location is fixed.
+          if( newOrder[ i ] >= 0 )
+            continue;
+
+          slots.Add( new Slot( i, startingPosition + i ) );
+
+          var timestamp = positionsStatus[ i ].VisiblePositionTimestamp;
+          if( timestamp == 0u )
+          {
+            movables.Add( i );
+          }
+          else
+          {
+            reorder.Add( new Tuple<int, uint>( i, timestamp ) );
+          }
+        }
+
+        var comparer = new MovableComparer( slots, visiblePositions );
+
+        // Reinsert the updated movable locations in a time fashion order into the not updated movable locations.
+        foreach( var i in ( from item in reorder
+                            orderby item.Item2, item.Item1
+                            select item.Item1 ) )
+        {
+          // This property is set to help the comparer identify the element the binary search is looking for.
+          // The algorithm is complex and need more information than the ones provided by the IComparer<>.Compare method.
+          comparer.LookFor = i;
+
+          var index = movables.BinarySearch( i, comparer );
+          if( index < 0 )
+          {
+            index = ~index;
+          }
+
+          if( index >= movables.Count )
+          {
+            movables.Add( i );
+          }
+          else
+          {
+            movables.Insert( index, i );
+          }
+        }
+
+        Debug.Assert( movables.Count == movableCount );
+
+        // Reinsert the movable locations into the fixed locations.
+        for( int i = 0; i < movables.Count; i++ )
+        {
+          newOrder[ slots[ i ].Index ] = indexes[ movables[ i ] ];
+        }
+
+        // Set the results.
+        for( int i = 0; i < newOrder.Length; i++ )
+        {
+          indexes[ i ] = newOrder[ i ];
+        }
+      }
+
+      private static void Apply( IList<ColumnHierarchyModel.IColumnLocation> locations, IList<int> indexes )
+      {
+        Debug.Assert( locations != null );
+        Debug.Assert( indexes != null );
+        Debug.Assert( locations.Count == indexes.Count );
+
+        for( int i = 0; i < indexes.Count - 1; i++ )
+        {
+          var pivot = locations[ indexes[ i ] ];
+          var target = locations[ indexes[ i + 1 ] ];
+          var next = pivot.GetNextSibling();
+
+          while( !object.Equals( next, target ) )
+          {
+            if( ( next == null ) || ( next.Type == LocationType.Column ) )
+            {
+              Debug.Assert( target.CanMoveAfter( pivot ) );
+              target.MoveAfter( pivot );
+              break;
+            }
+            // A splitter may be located between the columns.  Make sure not to move the column if it
+            // is the case or the splitter will go back next to the starting location.
+            else
+            {
+              next = next.GetNextSibling();
+            }
+          }
+        }
+      }
+
+      private static bool IsUnchanged( IList<ColumnHierarchyModel.IColumnLocation> locations )
+      {
+        if( ( locations == null ) || ( locations.Count <= 1 ) )
+          return true;
+
+        // Do a pass to check if a reordering is required.
+        foreach( var location in locations )
+        {
+          var positionStatus = location.Status.Position;
+
+          // This location's lock type may have changed, so does its position.
+          if( ( positionStatus.DraggableStatusTimestamp != 0u ) || ( positionStatus.MainColumnTimestamp != 0u ) )
+            return false;
+
+          if( location.Column.DraggableStatus != ColumnDraggableStatus.Draggable )
+          {
+            // This location may have change position, so we will need to apply an algorithm to figure out where to put it.
+            if( ( positionStatus.LocationTimestamp != 0u ) || ( positionStatus.VisiblePositionTimestamp != 0u ) )
+              return false;
+          }
+          else
+          {
+            // This location is considered fixed and will not be sorted.
+            if( positionStatus.LocationTimestamp > positionStatus.VisiblePositionTimestamp )
+              continue;
+
+            // This location visible position has changed, so we will need to apply
+            // an algorithm to figure out where to put it.
+            if( positionStatus.VisiblePositionTimestamp != 0u )
+              return false;
+          }
+        }
+
+        return true;
+      }
+
+      private static void Split( IList<ColumnHierarchyModel.IColumnLocation> locations, bool useDraggableStatus, IList<int> lockedFirst, IList<int> lockedLast, IList<int> unlocked )
+      {
+        Debug.Assert( locations != null );
+        Debug.Assert( lockedFirst != null );
+        Debug.Assert( lockedLast != null );
+        Debug.Assert( unlocked != null );
+
+        for( int i = 0; i < locations.Count; i++ )
+        {
+          var column = locations[ i ].Column;
+          var draggableStatus = column.DraggableStatus;
+
+          if( useDraggableStatus )
+          {
+            switch( draggableStatus )
+            {
+              case ColumnDraggableStatus.FirstUndraggable:
+                {
+                  lockedFirst.Add( i );
+                }
+                break;
+
+              case ColumnDraggableStatus.LastUndraggable:
+                {
+                  lockedLast.Add( i );
+                }
+                break;
+
+              case ColumnDraggableStatus.Draggable:
+                {
+                  unlocked.Add( i );
+                }
+                break;
+
+              default:
+                throw new NotImplementedException();
+            }
+          }
+          else
+          {
+            unlocked.Add( i );
+          }
+        }
+      }
+
+      private sealed class MovableComparer : IComparer<int>
+      {
+        private static readonly IComparer<Slot> SlotComparer = new VisiblePositionComparer();
+
+        internal MovableComparer( List<Slot> slots, IList<int> positions )
+        {
+          m_slots = slots;
+          m_positions = positions;
+        }
+
+        internal int LookFor
+        {
+          set
+          {
+            m_lookFor = value;
+          }
+        }
+
+        public int Compare( int x, int y )
+        {
+          if( x == m_lookFor )
+          {
+            var xPosition = m_positions[ x ];
+            var yPosition = m_positions[ y ];
+
+            // Since we are using this comparer to reinsert updated locations in time order,
+            // a visible position that is lesser than any other location should always be inserted before.
+            if( ( xPosition < yPosition ) )
+              return -1;
+
+            // For a visible position that is greater or equal, we must look at the available movables
+            // slots to insert the column in the slot that is the nearest to the desired target position.
+            var xSlot = this.FindSlot( xPosition );
+            var ySlot = this.FindSlot( yPosition );
+
+            var compare = xSlot.CompareTo( ySlot );
+            if( compare != 0 )
+              return compare;
+
+            var position = this.FindPosition( xSlot );
+
+            // The location is moving toward the end.
+            if( x < position )
+            {
+              if( y <= position )
+                return 1;
+
+              return -1;
+            }
+            // The location is moving toward the start.
+            else if( x > position )
+            {
+              if( y >= position )
+                return -1;
+
+              return 1;
+            }
+          }
+          else if( y == m_lookFor )
+          {
+            var xPosition = m_positions[ x ];
+            var yPosition = m_positions[ y ];
+
+            // Since we are using this comparer to reinsert updated locations in time order,
+            // a visible position that is lesser than any other location should always be inserted before.
+            if( ( yPosition < xPosition ) )
+              return 1;
+
+            // For a visible position that is greater or equal, we must look at the available movables
+            // slots to insert the column in the slot that is the nearest to the desired target position.
+            var xSlot = this.FindSlot( xPosition );
+            var ySlot = this.FindSlot( yPosition );
+
+            var compare = xSlot.CompareTo( ySlot );
+            if( compare != 0 )
+              return compare;
+
+            var position = this.FindPosition( ySlot );
+
+            // The location is moving toward the end.
+            if( y < position )
+            {
+              if( x <= position )
+                return -1;
+
+              return 1;
+            }
+            // The location is moving toward the start.
+            else if( y > position )
+            {
+              if( x >= position )
+                return 1;
+
+              return -1;
+            }
+          }
+
+          return x.CompareTo( y );
+        }
+
+        private int FindSlot( int position )
+        {
+          var index = m_slots.BinarySearch( new Slot( 0, position ), MovableComparer.SlotComparer );
+          if( index < 0 )
+            return ~index;
+
+          return index;
+        }
+
+        private int FindPosition( int slot )
+        {
+          Debug.Assert( ( slot >= 0 ) && ( slot <= m_slots.Count ) );
+
+          if( slot >= m_slots.Count )
+            return m_slots.Last().Index + 1;
+
+          return m_slots[ slot ].Index;
+        }
+
+        private readonly List<Slot> m_slots;
+        private readonly IList<int> m_positions;
+        private int m_lookFor;
+
+        private sealed class VisiblePositionComparer : IComparer<Slot>
+        {
+          public int Compare( Slot x, Slot y )
+          {
+            return x.VisiblePosition.CompareTo( y.VisiblePosition );
+          }
+        }
+      }
+
+      private struct Slot
+      {
+        internal Slot( int index, int visiblePosition )
+        {
+          Debug.Assert( index >= 0 );
+          Debug.Assert( visiblePosition >= 0 );
+
+          this.Index = index;
+          this.VisiblePosition = visiblePosition;
+        }
+
+        internal readonly int Index;
+        internal readonly int VisiblePosition;
+      }
+    }
+
+    #endregion
+
+    #region DeferUpdateState Private Class
+
+    private sealed class DeferUpdateState : DeferredDisposableState
+    {
+      internal DeferUpdateState( ColumnHierarchyManager target, UpdateOptions options )
+      {
+        if( target == null )
+          throw new ArgumentNullException( "target" );
+
+        m_target = target;
+        m_options = options;
+      }
+
+      protected override object SyncRoot
+      {
+        get
+        {
+          return m_target.SyncRoot;
+        }
+      }
+
+      protected override bool IsDeferred
+      {
+        get
+        {
+          return ( m_target.m_deferUpdateCount != 0 );
+        }
+      }
+
+      protected override void Increment()
+      {
+        m_target.m_deferUpdateCount++;
+      }
+
+      protected override void Decrement()
+      {
+        m_target.m_deferUpdateCount--;
+      }
+
+      protected override void OnDeferEnded( bool disposing )
+      {
+        if( !disposing )
+          return;
+
+        m_target.Update( m_options );
+      }
+
+      private readonly ColumnHierarchyManager m_target;
+      private readonly UpdateOptions m_options;
+    }
+
+    #endregion
+
+    #region ColumnStatus Private Struct
+
+    private struct ColumnStatus
+    {
+      internal ColumnStatus( ColumnVisibilityStatus visibility )
+        : this( default( ColumnPositionStatus ), visibility )
+      {
+      }
+
+      internal ColumnStatus( ColumnPositionStatus position, ColumnVisibilityStatus visibility )
+      {
+        this.Position = position;
+        this.Visibility = visibility;
+      }
+
+      internal ColumnStatus SetPositionStatus( ColumnPositionStatus status )
+      {
+        return new ColumnStatus( status, this.Visibility );
+      }
+
+      internal ColumnStatus SetVisibilityStatus( ColumnVisibilityStatus status )
+      {
+        return new ColumnStatus( this.Position, status );
+      }
+
+      internal readonly ColumnPositionStatus Position;
+      internal readonly ColumnVisibilityStatus Visibility;
+    }
+
+    #endregion
+
+    #region ColumnVisibilityStatus Private Struct
+
+    [DebuggerDisplay( "Visible = {Visible}, Mode = {Mode}" )]
+    private struct ColumnVisibilityStatus
+    {
+      private ColumnVisibilityStatus( bool visible, PropagationMode mode, uint timestamp )
+      {
+        m_visible = visible;
+        m_mode = mode;
+        m_timestamp = timestamp;
+      }
+
+      internal ColumnVisibilityStatus SetMode( PropagationMode mode )
+      {
+        return ColumnVisibilityStatus.Create( m_visible, mode, m_timestamp );
+      }
+
+      internal bool Visible
+      {
+        get
+        {
+          return m_visible;
+        }
+      }
+
+      internal PropagationMode Mode
+      {
+        get
+        {
+          return m_mode;
+        }
+      }
+
+      internal uint Timestamp
+      {
+        get
+        {
+          return m_timestamp;
+        }
+      }
+
+      internal static ColumnVisibilityStatus Create( bool visible )
+      {
+        return ColumnVisibilityStatus.Create( visible, PropagationMode.None, 0u );
+      }
+
+      internal static ColumnVisibilityStatus Create( bool visible, PropagationMode mode, uint timestamp )
+      {
+        return new ColumnVisibilityStatus( visible, mode, timestamp );
+      }
+
+      private readonly bool m_visible;
+      private readonly PropagationMode m_mode;
+      private readonly uint m_timestamp;
+    }
+
+    #endregion
+
+    #region ColumnPositionStatus Private Struct
+
+    private struct ColumnPositionStatus
+    {
+      internal static readonly ColumnPositionStatus Default = new ColumnPositionStatus();
+
+      private ColumnPositionStatus( uint parent, uint children, uint visiblePosition, uint location, uint draggableStatus, uint mainColumn )
+      {
+        m_parentTimestamp = parent;
+        m_childrenTimestamp = children;
+        m_visiblePositionTimestamp = visiblePosition;
+        m_locationTimestamp = location;
+        m_draggableStatusTimestamp = draggableStatus;
+        m_mainColumnTimestamp = mainColumn;
+      }
+
+      internal uint ParentTimestamp
+      {
+        get
+        {
+          return m_parentTimestamp;
+        }
+      }
+
+      internal uint ChildrenTimestamp
+      {
+        get
+        {
+          return m_childrenTimestamp;
+        }
+      }
+
+      internal uint VisiblePositionTimestamp
+      {
+        get
+        {
+          return m_visiblePositionTimestamp;
+        }
+      }
+
+      internal uint LocationTimestamp
+      {
+        get
+        {
+          return m_locationTimestamp;
+        }
+      }
+
+      internal uint DraggableStatusTimestamp
+      {
+        get
+        {
+          return m_draggableStatusTimestamp;
+        }
+      }
+
+      internal uint MainColumnTimestamp
+      {
+        get
+        {
+          return m_mainColumnTimestamp;
+        }
+      }
+
+      internal ColumnPositionStatus SetParentTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( timestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
+      }
+
+      internal ColumnPositionStatus SetChildrenTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( m_parentTimestamp, timestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
+      }
+
+      internal ColumnPositionStatus SetVisiblePositionTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, timestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
+      }
+
+      internal ColumnPositionStatus SetLocationTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, timestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
+      }
+
+      internal ColumnPositionStatus SetDraggableStatusTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, timestamp, m_mainColumnTimestamp );
+      }
+
+      internal ColumnPositionStatus SetMainColumnTimestamp( uint timestamp )
+      {
+        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, timestamp );
+      }
+
+      private readonly uint m_parentTimestamp;
+      private readonly uint m_childrenTimestamp;
+      private readonly uint m_visiblePositionTimestamp;
+      private readonly uint m_locationTimestamp;
+      private readonly uint m_draggableStatusTimestamp;
+      private readonly uint m_mainColumnTimestamp;
+    }
+
+    #endregion
+
+    #region ParentChildRelationshipSnapshot Private Struct
+
+    private struct ParentChildRelationshipSnapshot
+    {
+      internal ParentChildRelationshipSnapshot( ColumnHierarchyModel.IColumnLocation location, uint timestamp )
+      {
+        m_location = location;
+        m_timestamp = timestamp;
+      }
+
+      internal ColumnHierarchyModel.IColumnLocation Location
+      {
+        get
+        {
+          return m_location;
+        }
+      }
+
+      internal uint Timestamp
+      {
+        get
+        {
+          return m_timestamp;
+        }
+      }
+
+      private readonly ColumnHierarchyModel.IColumnLocation m_location;
+      private readonly uint m_timestamp;
+    }
+
+    #endregion
+
+    #region ParentChildRelationshipSnapshotComparer Private Class
+
+    private sealed class ParentChildRelationshipSnapshotComparer : IComparer<ParentChildRelationshipSnapshot>
+    {
+      public int Compare( ParentChildRelationshipSnapshot x, ParentChildRelationshipSnapshot y )
+      {
+        var compare = x.Timestamp.CompareTo( y.Timestamp );
+        if( compare != 0 )
+          return -compare;
+
+        return -string.CompareOrdinal( x.Location.Column.FieldName, y.Location.Column.FieldName );
+      }
+    }
+
+    #endregion
+
+    #region PropagationMode Private Enum
+
+    private enum PropagationMode : byte
+    {
+      None = 0,
+      BottomUp,
+      TopDown,
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs
new file mode 100644
index 00000000..4d538c14
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs
@@ -0,0 +1,167 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class ColumnHierarchyManagerHelper
+  {
+    internal static IDisposable DeferColumnsUpdate( DataGridContext dataGridContext )
+    {
+      Debug.Assert( dataGridContext != null );
+
+      return dataGridContext.ColumnManager.DeferUpdate();
+    }
+
+    internal static IDisposable DeferColumnsUpdate( DetailConfiguration detailConfiguration )
+    {
+      Debug.Assert( detailConfiguration != null );
+
+      return detailConfiguration.ColumnManager.DeferUpdate();
+    }
+
+    internal static bool MoveColumnBefore( DataGridContext dataGridContext, ColumnBase current, ColumnBase next )
+    {
+      Debug.Assert( dataGridContext != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnBefore( dataGridContext.ColumnManager, current, next );
+    }
+
+    internal static bool MoveColumnBefore( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase next )
+    {
+      Debug.Assert( detailConfiguration != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnBefore( detailConfiguration.ColumnManager, current, next );
+    }
+
+    internal static bool MoveColumnAfter( DataGridContext dataGridContext, ColumnBase current, ColumnBase previous )
+    {
+      Debug.Assert( dataGridContext != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnAfter( dataGridContext.ColumnManager, current, previous );
+    }
+
+    internal static bool MoveColumnAfter( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase previous )
+    {
+      Debug.Assert( detailConfiguration != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnAfter( detailConfiguration.ColumnManager, current, previous );
+    }
+
+    internal static bool MoveColumnUnder( DataGridContext dataGridContext, ColumnBase current, ColumnBase parent )
+    {
+      Debug.Assert( dataGridContext != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnUnder( dataGridContext.ColumnManager, dataGridContext.Columns, current, parent );
+    }
+
+    internal static bool MoveColumnUnder( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase parent )
+    {
+      Debug.Assert( detailConfiguration != null );
+
+      return ColumnHierarchyManagerHelper.MoveColumnUnder( detailConfiguration.ColumnManager, detailConfiguration.Columns, current, parent );
+    }
+
+    private static bool MoveColumnBefore( ColumnHierarchyManager columnsLayout, ColumnBase current, ColumnBase next )
+    {
+      Debug.Assert( columnsLayout != null );
+
+      var currentLocation = columnsLayout.GetColumnLocationFor( current );
+      if( currentLocation == null )
+        return false;
+
+      var pivotLocation = columnsLayout.GetColumnLocationFor( next );
+      if( pivotLocation == null )
+        return false;
+
+      if( !currentLocation.CanMoveBefore( pivotLocation ) )
+        return false;
+
+      currentLocation.MoveBefore( pivotLocation );
+      return true;
+    }
+
+    private static bool MoveColumnAfter( ColumnHierarchyManager columnsLayout, ColumnBase current, ColumnBase previous )
+    {
+      Debug.Assert( columnsLayout != null );
+
+      var currentLocation = columnsLayout.GetColumnLocationFor( current );
+      if( currentLocation == null )
+        return false;
+
+      var pivotLocation = columnsLayout.GetColumnLocationFor( previous );
+      if( pivotLocation == null )
+        return false;
+
+      if( !currentLocation.CanMoveAfter( pivotLocation ) )
+        return false;
+
+      currentLocation.MoveAfter( pivotLocation );
+      return true;
+    }
+
+    private static bool MoveColumnUnder( ColumnHierarchyManager columnsLayout, ColumnCollection columns, ColumnBase current, ColumnBase parent )
+    {
+      Debug.Assert( columnsLayout != null );
+
+      var currentLocation = columnsLayout.GetColumnLocationFor( current );
+      if( currentLocation == null )
+        return false;
+
+      var pivotLocation = default( ColumnHierarchyManager.ILocation );
+
+      // Move the column under the orphan section.
+      if( parent == null )
+      {
+        var columnCollection = current.ContainingCollection;
+        if( columnCollection == null )
+          return false;
+
+        var mergedColumnCollection = default( ColumnCollection );
+
+        if( columnCollection == columns )
+        {
+          mergedColumnCollection =  null;
+        }
+
+        if( mergedColumnCollection == null )
+          return false;
+
+        var levelMarkers = columnsLayout.GetLevelMarkersFor( mergedColumnCollection );
+        if( levelMarkers == null )
+          return false;
+
+        pivotLocation = levelMarkers.Orphan;
+      }
+      else
+      {
+        pivotLocation = columnsLayout.GetColumnLocationFor( parent );
+      }
+
+      if( pivotLocation == null )
+        return false;
+
+      if( !currentLocation.CanMoveUnder( pivotLocation ) )
+        return false;
+
+      currentLocation.MoveUnder( pivotLocation );
+      return true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs
new file mode 100644
index 00000000..2179ed22
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs
@@ -0,0 +1,3122 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Xceed.Utils.Collections;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ColumnHierarchyModel<TColumn, TStatus> where TColumn : class
+  {
+    #region Static Fields
+
+    private const int None = -1;
+
+    #endregion
+
+    #region LevelCount Property
+
+    internal int LevelCount
+    {
+      get
+      {
+        return m_level;
+      }
+    }
+
+    #endregion
+
+    #region [] Property
+
+    internal IColumnLocation this[ TColumn column ]
+    {
+      get
+      {
+        if( object.ReferenceEquals( column, null ) )
+          throw new ArgumentNullException( "column" );
+
+        if( m_capacity <= 0 )
+          return null;
+
+        var hashCode = column.GetHashCode();
+        var index = this.FindColumn( column, hashCode );
+        if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
+          return null;
+
+        var entry = m_columns[ index ];
+        return new ColumnLocation( this, entry.Column, entry.HashCode, index );
+      }
+    }
+
+    #endregion
+
+    #region LayoutChanging Event
+
+    internal event EventHandler<LayoutChangingEventArgs> LayoutChanging;
+
+    private void OnLayoutChanging( LayoutChangingEventArgs e )
+    {
+      var handler = this.LayoutChanging;
+      if( handler == null )
+        return;
+
+      try
+      {
+        m_preventLayoutChanged = true;
+        handler.Invoke( this, e );
+      }
+      finally
+      {
+        m_preventLayoutChanged = false;
+      }
+    }
+
+    #endregion
+
+    #region LayoutChanged Event
+
+    internal event EventHandler<LayoutChangedEventArgs> LayoutChanged;
+
+    private void OnLayoutChanged( LayoutChangedEventArgs e )
+    {
+      var handler = this.LayoutChanged;
+      if( handler == null )
+        return;
+
+      try
+      {
+        m_preventLayoutChanged = true;
+        handler.Invoke( this, e );
+      }
+      finally
+      {
+        m_preventLayoutChanged = false;
+      }
+    }
+
+    #endregion
+
+    #region StatusChanged Event
+
+    internal event EventHandler<StatusChangedEventArgs> StatusChanged;
+
+    private void OnStatusChanged( StatusChangedEventArgs e )
+    {
+      var handler = this.StatusChanged;
+      if( handler == null )
+        return;
+
+      try
+      {
+        m_preventLayoutChanged = true;
+        handler.Invoke( this, e );
+      }
+      finally
+      {
+        m_preventLayoutChanged = false;
+      }
+    }
+
+    #endregion
+
+    internal IMarkers AddLevel( int level )
+    {
+      if( level < 0 )
+        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
+
+      if( level > m_level )
+        throw new ArgumentException( "Only one level can be inserted at a time.", "level" );
+
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      // Resize the array to make space for a new level.
+      if( ( m_marks == null ) || ( m_marks.Length < m_level + 1 ) )
+      {
+        var currentSize = ( m_marks != null ) ? m_marks.Length : 0;
+        var desizedSize = ( int )Math.Min( Math.Max( m_level + 1, currentSize * 2L ), int.MaxValue );
+
+        Array.Resize( ref m_marks, desizedSize );
+        Debug.Assert( m_marks != null );
+
+        for( int i = currentSize; i < m_marks.Length; i++ )
+        {
+          m_marks[ i ] = MarkEntry.Default;
+        }
+
+        // This should only happen when the array is of size int.MaxValue.  Technically, this should never happen.
+        if( !object.Equals( m_marks.Last(), MarkEntry.Default ) )
+          throw new InvalidOperationException( "No more levels could be created." );
+      }
+
+      return this.AddLevelCore( level );
+    }
+
+    internal void RemoveLevel( int level )
+    {
+      if( level < 0 )
+        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
+
+      if( level >= m_level )
+        throw new ArgumentException( "The level does not exist.", "level" );
+
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      this.RemoveLevelCore( level );
+    }
+
+    internal IColumnLocation Add( TColumn column, int level )
+    {
+      return this.Add( column, default( TStatus ), level );
+    }
+
+    internal IColumnLocation Add( TColumn column, TStatus status, int level )
+    {
+      if( object.ReferenceEquals( column, null ) )
+        throw new ArgumentNullException( "column" );
+
+      if( level < 0 )
+        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
+
+      if( level >= m_level )
+        throw new ArgumentException( "The level is not available.", "level" );
+
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      var hashCode = column.GetHashCode();
+
+      if( m_size > 0 )
+      {
+        if( this.FindColumn( column, hashCode ) != ColumnHierarchyModel<TColumn, TStatus>.None )
+          throw new ArgumentException( "The column is already in the collection.", "column" );
+      }
+
+      var orphan = this.FindMark( level ).Orphan;
+      Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+
+      var index = this.AddCore( column, status, hashCode );
+      var location = new ColumnLocation( this, column, hashCode, index );
+
+      this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.Added ) );
+
+      if( !object.Equals( status, default( TStatus ) ) )
+      {
+        this.OnStatusChanged( new StatusChangedEventArgs( location, default( TStatus ), status ) );
+      }
+
+      this.ConnectBefore( index, orphan );
+
+      return location;
+    }
+
+    internal bool Remove( TColumn column )
+    {
+      if( object.ReferenceEquals( column, null ) )
+        throw new ArgumentNullException( "column" );
+
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      if( m_size <= 0 )
+        return false;
+
+      var index = this.FindColumn( column );
+      if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
+        return false;
+
+      var level = this.GetLevel( index );
+      var relations = m_relations[ index ];
+
+      // Move all children under the level's orphan entry.
+      if( relations.FirstChild != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        var orphan = this.FindMark( level ).Orphan;
+        Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        var current = relations.FirstChild;
+        var next = this.GetNextSibling( current );
+
+        Debug.Assert( this.IsColumn( current ) );
+        this.Disconnect( current );
+        this.ConnectUnder( current, orphan );
+
+        var previous = current;
+        current = next;
+
+        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
+        {
+          next = this.GetNextSibling( current );
+
+          Debug.Assert( this.IsColumn( current ) );
+          this.Disconnect( current );
+          this.ConnectAfter( current, previous );
+
+          previous = current;
+          current = next;
+        }
+      }
+
+      Debug.Assert( this.GetFirstChild( index ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+      this.OnLayoutChanging( new LayoutChangingEventArgs( this.GetTargetLocation( index ), LayoutChangingAction.Removing ) );
+      this.Disconnect( index );
+      this.RemoveCore( index );
+
+      return true;
+    }
+
+    internal bool Contains( TColumn column )
+    {
+      if( ( m_size <= 0 ) || object.ReferenceEquals( column, null ) )
+        return false;
+
+      return ( this.FindColumn( column ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+    }
+
+    internal void Clear()
+    {
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      if( m_size <= 0 )
+        return;
+
+      this.OnLayoutChanging( new LayoutChangingEventArgs( null, LayoutChangingAction.Clearing ) );
+
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_columns != null );
+      Debug.Assert( m_status != null );
+      Debug.Assert( m_relations != null );
+      Debug.Assert( m_marks != null );
+
+      for( int i = 0; i < m_level; i++ )
+      {
+        m_marks[ i ] = MarkEntry.Default;
+      }
+
+      for( int i = 0; i < m_capacity; i++ )
+      {
+        m_buckets[ i ] = ColumnHierarchyModel<TColumn, TStatus>.None;
+        m_columns[ i ] = new ColumnEntry( ( i < m_capacity - 1 ) ? i + 1 : ColumnHierarchyModel<TColumn, TStatus>.None );
+        m_status[ i ] = default( TStatus );
+        m_relations[ i ] = RelationEntry.Default;
+      }
+
+      m_level = 0;
+      m_free = 0;
+      m_size = 0;
+
+      this.OnLayoutChanged( new LayoutChangedEventArgs( null, LayoutChangedAction.Cleared ) );
+    }
+
+    internal IMarkers GetLevelMarkers( int level )
+    {
+      if( level < 0 )
+        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
+
+      if( level >= m_level )
+        throw new ArgumentException( "The level must be less than LevelCount.", "level" );
+
+      var entry = this.FindMark( level );
+
+      return new Markers( this, level, entry );
+    }
+
+    private Markers AddLevelCore( int level )
+    {
+      Debug.Assert( ( level >= 0 ) && ( level <= m_level ) );
+      Debug.Assert( m_marks != null );
+      Debug.Assert( level < m_marks.Length );
+      Debug.Assert( object.Equals( m_marks.Last(), MarkEntry.Default ) );
+
+      // Offset the marks to insert a entry that will deal with the new level.
+      for( int i = m_marks.Length - 1; i > level; i-- )
+      {
+        m_marks[ i ] = m_marks[ i - 1 ];
+      }
+
+      var start = this.AddCore( default( TStatus ) );
+      var end = this.AddCore( default( TStatus ) );
+      var splitter = this.AddCore( default( TStatus ) );
+      var orphan = this.AddCore( default( TStatus ) );
+      var markEntry = new MarkEntry( start, end, splitter, orphan );
+      var markers = new Markers( this, level, markEntry );
+
+      m_marks[ level ] = markEntry;
+      m_level++;
+
+      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Start, LayoutChangedAction.Added ) );
+      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.End, LayoutChangedAction.Added ) );
+      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Splitter, LayoutChangedAction.Added ) );
+      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Orphan, LayoutChangedAction.Added ) );
+
+      var parentStart = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childStart = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
+
+      if( level + 1 < m_marks.Length )
+      {
+        var entry = m_marks[ level + 1 ];
+
+        parentStart = entry.Start;
+        parentEnd = entry.End;
+        parentSplitter = entry.Splitter;
+        parentOrphan = entry.Orphan;
+      }
+
+      if( level > 0 )
+      {
+        var entry = m_marks[ level - 1 ];
+
+        childStart = entry.Start;
+        childEnd = entry.End;
+        childSplitter = entry.Splitter;
+        childOrphan = entry.Orphan;
+      }
+
+      // Move the entries on the child level under the new level entries.
+      if( childStart != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( childStart != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childOrphan == this.GetPreviousSiblingOrCousin( childEnd ) );
+        Debug.Assert( this.GetNextSiblingOrCousin( childEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        var next = childOrphan;
+        var current = this.GetPreviousSiblingOrCousin( next );
+
+        // Move the child orphan entry under the new level's orphan entry.
+        this.Disconnect( childOrphan );
+        this.ConnectUnder( childOrphan, orphan );
+
+        // Move the columns under the new level's orphan entry.
+        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
+        {
+          var previous = this.GetPreviousSiblingOrCousin( current );
+
+          if( this.IsColumn( current ) )
+          {
+            this.Disconnect( current );
+            this.ConnectBefore( current, next );
+
+            next = current;
+          }
+
+          current = previous;
+        }
+
+        // Move the remaining marker entries under the new level's related marker entries.
+        this.Disconnect( childStart );
+        this.Disconnect( childEnd );
+        this.Disconnect( childSplitter );
+
+        this.ConnectUnder( childStart, start );
+        this.ConnectUnder( childEnd, end );
+        this.ConnectUnder( childSplitter, splitter );
+
+        Debug.Assert( this.GetFirstChild( start ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( end ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( splitter ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( orphan ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+      }
+
+      // Move the new level's marker entries under the parent level's related marker entries.
+      if( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentOrphan == this.GetPreviousSiblingOrCousin( parentEnd ) );
+        Debug.Assert( this.GetNextSiblingOrCousin( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        Debug.Assert( this.GetFirstChild( parentStart ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentSplitter ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentOrphan ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        this.ConnectUnder( start, parentStart );
+        this.ConnectUnder( end, parentEnd );
+        this.ConnectUnder( splitter, parentSplitter );
+        this.ConnectUnder( orphan, parentOrphan );
+      }
+      // Order the new level's marker entries.
+      else
+      {
+        this.ConnectAfter( splitter, start );
+        this.ConnectAfter( orphan, splitter );
+        this.ConnectAfter( end, orphan );
+      }
+
+      return markers;
+    }
+
+    private void RemoveLevelCore( int level )
+    {
+      var markers = this.FindMark( level );
+      var start = markers.Start;
+      var end = markers.End;
+      var splitter = markers.Splitter;
+      var orphan = markers.Orphan;
+      Debug.Assert( start != ColumnHierarchyModel<TColumn, TStatus>.None );
+      Debug.Assert( end != ColumnHierarchyModel<TColumn, TStatus>.None );
+      Debug.Assert( splitter != ColumnHierarchyModel<TColumn, TStatus>.None );
+      Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+
+      var parentStart = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var parentOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childStart = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
+      var childOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
+
+      if( level + 1 < m_marks.Length )
+      {
+        var entry = m_marks[ level + 1 ];
+
+        parentStart = entry.Start;
+        parentEnd = entry.End;
+        parentSplitter = entry.Splitter;
+        parentOrphan = entry.Orphan;
+      }
+
+      if( level > 0 )
+      {
+        var entry = m_marks[ level - 1 ];
+
+        childStart = entry.Start;
+        childEnd = entry.End;
+        childSplitter = entry.Splitter;
+        childOrphan = entry.Orphan;
+      }
+
+      if( childStart != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( childStart != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( childOrphan == this.GetPreviousSiblingOrCousin( childEnd ) );
+        Debug.Assert( this.GetNextSiblingOrCousin( childEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        // Link all entries on the child level together.  They will be rearrange later if necessary.
+        var next = ColumnHierarchyModel<TColumn, TStatus>.None;
+        var current = childEnd;
+
+        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
+        {
+          var previous = this.GetPreviousSiblingOrCousin( current );
+
+          this.Disconnect( current );
+
+          if( next != ColumnHierarchyModel<TColumn, TStatus>.None )
+          {
+            this.ConnectBefore( current, next );
+          }
+          else
+          {
+            this.SetRelations( current, new RelationEntry( ColumnHierarchyModel<TColumn, TStatus>.None, this.GetFirstChild( current ), ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None ) );
+          }
+
+          next = current;
+          current = previous;
+        }
+      }
+
+      // Remove any relation to entries of the removed level.
+      {
+        var current = end;
+        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
+        {
+          var previous = this.GetPreviousSiblingOrCousin( current );
+
+          this.OnLayoutChanging( new LayoutChangingEventArgs( this.GetTargetLocation( current ), LayoutChangingAction.Removing ) );
+          this.Disconnect( current );
+          this.RemoveCore( current );
+
+          current = previous;
+        }
+      }
+
+      // Offset the marks to remove the level that was removed.
+      for( int i = level; i < m_level - 1; i++ )
+      {
+        m_marks[ i ] = m_marks[ i + 1 ];
+      }
+
+      m_level--;
+      m_marks[ m_level ] = MarkEntry.Default;
+
+      // Reconnect the entries on the child level under the parent level's related entries.
+      if( ( childStart != ColumnHierarchyModel<TColumn, TStatus>.None ) && ( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None ) )
+      {
+        Debug.Assert( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( parentOrphan == this.GetPreviousSibling( parentEnd ) );
+        Debug.Assert( this.GetFirstChild( parentStart ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentSplitter ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetFirstChild( parentOrphan ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+        Debug.Assert( this.GetNextSiblingOrCousin( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        var next = childOrphan;
+        var current = this.GetPreviousSibling( next );
+
+        // Move the child orphan entry under the parent level's orphan entry.
+        this.Disconnect( childOrphan );
+        this.ConnectUnder( childOrphan, parentOrphan );
+
+        // Move the columns under the parent level's orphan entry.
+        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
+        {
+          var previous = this.GetPreviousSibling( current );
+
+          if( this.IsColumn( current ) )
+          {
+            this.Disconnect( current );
+            this.ConnectBefore( current, next );
+
+            next = current;
+          }
+
+          current = previous;
+        }
+
+        // Move the remaining marker entries under the parent level's related marker entries.
+        this.Disconnect( childStart );
+        this.Disconnect( childEnd );
+        this.Disconnect( childSplitter );
+
+        this.ConnectUnder( childStart, parentStart );
+        this.ConnectUnder( childEnd, parentEnd );
+        this.ConnectUnder( childSplitter, parentSplitter );
+
+        Debug.Assert( this.GetFirstChild( parentStart ) == childStart );
+        Debug.Assert( this.GetFirstChild( parentEnd ) == childEnd );
+        Debug.Assert( this.GetFirstChild( parentSplitter ) == childSplitter );
+        Debug.Assert( this.GetFirstChild( parentOrphan ) != ColumnHierarchyModel<TColumn, TStatus>.None );
+      }
+    }
+
+    private int AddCore( TStatus status )
+    {
+      this.EnsureCapacity();
+
+      Debug.Assert( m_columns != null );
+      Debug.Assert( m_status != null );
+      Debug.Assert( m_relations != null );
+
+      var free = m_free;
+
+      m_free = m_columns[ m_free ].Next;
+      m_columns[ free ] = new ColumnEntry( ColumnHierarchyModel<TColumn, TStatus>.None );
+      m_status[ free ] = status;
+      m_relations[ free ] = RelationEntry.Default;
+
+      m_size++;
+
+      return free;
+    }
+
+    private int AddCore( TColumn column, TStatus status, int hashCode )
+    {
+      var index = this.AddCore( status );
+
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_columns != null );
+      Debug.Assert( m_status != null );
+
+      var bucket = this.GetBucket( hashCode );
+      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
+
+      var collision = m_buckets[ bucket ];
+
+      m_buckets[ bucket ] = index;
+      m_columns[ index ] = new ColumnEntry( column, hashCode, collision );
+
+      return index;
+    }
+
+    private void RemoveCore( int index )
+    {
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_columns != null );
+      Debug.Assert( m_status != null );
+      Debug.Assert( m_relations != null );
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      m_status[ index ] = default( TStatus );
+      m_relations[ index ] = RelationEntry.Default;
+
+      var entry = m_columns[ index ];
+
+      // Only column entry needs to adjust the buckets.
+      if( this.IsColumn( entry ) )
+      {
+        var bucket = this.GetBucket( entry.HashCode );
+        Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
+        Debug.Assert( m_buckets[ bucket ] != ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        if( m_buckets[ bucket ] == index )
+        {
+          m_buckets[ bucket ] = entry.Next;
+        }
+        else
+        {
+          // Repair the linked list.
+          var previous = m_buckets[ bucket ];
+          var next = m_columns[ previous ].Next;
+
+          while( next != index )
+          {
+            Debug.Assert( next != ColumnHierarchyModel<TColumn, TStatus>.None );
+            previous = next;
+            next = m_columns[ next ].Next;
+          }
+
+          Debug.Assert( next == index );
+
+          m_columns[ previous ] = m_columns[ previous ].SetNext( entry.Next );
+        }
+      }
+
+      m_columns[ index ] = new ColumnEntry( m_free );
+      m_free = index;
+
+      m_size--;
+    }
+
+    private void Disconnect( int index )
+    {
+      var relations = m_relations[ index ];
+
+      if( relations.Previous != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        this.SetRelations( relations.Previous, m_relations[ relations.Previous ].SetNext( relations.Next ) );
+      }
+      else if( relations.Parent != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( m_relations[ relations.Parent ].FirstChild == index );
+
+        this.SetRelations( relations.Parent, m_relations[ relations.Parent ].SetFirstChild( relations.Next ) );
+      }
+
+      if( relations.Next != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        this.SetRelations( relations.Next, m_relations[ relations.Next ].SetPrevious( relations.Previous ) );
+      }
+    }
+
+    private void ConnectBefore( int index, int pivot )
+    {
+      var sourceRelations = m_relations[ index ];
+      var pivotRelations = m_relations[ pivot ];
+
+      if( pivotRelations.Previous != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( pivotRelations.Previous != index );
+
+        this.SetRelations( pivotRelations.Previous, m_relations[ pivotRelations.Previous ].SetNext( index ) );
+      }
+      else if( pivotRelations.Parent != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( m_relations[ pivotRelations.Parent ].FirstChild == pivot );
+
+        this.SetRelations( pivotRelations.Parent, m_relations[ pivotRelations.Parent ].SetFirstChild( index ) );
+      }
+
+      this.SetRelations( index, new RelationEntry( pivotRelations.Parent, sourceRelations.FirstChild, pivotRelations.Previous, pivot ) );
+      this.SetRelations( pivot, pivotRelations.SetPrevious( index ) );
+    }
+
+    private void ConnectAfter( int index, int pivot )
+    {
+      var sourceRelations = m_relations[ index ];
+      var pivotRelations = m_relations[ pivot ];
+
+      if( pivotRelations.Next != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( pivotRelations.Next != index );
+
+        this.SetRelations( pivotRelations.Next, m_relations[ pivotRelations.Next ].SetPrevious( index ) );
+      }
+
+      this.SetRelations( index, new RelationEntry( pivotRelations.Parent, sourceRelations.FirstChild, pivot, pivotRelations.Next ) );
+      this.SetRelations( pivot, pivotRelations.SetNext( index ) );
+    }
+
+    private void ConnectUnder( int index, int pivot )
+    {
+      var sourceRelations = m_relations[ index ];
+      var pivotRelations = m_relations[ pivot ];
+
+      if( pivotRelations.FirstChild != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        Debug.Assert( pivotRelations.FirstChild != index );
+        Debug.Assert( m_relations[ pivotRelations.FirstChild ].Previous == ColumnHierarchyModel<TColumn, TStatus>.None );
+
+        this.SetRelations( pivotRelations.FirstChild, m_relations[ pivotRelations.FirstChild ].SetPrevious( index ) );
+      }
+
+      this.SetRelations( index, new RelationEntry( pivot, sourceRelations.FirstChild, ColumnHierarchyModel<TColumn, TStatus>.None, pivotRelations.FirstChild ) );
+      this.SetRelations( pivot, pivotRelations.SetFirstChild( index ) );
+    }
+
+    private void MoveBefore( int source, int pivot )
+    {
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
+      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
+
+      // The entry is already at the proper location.
+      if( m_relations[ pivot ].Previous == source )
+        return;
+
+      if( source == pivot )
+        throw new ArgumentException( "Cannot move the entry before itself.", "source" );
+
+      Debug.Assert( this.GetAncestorCount( source ) == this.GetAncestorCount( pivot ), "Cannot move entries on different level." );
+      Debug.Assert( !this.IsStart( pivot ), "No entry can be moved before the start." );
+      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
+      Debug.Assert( !this.IsSplitter( source ) || ( this.GetLevel( source ) == m_level - 1 ), "Only the topmost splitter can be moved." );
+      Debug.Assert( !this.IsSplitter( pivot ) || ( this.GetLevel( pivot ) == m_level - 1 ), "An entry cannot be moved before the splitter on this level." );
+
+      this.Disconnect( source );
+      this.ConnectBefore( source, pivot );
+    }
+
+    private void MoveAfter( int source, int pivot )
+    {
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
+      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
+
+      // The entry is already at the proper location.
+      if( m_relations[ pivot ].Next == source )
+        return;
+
+      if( source == pivot )
+        throw new ArgumentException( "Cannot move the entry after itself.", "source" );
+
+      Debug.Assert( this.GetAncestorCount( source ) == this.GetAncestorCount( pivot ), "Cannot move entries on different level." );
+      Debug.Assert( !this.IsEnd( pivot ), "No entry can be moved after the end." );
+      Debug.Assert( !this.IsOrphan( pivot ), "No entry can be moved after an orphan entry." );
+      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
+      Debug.Assert( !this.IsSplitter( source ) || ( this.GetLevel( source ) == m_level - 1 ), "Only the topmost splitter can be move." );
+      Debug.Assert( !this.IsSplitter( pivot ) || ( this.GetLevel( pivot ) == m_level - 1 ), "An entry cannot be moved after the splitter on this level." );
+
+      this.Disconnect( source );
+      this.ConnectAfter( source, pivot );
+    }
+
+    private void MoveUnder( int source, int pivot )
+    {
+      if( m_preventLayoutChanged )
+        throw new InvalidOperationException( "The layout cannot be updated." );
+
+      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
+      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
+
+      // The entry is already at the proper location.
+      if( m_relations[ source ].Parent == pivot )
+        return;
+
+      if( source == pivot )
+        throw new ArgumentException( "Cannot move the entry under itself.", "source" );
+
+      Debug.Assert( this.GetAncestorCount( source ) == ( this.GetAncestorCount( pivot ) + 1 ), "The entry must be a location on the previous level." );
+      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
+      Debug.Assert( !this.IsSplitter( source ), "A splitter cannot be moved under another entry." );
+      Debug.Assert( !this.IsSplitter( pivot ), "An entry cannot be moved under a splitter." );
+
+      this.Disconnect( source );
+      this.ConnectUnder( source, pivot );
+    }
+
+    private void SetRelations( int index, RelationEntry relations )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      var current = m_relations[ index ];
+      var location = this.GetTargetLocation( index );
+      Debug.Assert( location != null );
+
+      if( current.Parent != relations.Parent )
+      {
+        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingParent ) );
+      }
+
+      if( current.FirstChild != relations.FirstChild )
+      {
+        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingFirstChild ) );
+      }
+
+      if( current.Previous != relations.Previous )
+      {
+        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingPrevious ) );
+      }
+
+      if( current.Next != relations.Next )
+      {
+        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingNext ) );
+      }
+
+      m_relations[ index ] = relations;
+
+      if( current.Parent != relations.Parent )
+      {
+        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.ParentChanged ) );
+      }
+
+      if( current.FirstChild != relations.FirstChild )
+      {
+        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.FirstChildChanged ) );
+      }
+
+      if( current.Previous != relations.Previous )
+      {
+        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.PreviousChanged ) );
+      }
+
+      if( current.Next != relations.Next )
+      {
+        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.NextChanged ) );
+      }
+    }
+
+    private TStatus GetStatus( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      return m_status[ index ];
+    }
+
+    private void SetStatus( int index, TStatus value )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      var oldValue = m_status[ index ];
+      if( object.Equals( oldValue, value ) )
+        return;
+
+      var columnLocation = this.GetTargetLocation( index ) as IColumnLocation;
+      Debug.Assert( columnLocation != null );
+
+      m_status[ index ] = value;
+
+      this.OnStatusChanged( new StatusChangedEventArgs( columnLocation, oldValue, value ) );
+    }
+
+    private bool IsStart( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
+        return false;
+
+      for( int level = m_level - 1; level >= 0; level-- )
+      {
+        if( index == this.FindMark( level ).Start )
+          return true;
+      }
+
+      return false;
+    }
+
+    private bool IsEnd( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
+        return false;
+
+      for( int level = m_level - 1; level >= 0; level-- )
+      {
+        if( index == this.FindMark( level ).End )
+          return true;
+      }
+
+      return false;
+    }
+
+    private bool IsSplitter( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
+        return false;
+
+      for( int level = m_level - 1; level >= 0; level-- )
+      {
+        if( index == this.FindMark( level ).Splitter )
+          return true;
+      }
+
+      return false;
+    }
+
+    private bool IsOrphan( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
+        return false;
+
+      for( int level = m_level - 1; level >= 0; level-- )
+      {
+        if( index == this.FindMark( level ).Orphan )
+          return true;
+      }
+
+      return false;
+    }
+
+    private bool IsColumn( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) )
+        return false;
+
+      return this.IsColumn( m_columns[ index ] );
+    }
+
+    private bool IsColumn( ColumnEntry entry )
+    {
+      return !object.ReferenceEquals( entry.Column, null );
+    }
+
+    private MarkEntry FindMark( int level )
+    {
+      Debug.Assert( ( level >= 0 ) && ( level < m_level ) );
+      Debug.Assert( m_marks != null );
+      Debug.Assert( level < m_marks.Length );
+
+      return m_marks[ level ];
+    }
+
+    private int FindColumn( TColumn column )
+    {
+      Debug.Assert( !object.ReferenceEquals( column, null ) );
+
+      return this.FindColumn( column, column.GetHashCode() );
+    }
+
+    private int FindColumn( TColumn column, int hashCode )
+    {
+      Debug.Assert( !object.ReferenceEquals( column, null ) );
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_columns != null );
+
+      var bucket = this.GetBucket( hashCode );
+      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
+
+      var index = m_buckets[ bucket ];
+
+      while( index != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        var entry = m_columns[ index ];
+        if( ( entry.HashCode == hashCode ) && object.Equals( entry.Column, column ) )
+          return index;
+
+        index = entry.Next;
+      }
+
+      return ColumnHierarchyModel<TColumn, TStatus>.None;
+    }
+
+    private StartLocation CreateStartLocation( int level, int index )
+    {
+      Debug.Assert( this.IsStart( index ) );
+
+      return new StartLocation( this, level, index );
+    }
+
+    private EndLocation CreateEndLocation( int level, int index )
+    {
+      Debug.Assert( this.IsEnd( index ) );
+
+      return new EndLocation( this, level, index );
+    }
+
+    private SplitterLocation CreateSplitterLocation( int level, int index )
+    {
+      Debug.Assert( this.IsSplitter( index ) );
+
+      return new SplitterLocation( this, level, index );
+    }
+
+    private OrphanLocation CreateOrphanLocation( int level, int index )
+    {
+      Debug.Assert( this.IsOrphan( index ) );
+
+      return new OrphanLocation( this, level, index );
+    }
+
+    private ColumnLocation CreateColumnLocation( int index )
+    {
+      Debug.Assert( this.IsColumn( index ) );
+
+      var entry = m_columns[ index ];
+
+      return new ColumnLocation( this, entry.Column, entry.HashCode, index );
+    }
+
+    private int GetParent( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+      Debug.Assert( m_relations != null );
+
+      return m_relations[ index ].Parent;
+    }
+
+    private int GetFirstChild( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+      Debug.Assert( m_relations != null );
+
+      return m_relations[ index ].FirstChild;
+    }
+
+    private int GetPreviousSibling( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+      Debug.Assert( m_relations != null );
+
+      return m_relations[ index ].Previous;
+    }
+
+    private int GetNextSibling( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+      Debug.Assert( m_relations != null );
+
+      return m_relations[ index ].Next;
+    }
+
+    private int GetPreviousSiblingOrCousin( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      var relations = m_relations[ index ];
+      var target = relations.Previous;
+
+      if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
+        return target;
+
+      var parent = relations.Parent;
+      if( parent != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        var oncle = parent;
+
+        while( true )
+        {
+          oncle = this.GetPreviousSiblingOrCousin( oncle );
+          if( oncle == ColumnHierarchyModel<TColumn, TStatus>.None )
+            break;
+
+          target = this.GetFirstChild( oncle );
+          if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
+          {
+            while( this.GetNextSibling( target ) != ColumnHierarchyModel<TColumn, TStatus>.None )
+            {
+              target = this.GetNextSibling( target );
+            }
+
+            return target;
+          }
+        }
+      }
+
+      // No more sibling.
+      return ColumnHierarchyModel<TColumn, TStatus>.None;
+    }
+
+    private int GetNextSiblingOrCousin( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      var relations = m_relations[ index ];
+      var target = relations.Next;
+
+      if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
+        return target;
+
+      var parent = relations.Parent;
+      if( parent != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        var oncle = parent;
+
+        while( true )
+        {
+          oncle = this.GetNextSiblingOrCousin( oncle );
+          if( oncle == ColumnHierarchyModel<TColumn, TStatus>.None )
+            break;
+
+          target = this.GetFirstChild( oncle );
+          if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
+            return target;
+        }
+      }
+
+      // No more sibling.
+      return ColumnHierarchyModel<TColumn, TStatus>.None;
+    }
+
+    private ILocation GetTargetLocation( int index )
+    {
+      if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
+        return null;
+
+      if( this.IsColumn( index ) )
+        return this.CreateColumnLocation( index );
+
+      for( int level = m_level - 1; level >= 0; level-- )
+      {
+        var entry = this.FindMark( level );
+        if( entry.Start == index )
+          return this.CreateStartLocation( level, index );
+
+        if( entry.End == index )
+          return this.CreateEndLocation( level, index );
+
+        if( entry.Splitter == index )
+          return this.CreateSplitterLocation( level, index );
+
+        if( entry.Orphan == index )
+          return this.CreateOrphanLocation( level, index );
+      }
+
+      throw new InvalidOperationException();
+    }
+
+    private int GetLevel( int index )
+    {
+      Debug.Assert( m_level > 0 );
+
+      var ancestors = this.GetAncestorCount( index );
+      Debug.Assert( ancestors < m_level );
+
+      return m_level - ancestors - 1;
+    }
+
+    private int GetAncestorCount( int index )
+    {
+      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
+
+      var count = -1;
+
+      while( index != ColumnHierarchyModel<TColumn, TStatus>.None )
+      {
+        index = this.GetParent( index );
+        count++;
+      }
+
+      Debug.Assert( count >= 0 );
+
+      return count;
+    }
+
+    private int GetBucket( int hashCode )
+    {
+      return ColumnHierarchyModel<TColumn, TStatus>.GetBucket( hashCode, m_capacity );
+    }
+
+    private void EnsureMarks( int level, MarkEntry entry )
+    {
+      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || !object.Equals( entry, m_marks[ level ] ) )
+        throw new InvalidOperationException( "The markers are no longer valid." );
+    }
+
+    private int EnsureStart( int level, int index )
+    {
+      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Start ) )
+        throw new InvalidOperationException( "The location is no longer valid." );
+
+      return level;
+    }
+
+    private int EnsureEnd( int level, int index )
+    {
+      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].End ) )
+        throw new InvalidOperationException( "The location is no longer valid." );
+
+      return level;
+    }
+
+    private int EnsureSplitter( int level, int index )
+    {
+      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Splitter ) )
+        throw new InvalidOperationException( "The location is no longer valid." );
+
+      return level;
+    }
+
+    private int EnsureOrphan( int level, int index )
+    {
+      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Orphan ) )
+        throw new InvalidOperationException( "The location is no longer valid." );
+
+      return level;
+    }
+
+    private int EnsureColumn( TColumn column, int hashCode, int index )
+    {
+      if( ( index < 0 ) || ( index >= m_capacity ) )
+        throw new InvalidOperationException( "The column location is no longer valid." );
+
+      var entry = m_columns[ index ];
+      if( ( hashCode != entry.HashCode ) || !object.Equals( column, entry.Column ) )
+        throw new InvalidOperationException( "The column location is no longer valid." );
+
+      return this.GetLevel( index );
+    }
+
+    private void EnsureCapacity()
+    {
+      // Make sure the collection is not full.
+      if( m_size != m_capacity )
+        return;
+
+      Debug.Assert( m_free == ColumnHierarchyModel<TColumn, TStatus>.None );
+      this.EnsureCapacity( m_capacity * 2L );
+      Debug.Assert( m_free != ColumnHierarchyModel<TColumn, TStatus>.None );
+      Debug.Assert( m_size != m_capacity );
+    }
+
+    private void EnsureCapacity( long min )
+    {
+      if( ( m_capacity >= min ) && ( m_capacity > 0 ) )
+        return;
+
+      var capacity = ColumnHierarchyModel<TColumn, TStatus>.FindNextSize( min );
+      Debug.Assert( capacity > 0 );
+
+      m_buckets = new int[ capacity ];
+
+      Array.Resize( ref m_columns, capacity );
+      Array.Resize( ref m_status, capacity );
+      Array.Resize( ref m_relations, capacity );
+
+      for( int i = 0; i < m_buckets.Length; i++ )
+      {
+        m_buckets[ i ] = ColumnHierarchyModel<TColumn, TStatus>.None;
+      }
+
+      for( int i = m_capacity; i < capacity; i++ )
+      {
+        m_columns[ i ] = new ColumnEntry( ( i < capacity - 1 ) ? i + 1 : ColumnHierarchyModel<TColumn, TStatus>.None );
+        m_status[ i ] = default( TStatus );
+        m_relations[ i ] = RelationEntry.Default;
+      }
+
+      // Rehash the elements to initialize the buckets.
+      for( int i = 0; i < m_capacity; i++ )
+      {
+        var entry = m_columns[ i ];
+
+        // Only column entry needs to adjust the buckets.
+        if( this.IsColumn( entry ) )
+        {
+          var bucket = ColumnHierarchyModel<TColumn, TStatus>.GetBucket( entry.HashCode, capacity );
+          Debug.Assert( ( bucket >= 0 ) && ( bucket < capacity ) );
+
+          var index = m_buckets[ bucket ];
+
+          m_buckets[ bucket ] = i;
+          m_columns[ i ] = entry.SetNext( index );
+        }
+      }
+
+      m_free = m_capacity;
+      m_capacity = capacity;
+    }
+
+    private static int FindNextSize( long min )
+    {
+      var sizes = ArrayHelper.Sizes;
+
+      for( int i = 0; i < sizes.Length; i++ )
+      {
+        var size = sizes[ i ];
+
+        if( size >= min )
+          return size;
+      }
+
+      throw new InvalidOperationException( "Cannot find a larger size." );
+    }
+
+    private static int GetBucket( int hashCode, int capacity )
+    {
+      Debug.Assert( capacity > 0 );
+
+      // Remove the negative sign without using Math.Abs to handle the case of int.MinValue.
+      return ( hashCode & 0x7fffffff ) % capacity;
+    }
+
+    private int[] m_buckets;
+    private ColumnEntry[] m_columns;
+    private TStatus[] m_status;
+    private RelationEntry[] m_relations;
+    private MarkEntry[] m_marks;
+    private int m_level; //0
+    private int m_capacity; //0
+    private int m_size; //0
+    private bool m_preventLayoutChanged; //false
+    private int m_free = ColumnHierarchyModel<TColumn, TStatus>.None;
+
+    #region IMarkers Internal Interface
+
+    internal interface IMarkers
+    {
+      ILocation Start
+      {
+        get;
+      }
+
+      ILocation End
+      {
+        get;
+      }
+
+      ILocation Splitter
+      {
+        get;
+      }
+
+      ILocation Orphan
+      {
+        get;
+      }
+    }
+
+    #endregion
+
+    #region ILocation Internal Interface
+
+    internal interface ILocation
+    {
+      LocationType Type
+      {
+        get;
+      }
+
+      int Level
+      {
+        get;
+      }
+
+      ILocation GetParent();
+      ILocation GetFirstChild();
+
+      ILocation GetPreviousSibling();
+      ILocation GetNextSibling();
+
+      ILocation GetPreviousSiblingOrCousin();
+      ILocation GetNextSiblingOrCousin();
+
+      bool CanMoveBefore( ILocation location );
+      bool CanMoveAfter( ILocation location );
+      bool CanMoveUnder( ILocation location );
+
+      void MoveBefore( ILocation location );
+      void MoveAfter( ILocation location );
+      void MoveUnder( ILocation location );
+    }
+
+    #endregion
+
+    #region IColumnLocation Internal Interface
+
+    internal interface IColumnLocation : ILocation
+    {
+      TColumn Column
+      {
+        get;
+      }
+
+      TStatus Status
+      {
+        get;
+        set;
+      }
+    }
+
+    #endregion
+
+    #region LayoutChangingEventArgs Internal Class
+
+    internal sealed class LayoutChangingEventArgs : EventArgs
+    {
+      internal LayoutChangingEventArgs( ILocation location, LayoutChangingAction action )
+      {
+        m_location = location;
+        m_action = action;
+      }
+
+      internal ILocation Location
+      {
+        get
+        {
+          return m_location;
+        }
+      }
+
+      internal LayoutChangingAction Action
+      {
+        get
+        {
+          return m_action;
+        }
+      }
+
+      private readonly ILocation m_location;
+      private readonly LayoutChangingAction m_action;
+    }
+
+    #endregion
+
+    #region LayoutChangedEventArgs Internal Class
+
+    internal sealed class LayoutChangedEventArgs : EventArgs
+    {
+      internal LayoutChangedEventArgs( ILocation location, LayoutChangedAction action )
+      {
+        m_location = location;
+        m_action = action;
+      }
+
+      internal ILocation Location
+      {
+        get
+        {
+          return m_location;
+        }
+      }
+
+      internal LayoutChangedAction Action
+      {
+        get
+        {
+          return m_action;
+        }
+      }
+
+      private readonly ILocation m_location;
+      private readonly LayoutChangedAction m_action;
+    }
+
+    #endregion
+
+    #region StatusChangedEventArgs Internal Class
+
+    internal sealed class StatusChangedEventArgs : EventArgs
+    {
+      internal StatusChangedEventArgs( IColumnLocation location, TStatus oldValue, TStatus newValue )
+      {
+        m_location = location;
+        m_oldValue = oldValue;
+        m_newValue = newValue;
+      }
+
+      internal IColumnLocation Location
+      {
+        get
+        {
+          return m_location;
+        }
+      }
+
+      internal TStatus OldValue
+      {
+        get
+        {
+          return m_oldValue;
+        }
+      }
+
+      internal TStatus NewValue
+      {
+        get
+        {
+          return m_newValue;
+        }
+      }
+
+      private readonly IColumnLocation m_location;
+      private readonly TStatus m_oldValue;
+      private readonly TStatus m_newValue;
+    }
+
+    #endregion
+
+    #region LayoutChangingAction Internal Enum
+
+    internal enum LayoutChangingAction
+    {
+      Clearing,
+      Removing,
+      ChangingParent,
+      ChangingFirstChild,
+      ChangingPrevious,
+      ChangingNext,
+    }
+
+    #endregion
+
+    #region LayoutChangedAction Internal Enum
+
+    internal enum LayoutChangedAction
+    {
+      Cleared,
+      Added,
+      ParentChanged,
+      FirstChildChanged,
+      PreviousChanged,
+      NextChanged,
+    }
+
+    #endregion
+
+    #region IPivotLocation Private Interface
+
+    private interface IPivotLocation
+    {
+      bool CanBeNextSiblingOf( IMovableLocation location );
+      bool CanBePreviousSiblingOf( IMovableLocation location );
+      bool CanBeParentOf( IMovableLocation location );
+
+      void SetHasNextSiblingOf( IMovableLocation location );
+      void SetHasPreviousSiblingOf( IMovableLocation location );
+      void SetHasParentOf( IMovableLocation location );
+    }
+
+    #endregion
+
+    #region IMovableLocation Private Interface
+
+    private interface IMovableLocation
+    {
+      bool CanMoveBefore( StartLocation location );
+      bool CanMoveBefore( EndLocation location );
+      bool CanMoveBefore( SplitterLocation location );
+      bool CanMoveBefore( OrphanLocation location );
+      bool CanMoveBefore( ColumnLocation location );
+
+      bool CanMoveAfter( StartLocation location );
+      bool CanMoveAfter( EndLocation location );
+      bool CanMoveAfter( SplitterLocation location );
+      bool CanMoveAfter( OrphanLocation location );
+      bool CanMoveAfter( ColumnLocation location );
+
+      bool CanMoveUnder( StartLocation location );
+      bool CanMoveUnder( EndLocation location );
+      bool CanMoveUnder( SplitterLocation location );
+      bool CanMoveUnder( OrphanLocation location );
+      bool CanMoveUnder( ColumnLocation location );
+
+      void MoveBefore( StartLocation location );
+      void MoveBefore( EndLocation location );
+      void MoveBefore( SplitterLocation location );
+      void MoveBefore( OrphanLocation location );
+      void MoveBefore( ColumnLocation location );
+
+      void MoveAfter( StartLocation location );
+      void MoveAfter( EndLocation location );
+      void MoveAfter( SplitterLocation location );
+      void MoveAfter( OrphanLocation location );
+      void MoveAfter( ColumnLocation location );
+
+      void MoveUnder( StartLocation location );
+      void MoveUnder( EndLocation location );
+      void MoveUnder( SplitterLocation location );
+      void MoveUnder( OrphanLocation location );
+      void MoveUnder( ColumnLocation location );
+    }
+
+    #endregion
+
+    #region Markers Private Class
+
+    private sealed class Markers : IMarkers
+    {
+      internal Markers( ColumnHierarchyModel<TColumn, TStatus> owner, int level, MarkEntry entry )
+      {
+        Debug.Assert( owner != null );
+
+        m_owner = owner;
+        m_level = level;
+        m_entry = entry;
+      }
+
+      public ILocation Start
+      {
+        get
+        {
+          this.EnsureMarks();
+
+          return m_owner.CreateStartLocation( m_level, m_entry.Start );
+        }
+      }
+
+      public ILocation End
+      {
+        get
+        {
+          this.EnsureMarks();
+
+          return m_owner.CreateEndLocation( m_level, m_entry.End );
+        }
+      }
+
+      public ILocation Splitter
+      {
+        get
+        {
+          this.EnsureMarks();
+
+          return m_owner.CreateSplitterLocation( m_level, m_entry.Splitter );
+        }
+      }
+
+      public ILocation Orphan
+      {
+        get
+        {
+          this.EnsureMarks();
+
+          return m_owner.CreateOrphanLocation( m_level, m_entry.Orphan );
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_level;
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as Markers;
+        if( target == null )
+          return false;
+
+        return ( m_level == target.m_level )
+            && ( object.Equals( m_entry, target.m_entry ) )
+            && ( m_owner == target.m_owner );
+      }
+
+      private void EnsureMarks()
+      {
+        m_owner.EnsureMarks( m_level, m_entry );
+      }
+
+      private readonly ColumnHierarchyModel<TColumn, TStatus> m_owner;
+      private readonly int m_level;
+      private readonly MarkEntry m_entry;
+    }
+
+    #endregion
+
+    #region Location Private Class
+
+    private abstract class Location : ILocation, IMovableLocation, IPivotLocation
+    {
+      protected Location( ColumnHierarchyModel<TColumn, TStatus> owner, int index )
+      {
+        Debug.Assert( owner != null );
+
+        m_owner = owner;
+        m_index = index;
+      }
+
+      protected abstract LocationType Type
+      {
+        get;
+      }
+
+      protected int Level
+      {
+        get
+        {
+          return this.EnsureLocation();
+        }
+      }
+
+      internal int Index
+      {
+        get
+        {
+          return m_index;
+        }
+      }
+
+      internal ColumnHierarchyModel<TColumn, TStatus> Owner
+      {
+        get
+        {
+          return m_owner;
+        }
+      }
+
+      LocationType ILocation.Type
+      {
+        get
+        {
+          return this.Type;
+        }
+      }
+
+      int ILocation.Level
+      {
+        get
+        {
+          return this.Level;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_index;
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as Location;
+        if( target == null )
+          return false;
+
+        return ( m_index == target.m_index )
+            && ( m_owner == target.m_owner );
+      }
+
+      protected TStatus GetStatus()
+      {
+        this.EnsureLocation();
+
+        return m_owner.GetStatus( m_index );
+      }
+
+      protected void SetStatus( TStatus status )
+      {
+        this.EnsureLocation();
+
+        m_owner.SetStatus( m_index, status );
+      }
+
+      protected void MoveBeforeCore( Location location )
+      {
+        m_owner.MoveBefore( m_index, location.m_index );
+      }
+
+      protected void MoveAfterCore( Location location )
+      {
+        m_owner.MoveAfter( m_index, location.m_index );
+      }
+
+      protected void MoveUnderCore( Location location )
+      {
+        m_owner.MoveUnder( m_index, location.m_index );
+      }
+
+      protected virtual bool CanMoveBefore( StartLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveBefore( EndLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveBefore( SplitterLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveBefore( OrphanLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveBefore( ColumnLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveAfter( StartLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveAfter( EndLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveAfter( SplitterLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveAfter( OrphanLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveAfter( ColumnLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveUnder( StartLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveUnder( EndLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveUnder( SplitterLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveUnder( OrphanLocation location )
+      {
+        return false;
+      }
+
+      protected virtual bool CanMoveUnder( ColumnLocation location )
+      {
+        return false;
+      }
+
+      protected virtual void MoveBefore( StartLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveBefore( EndLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveBefore( SplitterLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveBefore( OrphanLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveBefore( ColumnLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveAfter( StartLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveAfter( EndLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveAfter( SplitterLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveAfter( OrphanLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveAfter( ColumnLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveUnder( StartLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveUnder( EndLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveUnder( SplitterLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveUnder( OrphanLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected virtual void MoveUnder( ColumnLocation location )
+      {
+        throw new NotSupportedException();
+      }
+
+      protected abstract bool CanBeNextSiblingOf( IMovableLocation location );
+      protected abstract bool CanBePreviousSiblingOf( IMovableLocation location );
+      protected abstract bool CanBeParentOf( IMovableLocation location );
+      protected abstract void SetHasNextSiblingOf( IMovableLocation location );
+      protected abstract void SetHasPreviousSiblingOf( IMovableLocation location );
+      protected abstract void SetHasParentOf( IMovableLocation location );
+
+      internal abstract int EnsureLocation();
+
+      private int EnsureLocation( ILocation location )
+      {
+        if( location == null )
+          throw new ArgumentNullException( "location" );
+
+        var target = location as Location;
+        if( target == null )
+          throw new ArgumentException( "The location must derive from Location.", "location" );
+
+        if( target.Owner != m_owner )
+          throw new ArgumentException( "The location must share the same owner.", "location" );
+
+        return target.EnsureLocation();
+      }
+
+      private void EnsureSiblingLocation( ILocation location )
+      {
+        var sourceLevel = this.EnsureLocation();
+        var targetLevel = this.EnsureLocation( location );
+
+        if( sourceLevel != targetLevel )
+          throw new ArgumentException( "The location must be on the same level.", "location" );
+      }
+
+      private void EnsureParentLocation( ILocation location )
+      {
+        var sourceLevel = this.EnsureLocation();
+        var targetLevel = this.EnsureLocation( location );
+
+        if( sourceLevel != targetLevel - 1 )
+          throw new ArgumentException( "The location must be on the parent level.", "location" );
+      }
+
+      ILocation ILocation.GetParent()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetParent( m_index ) );
+      }
+
+      ILocation ILocation.GetFirstChild()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetFirstChild( m_index ) );
+      }
+
+      ILocation ILocation.GetPreviousSibling()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetPreviousSibling( m_index ) );
+      }
+
+      ILocation ILocation.GetNextSibling()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetNextSibling( m_index ) );
+      }
+
+      ILocation ILocation.GetPreviousSiblingOrCousin()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetPreviousSiblingOrCousin( m_index ) );
+      }
+
+      ILocation ILocation.GetNextSiblingOrCousin()
+      {
+        this.EnsureLocation();
+        return m_owner.GetTargetLocation( m_owner.GetNextSiblingOrCousin( m_index ) );
+      }
+
+      bool ILocation.CanMoveBefore( ILocation location )
+      {
+        if( location == null )
+          return false;
+
+        if( object.Equals( location, this ) )
+          return false;
+
+        var currentLevel = this.EnsureLocation();
+        var targetLevel = this.EnsureLocation( location );
+
+        if( currentLevel != targetLevel )
+          return false;
+
+        Debug.Assert( location is IPivotLocation );
+
+        return ( ( IPivotLocation )location ).CanBeNextSiblingOf( this );
+      }
+
+      bool ILocation.CanMoveAfter( ILocation location )
+      {
+        if( location == null )
+          return false;
+
+        if( object.Equals( location, this ) )
+          return false;
+
+        var currentLevel = this.EnsureLocation();
+        var targetLevel = this.EnsureLocation( location );
+
+        if( currentLevel != targetLevel )
+          return false;
+
+        Debug.Assert( location is IPivotLocation );
+
+        return ( ( IPivotLocation )location ).CanBePreviousSiblingOf( this );
+      }
+
+      bool ILocation.CanMoveUnder( ILocation location )
+      {
+        if( location == null )
+          return false;
+
+        if( object.Equals( location, this ) )
+          return false;
+
+        var currentLevel = this.EnsureLocation();
+        var targetLevel = this.EnsureLocation( location );
+
+        if( currentLevel != targetLevel - 1 )
+          return false;
+
+        Debug.Assert( location is IPivotLocation );
+
+        return ( ( IPivotLocation )location ).CanBeParentOf( this );
+      }
+
+      void ILocation.MoveBefore( ILocation location )
+      {
+        this.EnsureSiblingLocation( location );
+
+        Debug.Assert( ( ( ILocation )this ).CanMoveBefore( location ) );
+        Debug.Assert( location is IPivotLocation );
+
+        ( ( IPivotLocation )location ).SetHasNextSiblingOf( this );
+      }
+
+      void ILocation.MoveAfter( ILocation location )
+      {
+        this.EnsureSiblingLocation( location );
+
+        Debug.Assert( ( ( ILocation )this ).CanMoveAfter( location ) );
+        Debug.Assert( location is IPivotLocation );
+
+        ( ( IPivotLocation )location ).SetHasPreviousSiblingOf( this );
+      }
+
+      void ILocation.MoveUnder( ILocation location )
+      {
+        this.EnsureParentLocation( location );
+
+        Debug.Assert( ( ( ILocation )this ).CanMoveUnder( location ) );
+        Debug.Assert( location is IPivotLocation );
+
+        ( ( IPivotLocation )location ).SetHasParentOf( this );
+      }
+
+      bool IMovableLocation.CanMoveBefore( StartLocation location )
+      {
+        return this.CanMoveBefore( location );
+      }
+
+      bool IMovableLocation.CanMoveBefore( EndLocation location )
+      {
+        return this.CanMoveBefore( location );
+      }
+
+      bool IMovableLocation.CanMoveBefore( SplitterLocation location )
+      {
+        return this.CanMoveBefore( location );
+      }
+
+      bool IMovableLocation.CanMoveBefore( OrphanLocation location )
+      {
+        return this.CanMoveBefore( location );
+      }
+
+      bool IMovableLocation.CanMoveBefore( ColumnLocation location )
+      {
+        return this.CanMoveBefore( location );
+      }
+
+      bool IMovableLocation.CanMoveAfter( StartLocation location )
+      {
+        return this.CanMoveAfter( location );
+      }
+
+      bool IMovableLocation.CanMoveAfter( EndLocation location )
+      {
+        return this.CanMoveAfter( location );
+      }
+
+      bool IMovableLocation.CanMoveAfter( SplitterLocation location )
+      {
+        return this.CanMoveAfter( location );
+      }
+
+      bool IMovableLocation.CanMoveAfter( OrphanLocation location )
+      {
+        return this.CanMoveAfter( location );
+      }
+
+      bool IMovableLocation.CanMoveAfter( ColumnLocation location )
+      {
+        return this.CanMoveAfter( location );
+      }
+
+      bool IMovableLocation.CanMoveUnder( StartLocation location )
+      {
+        return this.CanMoveUnder( location );
+      }
+
+      bool IMovableLocation.CanMoveUnder( EndLocation location )
+      {
+        return this.CanMoveUnder( location );
+      }
+
+      bool IMovableLocation.CanMoveUnder( SplitterLocation location )
+      {
+        return this.CanMoveUnder( location );
+      }
+
+      bool IMovableLocation.CanMoveUnder( OrphanLocation location )
+      {
+        return this.CanMoveUnder( location );
+      }
+
+      bool IMovableLocation.CanMoveUnder( ColumnLocation location )
+      {
+        return this.CanMoveUnder( location );
+      }
+
+      void IMovableLocation.MoveBefore( StartLocation location )
+      {
+        this.MoveBefore( location );
+      }
+
+      void IMovableLocation.MoveBefore( EndLocation location )
+      {
+        this.MoveBefore( location );
+      }
+
+      void IMovableLocation.MoveBefore( SplitterLocation location )
+      {
+        this.MoveBefore( location );
+      }
+
+      void IMovableLocation.MoveBefore( OrphanLocation location )
+      {
+        this.MoveBefore( location );
+      }
+
+      void IMovableLocation.MoveBefore( ColumnLocation location )
+      {
+        this.MoveBefore( location );
+      }
+
+      void IMovableLocation.MoveAfter( StartLocation location )
+      {
+        this.MoveAfter( location );
+      }
+
+      void IMovableLocation.MoveAfter( EndLocation location )
+      {
+        this.MoveAfter( location );
+      }
+
+      void IMovableLocation.MoveAfter( SplitterLocation location )
+      {
+        this.MoveAfter( location );
+      }
+
+      void IMovableLocation.MoveAfter( OrphanLocation location )
+      {
+        this.MoveAfter( location );
+      }
+
+      void IMovableLocation.MoveAfter( ColumnLocation location )
+      {
+        this.MoveAfter( location );
+      }
+
+      void IMovableLocation.MoveUnder( StartLocation location )
+      {
+        this.MoveUnder( location );
+      }
+
+      void IMovableLocation.MoveUnder( EndLocation location )
+      {
+        this.MoveUnder( location );
+      }
+
+      void IMovableLocation.MoveUnder( SplitterLocation location )
+      {
+        this.MoveUnder( location );
+      }
+
+      void IMovableLocation.MoveUnder( OrphanLocation location )
+      {
+        this.MoveUnder( location );
+      }
+
+      void IMovableLocation.MoveUnder( ColumnLocation location )
+      {
+        this.MoveUnder( location );
+      }
+
+      bool IPivotLocation.CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return this.CanBeNextSiblingOf( location );
+      }
+
+      bool IPivotLocation.CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return this.CanBePreviousSiblingOf( location );
+      }
+
+      bool IPivotLocation.CanBeParentOf( IMovableLocation location )
+      {
+        return this.CanBeParentOf( location );
+      }
+
+      void IPivotLocation.SetHasNextSiblingOf( IMovableLocation location )
+      {
+        this.SetHasNextSiblingOf( location );
+      }
+
+      void IPivotLocation.SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        this.SetHasPreviousSiblingOf( location );
+      }
+
+      void IPivotLocation.SetHasParentOf( IMovableLocation location )
+      {
+        this.SetHasParentOf( location );
+      }
+
+      private readonly ColumnHierarchyModel<TColumn, TStatus> m_owner;
+      private readonly int m_index;
+    }
+
+    #endregion
+
+    #region StartLocation Private Class
+
+    private sealed class StartLocation : Location
+    {
+      internal StartLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
+        : base( owner, index )
+      {
+        m_level = level;
+      }
+
+      protected override LocationType Type
+      {
+        get
+        {
+          return LocationType.Start;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as StartLocation;
+        if( target == null )
+          return false;
+
+        return ( m_level == target.m_level )
+            && ( base.Equals( target ) );
+      }
+
+      protected override bool CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveBefore( this );
+      }
+
+      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveAfter( this );
+      }
+
+      protected override bool CanBeParentOf( IMovableLocation location )
+      {
+        return location.CanMoveUnder( this );
+      }
+
+      protected override void SetHasNextSiblingOf( IMovableLocation location )
+      {
+        location.MoveBefore( this );
+      }
+
+      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        location.MoveAfter( this );
+      }
+
+      protected override void SetHasParentOf( IMovableLocation location )
+      {
+        location.MoveUnder( this );
+      }
+
+      internal override int EnsureLocation()
+      {
+        return this.Owner.EnsureStart( m_level, this.Index );
+      }
+
+      private readonly int m_level;
+    }
+
+    #endregion
+
+    #region EndLocation Private Class
+
+    private sealed class EndLocation : Location
+    {
+      internal EndLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
+        : base( owner, index )
+      {
+        m_level = level;
+      }
+
+      protected override LocationType Type
+      {
+        get
+        {
+          return LocationType.End;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as EndLocation;
+        if( target == null )
+          return false;
+
+        return ( m_level == target.m_level )
+            && ( base.Equals( target ) );
+      }
+
+      protected override bool CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveBefore( this );
+      }
+
+      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveAfter( this );
+      }
+
+      protected override bool CanBeParentOf( IMovableLocation location )
+      {
+        return location.CanMoveUnder( this );
+      }
+
+      protected override void SetHasNextSiblingOf( IMovableLocation location )
+      {
+        location.MoveBefore( this );
+      }
+
+      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        location.MoveAfter( this );
+      }
+
+      protected override void SetHasParentOf( IMovableLocation location )
+      {
+        location.MoveUnder( this );
+      }
+
+      internal override int EnsureLocation()
+      {
+        return this.Owner.EnsureEnd( m_level, this.Index );
+      }
+
+      private readonly int m_level;
+    }
+
+    #endregion
+
+    #region SplitterLocation Private Class
+
+    private sealed class SplitterLocation : Location
+    {
+      internal SplitterLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
+        : base( owner, index )
+      {
+        m_level = level;
+      }
+
+      protected override LocationType Type
+      {
+        get
+        {
+          return LocationType.Splitter;
+        }
+      }
+
+      internal bool IsMovable
+      {
+        get
+        {
+          return ( m_level == this.Owner.LevelCount - 1 );
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as SplitterLocation;
+        if( target == null )
+          return false;
+
+        return ( m_level == target.m_level )
+            && ( base.Equals( target ) );
+      }
+
+      protected override bool CanMoveBefore( ColumnLocation location )
+      {
+        return this.CanMoveSplitterBefore( location );
+      }
+
+      protected override bool CanMoveBefore( OrphanLocation location )
+      {
+        return this.CanMoveSplitterBefore( location );
+      }
+
+      protected override bool CanMoveAfter( ColumnLocation location )
+      {
+        return this.CanMoveSplitterAfter( location );
+      }
+
+      protected override bool CanMoveAfter( StartLocation location )
+      {
+        return this.CanMoveSplitterAfter( location );
+      }
+
+      protected override void MoveBefore( ColumnLocation location )
+      {
+        this.MoveSplitterBefore( location );
+      }
+
+      protected override void MoveBefore( OrphanLocation location )
+      {
+        this.MoveSplitterBefore( location );
+      }
+
+      protected override void MoveAfter( ColumnLocation location )
+      {
+        this.MoveSplitterAfter( location );
+      }
+
+      protected override void MoveAfter( StartLocation location )
+      {
+        this.MoveSplitterAfter( location );
+      }
+
+      protected override bool CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveBefore( this );
+      }
+
+      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveAfter( this );
+      }
+
+      protected override bool CanBeParentOf( IMovableLocation location )
+      {
+        return location.CanMoveUnder( this );
+      }
+
+      protected override void SetHasNextSiblingOf( IMovableLocation location )
+      {
+        location.MoveBefore( this );
+      }
+
+      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        location.MoveAfter( this );
+      }
+
+      protected override void SetHasParentOf( IMovableLocation location )
+      {
+        location.MoveUnder( this );
+      }
+
+      internal override int EnsureLocation()
+      {
+        return this.Owner.EnsureSplitter( m_level, this.Index );
+      }
+
+      private bool CanMoveSplitterBefore( ILocation location )
+      {
+        if( this.IsMovable )
+          return true;
+
+        // The current and target locations should not be on the top-most level.
+        Debug.Assert( m_level < this.Owner.LevelCount - 1 );
+
+        // The splitter may not move or a merged column is going to be splitted.
+        if( location.GetPreviousSibling() != null )
+          return false;
+
+        var parentLocation = ( ( ILocation )this ).GetParent();
+        Debug.Assert( parentLocation != null );
+
+        return parentLocation.CanMoveBefore( location.GetParent() );
+      }
+
+      private bool CanMoveSplitterAfter( ILocation location )
+      {
+        if( this.IsMovable )
+          return true;
+
+        // The current and target locations should not be on the top-most level.
+        Debug.Assert( m_level < this.Owner.LevelCount - 1 );
+
+        // The splitter may not move or a merged column is going to be splitted.
+        if( location.GetNextSibling() != null )
+          return false;
+
+        var parentLocation = ( ( ILocation )this ).GetParent();
+        Debug.Assert( parentLocation != null );
+
+        return parentLocation.CanMoveAfter( location.GetParent() );
+      }
+
+      private void MoveSplitterBefore( Location location )
+      {
+        if( this.IsMovable )
+        {
+          this.MoveBeforeCore( location );
+        }
+        else
+        {
+          var parentLocation = ( ( ILocation )this ).GetParent();
+          Debug.Assert( parentLocation != null );
+
+          parentLocation.MoveBefore( ( ( ILocation )location ).GetParent() );
+        }
+      }
+
+      private void MoveSplitterAfter( Location location )
+      {
+        if( this.IsMovable )
+        {
+          this.MoveAfterCore( location );
+        }
+        else
+        {
+          var parentLocation = ( ( ILocation )this ).GetParent();
+          Debug.Assert( parentLocation != null );
+
+          parentLocation.MoveAfter( ( ( ILocation )location ).GetParent() );
+        }
+      }
+
+      private readonly int m_level;
+    }
+
+    #endregion
+
+    #region OrphanLocation Private Class
+
+    private sealed class OrphanLocation : Location
+    {
+      internal OrphanLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
+        : base( owner, index )
+      {
+        m_level = level;
+      }
+
+      protected override LocationType Type
+      {
+        get
+        {
+          return LocationType.Orphan;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as OrphanLocation;
+        if( target == null )
+          return false;
+
+        return ( m_level == target.m_level )
+            && ( base.Equals( target ) );
+      }
+
+      protected override bool CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveBefore( this );
+      }
+
+      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveAfter( this );
+      }
+
+      protected override bool CanBeParentOf( IMovableLocation location )
+      {
+        return location.CanMoveUnder( this );
+      }
+
+      protected override void SetHasNextSiblingOf( IMovableLocation location )
+      {
+        location.MoveBefore( this );
+      }
+
+      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        location.MoveAfter( this );
+      }
+
+      protected override void SetHasParentOf( IMovableLocation location )
+      {
+        location.MoveUnder( this );
+      }
+
+      internal override int EnsureLocation()
+      {
+        return this.Owner.EnsureOrphan( m_level, this.Index );
+      }
+
+      private readonly int m_level;
+    }
+
+    #endregion
+
+    #region ColumnLocation Private Class
+
+    private sealed class ColumnLocation : Location, IColumnLocation
+    {
+      internal ColumnLocation( ColumnHierarchyModel<TColumn, TStatus> owner, TColumn column, int hashCode, int index )
+        : base( owner, index )
+      {
+        m_column = column;
+        m_hashCode = hashCode;
+      }
+
+      protected override LocationType Type
+      {
+        get
+        {
+          return LocationType.Column;
+        }
+      }
+
+      TColumn IColumnLocation.Column
+      {
+        get
+        {
+          return m_column;
+        }
+      }
+
+      TStatus IColumnLocation.Status
+      {
+        get
+        {
+          return this.GetStatus();
+        }
+        set
+        {
+          this.SetStatus( value );
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as ColumnLocation;
+        if( target == null )
+          return false;
+
+        return ( object.Equals( m_column, target.m_column ) )
+            && ( base.Equals( target ) );
+      }
+
+      protected override bool CanMoveBefore( ColumnLocation location )
+      {
+        return true;
+      }
+
+      protected override bool CanMoveBefore( SplitterLocation location )
+      {
+        // The column may move only next to the the top-most splitter.
+        return location.IsMovable;
+      }
+
+      protected override bool CanMoveBefore( OrphanLocation location )
+      {
+        return true;
+      }
+
+      protected override bool CanMoveAfter( ColumnLocation location )
+      {
+        return true;
+      }
+
+      protected override bool CanMoveAfter( SplitterLocation location )
+      {
+        // The column may move only next to the the top-most splitter.
+        return location.IsMovable;
+      }
+
+      protected override bool CanMoveAfter( StartLocation location )
+      {
+        return true;
+      }
+
+      protected override bool CanMoveUnder( ColumnLocation location )
+      {
+        return true;
+      }
+
+      protected override bool CanMoveUnder( OrphanLocation location )
+      {
+        return true;
+      }
+
+      protected override void MoveBefore( ColumnLocation location )
+      {
+        this.MoveBeforeCore( location );
+      }
+
+      protected override void MoveBefore( SplitterLocation location )
+      {
+        this.MoveBeforeCore( location );
+      }
+
+      protected override void MoveBefore( OrphanLocation location )
+      {
+        this.MoveBeforeCore( location );
+      }
+
+      protected override void MoveAfter( ColumnLocation location )
+      {
+        this.MoveAfterCore( location );
+      }
+
+      protected override void MoveAfter( SplitterLocation location )
+      {
+        this.MoveAfterCore( location );
+      }
+
+      protected override void MoveAfter( StartLocation location )
+      {
+        this.MoveAfterCore( location );
+      }
+
+      protected override void MoveUnder( ColumnLocation location )
+      {
+        this.MoveUnderCore( location );
+      }
+
+      protected override void MoveUnder( OrphanLocation location )
+      {
+        this.MoveUnderCore( location );
+      }
+
+      protected override bool CanBeNextSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveBefore( this );
+      }
+
+      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
+      {
+        return location.CanMoveAfter( this );
+      }
+
+      protected override bool CanBeParentOf( IMovableLocation location )
+      {
+        return location.CanMoveUnder( this );
+      }
+
+      protected override void SetHasNextSiblingOf( IMovableLocation location )
+      {
+        location.MoveBefore( this );
+      }
+
+      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
+      {
+        location.MoveAfter( this );
+      }
+
+      protected override void SetHasParentOf( IMovableLocation location )
+      {
+        location.MoveUnder( this );
+      }
+
+      internal override int EnsureLocation()
+      {
+        return this.Owner.EnsureColumn( m_column, m_hashCode, this.Index );
+      }
+
+      private readonly TColumn m_column;
+      private readonly int m_hashCode;
+    }
+
+    #endregion
+
+    #region ColumnEntry Private Struct
+
+    [DebuggerDisplay( "Column = {Column}, Next = {Next}" )]
+    private struct ColumnEntry
+    {
+      internal ColumnEntry( TColumn column, int hashCode, int next )
+      {
+        m_column = column;
+        m_hashCode = hashCode;
+        m_next = next;
+      }
+
+      internal ColumnEntry( int next )
+        : this( default( TColumn ), 0, next )
+      {
+      }
+
+      internal TColumn Column
+      {
+        get
+        {
+          return m_column;
+        }
+      }
+
+      internal int HashCode
+      {
+        get
+        {
+          return m_hashCode;
+        }
+      }
+
+      internal int Next
+      {
+        get
+        {
+          return m_next;
+        }
+      }
+
+      internal ColumnEntry SetNext( int next )
+      {
+        return new ColumnEntry( m_column, m_hashCode, next );
+      }
+
+      private readonly TColumn m_column;
+      private readonly int m_hashCode;
+      private readonly int m_next;
+    }
+
+    #endregion
+
+    #region MarkEntry Private Struct
+
+    [DebuggerDisplay( "Start = {Start}, End = {End}, Splitter = {Splitter}, Orphan = {Orphan}" )]
+    private struct MarkEntry
+    {
+      internal static readonly MarkEntry Default = new MarkEntry( ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None );
+
+      internal MarkEntry( int start, int end, int splitter, int orphan )
+      {
+        m_start = start;
+        m_end = end;
+        m_splitter = splitter;
+        m_orphan = orphan;
+      }
+
+      internal int Start
+      {
+        get
+        {
+          return m_start;
+        }
+      }
+
+      internal int End
+      {
+        get
+        {
+          return m_end;
+        }
+      }
+
+      internal int Splitter
+      {
+        get
+        {
+          return m_splitter;
+        }
+      }
+
+      internal int Orphan
+      {
+        get
+        {
+          return m_orphan;
+        }
+      }
+
+      private readonly int m_start;
+      private readonly int m_end;
+      private readonly int m_splitter;
+      private readonly int m_orphan;
+    }
+
+    #endregion
+
+    #region RelationEntry Private Struct
+
+    [DebuggerDisplay( "Parent = {Parent}, FirstChild = {FirstChild}, Previous = {Previous}, Next = {Next}" )]
+    private struct RelationEntry
+    {
+      internal static readonly RelationEntry Default = new RelationEntry( ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None );
+
+      internal RelationEntry( int parent, int child, int previous, int next )
+      {
+        m_previous = previous;
+        m_next = next;
+        m_parent = parent;
+        m_child = child;
+      }
+
+      internal RelationEntry( int child, int previous, int next )
+        : this( ColumnHierarchyModel<TColumn, TStatus>.None, child, previous, next )
+      {
+      }
+
+      internal RelationEntry( int previous, int next )
+        : this( ColumnHierarchyModel<TColumn, TStatus>.None, previous, next )
+      {
+      }
+
+      internal int Parent
+      {
+        get
+        {
+          return m_parent;
+        }
+      }
+
+      internal int FirstChild
+      {
+        get
+        {
+          return m_child;
+        }
+      }
+
+      internal int Previous
+      {
+        get
+        {
+          return m_previous;
+        }
+      }
+
+      internal int Next
+      {
+        get
+        {
+          return m_next;
+        }
+      }
+
+      internal RelationEntry SetParent( int parent )
+      {
+        return new RelationEntry( parent, m_child, m_previous, m_next );
+      }
+
+      internal RelationEntry SetFirstChild( int child )
+      {
+        return new RelationEntry( m_parent, child, m_previous, m_next );
+      }
+
+      internal RelationEntry SetPrevious( int previous )
+      {
+        return new RelationEntry( m_parent, m_child, previous, m_next );
+      }
+
+      internal RelationEntry SetNext( int next )
+      {
+        return new RelationEntry( m_parent, m_child, m_previous, next );
+      }
+
+      private readonly int m_previous;
+      private readonly int m_next;
+      private readonly int m_parent;
+      private readonly int m_child;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
index 7474089a..3704d7fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
@@ -14,8 +14,10 @@
 
   ***********************************************************************************/
 
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Automation.Peers;
 using System.Windows.Controls.Primitives;
@@ -24,7 +26,6 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Automation;
 using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
@@ -35,8 +36,8 @@ namespace Xceed.Wpf.DataGrid
   {
     static ColumnManagerCell()
     {
-      FocusableProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( false ) );
-      ReadOnlyProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( true ) );
+      UIElement.FocusableProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( false ) );
+      Cell.ReadOnlyProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( true ) );
 
       ColumnManagerCell.IsPressedProperty = ColumnManagerCell.IsPressedPropertyKey.DependencyProperty;
 
@@ -151,13 +152,26 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ColumnReordering Internal Event
+    #region CanBeCollapsed Property
 
-    internal static readonly RoutedEvent ColumnReorderingEvent =
-          EventManager.RegisterRoutedEvent( "ColumnReordering",
-             RoutingStrategy.Bubble,
-             typeof( ColumnReorderingEventHandler ),
-             typeof( ColumnManagerCell ) );
+    internal override bool CanBeCollapsed
+    {
+      get
+      {
+        // A ColumnManagerCell is always collapsible (except when it, or it's parent column, is being dragged), since it can't be edited.
+        if( ( bool )this.GetValue( ColumnManagerCell.IsBeingDraggedProperty ) )
+        {
+          return false;
+        }
+
+        var parentColumn = this.ParentColumn;
+        if( parentColumn == null )
+          return true;
+
+        return !TableflowView.GetIsBeingDraggedAnimated( parentColumn );
+
+      }
+    }
 
     #endregion
 
@@ -172,15 +186,11 @@ namespace Xceed.Wpf.DataGrid
     {
       base.InitializeCore( dataGridContext, parentRow, parentColumn );
 
-      this.SetColumnBinding( ColumnManagerCell.ContentProperty, parentColumn, ColumnBase.TitleProperty );
-      this.SetColumnBinding( ColumnManagerCell.ContentTemplateProperty, parentColumn, ColumnBase.TitleTemplateProperty );
-      this.SetColumnBinding( ColumnManagerCell.ContentTemplateSelectorProperty, parentColumn, ColumnBase.TitleTemplateSelectorProperty );
+      this.SetColumnBinding( ColumnManagerCell.ContentProperty, "ParentColumn.Title" );
+      this.SetColumnBinding( ColumnManagerCell.ContentTemplateProperty, "ParentColumn.TitleTemplate" );
+      this.SetColumnBinding( ColumnManagerCell.ContentTemplateSelectorProperty, "ParentColumn.TitleTemplateSelector" );
     }
 
-    protected override AutomationPeer OnCreateAutomationPeer()
-    {
-      return new ColumnManagerCellAutomationPeer( this );
-    }
 
     protected internal override void PrepareDefaultStyleKey( ViewBase view )
     {
@@ -226,8 +236,7 @@ namespace Xceed.Wpf.DataGrid
             UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
 
             m_dragSourceManager.DropOutsideCursor = ( uiViewBase != null ) ? uiViewBase.CannotDropDraggedElementCursor : UIViewBase.DefaultCannotDropDraggedElementCursor;
-
-            m_dragSourceManager.ProcessMouseLeftButtonDown( e );
+            m_dragSourceManager.DragStart( e );
           }
         }
 
@@ -243,7 +252,7 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_dragSourceManager != null )
         {
-          m_dragSourceManager.ProcessMouseMove( e );
+          m_dragSourceManager.DragMove( e );
         }
 
         if( !this.IsBeingDragged )
@@ -270,7 +279,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( m_dragSourceManager != null )
       {
-        m_dragSourceManager.ProcessMouseLeftButtonUp( e );
+        m_dragSourceManager.Drop( e );
       }
 
       if( isMouseCaptured )
@@ -312,7 +321,7 @@ namespace Xceed.Wpf.DataGrid
     {
       if( m_dragSourceManager != null )
       {
-        m_dragSourceManager.ProcessLostMouseCapture( e );
+        m_dragSourceManager.DragCancel( e );
       }
 
       if( this.IsPressed )
@@ -367,8 +376,6 @@ namespace Xceed.Wpf.DataGrid
       Debug.Assert( dataGridContext != null );
 
       var toggleColumnSortCommand = dataGridContext.ToggleColumnSortCommand;
-      if( !toggleColumnSortCommand.CanExecute( column, shiftUnpressed ) )
-        return;
 
       toggleColumnSortCommand.Execute( column, shiftUnpressed );
     }
@@ -433,7 +440,7 @@ namespace Xceed.Wpf.DataGrid
       m_originalWidth = -1d;
     }
 
-    internal void ShowDropMark( Point mousePosition )
+    internal void ShowDropMark( RelativePoint mousePosition )
     {
       if( m_dropMarkAdorner == null )
       {
@@ -532,9 +539,9 @@ namespace Xceed.Wpf.DataGrid
 
     private void SetupDragManager()
     {
+      // Prevent any drag operation if columns layout is changing.
       var dataGridContext = this.DataGridContext;
-      // Can be null in design-time (edition of a style TargetType ColumnManagerCell).
-      if( dataGridContext == null )
+      if( ( dataGridContext == null ) || ( dataGridContext.ColumnManager.IsUpdateDeferred ) )
         return;
 
       // We do not support DragDrop when there are no AdornerLayer because there wouldn't be any visual feedback for the operation.
@@ -553,8 +560,7 @@ namespace Xceed.Wpf.DataGrid
       }
 
       var dataGridControl = dataGridContext.DataGridControl;
-      if( dataGridControl == null )
-        return;
+      Debug.Assert( dataGridControl != null );
 
       if( m_dragSourceManager != null )
       {
@@ -579,13 +585,14 @@ namespace Xceed.Wpf.DataGrid
       binding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AutoScrollIntervalProperty );
       binding.Mode = BindingMode.OneWay;
       binding.Source = this;
+      binding.Converter = new MillisecondsConverter();
       BindingOperations.SetBinding( m_dragSourceManager, DragSourceManager.AutoScrollIntervalProperty, binding );
 
       binding = new Binding();
-      binding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AutoScrollTresholdProperty );
+      binding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AutoScrollThresholdProperty );
       binding.Mode = BindingMode.OneWay;
       binding.Source = this;
-      BindingOperations.SetBinding( m_dragSourceManager, DragSourceManager.AutoScrollTresholdProperty, binding );
+      BindingOperations.SetBinding( m_dragSourceManager, DragSourceManager.AutoScrollThresholdProperty, binding );
     }
 
     private void DragSourceManager_PropertyChanged( object sender, PropertyChangedEventArgs e )
@@ -663,7 +670,11 @@ namespace Xceed.Wpf.DataGrid
 
     private ColumnManagerCell GetPreviousVisibleColumnManagerCell()
     {
-      var previousVisibleColumn = this.ParentColumn.PreviousVisibleColumn;
+      var parentColumn = this.ParentColumn;
+      if( parentColumn == null )
+        return null;
+
+      var previousVisibleColumn = parentColumn.PreviousVisibleColumn;
       if( previousVisibleColumn == null )
         return null;
 
@@ -715,12 +726,12 @@ namespace Xceed.Wpf.DataGrid
       previousColumnManagerCell.ColumnResizerThumb_DragCompleted( previousColumnManagerCell, e );
     }
 
-    private void SetColumnBinding( DependencyProperty targetProperty, ColumnBase parentColumn, DependencyProperty sourceProperty )
+    private void SetColumnBinding( DependencyProperty targetProperty, string sourceProperty )
     {
-      if( this.HasColumnBinding( targetProperty, parentColumn, sourceProperty ) )
+      if( BindingOperations.GetBinding( this, targetProperty ) != null )
         return;
 
-      var binding = ColumnManagerCell.CreateColumnBinding( parentColumn, sourceProperty );
+      var binding = ColumnManagerCell.CreateColumnBinding( sourceProperty );
       if( binding != null )
       {
         BindingOperations.SetBinding( this, targetProperty, binding );
@@ -731,35 +742,12 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private bool HasColumnBinding( DependencyProperty targetProperty, ColumnBase parentColumn, DependencyProperty sourceProperty )
-    {
-      if( parentColumn == null )
-        return false;
-
-      var binding = BindingOperations.GetBinding( this, targetProperty );
-      if( binding == null )
-        return false;
-
-      var path = binding.Path;
-      if( path == null )
-        return false;
-
-      var pathParameters = path.PathParameters;
-
-      return ( binding.Source == parentColumn )
-          && ( pathParameters.Count == 1 )
-          && ( pathParameters[ 0 ] == sourceProperty );
-    }
-
-    private static Binding CreateColumnBinding( ColumnBase parentColumn, DependencyProperty sourceProperty )
+    private static Binding CreateColumnBinding( string sourceProperty )
     {
-      if( parentColumn == null )
-        return null;
-
       var binding = new Binding();
       binding.Path = new PropertyPath( sourceProperty );
       binding.Mode = BindingMode.OneWay;
-      binding.Source = parentColumn;
+      binding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
       binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
 
       return binding;
@@ -767,38 +755,63 @@ namespace Xceed.Wpf.DataGrid
 
     #region IDropTarget Members
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
+      var draggedCell = draggedElement as ColumnManagerCell;
       if( ( draggedCell == null ) || ( this == draggedCell ) )
         return false;
 
-      ColumnManagerRow parentRow = this.ParentRow as ColumnManagerRow;
+      var parentRow = this.ParentRow as ColumnManagerRow;
       if( ( parentRow == null ) || !parentRow.AllowColumnReorder )
         return false;
 
-      if( !ColumnManagerCell.CanMove( draggedCell ) || !ColumnManagerCell.CanMove( this ) )
+      var draggedDetailContext = draggedCell.DataGridContext;
+      var sourceDetailContext = this.DataGridContext;
+      Debug.Assert( ( draggedDetailContext != null ) && ( sourceDetailContext != null ) );
+
+      if( ( sourceDetailContext.SourceDetailConfiguration != draggedDetailContext.SourceDetailConfiguration ) ||
+          ( sourceDetailContext.GroupLevelDescriptions != draggedDetailContext.GroupLevelDescriptions ) )
         return false;
 
-      DataGridContext draggedDetailContext = draggedCell.DataGridContext;
-      DataGridContext sourceDetailContext = this.DataGridContext;
-      Debug.Assert( ( draggedDetailContext != null ) && ( sourceDetailContext != null ) );
+      if( !ColumnManagerCell.CanMove( draggedCell ) )
+        return false;
+
+      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
+      if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
+      {
+        if( !manager.CanReorder( draggedCell, this, mousePosition ) )
+          return false;
+      }
+      else
+      {
+        var relativePosition = mousePosition.GetPoint( this );
+        var moveBefore = ( relativePosition.X <= this.ActualWidth / 2d );
 
-      return ( sourceDetailContext.SourceDetailConfiguration == draggedDetailContext.SourceDetailConfiguration ) &&
-             ( sourceDetailContext.GroupLevelDescriptions == draggedDetailContext.GroupLevelDescriptions );
+        if( moveBefore )
+        {
+          if( !draggedCell.CanMoveBefore( this.ParentColumn ) )
+            return false;
+        }
+        else
+        {
+          if( !draggedCell.CanMoveAfter( this.ParentColumn ) )
+            return false;
+        }
+      }
+
+      return true;
     }
 
     void IDropTarget.DragEnter( UIElement draggedElement )
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
-
+      var draggedCell = draggedElement as ColumnManagerCell;
       if( draggedCell != null )
       {
-        ColumnReorderingDragSourceManager manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
+        var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
 
         // No need for drop mark when performing animated Column reordering
         if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
@@ -810,11 +823,10 @@ namespace Xceed.Wpf.DataGrid
 
     void IDropTarget.DragLeave( UIElement draggedElement )
     {
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
-
+      var draggedCell = draggedElement as ColumnManagerCell;
       if( draggedCell != null )
       {
-        ColumnReorderingDragSourceManager manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
+        var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
 
         // No need for drop mark when performing animated Column reordering
         if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
@@ -824,19 +836,18 @@ namespace Xceed.Wpf.DataGrid
       this.HideDropMark();
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
-
+      var draggedCell = draggedElement as ColumnManagerCell;
       if( draggedCell == null )
         return;
 
-      this.ProcessDrop( draggedCell );
+      this.ProcessDrop( draggedCell, mousePosition );
     }
 
-    internal void ProcessDrop( ColumnManagerCell draggedCell )
+    internal void ProcessDrop( ColumnManagerCell draggedCell, RelativePoint mousePosition )
     {
-      ColumnReorderingDragSourceManager manager = null;
+      var manager = default( ColumnReorderingDragSourceManager );
 
       if( draggedCell != null )
       {
@@ -849,47 +860,110 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        int oldPosition = draggedCell.ParentColumn.VisiblePosition;
-        int newPosition = this.ParentColumn.VisiblePosition;
+        this.HideDropMark();
 
-        if( m_dropMarkAdorner != null )
+        var dataGridContext = this.DataGridContext;
+        Debug.Assert( dataGridContext != null );
+
+        if( dataGridContext != null )
         {
-          DropMarkAlignment alignment = m_dropMarkAdorner.Alignment;
+          var targetColumn = draggedCell.ParentColumn;
+          var pivotColumn = this.ParentColumn;
+
+          Debug.Assert( targetColumn != null );
+          Debug.Assert( pivotColumn != null );
 
-          this.HideDropMark();
+          var relativePosition = mousePosition.GetPoint( this );
+          var offset = Point.Subtract( mousePosition.GetPoint( draggedCell ), relativePosition );
+          var moveBefore = true;
 
-          if( draggedCell.ParentColumn.VisiblePosition < newPosition )
+          // We assumme the cells are layouted horizontally.
+          if( Math.Abs( offset.X ) >= Math.Abs( offset.Y ) )
           {
-            if( alignment == DropMarkAlignment.Near )
-            {
-              draggedCell.ParentColumn.VisiblePosition = newPosition - 1;
-            }
-            else
-            {
-              draggedCell.ParentColumn.VisiblePosition = newPosition;
-            }
+            // Consider the case where the columns are layouted from left to right in reverse order.
+            var reverse = ( ( offset.X > 0d ) == ( targetColumn.VisiblePosition >= pivotColumn.VisiblePosition ) );
+
+            moveBefore = ( ( relativePosition.X < this.ActualWidth / 2d ) != reverse );
           }
+          // We assume the cells are layouted vertically.
           else
           {
-            if( alignment == DropMarkAlignment.Near )
-            {
-              draggedCell.ParentColumn.VisiblePosition = newPosition;
-            }
-            else
-            {
-              draggedCell.ParentColumn.VisiblePosition = newPosition + 1;
-            }
+            // Consider the case where the columns are layouted from top to bottom in reverse order.
+            var reverse = ( ( offset.Y > 0d ) == ( targetColumn.VisiblePosition >= pivotColumn.VisiblePosition ) );
+
+            moveBefore = ( ( relativePosition.Y < this.ActualHeight / 2d ) != reverse );
           }
 
-          // This will force every Rows to update there layout
-          ColumnReorderingEventArgs e = new ColumnReorderingEventArgs( ColumnManagerCell.ColumnReorderingEvent, oldPosition, newPosition );
-          this.RaiseEvent( e );
+          var success = ( moveBefore )
+                          ? dataGridContext.MoveColumnBefore( targetColumn, pivotColumn )
+                          : dataGridContext.MoveColumnAfter( targetColumn, pivotColumn );
 
+          Debug.Assert( success );
         }
       }
     }
 
-    private static bool CanMove( ColumnManagerCell cell )
+    internal bool CanMoveBefore( ColumnBase column )
+    {
+      // A column that is locked cannot move.
+      var parentColumn = this.ParentColumn;
+      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
+        return false;
+
+      // The cell cannot move before a column that is locked in the first position.
+      if( ( column == null ) || ( column.DraggableStatus == ColumnDraggableStatus.FirstUndraggable ) )
+        return false;
+
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext == null )
+        return false;
+
+      if( dataGridContext.AreDetailsFlatten )
+      {
+        // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
+        // when details are flatten.
+        if( dataGridContext.SourceDetailConfiguration != null )
+          return false;
+
+        // The main column is always the first column when details are flatten.
+        if( column.IsMainColumn )
+          return false;
+      }
+
+      return true;
+    }
+
+    internal bool CanMoveAfter( ColumnBase column )
+    {
+      // A column that is locked cannot move.
+      var parentColumn = this.ParentColumn;
+      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
+        return false;
+
+      // The cell cannot move after a column that is locked in the last position.
+      if( ( column == null ) || ( column.DraggableStatus == ColumnDraggableStatus.LastUndraggable ) )
+        return false;
+
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext == null )
+        return false;
+
+      if( dataGridContext.AreDetailsFlatten )
+      {
+        // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
+        // when details are flatten.
+        if( dataGridContext.SourceDetailConfiguration != null )
+          return false;
+
+        // The main column is not allowed to be reordered when details are flatten.
+        if( column.IsMainColumn )
+          return false;
+      }
+
+      return true;
+    }
+
+    internal static bool CanMove( ColumnManagerCell cell )
     {
       if( cell == null )
         return false;
@@ -898,6 +972,11 @@ namespace Xceed.Wpf.DataGrid
       if( dataGridContext == null )
         return false;
 
+      // A column that is locked cannot move.
+      var parentColumn = cell.ParentColumn;
+      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
+        return false;
+
       if( dataGridContext.AreDetailsFlatten )
       {
         // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
@@ -906,15 +985,14 @@ namespace Xceed.Wpf.DataGrid
           return false;
 
         // The main column is not allowed to be reordered when details are flatten.
-        var parentColumn = cell.ParentColumn;
-        if( ( parentColumn == null ) || ( parentColumn.IsMainColumn ) )
+        if( parentColumn.IsMainColumn )
           return false;
       }
 
       return true;
     }
 
-    #endregion IDropTarget Members
+    #endregion
 
     // Will remain null when no AdornerLayer is found.
     private ColumnReorderingDragSourceManager m_dragSourceManager;
@@ -927,5 +1005,22 @@ namespace Xceed.Wpf.DataGrid
     private double m_originalWidth = -1d;
     private Thumb m_columnResizerThumb; // = null
     private Thumb m_columnResizerThumbLeft; // null
+
+    #region MillisecondsConverter Private Class
+
+    private sealed class MillisecondsConverter : IValueConverter
+    {
+      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return TimeSpan.FromMilliseconds( System.Convert.ToDouble( value ) );
+      }
+
+      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        throw new NotSupportedException();
+      }
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
index 210dcf62..9f19429b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
@@ -14,13 +14,18 @@
 
   ***********************************************************************************/
 
+using System;
 using System.Collections;
-using System.Diagnostics;
+using System.ComponentModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Automation.Peers;
-using Xceed.Wpf.DataGrid.Automation;
-using Xceed.Wpf.DataGrid.Views;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Utils.Wpf;
 using Xceed.Utils.Wpf.DragDrop;
+using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -28,7 +33,8 @@ namespace Xceed.Wpf.DataGrid
   {
     static ColumnManagerRow()
     {
-      NavigationBehaviorProperty.OverrideMetadata( typeof( ColumnManagerRow ), new FrameworkPropertyMetadata( NavigationBehavior.None ) );
+      Row.NavigationBehaviorProperty.OverrideMetadata( typeof( ColumnManagerRow ), new FrameworkPropertyMetadata( NavigationBehavior.None ) );
+      FrameworkElement.ContextMenuProperty.OverrideMetadata( typeof( ColumnManagerRow ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( ColumnManagerRow.CoerceContextMenu ) ) );
     }
 
     public ColumnManagerRow()
@@ -42,8 +48,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region AllowColumnReorder Property
 
-    public static readonly DependencyProperty AllowColumnReorderProperty =
-        DependencyProperty.Register( "AllowColumnReorder", typeof( bool ), typeof( ColumnManagerRow ), new UIPropertyMetadata( true ) );
+    public static readonly DependencyProperty AllowColumnReorderProperty = DependencyProperty.Register(
+      "AllowColumnReorder",
+      typeof( bool ),
+      typeof( ColumnManagerRow ),
+      new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( ColumnManagerRow.OnAllowColumnReorderChanged ) ) );
 
     public bool AllowColumnReorder
     {
@@ -57,12 +66,28 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AllowColumnReorder Property
+    private static void OnAllowColumnReorderChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as ColumnManagerRow;
+      if( self == null )
+        return;
+
+      var configuration = self.Configuration;
+      if( configuration == null )
+        return;
+
+      configuration.AllowColumnReorder = ( bool )e.NewValue;
+    }
+
+    #endregion
 
     #region AllowColumnResize Property
 
-    public static readonly DependencyProperty AllowColumnResizeProperty =
-        DependencyProperty.Register( "AllowColumnResize", typeof( bool ), typeof( ColumnManagerRow ), new UIPropertyMetadata( true ) );
+    public static readonly DependencyProperty AllowColumnResizeProperty = DependencyProperty.Register(
+      "AllowColumnResize",
+      typeof( bool ),
+      typeof( ColumnManagerRow ),
+      new UIPropertyMetadata( true ) );
 
     public bool AllowColumnResize
     {
@@ -76,12 +101,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AllowColumnResize Property
+    #endregion
 
     #region AllowSort Property
 
-    public static readonly DependencyProperty AllowSortProperty =
-        DependencyProperty.Register( "AllowSort", typeof( bool ), typeof( ColumnManagerRow ), new UIPropertyMetadata( true ) );
+    public static readonly DependencyProperty AllowSortProperty = DependencyProperty.Register(
+      "AllowSort",
+      typeof( bool ),
+      typeof( ColumnManagerRow ),
+      new UIPropertyMetadata( true ) );
 
     public bool AllowSort
     {
@@ -95,13 +123,56 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AllowSort Property
+    #endregion
+
+    #region IsUnfocusable Property
 
-    protected override AutomationPeer OnCreateAutomationPeer()
+    internal override bool IsUnfocusable
     {
-      return new ColumnManagerRowAutomationPeer( this );
+      get
+      {
+        return true;
+      }
+    }
+
+    #endregion
+
+    #region Configuration Internal Property
+
+    internal ColumnManagerRowConfiguration Configuration
+    {
+      get
+      {
+        return m_configuration;
+      }
+      set
+      {
+        if( value == m_configuration )
+          return;
+
+        if( m_configuration != null )
+        {
+          PropertyChangedEventManager.RemoveListener( m_configuration, this, string.Empty );
+        }
+
+        m_configuration = value;
+
+        this.PushAllowColumnReorder();
+
+        if( m_configuration != null )
+        {
+          PropertyChangedEventManager.AddListener( m_configuration, this, string.Empty );
+        }
+
+        this.UpdateAllowColumnReorder();
+      }
     }
 
+    private ColumnManagerRowConfiguration m_configuration;
+
+    #endregion
+
+
     protected override Cell CreateCell( ColumnBase column )
     {
       return new ColumnManagerCell();
@@ -112,14 +183,27 @@ namespace Xceed.Wpf.DataGrid
       return ( cell is ColumnManagerCell );
     }
 
-    protected internal override void PrepareDefaultStyleKey( ViewBase view )
+    protected internal override void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
     {
-      object currentThemeKey = view.GetDefaultStyleKey( typeof( ColumnManagerRow ) );
+      var currentThemeKey = view.GetDefaultStyleKey( typeof( ColumnManagerRow ) );
+      if( currentThemeKey.Equals( this.DefaultStyleKey ) )
+        return;
 
-      if( currentThemeKey.Equals( this.DefaultStyleKey ) == false )
-      {
-        this.DefaultStyleKey = currentThemeKey;
-      }
+      this.DefaultStyleKey = currentThemeKey;
+    }
+
+    protected override void PrepareContainer( DataGridContext dataGridContext, object item )
+    {
+      base.PrepareContainer( dataGridContext, item );
+
+      this.Configuration = dataGridContext.ColumnManagerRowConfiguration;
+    }
+
+    protected override void ClearContainer()
+    {
+      this.Configuration = null;
+
+      base.ClearContainer();
     }
 
     protected override void OnPreviewMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
@@ -128,42 +212,92 @@ namespace Xceed.Wpf.DataGrid
       //This is because we do not want the ColumnManager Row to be selectable through the Mouse
     }
 
-    #region IDropTarget Members
+    protected override void OnMouseRightButtonUp( MouseButtonEventArgs e )
+    {
+      if( e.Handled )
+        return;
+
+      base.OnMouseRightButtonUp( e );
+    }
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    private static object CoerceContextMenu( DependencyObject sender, object value )
     {
-      bool canDrop = false;
+      if( value == null )
+        return value;
 
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
+      var self = sender as ColumnManagerRow;
+      if( ( self == null ) )
+        return value;
 
-      if( draggedCell == null )
-        return false;
+      return null;
+    }
 
-      ColumnReorderingDragSourceManager manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
+    private void PushAllowColumnReorder()
+    {
+      var configuration = this.Configuration;
+      if( configuration == null )
+        return;
 
-      if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
+      if( DependencyPropertyHelper.GetValueSource( this, ColumnManagerRow.AllowColumnReorderProperty ).BaseValueSource == BaseValueSource.Default )
+        return;
+
+      configuration.AllowColumnReorder = this.AllowColumnReorder;
+    }
+
+    private void UpdateAllowColumnReorder()
+    {
+      var configuration = this.Configuration;
+      if( configuration == null )
+        return;
+
+      this.AllowColumnReorder = configuration.AllowColumnReorder;
+    }
+
+    private void OnConfigurationPropertyChanged( PropertyChangedEventArgs e )
+    {
+      var propertyName = e.PropertyName;
+
+      if( string.IsNullOrEmpty( propertyName ) || propertyName == ColumnManagerRow.AllowColumnReorderProperty.Name )
       {
-        ColumnManagerCell cell = draggedElement as ColumnManagerCell;
+        this.UpdateAllowColumnReorder();
+      }
+    }
 
-        if( ( cell != null ) && ( cell.IsBeingDragged ) )
-        {
-          DataGridContext rowDataGridContext = DataGridControl.GetDataGridContext( this );
+    #region IDropTarget Members
 
-          if( ( rowDataGridContext != null ) && ( rowDataGridContext.Columns.Contains( cell.ParentColumn ) ) )
-          {
-            canDrop = true;
-          }
-        }
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
+    {
+      var draggedCell = draggedElement as ColumnManagerCell;
+      if( draggedCell == null )
+        return false;
+
+      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
+      if( ( manager != null ) && manager.IsAnimatedColumnReorderingEnabled && draggedCell.IsBeingDragged )
+      {
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
+        if( ( dataGridContext == null ) || !dataGridContext.Columns.Contains( draggedCell.ParentColumn ) )
+          return false;
+
+        // We are not interested by the y-axis.
+        var relativePoint = mousePosition.GetPoint( this );
+        var xPosition = new RelativePoint( this, new Point( relativePoint.X, this.ActualHeight / 2d ) );
+
+        var targetCell = ( from dropTarget in manager.GetDropTargetsAtPoint( xPosition )
+                           let dropCell = dropTarget as ColumnManagerCell
+                           where ( dropCell != null )
+                           select dropCell ).FirstOrDefault();
+        if( ( targetCell == null ) || ( targetCell == draggedCell ) || ( ( IDropTarget )targetCell ).CanDropElement( draggedElement, xPosition ) )
+          return true;
       }
 
-      return canDrop;
+      return false;
     }
 
     void IDropTarget.DragEnter( UIElement draggedElement )
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
     }
 
@@ -171,15 +305,13 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
-
+      var draggedCell = draggedElement as ColumnManagerCell;
       if( draggedCell == null )
         return;
 
-      ColumnReorderingDragSourceManager manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-
+      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
       if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
       {
         manager.CommitReordering();
@@ -187,5 +319,28 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    #region IWeakEventListener Members
+
+    protected override bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      var result = base.OnReceiveWeakEvent( managerType, sender, e );
+
+      if( typeof( PropertyChangedEventManager ) == managerType )
+      {
+        if( sender == m_configuration )
+        {
+          this.OnConfigurationPropertyChanged( ( PropertyChangedEventArgs )e );
+        }
+      }
+      else
+      {
+        return result;
+      }
+
+      return true;
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs
new file mode 100644
index 00000000..81fbab68
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs
@@ -0,0 +1,67 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.ComponentModel;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class ColumnManagerRowConfiguration : DependencyObject, INotifyPropertyChanged
+  {
+    #region AllowColumnReorder Property
+
+    public static readonly DependencyProperty AllowColumnReorderProperty = DependencyProperty.Register(
+      "AllowColumnReorder",
+      typeof( bool ),
+      typeof( ColumnManagerRowConfiguration ),
+      new UIPropertyMetadata( true ) );
+
+    public bool AllowColumnReorder
+    {
+      get
+      {
+        return ( bool )this.GetValue( ColumnManagerRowConfiguration.AllowColumnReorderProperty );
+      }
+      set
+      {
+        this.SetValue( ColumnManagerRowConfiguration.AllowColumnReorderProperty, value );
+      }
+    }
+
+    #endregion
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( e.Property.Name );
+    }
+
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged( string propertyName )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs
deleted file mode 100644
index 9d9b1189..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void ColumnReorderingEventHandler( object sender, ColumnReorderingEventArgs e );
-
-  internal class ColumnReorderingEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ColumnReorderingEventArgs( RoutedEvent routedEvent, int oldVisiblePosition, int newVisiblePosition )
-      : base( routedEvent )
-    {
-      m_oldVisiblePosition = oldVisiblePosition;
-      m_newVisiblePosition = newVisiblePosition;
-    }
-
-    #endregion
-
-    #region OldVisiblePosition
-
-    public int OldVisiblePosition
-    {
-      get
-      {
-        return m_oldVisiblePosition;
-      }
-      set
-      {
-        m_oldVisiblePosition = value;
-      }
-    }
-
-    private int m_oldVisiblePosition;
-
-    #endregion
-
-    #region NewVisiblePosition
-
-    public int NewVisiblePosition
-    {
-      get
-      {
-        return m_newVisiblePosition;
-      }
-      set
-      {
-        m_newVisiblePosition = value;
-      }
-    }
-
-    private int m_newVisiblePosition;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs
index 69198547..8e8ded1f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs
@@ -20,23 +20,15 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Windows;
 using System.Windows.Data;
+using Xceed.Utils.Wpf;
 using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal sealed class ColumnSynchronizationManager : IWeakEventListener
   {
-    #region Static Fields
-
-    private static readonly string DetailConfigurationDataGridControlPropertyName = "DataGridControl";
-    private static readonly string DetailConfigurationIsAttachedToDetailDescriptionPropertyName = "IsAttachedToDetailDescription";
-    private static readonly string ColumnCollectionMainColumnPropertyName = "MainColumn";
-
-    #endregion
-
     #region Constructor
 
     internal ColumnSynchronizationManager( DetailConfiguration configuration )
@@ -47,33 +39,18 @@ namespace Xceed.Wpf.DataGrid
       m_detailConfiguration = configuration;
       m_itemPropertyMap = configuration.ItemPropertyMap;
 
-      PropertyChangedEventManager.AddListener( configuration, this, ColumnSynchronizationManager.DetailConfigurationDataGridControlPropertyName );
-      PropertyChangedEventManager.AddListener( configuration, this, ColumnSynchronizationManager.DetailConfigurationIsAttachedToDetailDescriptionPropertyName );
-      CollectionChangedEventManager.AddListener( ( INotifyCollectionChanged )m_itemPropertyMap, this );
+      PropertyChangedEventManager.AddListener( configuration, this, string.Empty );
+      MappingChangedEventManager.AddListener( m_itemPropertyMap, this );
 
       using( this.DeferSynchronization() )
       {
         this.DataGridControl = configuration.DataGridControl;
-        this.DetailColumns = configuration.Columns;
-
-        Debug.Assert( this.DetailColumns != null );
-      }
-    }
-
-    #endregion
-
-    #region DetailConfiguration Private Property
+        this.DetailColumnManager = configuration.ColumnManager;
 
-    private DetailConfiguration DetailConfiguration
-    {
-      get
-      {
-        return m_detailConfiguration;
+        Debug.Assert( m_detailColumnManager != null );
       }
     }
 
-    private readonly DetailConfiguration m_detailConfiguration;
-
     #endregion
 
     #region DataGridControl Private Property
@@ -102,14 +79,14 @@ namespace Xceed.Wpf.DataGrid
           {
             ViewChangedEventManager.AddListener( m_dataGridControl, this );
 
-            this.MasterColumns = m_dataGridControl.Columns;
+            this.MasterColumnManager = m_dataGridControl.DataGridContext.ColumnManager;
           }
           else
           {
-            this.MasterColumns = null;
+            this.MasterColumnManager = null;
           }
 
-          this.InvalidateSynchronization();
+          m_isSynchronizationValid = false;
         }
       }
     }
@@ -118,99 +95,71 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ItemPropertyMap Private Property
-
-    private FieldNameMap ItemPropertyMap
-    {
-      get
-      {
-        return m_itemPropertyMap;
-      }
-    }
-
-    private readonly FieldNameMap m_itemPropertyMap;
-
-    #endregion
-
-    #region MasterColumns Private Property
+    #region MasterColumnManager Private Property
 
-    private ColumnCollection MasterColumns
+    private ColumnHierarchyManager MasterColumnManager
     {
       get
       {
-        return m_masterColumns;
+        return m_masterColumnManager;
       }
       set
       {
-        if( value == m_masterColumns )
+        if( value == m_masterColumnManager )
           return;
 
-        if( m_masterColumns != null )
+        if( m_masterColumnManager != null )
         {
-          CollectionChangedEventManager.RemoveListener( m_masterColumns, this );
-          PropertyChangedEventManager.RemoveListener( m_masterColumns, this, ColumnSynchronizationManager.ColumnCollectionMainColumnPropertyName );
-          VisibleColumnsUpdatedEventManager.RemoveListener( m_masterColumns, this );
+          ColumnsLayoutChangedEventManager.RemoveListener( m_masterColumnManager, this );
+          CollectionChangedEventManager.RemoveListener( m_masterColumnManager.Columns, this );
+          PropertyChangedEventManager.RemoveListener( m_masterColumnManager.Columns, this, ColumnCollection.MainColumnPropertyName );
         }
 
-        m_masterColumns = value;
+        m_masterColumnManager = value;
 
-        if( m_masterColumns != null )
+        if( m_masterColumnManager != null )
         {
-          CollectionChangedEventManager.AddListener( m_masterColumns, this );
-          PropertyChangedEventManager.AddListener( m_masterColumns, this, ColumnSynchronizationManager.ColumnCollectionMainColumnPropertyName );
-          VisibleColumnsUpdatedEventManager.AddListener( m_masterColumns, this );
+          ColumnsLayoutChangedEventManager.AddListener( m_masterColumnManager, this );
+          CollectionChangedEventManager.AddListener( m_masterColumnManager.Columns, this );
+          PropertyChangedEventManager.AddListener( m_masterColumnManager.Columns, this, ColumnCollection.MainColumnPropertyName );
         }
       }
     }
 
-    private ColumnCollection m_masterColumns;
+    private ColumnHierarchyManager m_masterColumnManager;
 
     #endregion
 
-    #region DetailColumns Private Property
+    #region DetailColumnManager Private Property
 
-    private ColumnCollection DetailColumns
+    private ColumnHierarchyManager DetailColumnManager
     {
       get
       {
-        return m_detailColumns;
+        return m_detailColumnManager;
       }
       set
       {
-        if( value == m_detailColumns )
+        if( value == m_detailColumnManager )
           return;
 
-        if( m_detailColumns != null )
+        if( m_detailColumnManager != null )
         {
-          CollectionChangedEventManager.RemoveListener( m_detailColumns, this );
-          VisibleColumnsUpdatedEventManager.RemoveListener( m_detailColumns, this );
+          ColumnsLayoutChangedEventManager.RemoveListener( m_detailColumnManager, this );
+          CollectionChangedEventManager.RemoveListener( m_detailColumnManager.Columns, this );
         }
 
-        m_detailColumns = value;
+        m_detailColumnManager = value;
 
-        if( m_detailColumns != null )
+        if( m_detailColumnManager != null )
         {
-          CollectionChangedEventManager.AddListener( m_detailColumns, this );
-          VisibleColumnsUpdatedEventManager.AddListener( m_detailColumns, this );
+          ColumnsLayoutChangedEventManager.AddListener( m_detailColumnManager, this );
+          CollectionChangedEventManager.AddListener( m_detailColumnManager.Columns, this );
         }
       }
     }
 
-    private ColumnCollection m_detailColumns;
-
-    #endregion
-
-    #region PairedColumns Private Property
-
-    private Dictionary<SynchronizationKey, SynchronizationEntry> PairedColumns
-    {
-      get
-      {
-        return m_pairedColumns;
-      }
-    }
-
-    private readonly Dictionary<SynchronizationKey, SynchronizationEntry> m_pairedColumns = new Dictionary<SynchronizationKey, SynchronizationEntry>( 0 );
+    private ColumnHierarchyManager m_detailColumnManager;
 
     #endregion
 
@@ -220,25 +169,11 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return ( this.MasterColumns != null )
-            && ( this.DetailConfiguration.IsAttachedToDetailDescription );
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingColumns Private Property
-
-    private bool IsUpdatingColumns
-    {
-      get
-      {
-        return m_isUpdatingColumns;
+        return ( m_masterColumnManager != null )
+            && ( m_detailConfiguration.DetailDescription != null );
       }
     }
 
-    private bool m_isUpdatingColumns;
-
     #endregion
 
     #region AreDetailsFlatten Private Property
@@ -247,10 +182,8 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        var dataGridControl = this.DataGridControl;
-
-        return ( dataGridControl != null )
-            && ( dataGridControl.AreDetailsFlatten );
+        return ( m_dataGridControl != null )
+            && ( m_dataGridControl.AreDetailsFlatten );
       }
     }
 
@@ -260,47 +193,35 @@ namespace Xceed.Wpf.DataGrid
 
     private IDisposable DeferSynchronization()
     {
-      return new DeferSynchronizationHelper( this );
+      return new DeferredDisposable( new DeferState( this ) );
     }
 
-    private bool IsSynchronizationDefered
+    private bool IsSynchronizationDeferred
     {
       get
       {
-        return ( Interlocked.CompareExchange( ref m_deferSynchronizationCount, 0, 0 ) != 0 );
+        return ( m_deferSynchronizationCount != 0 );
       }
     }
 
-    private bool IsSynchronizationValid
-    {
-      get
-      {
-        return m_isSynchronizationValid;
-      }
-    }
-
-    private void InvalidateSynchronization()
-    {
-      m_isSynchronizationValid = false;
-    }
-
     private int m_deferSynchronizationCount; //0
     private bool m_isSynchronizationValid = true;
 
     #endregion
 
-    private void Refresh()
+    internal void Refresh()
     {
-      if( this.IsUpdatingColumns )
+      if( m_isUpdatingColumns )
         return;
 
-      this.InvalidateSynchronization();
+      m_isSynchronizationValid = false;
+
       this.UpdateColumns();
     }
 
     private void UpdateColumns()
     {
-      if( this.IsSynchronizationDefered || this.IsSynchronizationValid || this.IsUpdatingColumns )
+      if( this.IsSynchronizationDeferred || m_isSynchronizationValid || m_isUpdatingColumns )
         return;
 
       try
@@ -310,19 +231,24 @@ namespace Xceed.Wpf.DataGrid
 
         if( this.IsSynchronizationReady && this.AreDetailsFlatten )
         {
-          var keys = new HashSet<SynchronizationKey>( this.GetNewKeys() );
+          Debug.Assert( m_detailColumnManager != null );
 
-          foreach( var key in this.PairedColumns.Keys.Except( keys ).ToArray() )
+          using( m_detailColumnManager.DeferUpdate() )
           {
-            this.Desynchronize( key );
-          }
+            var keys = new HashSet<SynchronizationKey>( this.GetNewKeys() );
 
-          foreach( var key in keys.OrderBy( item => item.OrderKey ) )
-          {
-            this.Synchronize( key );
-          }
+            foreach( var key in m_pairedColumns.Keys.Except( keys ).ToArray() )
+            {
+              this.Desynchronize( key );
+            }
+
+            foreach( var key in keys.OrderBy( item => item.OrderKey ) )
+            {
+              this.Synchronize( key );
+            }
 
-          this.SetMainColumn();
+            this.SetMainColumn();
+          }
         }
         else
         {
@@ -340,18 +266,18 @@ namespace Xceed.Wpf.DataGrid
       if( key == null )
         return;
 
-      var collection = this.PairedColumns;
+      var collection = m_pairedColumns;
 
       SynchronizationEntry pair;
       if( !collection.TryGetValue( key, out pair ) )
       {
         if( key.MasterColumn != null )
         {
-          pair = new BoundColumn( key );
+          pair = new BoundColumn( this, key );
         }
         else
         {
-          pair = new UnboundColumn( key );
+          pair = new UnboundColumn( this, key );
         }
 
         collection.Add( key, pair );
@@ -365,7 +291,7 @@ namespace Xceed.Wpf.DataGrid
       if( key == null )
         return;
 
-      var collection = this.PairedColumns;
+      var collection = m_pairedColumns;
 
       SynchronizationEntry pair;
       if( !collection.TryGetValue( key, out pair ) )
@@ -377,7 +303,7 @@ namespace Xceed.Wpf.DataGrid
 
     private void Desynchronize()
     {
-      var collection = this.PairedColumns;
+      var collection = m_pairedColumns;
       while( collection.Count > 0 )
       {
         this.Desynchronize( collection.First().Key );
@@ -389,16 +315,17 @@ namespace Xceed.Wpf.DataGrid
       if( !this.IsSynchronizationReady || !this.AreDetailsFlatten )
         return;
 
-      var detailColumns = this.DetailColumns;
-      ColumnBase detailColumn = null;
+      Debug.Assert( m_detailColumnManager != null );
 
-      var mainColumn = this.MasterColumns.MainColumn;
+      var detailColumns = m_detailColumnManager.Columns;
+      var detailColumn = default( ColumnBase );
+
+      var mainColumn = m_masterColumnManager.Columns.MainColumn;
       if( mainColumn != null )
       {
-        string targetName;
-        if( this.ItemPropertyMap.TryGetItemPropertyName( mainColumn, out targetName ) )
+        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( m_itemPropertyMap, detailColumns, mainColumn, out detailColumn ) )
         {
-          detailColumn = detailColumns[ targetName ];
+          detailColumn = null;
         }
       }
 
@@ -407,24 +334,16 @@ namespace Xceed.Wpf.DataGrid
 
     private IEnumerable<SynchronizationKey> GetNewKeys()
     {
-      var detailConfig = this.DetailConfiguration;
-      var map = this.ItemPropertyMap;
-
-      foreach( var detailColumn in this.DetailColumns )
+      foreach( var detailColumn in m_detailColumnManager.Columns )
       {
-        ColumnBase masterColumn;
-        string targetName;
+        var masterColumn = default( ColumnBase );
 
-        if( map.TryGetColumnFieldName( detailColumn, out targetName ) )
-        {
-          masterColumn = this.MasterColumns[ targetName ];
-        }
-        else
+        if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( m_itemPropertyMap, m_masterColumnManager.Columns, detailColumn, out masterColumn ) )
         {
           masterColumn = null;
         }
 
-        yield return new SynchronizationKey( masterColumn, detailColumn, detailConfig );
+        yield return new SynchronizationKey( masterColumn, detailColumn, m_detailConfiguration );
       }
     }
 
@@ -433,17 +352,12 @@ namespace Xceed.Wpf.DataGrid
       this.Refresh();
     }
 
-    private void OnUserSettingsLoaded()
-    {
-      this.Refresh();
-    }
-
     private void OnMasterColumnsPropertyChanged( PropertyChangedEventArgs e )
     {
       var propertyName = e.PropertyName;
       bool mayHaveChanged = string.IsNullOrEmpty( propertyName );
 
-      if( mayHaveChanged || ( propertyName == ColumnSynchronizationManager.ColumnCollectionMainColumnPropertyName ) )
+      if( mayHaveChanged || ( propertyName == ColumnCollection.MainColumnPropertyName ) )
       {
         this.SetMainColumn();
       }
@@ -454,22 +368,14 @@ namespace Xceed.Wpf.DataGrid
       var propertyName = e.PropertyName;
       bool mayHaveChanged = string.IsNullOrEmpty( propertyName );
 
-      if( mayHaveChanged || ( propertyName == ColumnSynchronizationManager.DetailConfigurationDataGridControlPropertyName ) )
-      {
-        this.DataGridControl = this.DetailConfiguration.DataGridControl;
-      }
-
-      if( mayHaveChanged || ( propertyName == ColumnSynchronizationManager.DetailConfigurationIsAttachedToDetailDescriptionPropertyName ) )
+      if( mayHaveChanged || ( propertyName == DetailConfiguration.DataGridControlPropertyName ) )
       {
-        this.Refresh();
+        this.DataGridControl = m_detailConfiguration.DataGridControl;
       }
     }
 
-    private void OnItemPropertyMapCollectionChanged( NotifyCollectionChangedEventArgs e )
+    private void OnItemPropertyMapMappingChanged( EventArgs e )
     {
-      if( e.Action == NotifyCollectionChangedAction.Move )
-        return;
-
       this.Refresh();
     }
 
@@ -503,124 +409,105 @@ namespace Xceed.Wpf.DataGrid
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
+      Debug.Assert( sender != null );
+
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        if( sender == this.MasterColumns )
+        if( ( m_masterColumnManager != null ) && ( sender == m_masterColumnManager.Columns ) )
         {
-          Debug.Assert( sender != null );
-
           this.OnMasterColumnsCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
         }
-        else if( sender == this.DetailColumns )
+        else if( ( m_detailColumnManager != null ) && ( sender == m_detailColumnManager.Columns ) )
         {
-          Debug.Assert( sender != null );
-
           this.OnDetailColumnsCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
         }
-        else if( sender == this.ItemPropertyMap )
-        {
-          Debug.Assert( sender != null );
-
-          this.OnItemPropertyMapCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
-        }
-
-        return true;
       }
       else if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        if( sender == this.MasterColumns )
+        if( ( m_masterColumnManager != null ) && ( sender == m_masterColumnManager.Columns ) )
         {
-          Debug.Assert( sender != null );
-
           this.OnMasterColumnsPropertyChanged( ( PropertyChangedEventArgs )e );
         }
-        else if( sender == this.DetailConfiguration )
+        else if( sender == m_detailConfiguration )
         {
-          Debug.Assert( sender != null );
-
           this.OnDetailConfigurationPropertyChanged( ( PropertyChangedEventArgs )e );
         }
-
-        return true;
       }
-      else if( managerType == typeof( VisibleColumnsUpdatedEventManager ) )
+      else if( managerType == typeof( ColumnsLayoutChangedEventManager ) )
       {
-        if( sender == this.MasterColumns )
+        if( sender == m_masterColumnManager )
         {
-          Debug.Assert( sender != null );
-
           this.OnMasterVisibleColumnsUpdated( e );
         }
-        else if( sender == this.DetailColumns )
+        else if( sender == m_detailColumnManager )
         {
-          Debug.Assert( sender != null );
-
           this.OnDetailVisibleColumnsUpdated( e );
         }
-
-        return true;
+      }
+      else if( managerType == typeof( MappingChangedEventManager ) )
+      {
+        if( sender == m_itemPropertyMap )
+        {
+          this.OnItemPropertyMapMappingChanged( e );
+        }
       }
       else if( managerType == typeof( ViewChangedEventManager ) )
       {
-        if( sender == this.DataGridControl )
+        if( sender == m_dataGridControl )
         {
-          Debug.Assert( sender != null );
-
           this.OnViewChanged();
         }
-
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
 
-    #region DeferSynchronizationHelper Private Class
+    private readonly DetailConfiguration m_detailConfiguration;
+    private readonly DataGridItemPropertyMap m_itemPropertyMap;
+    private readonly Dictionary<SynchronizationKey, SynchronizationEntry> m_pairedColumns = new Dictionary<SynchronizationKey, SynchronizationEntry>( 0 );
 
-    private sealed class DeferSynchronizationHelper : IDisposable
-    {
-      internal DeferSynchronizationHelper( ColumnSynchronizationManager owner )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
+    private bool m_isUpdatingColumns;
 
-        m_owner = owner;
+    #region DeferState Private Class
 
-        Interlocked.Increment( ref owner.m_deferSynchronizationCount );
+    private sealed class DeferState : DeferredDisposableState
+    {
+      internal DeferState( ColumnSynchronizationManager target )
+      {
+        Debug.Assert( target != null );
+        m_target = target;
       }
 
-      void IDisposable.Dispose()
+      protected override bool IsDeferred
       {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
+        get
+        {
+          return m_target.IsSynchronizationDeferred;
+        }
       }
 
-      private void Dispose( bool disposing )
+      protected override void Increment()
       {
-        Debug.Assert( disposing );
-
-        var owner = m_owner;
-        if( Interlocked.CompareExchange<ColumnSynchronizationManager>( ref m_owner, null, owner ) == null )
-          return;
-
-        if( Interlocked.Decrement( ref owner.m_deferSynchronizationCount ) != 0 )
-          return;
-
-        owner.UpdateColumns();
+        m_target.m_deferSynchronizationCount++;
       }
 
-      ~DeferSynchronizationHelper()
+      protected override void Decrement()
       {
-        this.Dispose( false );
+        m_target.m_deferSynchronizationCount--;
       }
 
-      #region Private Fields
-
-      private ColumnSynchronizationManager m_owner;
+      protected override void OnDeferEnded( bool disposing )
+      {
+        m_target.UpdateColumns();
+      }
 
-      #endregion
+      private readonly ColumnSynchronizationManager m_target;
     }
 
     #endregion
@@ -733,14 +620,32 @@ namespace Xceed.Wpf.DataGrid
 
     private abstract class SynchronizationEntry
     {
-      protected SynchronizationEntry( SynchronizationKey key )
+      protected SynchronizationEntry( ColumnSynchronizationManager owner, SynchronizationKey key )
       {
+        if( owner == null )
+          throw new ArgumentNullException( "owner" );
+
         if( key == null )
           throw new ArgumentNullException( "key" );
 
+        m_owner = owner;
         m_key = key;
       }
 
+      #region Owner Protected Property
+
+      protected ColumnSynchronizationManager Owner
+      {
+        get
+        {
+          return m_owner;
+        }
+      }
+
+      private readonly ColumnSynchronizationManager m_owner;
+
+      #endregion
+
       #region MasterColumn Protected Property
 
       protected ColumnBase MasterColumn
@@ -801,201 +706,334 @@ namespace Xceed.Wpf.DataGrid
 
     private sealed class BoundColumn : SynchronizationEntry
     {
-      internal BoundColumn( SynchronizationKey key )
-        : base( key )
+      internal BoundColumn( ColumnSynchronizationManager owner, SynchronizationKey key )
+        : base( owner, key )
       {
         if( key.MasterColumn == null )
           throw new ArgumentException( "The master column is not set.", "key" );
-
-        m_bindings = BoundColumn.CreateBindings( key.MasterColumn ).ToArray();
       }
 
-      #region IsListeningEvents Private Property
-
-      private bool IsListeningEvents
+      public override void Synchronize()
       {
-        get
-        {
-          return m_isListeningEvents;
-        }
-        set
+        var masterColumn = this.MasterColumn;
+        var detailColumn = this.DetailColumn;
+
+        if( m_localValues == null )
         {
-          m_isListeningEvents = value;
+          m_localValues = new Dictionary<DependencyProperty, object>( 8 );
+
+          masterColumn.PropertyChanged += new PropertyChangedEventHandler( this.OnMasterColumnPropertyChanged );
+          masterColumn.FittedWidthRequested += new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
+
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.WidthProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.MinWidthProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.MaxWidthProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.DesiredWidthProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.VisibleProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
+          BoundColumn.StoreLocalValue( m_localValues, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
         }
-      }
 
-      private bool m_isListeningEvents; //false
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.WidthProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MinWidthProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MaxWidthProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.DesiredWidthProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.VisibleProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
+        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
 
-      #endregion
+        this.UpdateTargetPosition();
+      }
 
-      public override void Synchronize()
+      public override void Desynchronize()
       {
-        this.SubscribeEvents();
+        if( m_localValues == null )
+          return;
 
-        var targetColumn = this.DetailColumn;
+        var localValues = m_localValues;
+        m_localValues = null;
 
-        foreach( var entry in m_bindings )
-        {
-          var dp = entry.Key;
-          var binding = entry.Value;
+        var masterColumn = this.MasterColumn;
+        masterColumn.PropertyChanged -= new PropertyChangedEventHandler( this.OnMasterColumnPropertyChanged );
+        masterColumn.FittedWidthRequested -= new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
+
+        var detailColumn = this.DetailColumn;
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.WidthProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.MinWidthProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.MaxWidthProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.DesiredWidthProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.VisibleProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
+        BoundColumn.RestoreLocalValue( localValues, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
+
+        detailColumn.ClearValue( ColumnBase.VisiblePositionProperty );
+      }
 
-          // The appropriate binding is still in place.
-          var currentBinding = BindingOperations.GetBindingBase( targetColumn, dp );
-          if( currentBinding == binding )
-            continue;
+      private static void StoreLocalValue( Dictionary<DependencyProperty, object> store, ColumnBase column, DependencyProperty property )
+      {
+        Debug.Assert( store != null );
+        Debug.Assert( column != null );
+        Debug.Assert( property != null );
 
-          if( currentBinding != null )
+        var binding = BindingOperations.GetBindingBase( column, property );
+        if( binding != null )
+        {
+          store[ property ] = binding;
+        }
+        else
+        {
+          var value = column.ReadLocalValue( property );
+          if( value != DependencyProperty.UnsetValue )
           {
-            m_localValues[ dp ] = currentBinding;
+            store[ property ] = value;
           }
           else
           {
-            var localValue = targetColumn.ReadLocalValue( dp );
-            if( localValue != DependencyProperty.UnsetValue )
-            {
-              m_localValues[ dp ] = localValue;
-            }
-            else
-            {
-              m_localValues.Remove( dp );
-            }
+            store.Remove( property );
           }
-
-          BindingOperations.SetBinding( targetColumn, dp, binding );
         }
+      }
 
-        var visiblePosition = this.GetTargetVisiblePosition();
-        if( visiblePosition.HasValue )
+      private static void RestoreLocalValue( Dictionary<DependencyProperty, object> store, ColumnBase column, DependencyProperty property )
+      {
+        Debug.Assert( store != null );
+        Debug.Assert( column != null );
+        Debug.Assert( property != null );
+
+        object value;
+        if( !store.TryGetValue( property, out value ) || ( value == DependencyProperty.UnsetValue ) )
+        {
+          column.ClearValue( property );
+        }
+        else if( value is BindingBase )
         {
-          targetColumn.VisiblePosition = visiblePosition.Value;
+          BindingOperations.SetBinding( column, property, ( BindingBase )value );
         }
         else
         {
-          targetColumn.ClearValue( ColumnBase.VisiblePositionProperty );
+          column.SetValue( property, value );
         }
       }
 
-      public override void Desynchronize()
+      private static void SetValue( ColumnBase source, ColumnBase destination, DependencyProperty property, string propertyName )
       {
-        this.UnsubscribeEvents();
-
-        var targetColumn = this.DetailColumn;
+        Debug.Assert( property != null );
 
-        foreach( var entry in m_bindings )
+        if( string.IsNullOrEmpty( propertyName ) || ( propertyName == property.Name ) )
         {
-          var dp = entry.Key;
-          var binding = entry.Value;
+          BoundColumn.SetValue( source, destination, property );
+        }
+      }
 
-          // The appropriate binding is still in place.
-          var currentBinding = BindingOperations.GetBindingBase( targetColumn, dp );
-          if( currentBinding == binding )
-          {
-            object oldValue;
+      private static void SetValue( ColumnBase source, ColumnBase destination, DependencyProperty property )
+      {
+        Debug.Assert( source != null );
+        Debug.Assert( destination != null );
+        Debug.Assert( property != null );
+
+        destination.SetValue( property, source.GetValue( property ) );
+      }
+
+      private void UpdateTargetPosition()
+      {
+        var detailConfig = this.DetailConfiguration;
+        var dataGridControl = detailConfig.DataGridControl;
+
+        if( dataGridControl == null )
+          return;
+
+        var masterColumn = this.MasterColumn;
+        var masterColumnManager = DataGridControl.GetDataGridContext( dataGridControl ).ColumnManager;
+        var masterColumnLocation = masterColumnManager.GetColumnLocationFor( masterColumn );
+
+        if( masterColumnLocation == null )
+          return;
+
+        var detailColumn = this.DetailColumn;
+        var detailColumnManager = detailConfig.ColumnManager;
+        var detailColumnLocation = detailColumnManager.GetColumnLocationFor( detailColumn );
+
+        if( detailColumnLocation == null )
+          return;
 
-            if( m_localValues.TryGetValue( dp, out oldValue ) )
+        var map = detailConfig.ItemPropertyMap;
+        var previousMasterLocation = masterColumnLocation.GetPreviousSiblingOrCousin();
+        Debug.Assert( previousMasterLocation != null );
+
+        switch( previousMasterLocation.Type )
+        {
+          case LocationType.Start:
+          case LocationType.Splitter:
             {
-              var oldBinding = oldValue as BindingBase;
-              if( oldBinding != null )
-              {
-                BindingOperations.SetBinding( targetColumn, dp, oldBinding );
-              }
-              else
+              for( var previousDetailLocation = detailColumnLocation.GetPreviousSiblingOrCousin(); previousDetailLocation != null; previousDetailLocation = previousDetailLocation.GetPreviousSiblingOrCousin() )
               {
-                targetColumn.SetValue( dp, oldValue );
+                // The detail column is at the appropriate location.
+                if( previousDetailLocation.Type == previousMasterLocation.Type )
+                  return;
+
+                if( previousDetailLocation.Type != LocationType.Column )
+                  break;
+
+                ColumnBase unused;
+                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )previousDetailLocation ).Column, out unused ) )
+                  break;
               }
             }
-            else
+            break;
+
+          case LocationType.Column:
             {
-              BindingOperations.ClearBinding( targetColumn, dp );
+              var previousMasterColumn = ( ( ColumnHierarchyManager.IColumnLocation )previousMasterLocation ).Column;
+
+              for( var previousDetailLocation = detailColumnLocation.GetPreviousSiblingOrCousin(); previousDetailLocation != null; previousDetailLocation = previousDetailLocation.GetPreviousSiblingOrCousin() )
+              {
+                if( previousDetailLocation.Type != LocationType.Column )
+                  break;
+
+                ColumnBase targetMasterColumn;
+                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )previousDetailLocation ).Column, out targetMasterColumn ) )
+                {
+                  // The detail column is at the appropriate location.
+                  if( previousMasterColumn == targetMasterColumn )
+                    return;
+                }
+              }
             }
-          }
+            break;
 
-          m_localValues.Remove( dp );
+          default:
+            // Unexpected location.
+            throw new NotSupportedException();
         }
 
-        targetColumn.ClearValue( ColumnBase.VisiblePositionProperty );
-      }
+        var nextMasterLocation = masterColumnLocation.GetNextSiblingOrCousin();
+        Debug.Assert( nextMasterLocation != null );
 
-      private static IEnumerable<KeyValuePair<DependencyProperty, BindingBase>> CreateBindings( ColumnBase source )
-      {
-        yield return BoundColumn.CreateBinding( ColumnBase.WidthProperty, source );
-        yield return BoundColumn.CreateBinding( ColumnBase.MinWidthProperty, source );
-        yield return BoundColumn.CreateBinding( ColumnBase.MaxWidthProperty, source );
-        yield return BoundColumn.CreateBinding( ColumnBase.DesiredWidthProperty, source );
-        yield return BoundColumn.CreateBinding( ColumnBase.VisibleProperty, source );
-        yield return BoundColumn.CreateBinding( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty, source );
-        yield return BoundColumn.CreateBinding( TableflowView.IsBeingDraggedAnimatedProperty, source );
-        yield return BoundColumn.CreateBinding( TableflowView.ColumnReorderingDragSourceManagerProperty, source );
-      }
+        switch( nextMasterLocation.Type )
+        {
+          case LocationType.Splitter:
+          case LocationType.Orphan:
+            {
+              for( var nextDetailLocation = detailColumnLocation.GetNextSiblingOrCousin(); nextDetailLocation != null; nextDetailLocation = nextDetailLocation.GetNextSiblingOrCousin() )
+              {
+                // The detail column is at the appropriate location.
+                if( nextDetailLocation.Type == nextMasterLocation.Type )
+                  return;
 
-      private static KeyValuePair<DependencyProperty, BindingBase> CreateBinding( DependencyProperty dp, ColumnBase source )
-      {
-        if( dp == null )
-          throw new ArgumentNullException( "property" );
+                if( nextDetailLocation.Type != LocationType.Column )
+                  break;
 
-        if( source == null )
-          throw new ArgumentNullException( "source" );
+                ColumnBase unused;
+                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )nextDetailLocation ).Column, out unused ) )
+                  break;
+              }
+            }
+            break;
 
-        var binding = new Binding();
-        binding.Path = new PropertyPath( dp );
-        binding.Source = source;
+          case LocationType.Column:
+            {
+              var nextMasterColumn = ( ( ColumnHierarchyManager.IColumnLocation )nextMasterLocation ).Column;
 
-        return new KeyValuePair<DependencyProperty, BindingBase>( dp, binding );
-      }
+              for( var nextDetailLocation = detailColumnLocation.GetNextSiblingOrCousin(); nextDetailLocation != null; nextDetailLocation = nextDetailLocation.GetNextSiblingOrCousin() )
+              {
+                if( nextDetailLocation.Type != LocationType.Column )
+                  break;
+
+                ColumnBase targetMasterColumn;
+                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )nextDetailLocation ).Column, out targetMasterColumn ) )
+                {
+                  // The detail column is at the appropriate location.
+                  if( nextMasterColumn == targetMasterColumn )
+                    return;
+                }
+              }
+            }
+            break;
 
-      private Nullable<int> GetTargetVisiblePosition()
-      {
-        var detailConfig = this.DetailConfiguration;
+          default:
+            // Unexpected location.
+            throw new NotSupportedException();
+        }
 
-        var dataGridControl = detailConfig.DataGridControl;
-        if( dataGridControl == null )
-          return null;
+        // If we get here, it means that the column is really not at the appropriate location.
+        for( var pivotMasterLocation = previousMasterLocation; pivotMasterLocation != null; pivotMasterLocation = pivotMasterLocation.GetPreviousSiblingOrCousin() )
+        {
+          if( pivotMasterLocation.Type == LocationType.Column )
+          {
+            ColumnBase pivotDetailColumn;
+            if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( map, detailColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )pivotMasterLocation ).Column, out pivotDetailColumn ) )
+              continue;
 
-        var masterColumn = this.MasterColumn;
-        int visiblePosition = masterColumn.VisiblePosition;
-        if( visiblePosition < 0 )
-          return null;
+            var pivotDetailLocation = ( pivotDetailColumn != null ) ? detailColumnManager.GetColumnLocationFor( pivotDetailColumn ) : null;
+            if( pivotDetailLocation == null )
+              continue;
 
-        var masterColumnNode = dataGridControl.ColumnsByVisiblePosition.Find( masterColumn );
-        if( masterColumnNode == null )
-          return null;
+            Debug.Assert( detailColumnLocation.CanMoveAfter( pivotDetailLocation ) );
+            detailColumnLocation.MoveAfter( pivotDetailLocation );
+          }
+          else
+          {
+            switch( pivotMasterLocation.Type )
+            {
+              case LocationType.Start:
+                {
+                  var pivotDetailLocation = detailColumnManager.GetLevelMarkersFor( detailColumnManager.Columns ).Start;
 
-        var map = this.DetailConfiguration.ItemPropertyMap;
+                  if( !detailColumnLocation.CanMoveAfter( pivotDetailLocation ) )
+                    throw new NotSupportedException();
 
-        // Remove master columns that are not linked to a detail column from the VisiblePosition count.
-        masterColumnNode = masterColumnNode.Previous;
-        while( masterColumnNode != null )
-        {
-          string detailColumnName;
-          if( !map.TryGetItemPropertyName( masterColumnNode.Value, out detailColumnName ) )
-          {
-            visiblePosition--;
-          }
+                  detailColumnLocation.MoveAfter( pivotDetailLocation );
+                }
+                break;
 
-          masterColumnNode = masterColumnNode.Previous;
-        }
+              case LocationType.Splitter:
+                {
+                  var pivotDetailLocation = detailColumnManager.GetLevelMarkersFor( detailColumnManager.Columns ).Splitter;
+
+                  if( !detailColumnLocation.CanMoveAfter( pivotDetailLocation ) )
+                    throw new NotSupportedException();
 
-        Debug.Assert( visiblePosition >= 0 );
+                  detailColumnLocation.MoveAfter( pivotDetailLocation );
+                }
+                break;
+
+              default:
+                // Unexpected location.
+                throw new NotSupportedException();
+            }
+          }
 
-        return visiblePosition;
+          // The detail column is now at the appropriate location.
+          return;
+        }
       }
 
-      private void SubscribeEvents()
+      private void OnMasterColumnPropertyChanged( object sender, PropertyChangedEventArgs e )
       {
-        if( this.IsListeningEvents )
+        var masterColumn = sender as ColumnBase;
+        if( masterColumn == null )
           return;
 
-        this.MasterColumn.FittedWidthRequested += new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
-        this.IsListeningEvents = true;
-      }
+        Debug.Assert( masterColumn == this.MasterColumn );
 
-      private void UnsubscribeEvents()
-      {
-        if( !this.IsListeningEvents )
+        var masterColumnManager = this.Owner.MasterColumnManager;
+        if( ( masterColumnManager == null ) || masterColumnManager.IsUpdateDeferred )
           return;
 
-        this.MasterColumn.FittedWidthRequested -= new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
-        this.IsListeningEvents = false;
+        var detailColumn = this.DetailColumn;
+        var propertyName = e.PropertyName;
+
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.WidthProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MinWidthProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MaxWidthProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.DesiredWidthProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.VisibleProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty, propertyName );
+        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty, propertyName );
       }
 
       private void OnMasterColumnFittedWidthRequested( object sender, FittedWidthRequestedEventArgs e )
@@ -1009,12 +1047,7 @@ namespace Xceed.Wpf.DataGrid
         e.SetValue( fittedWidth );
       }
 
-      #region Private Fields
-
-      private readonly KeyValuePair<DependencyProperty, BindingBase>[] m_bindings;
-      private readonly Dictionary<DependencyProperty, object> m_localValues = new Dictionary<DependencyProperty, object>( 0 );
-
-      #endregion
+      private Dictionary<DependencyProperty, object> m_localValues;
     }
 
     #endregion
@@ -1023,8 +1056,8 @@ namespace Xceed.Wpf.DataGrid
 
     private sealed class UnboundColumn : SynchronizationEntry
     {
-      internal UnboundColumn( SynchronizationKey key )
-        : base( key )
+      internal UnboundColumn( ColumnSynchronizationManager owner, SynchronizationKey key )
+        : base( owner, key )
       {
         if( key.MasterColumn != null )
           throw new ArgumentException( "The master column should not be set.", "key" );
@@ -1085,11 +1118,7 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      #region Private Fields
-
       private object m_localValue = DependencyProperty.UnsetValue;
-
-      #endregion
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
index ae57b643..65111d45 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
@@ -25,10 +25,7 @@ namespace Xceed.Wpf.DataGrid.Converters
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      string strValue = value as string;
-
-      // Not a mistake: returns true if *value* is null or *strValue* is "".
-      return ( value == null ) || ( strValue == string.Empty );
+      return string.IsNullOrWhiteSpace( value as string );
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
index 6215e1ac..ea7925d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
@@ -16,19 +16,17 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Data;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class CurrencyManager
+  internal sealed class CurrencyManager : IWeakEventListener
   {
-    #region CONSTRUCTORS
-
-    public CurrencyManager( DataGridContext dataGridContext, CollectionView collectionView )
+    internal CurrencyManager( DataGridContext dataGridContext, CollectionView collectionView )
     {
       if( dataGridContext == null )
         throw new ArgumentNullException( "dataGridContext" );
@@ -39,50 +37,12 @@ namespace Xceed.Wpf.DataGrid
       m_dataGridContext = dataGridContext;
       m_collectionView = collectionView;
 
-      System.Diagnostics.Debug.Assert( m_dataGridContext.CurrentItem == m_collectionView.CurrentItem );
+      Debug.Assert( m_dataGridContext.CurrentItem == m_collectionView.CurrentItem );
 
       this.RegisterListeners();
     }
 
-    #endregion CONSTRUCTORS
-
-    #region IsCurrentChanging Property
-
-    public bool IsCurrentChanging
-    {
-      get;
-      private set;
-    }
-
-    #endregion IsCurrentChanging Property
-
-    #region PUBLIC METHODS
-
-    public void CleanCurrencyManager()
-    {
-      this.UnregisterListeners();
-
-      m_dataGridContext = null;
-      m_collectionView = null;
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region EVENT HANDLERS
-
-    private void OnDataGridContextCurrentItemChanged( object sender, EventArgs e )
-    {
-      this.ChangeCollectionViewCurrentItem();
-    }
-
-    private void OnCollectionViewCurrentChanged( object sender, EventArgs e )
-    {
-      this.ChangeDataGridContextCurrentItem();
-    }
-
-    #endregion EVENT HANDLERS
-
-    #region PRIVATE PROPERTIES
+    #region IsSetCurrentInProgress Private Property
 
     private bool IsSetCurrentInProgress
     {
@@ -92,6 +52,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region ShouldSynchronizeCurrentItem Private Property
+
     private bool ShouldSynchronizeCurrentItem
     {
       get
@@ -100,34 +64,47 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region ShouldSynchronizeSelectionWithCurrent Private Property
+
     private bool ShouldSynchronizeSelectionWithCurrent
     {
       get
       {
+        // #case 158670 
+        // When using DataGridVirtualizingCollectionViewBase, the synchronization between
+        // currentItem and Selection will only be done if currentItem is modified in code-behind.
+        var dgvcvb = m_collectionView.SourceCollection as DataGridVirtualizingCollectionViewBase;
+        if( ( dgvcvb != null ) && !dgvcvb.CanSynchronizeSelectionWithCurrent )
+          return false;
+
         return m_dataGridContext.DataGridControl.SynchronizeSelectionWithCurrent;
       }
     }
 
     #endregion
 
-    #region PRIVATE METHODS
+    internal void CleanManager()
+    {
+      this.UnregisterListeners();
+    }
 
     private void ChangeCollectionViewCurrentItem()
     {
-      if( ( this.IsCurrentChanging ) || ( !this.ShouldSynchronizeCurrentItem ) )
+      if( m_isCurrentChanging || !this.ShouldSynchronizeCurrentItem )
         return;
 
-      this.IsCurrentChanging = true;
+      m_isCurrentChanging = true;
 
       try
       {
-        // Synchronize the CurrentItem of the CollecitonView 
-        // with the one of the DataGridContext.
+        // Synchronize the CurrentItem of the CollecitonView with the one of the DataGridContext.
         m_collectionView.MoveCurrentToPosition( m_dataGridContext.CurrentItemIndex );
       }
       finally
       {
-        this.IsCurrentChanging = false;
+        m_isCurrentChanging = false;
       }
     }
 
@@ -137,10 +114,10 @@ namespace Xceed.Wpf.DataGrid
       if( this.IsSetCurrentInProgress )
         return;
 
-      if( ( this.IsCurrentChanging ) || ( !this.ShouldSynchronizeCurrentItem ) )
+      if( m_isCurrentChanging || !this.ShouldSynchronizeCurrentItem )
         return;
 
-      this.IsCurrentChanging = true;
+      m_isCurrentChanging = true;
 
       try
       {
@@ -157,12 +134,14 @@ namespace Xceed.Wpf.DataGrid
           AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
 
         if( m_collectionView.CurrentItem == null )
+        {
           this.ChangeCurrentDataGridContext();
+        }
       }
       catch( DataGridException )
       {
-        // When we deleted an item in edition that contain invalid data, we don't want a throw to go all the way up to the end user.
-        // We try to abort the edition in that case.
+        // When we deleted an item in edit that contain invalid data, we don't want a throw to go all the way up to the end user.
+        // We try to abort the edit in that case.
 
         if( ( m_dataGridContext.IsCurrent ) && ( m_dataGridContext.DataGridControl.IsBeingEdited ) && ( !m_dataGridContext.Items.Contains( m_dataGridContext.CurrentItem ) ) )
         {
@@ -179,97 +158,141 @@ namespace Xceed.Wpf.DataGrid
             AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
 
           if( m_collectionView.CurrentItem == null )
+          {
             this.ChangeCurrentDataGridContext();
+          }
         }
       }
       finally
       {
-        this.IsCurrentChanging = false;
+        m_isCurrentChanging = false;
       }
     }
 
     private void ChangeCurrentDataGridContext()
     {
-      if( ( m_dataGridContext.ParentDataGridContext == null )
-        || ( m_dataGridContext.ParentItem == null ) )
+      var parentDataGridContext = m_dataGridContext.ParentDataGridContext;
+      var parentItem = m_dataGridContext.ParentItem;
+
+      if( ( parentDataGridContext == null ) || ( parentItem == null ) )
         return;
 
-      List<DataGridContext> childContexts = this.GetParentItemChildContexts();
-      int currentContextIndex = childContexts.IndexOf( m_dataGridContext );
+      var childContexts = CurrencyManager.GetChildContexts( parentDataGridContext, parentItem ).ToList();
 
       if( childContexts.Count > 1 )
       {
-        if( currentContextIndex < ( childContexts.Count - 1 ) )
+        var currentContextIndex = childContexts.IndexOf( m_dataGridContext );
+        int lookForwardFrom;
+        int lookBackwardFrom;
+
+        if( currentContextIndex < 0 )
         {
-          // We are not the last context, we'll search for a
-          // non-empty context after us.
-          for( int i = currentContextIndex + 1; i < childContexts.Count; i++ )
-          {
-            DataGridContext childContext = childContexts[ i ];
+          lookForwardFrom = 0;
+          lookBackwardFrom = -1;
+        }
+        else
+        {
+          lookForwardFrom = currentContextIndex + 1;
+          lookBackwardFrom = currentContextIndex - 1;
+        }
 
-            if( childContext.Items.Count == 0 )
-              continue;
+        for( int i = lookForwardFrom; i < childContexts.Count; i++ )
+        {
+          var childContext = childContexts[ i ];
+          if( childContext.Items.Count <= 0 )
+            continue;
 
-            childContext.SetCurrentItemCore( childContext.Items.GetItemAt( 0 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-            return;
-          }
+          childContext.SetCurrentItemCore( childContext.Items.GetItemAt( 0 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
+          return;
         }
 
-        // No context have been found. We'll search for a 
-        // non-empty context before us.
-        for( int i = currentContextIndex - 1; i >= 0; i-- )
+        for( int i = lookBackwardFrom; i >= 0; i-- )
         {
-          DataGridContext childContext = childContexts[ i ];
-
-          int count = childContext.Items.Count;
+          var childContext = childContexts[ i ];
 
-          if( count == 0 )
+          var itemsCount = childContext.Items.Count;
+          if( itemsCount <= 0 )
             continue;
 
-          childContext.SetCurrentItemCore( childContext.Items.GetItemAt( count - 1 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
+          childContext.SetCurrentItemCore( childContext.Items.GetItemAt( itemsCount - 1 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
           return;
         }
       }
 
       // No context after or before us have been found, we will set the CurrentItem to our ParentItem.
-      m_dataGridContext.ParentDataGridContext.SetCurrentItemCore( m_dataGridContext.ParentItem, false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-    }
-
-    private List<DataGridContext> GetParentItemChildContexts()
-    {
-      List<DataGridContext> childContexts = new List<DataGridContext>();
-
-      foreach( DetailConfiguration detailConfig in m_dataGridContext.ParentDataGridContext.DetailConfigurations )
-      {
-        childContexts.Add( m_dataGridContext.ParentDataGridContext.GetChildContext( m_dataGridContext.ParentItem, detailConfig ) );
-      }
-
-      return childContexts;
+      parentDataGridContext.SetCurrentItemCore( parentItem, false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
     }
 
     private void RegisterListeners()
     {
       // We are not checking this.ShouldSynchronizeCurrentItem since it might return the wrong value if the grid
       // is still in the process of being instantiated.
-      m_dataGridContext.CurrentItemChanged += new EventHandler( this.OnDataGridContextCurrentItemChanged );
-      m_collectionView.CurrentChanged += new EventHandler( this.OnCollectionViewCurrentChanged );
+      CurrentItemChangedEventManager.AddListener( m_dataGridContext, this );
+      CurrentChangedEventManager.AddListener( m_collectionView, this );
     }
 
     private void UnregisterListeners()
     {
       // We are not checking this.ShouldSynchronizeCurrentItem since it might have returned the wrong value 
       // when RegisterListeners was called if the grid was still in the process of being instantiated.
-      m_dataGridContext.CurrentItemChanged -= new EventHandler( this.OnDataGridContextCurrentItemChanged );
-      m_collectionView.CurrentChanged -= new EventHandler( this.OnCollectionViewCurrentChanged );
+      CurrentItemChangedEventManager.RemoveListener( m_dataGridContext, this );
+      CurrentChangedEventManager.RemoveListener( m_collectionView, this );
+    }
+
+    private static IEnumerable<DataGridContext> GetChildContexts( DataGridContext dataGridContext, object item )
+    {
+      Debug.Assert( dataGridContext != null );
+      Debug.Assert( item != null );
+
+      return ( from detailConfig in dataGridContext.DetailConfigurations
+               let childContext = dataGridContext.GetChildContext( item, detailConfig )
+               where ( childContext != null )
+               select childContext );
+    }
+
+    private void OnDataGridContextCurrentItemChanged( object sender, EventArgs e )
+    {
+      Debug.Assert( sender == m_dataGridContext );
+
+      this.ChangeCollectionViewCurrentItem();
+    }
+
+    private void OnCollectionViewCurrentChanged( object sender, EventArgs e )
+    {
+      Debug.Assert( sender == m_collectionView );
+
+      this.ChangeDataGridContextCurrentItem();
+    }
+
+    #region IWeakEventListener Members
+
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
     }
 
-    #endregion PRIVATE METHODS
+    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( CurrentItemChangedEventManager ) )
+      {
+        this.OnDataGridContextCurrentItemChanged( sender, e );
+      }
+      else if( managerType == typeof( CurrentChangedEventManager ) )
+      {
+        this.OnCollectionViewCurrentChanged( sender, e );
+      }
+      else
+      {
+        return false;
+      }
 
-    #region PRIVATE FIELDS
+      return true;
+    }
 
-    private DataGridContext m_dataGridContext;
-    private CollectionView m_collectionView;
+    #endregion
 
-    #endregion PRIVATE FIELDS
+    private readonly DataGridContext m_dataGridContext;
+    private readonly CollectionView m_collectionView;
+    private bool m_isCurrentChanging;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
index 49232e2a..6d83fceb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
@@ -17,13 +17,11 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Globalization;
 using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Automation.Peers;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Xml;
-using Xceed.Wpf.DataGrid.Converters;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -70,6 +68,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+
     protected override void OnMouseEnter( MouseEventArgs e )
     {
       //If the current CellEditorDisplayConditions requires display when mouse is over the Cell 
@@ -118,16 +117,6 @@ namespace Xceed.Wpf.DataGrid
         //call the helper function to setup the Cell's binding.
         this.SetupDisplayMemberBinding( dataGridContext );
       }
-      else
-      {
-
-        BindingExpression binding = BindingOperations.GetBindingExpression( this, DataCell.ContentProperty );
-
-        if( binding != null )
-        {
-          binding.UpdateTarget();
-        }
-      }
     }
 
     protected internal override void PrepareContainer( DataGridContext dataGridContext, object item )
@@ -154,34 +143,32 @@ namespace Xceed.Wpf.DataGrid
     protected internal virtual void SetupDisplayMemberBinding( DataGridContext dataGridContext )
     {
       // Bind the cell content.
-      Column column = this.ParentColumn as Column;
+      var column = this.ParentColumn as Column;
 
       if( column != null )
       {
-        BindingBase displayMemberBinding = null;
-        object dataContext = this.ParentRow.DataContext;
+        var displayMemberBinding = default( BindingBase );
+        var dataItem = this.ParentRow.DataContext;
 
         // If the dataContext is our ParentRow, we do not create any binding
-        if( dataContext != this.ParentRow )
+        if( dataItem != this.ParentRow )
         {
           displayMemberBinding = column.GetDisplayMemberBinding();
 
           if( displayMemberBinding == null )
           {
-            if( ( dataGridContext == null ) || ( dataGridContext.ItemsSourceFieldDescriptors == null ) )
+            if( dataGridContext == null )
               throw new InvalidOperationException( "An attempt was made to create a DisplayMemberBinding before the DataGridContext has been initialized." );
 
             if( !DesignerProperties.GetIsInDesignMode( this ) )
             {
-              bool isDataGridUnboundItemProperty;
+              var propertyDescription = ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, column, ( dataItem != null ) ? dataItem.GetType() : null );
+              ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, dataGridContext.DataGridControl.DefaultCellEditors, dataGridContext.AutoCreateForeignKeyConfigurations, propertyDescription );
 
-              displayMemberBinding = ItemsSourceHelper.AutoCreateDisplayMemberBinding( column, dataGridContext, dataContext, out isDataGridUnboundItemProperty );
-
-              column.IsBoundToDataGridUnboundItemProperty = isDataGridUnboundItemProperty;
+              displayMemberBinding = column.GetDisplayMemberBinding();
             }
 
             column.IsBindingAutoCreated = true;
-            column.SetDisplayMemberBinding( displayMemberBinding );
           }
         }
 
@@ -191,9 +178,7 @@ namespace Xceed.Wpf.DataGrid
 
           BindingOperations.SetBinding( this, Cell.ContentProperty, displayMemberBinding );
 
-          XmlElement xmlElement =
-            this.GetValue( Cell.ContentProperty ) as XmlElement;
-
+          var xmlElement = this.GetValue( Cell.ContentProperty ) as XmlElement;
           if( xmlElement != null )
           {
 
@@ -204,10 +189,9 @@ namespace Xceed.Wpf.DataGrid
             //under any circumstances, a cell that is bound to XML cannot be recycled
             m_canBeRecycled = false;
 
-            BindingOperations.ClearBinding( this, Cell.ContentProperty );
-            this.ClearValue( Cell.ContentProperty );
+            this.ClearDisplayMemberBinding();
 
-            Binding xmlElementBinding = new Binding( "InnerXml" );
+            var xmlElementBinding = new Binding( "InnerXml" );
             xmlElementBinding.Source = xmlElement;
             xmlElementBinding.Mode = BindingMode.TwoWay;
             xmlElementBinding.UpdateSourceTrigger = UpdateSourceTrigger.Explicit;
@@ -215,12 +199,27 @@ namespace Xceed.Wpf.DataGrid
             BindingOperations.SetBinding( this, Cell.ContentProperty, xmlElementBinding );
           }
         }
+        else
+        {
+          this.ClearDisplayMemberBinding();
+        }
+      }
+      else
+      {
+        this.ClearDisplayMemberBinding();
       }
     }
 
     internal virtual void ClearDisplayMemberBinding()
     {
-      BindingOperations.ClearBinding( this, Cell.ContentProperty );
+      if( BindingOperations.IsDataBound( this, Cell.ContentProperty ) )
+      {
+        BindingOperations.ClearBinding( this, Cell.ContentProperty );
+      }
+      else
+      {
+        this.ClearValue( Cell.ContentProperty );
+      }
     }
 
     internal override void ContentCommitted()
@@ -239,9 +238,8 @@ namespace Xceed.Wpf.DataGrid
       if( column == null )
         return null;
 
-      // If a foreignKey CellContentTemplate was found by the configuration,
-      // it must be used even if a CellContentTemplate is defined because the 
-      // CellContentTemplate will be used by this template
+      // If a foreignKey CellContentTemplate was found by the configuration, it must be used even if a CellContentTemplate is defined
+      // because the CellContentTemplate will be used by this template
       var configuration = column.ForeignKeyConfiguration;
       if( configuration == null )
         return null;
@@ -251,8 +249,8 @@ namespace Xceed.Wpf.DataGrid
 
     internal override DataTemplate GetCellStringFormatDataTemplate( DataTemplate contentTemplate )
     {
+      // parentColumn is verified to be not null in the calling method
       var parentColumn = this.ParentColumn;
-      Debug.Assert( parentColumn != null );
 
       var format = parentColumn.CellContentStringFormat;
       Debug.Assert( !string.IsNullOrEmpty( format ) );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
index c35222d2..becf2ff1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
@@ -31,8 +31,6 @@ namespace Xceed.Wpf.DataGrid
 {
   public class DataGridBindingInfo
   {
-    #region CONSTRUCTORS
-
     public DataGridBindingInfo()
     {
       m_binding = new Binding();
@@ -48,8 +46,6 @@ namespace Xceed.Wpf.DataGrid
       m_binding.NotifyOnValidationError = true;
     }
 
-    #endregion CONSTRUCTORS
-
     #region BindsDirectlyToSource Property
 
     public bool BindsDirectlyToSource
@@ -273,19 +269,11 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion Path Property
 
-    #region INTERNAL METHODS
-
     internal Binding GetBinding()
     {
       return m_binding;
     }
 
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
-
     private Binding m_binding;
-
-    #endregion PRIVATE FIELDS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
index 0914c69f..ab48b471 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
@@ -31,8 +31,6 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Media;
 using Xceed.Utils.Collections;
-using Xceed.Wpf.DataGrid.Automation;
-using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
@@ -89,9 +87,23 @@ namespace Xceed.Wpf.DataGrid
       }
 
       //If the detailConfiguration is null then we are in the master...
-      if( detailConfiguration == null )
+      if( m_detailConfig == null )
       {
-        this.CreateStandaloneCollections();
+        var columns = new ColumnCollection( dataGridControl, null );
+
+        m_columnManager = new ColumnHierarchyManager( columns );
+        m_itemsSourcePropertyDescriptions = dataGridControl.ItemsSourcePropertyDescriptions;
+        m_itemPropertyMap = dataGridControl.ItemPropertyMap;
+        m_groupLevelDescriptions = new GroupLevelDescriptionCollection();
+
+        //in this particular case, I need to create a SortDescriptionsSyncContext to ensure I will be able to synchronize access to the sort descriptions collection.
+        m_sortDescriptionsSyncContext = new SortDescriptionsSyncContext();
+
+        //Register to the Columns Collection's CollectionChanged event to manage the Removal of the CurrentColumn.
+        CollectionChangedEventManager.AddListener( m_columnManager.Columns, this );
+
+        // Register to the VisibleColumnsChanged to update, if need be, the columns desired width when column stretching is active and there's a column reordering.
+        CollectionChangedEventManager.AddListener( m_columnManager.VisibleColumns, this );
 
         CollectionChangedEventManager.AddListener( m_items.SortDescriptions, this );
         CollectionChangedEventManager.AddListener( m_items.GroupDescriptions, this );
@@ -101,18 +113,24 @@ namespace Xceed.Wpf.DataGrid
         MaxGroupLevelsChangedEventManager.AddListener( m_dataGridControl, this );
         MaxSortLevelsChangedEventManager.AddListener( m_dataGridControl, this );
         ItemsSourceChangeCompletedEventManager.AddListener( m_dataGridControl, this );
+
+        this.HookToItemPropertiesChanged();
       }
       //Detail DataGridContext
       else
       {
+        m_detailConfig.AddDataGridContext( this );
+
+        m_columnManager = m_detailConfig.ColumnManager;
+        m_itemsSourcePropertyDescriptions = m_detailConfig.ItemsSourcePropertyDescriptions;
+        m_itemPropertyMap = m_detailConfig.ItemPropertyMap;
+
         //only listen to the detail grid config current column changed if the detail grid config is synchronized.
         CurrentColumnChangedEventManager.AddListener( m_detailConfig, this );
 
         GroupConfigurationSelectorChangedEventManager.AddListener( m_detailConfig, this );
         AllowDetailToggleChangedEventManager.AddListener( m_detailConfig, this );
 
-        VisibilityChangingEventManager.AddListener( m_detailConfig.Columns, this );
-
         // Register to the VisibleColumnsChanged to update, if need be, the columns desired width
         // when column stretching is active and there's a column reordering.
         CollectionChangedEventManager.AddListener( m_detailConfig.VisibleColumns, this );
@@ -120,19 +138,20 @@ namespace Xceed.Wpf.DataGrid
         MaxGroupLevelsChangedEventManager.AddListener( m_detailConfig, this );
         MaxSortLevelsChangedEventManager.AddListener( m_detailConfig, this );
 
-        m_detailConfig.RequestingDelayBringIntoViewAndFocusCurrent += this.OnDetailConfigRequestingDelayBringIntoViewAndFocusCurrent;
         m_detailConfig.DetailConfigurations.DataGridControl = dataGridControl;
       }
 
-      CollectionChangedEventManager.AddListener( this.DetailConfigurations, this );
-      VisibleColumnsUpdatedEventManager.AddListener( this.Columns, this );
-      VisibleColumnsUpdatingEventManager.AddListener( this.Columns, this );
-      RealizedContainersRequestedEventManager.AddListener( this.Columns, this );
-      DistinctValuesRequestedEventManager.AddListener( this.Columns, this );
+      Debug.Assert( m_columnManager != null );
+      Debug.Assert( m_itemsSourcePropertyDescriptions != null );
+      Debug.Assert( m_itemPropertyMap != null );
 
+      ColumnsLayoutChangingEventManager.AddListener( m_columnManager, this );
+      ColumnsLayoutChangedEventManager.AddListener( m_columnManager, this );
       DetailVisibilityChangedEventManager.AddListener( this.DetailConfigurations, this );
+      RealizedContainersRequestedEventManager.AddListener( this.Columns, this );
+      DistinctValuesRequestedEventManager.AddListener( this.Columns, this );
 
-      this.SetupViewProperties( true );
+      this.SetupViewProperties();
       this.InitializeViewProperties();
 
       ViewChangedEventManager.AddListener( m_dataGridControl, this );
@@ -151,8 +170,6 @@ namespace Xceed.Wpf.DataGrid
         this.DetailLevel++;
         tempDataGridContext = tempDataGridContext.ParentDataGridContext;
       }
-
-      this.HookToItemPropertiesChanged();
     }
 
     private void Items_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
@@ -179,36 +196,25 @@ namespace Xceed.Wpf.DataGrid
         m_dataGridControl.CoerceValue( DataGridControl.SelectedItemProperty );
       }
 
-      if( this.Peer != null )
-      {
-        m_dataGridControl.QueueDataGridContextPeerChlidrenRefresh( this );
-      }
-
       m_dataGridControl.SelectionChangerManager.UpdateSelectionAfterSourceCollectionChanged( this, e );
+
     }
 
     internal void CleanDataGridContext()
     {
-      if( m_currencyManager != null )
-      {
-        m_currencyManager.CleanCurrencyManager();
-        m_currencyManager = null;
-      }
+      m_currencyManager.CleanManager();
 
       if( m_items != null )
       {
         CollectionChangedEventManager.RemoveListener( m_items, this );
 
-        DataGridCollectionViewBase dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
-
+        var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
         if( dataGridCollectionViewBase != null )
         {
-          dataGridCollectionViewBase.UnregisterChangedEvents();
-          dataGridCollectionViewBase.RemoveSourceChangedListenersForDetail();
+          dataGridCollectionViewBase.Dispose();
         }
       }
 
-      //For non-master DataGridContext
       if( m_detailConfig == null )
       {
         GroupConfigurationSelectorChangedEventManager.RemoveListener( m_dataGridControl, this );
@@ -219,6 +225,8 @@ namespace Xceed.Wpf.DataGrid
 
         CollectionChangedEventManager.RemoveListener( m_items.SortDescriptions, this );
         CollectionChangedEventManager.RemoveListener( m_items.GroupDescriptions, this );
+
+        this.UnhookToItemPropertiesChanged( m_dataGridControlItemsSource as DataGridCollectionViewBase );
       }
       else
       {
@@ -229,24 +237,21 @@ namespace Xceed.Wpf.DataGrid
         MaxGroupLevelsChangedEventManager.RemoveListener( m_detailConfig, this );
         MaxSortLevelsChangedEventManager.RemoveListener( m_detailConfig, this );
 
-        m_detailConfig.RequestingDelayBringIntoViewAndFocusCurrent -= OnDetailConfigRequestingDelayBringIntoViewAndFocusCurrent;
+        m_detailConfig.RemoveDataGridContext( this );
       }
 
       this.ClearSizeStates();
 
+      ColumnsLayoutChangingEventManager.RemoveListener( m_columnManager, this );
+      ColumnsLayoutChangedEventManager.RemoveListener( m_columnManager, this );
       CollectionChangedEventManager.RemoveListener( this.DetailConfigurations, this );
-
       DetailVisibilityChangedEventManager.RemoveListener( this.DetailConfigurations, this );
-
-      VisibleColumnsUpdatedEventManager.RemoveListener( this.Columns, this );
-      VisibleColumnsUpdatingEventManager.RemoveListener( this.Columns, this );
       RealizedContainersRequestedEventManager.RemoveListener( this.Columns, this );
       DistinctValuesRequestedEventManager.RemoveListener( this.Columns, this );
 
       ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
-      this.UnhookToItemPropertiesChanged( m_dataGridControlItemsSource as DataGridCollectionViewBase );
 
-      ColumnVirtualizationManager columnVirtualizationManager = this.ColumnVirtualizationManager;
+      var columnVirtualizationManager = this.ColumnVirtualizationManager;
       if( columnVirtualizationManager != null )
       {
         columnVirtualizationManager.CleanManager();
@@ -280,8 +285,6 @@ namespace Xceed.Wpf.DataGrid
 
     #region ParentItem Read-Only Property
 
-    private object m_parentItem;
-
     public object ParentItem
     {
       get
@@ -290,7 +293,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ParentItem Read-Only Property
+    private readonly object m_parentItem;
+
+    #endregion
 
     #region AllowDetailToggle Property
 
@@ -300,15 +305,11 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.AllowDetailToggle;
-          }
-          else
-          {
-            return m_detailConfig.AllowDetailToggle;
-          }
+
+          return m_detailConfig.AllowDetailToggle;
         }
 
         return m_dataGridControl.AllowDetailToggle;
@@ -323,13 +324,11 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        DataGridCollectionViewBase dataGridCollectionViewBase =
-                  this.ItemsSourceCollection as DataGridCollectionViewBase;
-
+        var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
         if( dataGridCollectionViewBase == null )
           return null;
 
-        return dataGridCollectionViewBase.DistinctValues;
+        return null;
       }
     }
 
@@ -341,16 +340,10 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        if( m_detailConfig != null )
-          return m_detailConfig.Columns;
-
-        return m_columns;
+        return m_columnManager.Columns;
       }
     }
 
-    private ColumnCollection m_columns; // = null, this variable will store the ColumnCollection only when
-    //the DataGridContext is used "desynchronized".
-
     #endregion
 
     #region Items Property
@@ -363,9 +356,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private CollectionView m_items;
+    private readonly CollectionView m_items;
 
-    #endregion Items Property
+    #endregion
 
     #region OriginalItems Property
 
@@ -465,7 +458,7 @@ namespace Xceed.Wpf.DataGrid
       this.SetCurrent( this.Items.GetItemAt( index ), null, index, this.CurrentColumn, false, isCancelable, synchronizeSelectionWithCurrent, trigger );
     }
 
-    private void SetCurrentItemHelper( object dataItem, int sourceDataItemIndex )
+    private void SetCurrentItem( object dataItem, int sourceDataItemIndex )
     {
       // This is called only for DataItem
       if( ( m_currentItem == dataItem ) && ( m_currentItemIndex == sourceDataItemIndex ) )
@@ -480,14 +473,17 @@ namespace Xceed.Wpf.DataGrid
 
     private void OnCurrentItemChanged()
     {
-      if( this.CurrentItemChanged != null )
-        this.CurrentItemChanged( this, EventArgs.Empty );
+      var handler = this.CurrentItemChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
     }
 
     private object m_currentItem; // = null
     private int m_currentItemIndex = -1;
 
-    #endregion CurrentItem
+    #endregion
 
     #region DefaultGroupConfiguration Read-Only Property
 
@@ -497,15 +493,11 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.DefaultGroupConfiguration;
-          }
-          else
-          {
-            return m_detailConfig.DefaultGroupConfiguration;
-          }
+
+          return m_detailConfig.DefaultGroupConfiguration;
         }
 
         return m_dataGridControl.DefaultGroupConfiguration;
@@ -521,11 +513,9 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_detailConfig != null )
-        {
           return m_detailConfig.DetailConfigurations;
-        }
 
-        return m_dataGridControl.DetailConfigurations;
+        return null;
       }
     }
 
@@ -539,18 +529,14 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.Footers;
-          }
-          else
-          {
-            return m_detailConfig.Footers;
-          }
+
+          return m_detailConfig.Footers;
         }
 
-        Xceed.Wpf.DataGrid.Views.ViewBase view = m_dataGridControl.GetView( false );
+        var view = m_dataGridControl.GetView();
         if( view == null )
           return new ObservableCollection<DataTemplate>();
 
@@ -573,8 +559,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private GroupLevelDescriptionCollection m_groupLevelDescriptions; // = null, this variable will store the GroupLevelDescriptions only when
-    //the DataGridContext is used "desynchronized".
+    private readonly GroupLevelDescriptionCollection m_groupLevelDescriptions; //null
 
     #endregion
 
@@ -586,29 +571,29 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.GroupConfigurationSelector;
-          }
 
           return m_detailConfig.GroupConfigurationSelector;
         }
+
         return m_dataGridControl.GroupConfigurationSelector;
       }
     }
 
     private void OnGroupConfigurationSelectorChanged()
     {
-      if( this.GroupConfigurationSelectorChanged != null )
-      {
-        this.GroupConfigurationSelectorChanged( this, EventArgs.Empty );
-      }
+      var handler = this.GroupConfigurationSelectorChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
     }
 
     internal event EventHandler GroupConfigurationSelectorChanged;
 
-    #endregion GroupConfigurationSelector Property
+    #endregion
 
     #region HasDetails Read-Only Property
 
@@ -616,17 +601,6 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        bool isDataGridCollectionView = ( this.ItemsSourceCollection is DataGridCollectionView );
-
-        if( !isDataGridCollectionView )
-          return false;
-
-        foreach( DetailConfiguration detailConfig in this.DetailConfigurations )
-        {
-          if( detailConfig.Visible )
-            return true;
-        }
-
         return false;
       }
     }
@@ -641,18 +615,14 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.Headers;
-          }
-          else
-          {
-            return m_detailConfig.Headers;
-          }
+
+          return m_detailConfig.Headers;
         }
 
-        Xceed.Wpf.DataGrid.Views.ViewBase view = m_dataGridControl.GetView( false );
+        var view = m_dataGridControl.GetView();
         if( view == null )
           return new ObservableCollection<DataTemplate>();
 
@@ -668,25 +638,13 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return IsCurrentCache;
+        return m_flags[ ( int )DataGridContextFlags.IsCurrent ];
       }
     }
 
-    internal void SetIsCurrentHelper( bool value )
+    internal void SetIsCurrent( bool value )
     {
-      IsCurrentCache = value;
-    }
-
-    private bool IsCurrentCache
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridContextFlags.IsCurrent ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridContextFlags.IsCurrent ] = value;
-      }
+      m_flags[ ( int )DataGridContextFlags.IsCurrent ] = value;
     }
 
     #endregion
@@ -699,16 +657,13 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.ItemContainerStyle;
-          }
-          else
-          {
-            return m_detailConfig.ItemContainerStyle;
-          }
+
+          return m_detailConfig.ItemContainerStyle;
         }
+
         return m_dataGridControl.ItemContainerStyle;
       }
     }
@@ -723,15 +678,11 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.ItemContainerStyleSelector;
-          }
-          else
-          {
-            return m_detailConfig.ItemContainerStyleSelector;
-          }
+
+          return m_detailConfig.ItemContainerStyleSelector;
         }
 
         return m_dataGridControl.ItemContainerStyleSelector;
@@ -764,9 +715,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SelectionItemCollection m_selectedItems;
+    private readonly SelectionItemCollection m_selectedItems;
 
-    #endregion SelectedItems Read-Only Property
+    #endregion
 
     #region SelectedItemRanges Read-Only Property
 
@@ -778,9 +729,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SelectionItemRangeCollection m_selectedItemsRanges;
+    private readonly SelectionItemRangeCollection m_selectedItemsRanges;
 
-    #endregion SelectedItemRanges Read-Only Property
+    #endregion
 
     #region SelectedCellRanges Read-Only Property
 
@@ -792,9 +743,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SelectionCellRangeCollection m_selectedCellRanges;
+    private readonly SelectionCellRangeCollection m_selectedCellRanges;
 
-    #endregion SelectedCellRanges Read-Only Property
+    #endregion
 
     #region SourceDetailConfiguration Read-Only Property
 
@@ -808,7 +759,7 @@ namespace Xceed.Wpf.DataGrid
 
     private readonly DetailConfiguration m_detailConfig;
 
-    #endregion SourceDetailConfiguration Read-Only Property
+    #endregion
 
     #region VisibleColumns Read-Only Property
 
@@ -816,16 +767,10 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        if( m_detailConfig != null )
-          return m_detailConfig.VisibleColumns;
-
-        return m_visibleColumns;
+        return m_columnManager.VisibleColumns;
       }
     }
 
-    private ReadOnlyColumnCollection m_visibleColumns; // = null, this variable will store the VisibleColumns only when
-    //the DataGridContext is used "desynchronized".
-
     #endregion
 
     #region AutoCreateForeignKeyConfigurations Internal Property
@@ -835,9 +780,7 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_detailConfig != null )
-        {
           return m_detailConfig.AutoCreateForeignKeyConfigurations;
-        }
 
         return m_dataGridControl.AutoCreateForeignKeyConfigurations;
       }
@@ -853,22 +796,18 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.MaxSortLevels;
-          }
-          else
-          {
-            return m_detailConfig.MaxSortLevels;
-          }
+
+          return m_detailConfig.MaxSortLevels;
         }
 
         return m_dataGridControl.MaxSortLevels;
       }
     }
 
-    #endregion MaxSortLevels Property
+    #endregion
 
     #region MaxGroupLevels Property
 
@@ -878,22 +817,18 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_detailConfig != null )
         {
-          DefaultDetailConfiguration defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
+          var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
           if( defaultDetailConfig != null )
-          {
             return defaultDetailConfig.MaxGroupLevels;
-          }
-          else
-          {
-            return m_detailConfig.MaxGroupLevels;
-          }
+
+          return m_detailConfig.MaxGroupLevels;
         }
 
         return m_dataGridControl.MaxGroupLevels;
       }
     }
 
-    #endregion MaxGroupLevels Property
+    #endregion
 
     //--------- INTERNAL PROPERTIES ---------
 
@@ -919,9 +854,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SelectedItemsStorage m_selectedItemsStore;
+    private readonly SelectedItemsStorage m_selectedItemsStore;
 
-    #endregion SelectedItemsStore Read-Only Property
+    #endregion
 
     #region SelectedItemsStore Read-Only Property
 
@@ -933,9 +868,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SelectedCellsStorage m_selectedCellsStore;
+    private readonly SelectedCellsStorage m_selectedCellsStore;
 
-    #endregion SelectedItemsStore Read-Only Property
+    #endregion
 
     #region ColumnsByVisiblePosition Read-Only Property
 
@@ -943,16 +878,10 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        if( m_detailConfig != null )
-          return m_detailConfig.ColumnsByVisiblePosition;
-
-        return m_columnsByVisiblePosition;
+        return m_columnManager.ColumnsByVisiblePosition;
       }
     }
 
-    private HashedLinkedList<ColumnBase> m_columnsByVisiblePosition;// = null, this variable will store the ColumnsByVisiblePosition only when
-    //the DataGridContext is used "desynchronized".
-
     #endregion
 
     #region ColumnStretchingManager Property
@@ -962,7 +891,9 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_columnStretchingManager == null )
+        {
           m_columnStretchingManager = new ColumnStretchingManager( this );
+        }
 
         return m_columnStretchingManager;
       }
@@ -978,8 +909,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        Row currentRow = this.CurrentRow;
-
+        var currentRow = this.CurrentRow;
         if( currentRow == null )
           return null;
 
@@ -987,7 +917,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CurrentCell Property
+    #endregion
 
     #region CurrentRow Read-Only Property
 
@@ -1002,12 +932,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CurrentRow Property
+    #endregion
 
     #region CustomItemContainerGenerator Read-Only Property
 
-    private CustomItemContainerGenerator m_generator;
-
     internal CustomItemContainerGenerator CustomItemContainerGenerator
     {
       get
@@ -1027,6 +955,8 @@ namespace Xceed.Wpf.DataGrid
       m_generator = generator;
     }
 
+    private CustomItemContainerGenerator m_generator;
+
     #endregion
 
     #region InternalCurrentItem Read-Only Property
@@ -1039,105 +969,40 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal void SetInternalCurrentItemHelper( object value )
+    private void SetInternalCurrentItem( object value )
     {
       m_internalCurrentItem = value;
     }
 
-    private object m_internalCurrentItem; // = null
-
-    #endregion
-
-    #region InternalCurrentItemNamesTree Read-Only Property
-
-    internal object[] InternalCurrentItemNamesTree
-    {
-      get
-      {
-        return m_internalCurrentItemNamesTree;
-      }
-    }
-
-    private void SetInternalCurrentItemNamesTree( object[] namesTree )
-    {
-      m_internalCurrentItemNamesTree = namesTree;
-    }
-
-    private object[] m_internalCurrentItemNamesTree;
+    private object m_internalCurrentItem; //null
 
     #endregion
 
-    #region ItemsSourceFieldDescriptors Property
+    #region ItemsSourcePropertyDescriptions Property
 
-    internal Dictionary<string, ItemsSourceHelper.FieldDescriptor> ItemsSourceFieldDescriptors
+    internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
     {
       get
       {
-        if( m_detailConfig != null )
-        {
-          Dictionary<string, ItemsSourceHelper.FieldDescriptor> itemsSourceFieldDescriptors = m_detailConfig.ItemsSourceFieldDescriptors;
-
-          if( itemsSourceFieldDescriptors == null )
-          {
-            if( this.AreDetailsFlatten )
-            {
-              var rootDataGridContext = this.RootDataGridContext;
-              Debug.Assert( ( rootDataGridContext != null ) && ( this != rootDataGridContext ) );
-
-              itemsSourceFieldDescriptors = ItemsSourceHelper.GetFields( rootDataGridContext.ItemsSourceFieldDescriptors, this.ItemPropertyMap, m_items, null );
-            }
-            else
-            {
-              itemsSourceFieldDescriptors = ItemsSourceHelper.GetFields( m_items, null );
-            }
-
-            m_detailConfig.ItemsSourceFieldDescriptors = itemsSourceFieldDescriptors;
-          }
-
-          return itemsSourceFieldDescriptors;
-        }
-
-        //we are nescessarily in the master context in this case ( m_detailConfig == null ).
-        if( m_itemsSourceFieldDescriptors == null )
-          m_itemsSourceFieldDescriptors = ItemsSourceHelper.GetFields( m_dataGridControl.ItemsSource, null );
-
-        return m_itemsSourceFieldDescriptors;
-      }
-      set
-      {
-        if( m_detailConfig != null )
-        {
-          m_detailConfig.ItemsSourceFieldDescriptors = value;
-          return;
-        }
-
-        m_itemsSourceFieldDescriptors = value;
+        return m_itemsSourcePropertyDescriptions;
       }
     }
 
-    private Dictionary<string, ItemsSourceHelper.FieldDescriptor> m_itemsSourceFieldDescriptors;
+    private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions;
 
     #endregion
 
     #region ItemPropertyMap Internal Property
 
-    internal FieldNameMap ItemPropertyMap
+    internal DataGridItemPropertyMap ItemPropertyMap
     {
       get
       {
-        if( m_detailConfig != null )
-          return m_detailConfig.ItemPropertyMap;
-
-        if( m_itemPropertyMap == null )
-        {
-          m_itemPropertyMap = new FieldNameMap();
-        }
-
         return m_itemPropertyMap;
       }
     }
 
-    private FieldNameMap m_itemPropertyMap; //null
+    private readonly DataGridItemPropertyMap m_itemPropertyMap;
 
     #endregion
 
@@ -1210,9 +1075,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        DataGridCollectionViewBase dataGridCollectionViewBase =
-          this.ItemsSourceCollection as DataGridCollectionViewBase;
-
+        var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
         if( dataGridCollectionViewBase != null )
           return dataGridCollectionViewBase.DataGridSortDescriptions.SyncContext;
 
@@ -1221,7 +1084,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private SortDescriptionsSyncContext m_sortDescriptionsSyncContext; // = null
+    private readonly SortDescriptionsSyncContext m_sortDescriptionsSyncContext; //null
 
     #endregion
 
@@ -1232,13 +1095,12 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_detailConfig != null )
-        {
           return m_detailConfig.DefaultDetailConfiguration;
-        }
 
         return m_dataGridControl.DefaultDetailConfiguration;
       }
     }
+
     #endregion
 
     #region ColumnVirtualizationManager Property
@@ -1247,8 +1109,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        ColumnVirtualizationManager columnVirtualizationManager = ColumnVirtualizationManager.GetColumnVirtualizationManager( this );
-
+        var columnVirtualizationManager = this.GetColumnVirtualizationManagerOrNull();
         if( columnVirtualizationManager == null )
         {
           columnVirtualizationManager = this.DataGridControl.GetView().CreateColumnVirtualizationManager( this );
@@ -1268,58 +1129,42 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region FixedHeaderFooterViewPortSize Property
+    #region ColumnManagerRowConfiguration Read-Only Internal Property
 
-    internal Size FixedHeaderFooterViewPortSize
+    internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
     {
       get
       {
-        return m_fixedHeaderFooterViewPortSize;
-      }
-      set
-      {
-        if( Size.Equals( m_fixedHeaderFooterViewPortSize, value ) == false )
-        {
-          m_fixedHeaderFooterViewPortSize = value;
-          this.NotifyPropertyChanged( "FixedHeaderFooterViewPortSize" );
-        }
+        if( m_detailConfig != null )
+          return m_detailConfig.ColumnManagerRowConfiguration;
+
+        return this.DataGridControl.ColumnManagerRowConfiguration;
       }
     }
 
-    private Size m_fixedHeaderFooterViewPortSize = new Size();
-
     #endregion
 
-    #region RecyclingManager Read-Only property
+    #region FixedHeaderFooterViewPortSize Property
 
-    internal RecyclingManager RecyclingManager
+    internal Size FixedHeaderFooterViewPortSize
     {
       get
       {
-        RecyclingManager retval = null;
+        return m_fixedHeaderFooterViewPortSize;
+      }
+      set
+      {
+        if( Size.Equals( value, m_fixedHeaderFooterViewPortSize ) )
+          return;
 
-        //If the DataGridContext belongs to a detail, then use the DetailConfiguration's RecyclingManager
-        DetailConfiguration sourceDetailConfiguration = this.SourceDetailConfiguration;
-        if( sourceDetailConfiguration != null )
-        {
-          retval = sourceDetailConfiguration.RecyclingManager;
-        }
-        else
-        {
-          //If the DataGridContext is from the Master context, then use and/or create the RecyclingManager
-          if( m_recyclingManager == null )
-          {
-            m_recyclingManager = new RecyclingManager();
-          }
-          retval = m_recyclingManager;
-        }
+        m_fixedHeaderFooterViewPortSize = value;
 
-        //RecyclingManager should never be null
-        Debug.Assert( retval != null );
-        return retval;
+        this.OnPropertyChanged( "FixedHeaderFooterViewPortSize" );
       }
     }
 
+    private Size m_fixedHeaderFooterViewPortSize = new Size();
+
     #endregion
 
     #region IsDeleteCommandEnabled Property
@@ -1345,8 +1190,7 @@ namespace Xceed.Wpf.DataGrid
         return dataGridContext.DataGridControl.IsDeleteCommandEnabled;
       }
 
-      DefaultDetailConfiguration defaultDetailConfig = dataGridContext.GetDefaultDetailConfigurationForContext();
-
+      var defaultDetailConfig = dataGridContext.GetDefaultDetailConfigurationForContext();
       if( defaultDetailConfig != null )
       {
         if( defaultDetailConfig.ReadLocalValue( DefaultDetailConfiguration.IsDeleteCommandEnabledProperty ) != DependencyProperty.UnsetValue )
@@ -1361,7 +1205,7 @@ namespace Xceed.Wpf.DataGrid
       return this.FindIsDeletedCommandEnabledAmbient( dataGridContext.ParentDataGridContext );
     }
 
-    #endregion IsDeleteCommandEnabled Property
+    #endregion
 
     #region SelectionChanged Event
 
@@ -1380,20 +1224,6 @@ namespace Xceed.Wpf.DataGrid
       if( ( selectionInfo.RemovedItems.Count == 0 ) && ( selectionInfo.AddedItems.Count == 0 ) )
         return;
 
-      if( ( AutomationPeer.ListenerExists( AutomationEvents.SelectionPatternOnInvalidated )
-        || AutomationPeer.ListenerExists( AutomationEvents.SelectionItemPatternOnElementSelected ) )
-        || ( AutomationPeer.ListenerExists( AutomationEvents.SelectionItemPatternOnElementAddedToSelection )
-          || AutomationPeer.ListenerExists( AutomationEvents.SelectionItemPatternOnElementRemovedFromSelection ) ) )
-      {
-        DataGridContextAutomationPeer peer = this.Peer;
-
-        if( peer != null )
-        {
-          peer.RaiseSelectionEvents(
-            ( IList<object> )selectionInfo.RemovedItems,
-            ( IList<object> )selectionInfo.AddedItems );
-        }
-      }
     }
 
     #endregion
@@ -1510,36 +1340,36 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region ItemsProperties/Column Auto update
+    #region ColumnManager Internal Property
 
-    private void HookToItemPropertiesChanged()
+    internal ColumnHierarchyManager ColumnManager
     {
-      DataGridCollectionViewBase itemsSourceCollection = this.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      if( itemsSourceCollection != null )
+      get
       {
-        ItemPropertiesChangedEventManager.AddListener( itemsSourceCollection.ItemProperties, this );
+        return m_columnManager;
       }
     }
 
-    private void UnhookToItemPropertiesChanged( DataGridCollectionViewBase itemsSourceCollection )
-    {
-      if( itemsSourceCollection != null )
-      {
-        ItemPropertiesChangedEventManager.RemoveListener( itemsSourceCollection.ItemProperties, this );
-      }
-    }
+    private readonly ColumnHierarchyManager m_columnManager;
 
-    #endregion ItemsProperties/Column Auto update
+    #endregion
 
-    #region IsSettingFixedColumnCount Property
+    #region CanIncreaseColumnWidth Property
 
-    internal bool IsSettingFixedColumnCount
+    internal bool CanIncreaseColumnWidth
     {
-      get;
-      set;
+      get
+      {
+        return m_canIncreaseColumnWidth;
+      }
+      set
+      {
+        m_canIncreaseColumnWidth = value;
+      }
     }
 
+    private bool m_canIncreaseColumnWidth = true;
+
     #endregion
 
     internal void SetCurrentColumnAndChangeSelection( ColumnBase newCurrentColumn )
@@ -1567,11 +1397,9 @@ namespace Xceed.Wpf.DataGrid
         }
 
         var oldPosition = SelectionRangePoint.TryCreateFromCurrent( this );
-        var newPosition = new SelectionRangePoint( this, item, dataRowIndex, newCurrentColumn.VisiblePosition );
+        var newPosition = SelectionRangePoint.TryCreateRangePoint( this, item, dataRowIndex, newCurrentColumn.VisiblePosition );
 
-        m_dataGridControl.SelectionChangerManager.UpdateSelection(
-          oldPosition,newPosition, true, rowIsBeingEdited,
-          SelectionManager.UpdateSelectionSource.Navigation );
+        m_dataGridControl.SelectionChangerManager.UpdateSelection( oldPosition, newPosition, true, rowIsBeingEdited, SelectionManager.UpdateSelectionSource.Navigation );
       }
     }
 
@@ -1615,59 +1443,44 @@ namespace Xceed.Wpf.DataGrid
 
     public bool IsGroupExpanded( CollectionViewGroup group )
     {
-      return this.CustomItemContainerGenerator.IsGroupExpanded( group );
+      return ( this.CustomItemContainerGenerator.IsGroupExpanded( group ) == true );
     }
 
-    internal bool IsGroupExpandedCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool? IsGroupExpanded( CollectionViewGroup group, bool recurseDetails )
     {
-      return this.CustomItemContainerGenerator.IsGroupExpandedCore( group, recurseDetails );
+      return this.CustomItemContainerGenerator.IsGroupExpanded( group, recurseDetails );
     }
 
-    public void ToggleGroupExpansion( CollectionViewGroup group )
+    public bool ToggleGroupExpansion( CollectionViewGroup group )
     {
-      this.CustomItemContainerGenerator.ToggleGroupExpansion( group );
+      return this.CustomItemContainerGenerator.ToggleGroupExpansion( group );
     }
 
-    public void ExpandGroup( CollectionViewGroup group )
+    public bool ExpandGroup( CollectionViewGroup group )
     {
-      this.CustomItemContainerGenerator.ExpandGroup( group );
+      return this.CustomItemContainerGenerator.ExpandGroup( group );
     }
 
-    internal bool ExpandGroupCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool ExpandGroup( CollectionViewGroup group, bool recurseDetails )
     {
-      return this.CustomItemContainerGenerator.ExpandGroupCore( group, recurseDetails );
+      return this.CustomItemContainerGenerator.ExpandGroup( group, recurseDetails );
     }
 
-    public void CollapseGroup( CollectionViewGroup group )
+    public bool CollapseGroup( CollectionViewGroup group )
     {
-      this.CustomItemContainerGenerator.CollapseGroup( group );
+      return this.CustomItemContainerGenerator.CollapseGroup( group );
     }
 
-    internal bool CollapseGroupCore( CollectionViewGroup group, bool recurseDetails )
+    internal bool CollapseGroup( CollectionViewGroup group, bool recurseDetails )
     {
-      return this.CustomItemContainerGenerator.CollapseGroupCore( group, recurseDetails );
+      return this.CustomItemContainerGenerator.CollapseGroup( group, recurseDetails );
     }
 
-    internal bool AreDetailsExpanded( object dataItem )
+    public bool AreDetailsExpanded( object dataItem )
     {
       return this.CustomItemContainerGenerator.AreDetailsExpanded( dataItem );
     }
 
-    internal void CollapseDetails( object dataItem )
-    {
-      this.CustomItemContainerGenerator.CollapseDetails( dataItem );
-    }
-
-    internal void ExpandDetails( object dataItem )
-    {
-      this.CustomItemContainerGenerator.ExpandDetails( dataItem );
-    }
-
-    internal void ToggleDetailExpansion( object dataItem )
-    {
-      this.CustomItemContainerGenerator.ToggleDetails( dataItem );
-    }
-
     public Group GetGroupFromCollectionViewGroup( CollectionViewGroup collectionViewGroup )
     {
       if( collectionViewGroup == null )
@@ -1683,7 +1496,7 @@ namespace Xceed.Wpf.DataGrid
       if( item == null )
         return null;
 
-      DependencyObject container = null;
+      var container = default( DependencyObject );
 
       if( ( m_detailConfig == null ) && ( item is DataTemplate ) )
       {
@@ -1693,7 +1506,9 @@ namespace Xceed.Wpf.DataGrid
       }
 
       if( container == null )
+      {
         container = this.CustomItemContainerGenerator.ContainerFromItem( item );
+      }
 
       return container;
     }
@@ -1743,7 +1558,7 @@ namespace Xceed.Wpf.DataGrid
       //For the master level, before interrogating the Generator, I need to check for the items presence in the Fixed regions.
       if( ( m_detailConfig == null ) && ( dataTemplate != null ) )
       {
-        Xceed.Wpf.DataGrid.Views.ViewBase view = m_dataGridControl.GetView();
+        Views.ViewBase view = m_dataGridControl.GetView();
 
         //Fixed header cannot have a Parent Group.
         if( view.FixedHeaders.Contains( dataTemplate ) == true )
@@ -1752,7 +1567,6 @@ namespace Xceed.Wpf.DataGrid
         //Fixed header cannot have a Parent Group.
         if( view.FixedFooters.Contains( dataTemplate ) == true )
           return null;
-
       }
 
       if( this.CustomItemContainerGenerator.IsInUse == true )
@@ -1798,62 +1612,56 @@ namespace Xceed.Wpf.DataGrid
       if( column == null )
         throw new ArgumentNullException( "column" );
 
-      string xPath = null;
-      PropertyPath propertyPath = null;
+      var xPath = default( string );
+      var propertyPath = default( PropertyPath );
 
       // Disable warning for DisplayMemberBinding when internaly used
 #pragma warning disable 618
-
-      Binding displayMemberBinding = column.DisplayMemberBinding as Binding;
-
+      var displayMemberBinding = column.DisplayMemberBinding as Binding;
 #pragma warning restore 618
 
       if( displayMemberBinding == null )
       {
-        bool isBoundToDataGridUnboundItemProperty;
-
-        displayMemberBinding = ItemsSourceHelper.AutoCreateDisplayMemberBinding(
-          column, this, dataItem, out isBoundToDataGridUnboundItemProperty );
+        displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding(
+                                 ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( this, column, dataItem.GetType() ) );
       }
 
-      if( displayMemberBinding != null )
-      {
-        xPath = displayMemberBinding.XPath;
-        propertyPath = displayMemberBinding.Path;
-      }
-      else
-      {
+      if( displayMemberBinding == null )
         throw new DataGridInternalException( "DisplayMemberBinding is null.", m_dataGridControl );
-      }
 
-      IValueConverter converter = new Xceed.Wpf.DataGrid.Converters.SourceDataConverter( ItemsSourceHelper.IsItemSupportingDBNull( dataItem ), CultureInfo.InvariantCulture );
+      xPath = displayMemberBinding.XPath;
+      propertyPath = displayMemberBinding.Path;
 
-      BindingPathValueExtractor extractorForRead = new BindingPathValueExtractor( xPath, propertyPath, false, typeof( object ), converter, null, CultureInfo.InvariantCulture );
+      var converter = new Xceed.Wpf.DataGrid.Converters.SourceDataConverter( ItemsSourceHelper.IsItemSupportingDBNull( dataItem ), CultureInfo.InvariantCulture );
 
-      return extractorForRead;
+      return new BindingPathValueExtractor( xPath, propertyPath, false, typeof( object ), converter, null, CultureInfo.InvariantCulture );
     }
 
-    //---------- INTERNAL METHODS -----------
+    public IDisposable DeferColumnsUpdate()
+    {
+      return ColumnHierarchyManagerHelper.DeferColumnsUpdate( this );
+    }
 
-    internal IDisposable DeferRestoreState()
+    public bool MoveColumnBefore( ColumnBase current, ColumnBase next )
     {
-      return new DeferRestoreStateDisposable( this );
+      return ColumnHierarchyManagerHelper.MoveColumnBefore( this, current, next );
     }
 
-    internal void SetAssociatedAutomationPeer()
+    public bool MoveColumnAfter( ColumnBase current, ColumnBase previous )
     {
-      DataGridContextAutomationPeer parentAutomationPeer = m_parentDataGridContext.Peer;
+      return ColumnHierarchyManagerHelper.MoveColumnAfter( this, current, previous );
+    }
 
-      if( parentAutomationPeer == null )
-        return;
+    public bool MoveColumnUnder( ColumnBase current, ColumnBase parent )
+    {
+      return ColumnHierarchyManagerHelper.MoveColumnUnder( this, current, parent );
+    }
 
-      DataGridContextAutomationPeer automationPeer = parentAutomationPeer.GetDetailPeer( m_parentItem, m_detailConfig );
+    //---------- INTERNAL METHODS -----------
 
-      if( automationPeer != null )
-      {
-        this.Peer = automationPeer;
-        automationPeer.DataGridContext = this;
-      }
+    internal IDisposable DeferRestoreState()
+    {
+      return new DeferRestoreStateDisposable( this );
     }
 
     internal void UpdatePublicSelectionProperties()
@@ -1900,44 +1708,98 @@ namespace Xceed.Wpf.DataGrid
 
     internal void GetFirstSelectedItemFromStore( bool checkCellsStore, out int selectedItemIndex, out object selectedItem, out int selectedColumnIndex )
     {
-      SelectionRangeWithItems newSelectedRangeWithItems = ( m_selectedItemsStore.Count == 0 ) ?
-        SelectionRangeWithItems.Empty : m_selectedItemsStore[ 0 ];
+      var newSelectedRangeWithItems = ( m_selectedItemsStore.Count == 0 ) ? SelectionRangeWithItems.Empty : m_selectedItemsStore[ 0 ];
 
-      if( newSelectedRangeWithItems.IsEmpty )
+      try
       {
-        if( checkCellsStore )
+        if( newSelectedRangeWithItems.IsEmpty )
         {
-          SelectionCellRangeWithItems newSelectionCellRangeWithItems = ( m_selectedCellsStore.Count == 0 ) ?
-            SelectionCellRangeWithItems.Empty : m_selectedCellsStore[ 0 ];
+          if( checkCellsStore )
+          {
+            var newSelectionCellRangeWithItems = ( m_selectedCellsStore.Count == 0 ) ? SelectionCellRangeWithItems.Empty : m_selectedCellsStore[ 0 ];
 
-          if( newSelectionCellRangeWithItems.ItemRange.IsEmpty )
+            if( newSelectionCellRangeWithItems.ItemRange.IsEmpty )
+            {
+              selectedColumnIndex = -1;
+              selectedItemIndex = -1;
+              selectedItem = null;
+            }
+            else
+            {
+              selectedColumnIndex = newSelectionCellRangeWithItems.ColumnRange.StartIndex;
+              selectedItemIndex = newSelectionCellRangeWithItems.ItemRange.StartIndex;
+              selectedItem = newSelectionCellRangeWithItems.ItemRangeWithItems.GetItem( this, 0 );
+            }
+          }
+          else
           {
             selectedColumnIndex = -1;
             selectedItemIndex = -1;
             selectedItem = null;
           }
-          else
-          {
-            selectedColumnIndex = newSelectionCellRangeWithItems.ColumnRange.StartIndex;
-            selectedItemIndex = newSelectionCellRangeWithItems.ItemRange.StartIndex;
-            selectedItem = newSelectionCellRangeWithItems.ItemRangeWithItems.GetItem( this, 0 );
-          }
         }
         else
         {
           selectedColumnIndex = -1;
-          selectedItemIndex = -1;
-          selectedItem = null;
+          selectedItemIndex = newSelectedRangeWithItems.Range.StartIndex;
+          selectedItem = newSelectedRangeWithItems.GetItem( this, 0 );
         }
       }
-      else
+      catch( ArgumentOutOfRangeException )
       {
         selectedColumnIndex = -1;
-        selectedItemIndex = newSelectedRangeWithItems.Range.StartIndex;
-        selectedItem = newSelectedRangeWithItems.GetItem( this, 0 );
+        selectedItemIndex = -1;
+        selectedItem = null;
       }
     }
 
+    internal ColumnBase GetMatchingColumn( DataGridContext sourceContext, ColumnBase sourceColumn )
+    {
+      if( ( sourceContext == null ) || ( sourceColumn == null ) )
+        return null;
+
+      if( sourceContext == this )
+        return sourceColumn;
+
+      var collectionView = sourceContext.ItemsSourceCollection as DataGridCollectionViewBase;
+      if( collectionView == null )
+        return null;
+
+      var sourceItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( collectionView.ItemProperties, sourceColumn.FieldName );
+      if( sourceItemProperty == null )
+        return null;
+
+      var masterContext = sourceContext.RootDataGridContext;
+      var masterItemProperty = sourceItemProperty;
+
+      if( masterContext != sourceContext )
+      {
+        if( !sourceContext.ItemPropertyMap.TryGetMasterItemProperty( sourceItemProperty, out masterItemProperty ) )
+          return null;
+      }
+
+      Debug.Assert( masterItemProperty != null );
+      if( masterItemProperty == null )
+        return null;
+
+      var currentItemProperty = masterItemProperty;
+      if( masterContext != this )
+      {
+        if( !this.ItemPropertyMap.TryGetDetailItemProperty( masterItemProperty, out currentItemProperty ) )
+          return null;
+      }
+
+      Debug.Assert( currentItemProperty != null );
+      if( currentItemProperty == null )
+        return null;
+
+      var columnName = PropertyRouteParser.Parse( currentItemProperty );
+      if( string.IsNullOrEmpty( columnName ) )
+        return null;
+
+      return this.Columns[ columnName ];
+    }
+
     internal ColumnBase GetDefaultImageColumn()
     {
       if( !this.DefaultImageColumnDetermined )
@@ -1945,62 +1807,72 @@ namespace Xceed.Wpf.DataGrid
         if( this.Items.Count > 0 )
         {
           this.DefaultImageColumnDetermined = true;
-          ItemsSourceHelper.FieldDescriptor fieldDescriptor;
-          object dataItem = this.Items.GetItemAt( 0 );
 
-          foreach( ColumnBase visibleColumn in this.VisibleColumns )
+          var dataItem = this.Items.GetItemAt( 0 );
+
+          foreach( var column in this.VisibleColumns )
           {
-            if( this.ItemsSourceFieldDescriptors.TryGetValue( visibleColumn.FieldName, out fieldDescriptor ) )
+            var key = PropertyRouteParser.Parse( column.FieldName );
+            if( key == null )
+              continue;
+
+            var propertyDescriptionRoute = default( PropertyDescriptionRoute );
+            if( !m_itemsSourcePropertyDescriptions.TryGetValue( key, out propertyDescriptionRoute ) )
+              continue;
+
+            var propertyDescription = propertyDescriptionRoute.Current;
+            var dataType = propertyDescription.DataType;
+
+            if( typeof( ImageSource ).IsAssignableFrom( dataType ) )
             {
-              if( typeof( ImageSource ).IsAssignableFrom( fieldDescriptor.DataType ) )
-              {
-                m_defaultImageColumn = visibleColumn;
-                break;
-              }
-              else if( ( typeof( byte[] ).IsAssignableFrom( fieldDescriptor.DataType ) ) ||
-                       ( typeof( System.Drawing.Image ).IsAssignableFrom( fieldDescriptor.DataType ) ) )
-              {
-                Xceed.Wpf.DataGrid.Converters.ImageConverter converter = new Xceed.Wpf.DataGrid.Converters.ImageConverter();
-                object convertedValue = null;
-                object rawValue = null;
+              m_defaultImageColumn = column;
+              break;
+            }
+            else if( ( typeof( byte[] ).IsAssignableFrom( dataType ) ) ||
+                     ( typeof( System.Drawing.Image ).IsAssignableFrom( dataType ) ) )
+            {
+              var converter = new Xceed.Wpf.DataGrid.Converters.ImageConverter();
+              var convertedValue = default( object );
+              var rawValue = default( object );
 
-                try
+              try
+              {
+                if( propertyDescription.PropertyDescriptor == null )
                 {
-                  if( fieldDescriptor.PropertyDescriptor == null )
+                  var dataRow = dataItem as System.Data.DataRow;
+                  if( dataRow == null )
                   {
-                    System.Data.DataRow dataRow = dataItem as System.Data.DataRow;
-
-                    if( dataRow == null )
+                    var dataRowView = dataItem as System.Data.DataRowView;
+                    if( dataRowView != null )
                     {
-                      System.Data.DataRowView dataRowView = dataItem as System.Data.DataRowView;
-
-                      if( dataRowView != null )
-                        rawValue = dataRowView[ fieldDescriptor.Name ];
-                    }
-                    else
-                    {
-                      rawValue = dataRow[ fieldDescriptor.Name ];
+                      rawValue = dataRowView[ propertyDescription.Name ];
                     }
                   }
                   else
                   {
-                    rawValue = fieldDescriptor.PropertyDescriptor.GetValue( dataItem );
+                    rawValue = dataRow[ propertyDescription.Name ];
                   }
-
-                  if( rawValue != null )
-                    convertedValue = converter.Convert( rawValue, typeof( ImageSource ), null, System.Globalization.CultureInfo.CurrentCulture );
                 }
-                catch( NotSupportedException )
+                else
                 {
-                  //suppress the exception, the byte[] is not an image. convertedValue will remain null
+                  rawValue = propertyDescription.PropertyDescriptor.GetValue( dataItem );
                 }
 
-                if( convertedValue != null )
+                if( rawValue != null )
                 {
-                  m_defaultImageColumn = visibleColumn;
-                  break;
+                  convertedValue = converter.Convert( rawValue, typeof( ImageSource ), null, CultureInfo.CurrentCulture );
                 }
               }
+              catch( NotSupportedException )
+              {
+                //suppress the exception, the byte[] is not an image. convertedValue will remain null
+              }
+
+              if( convertedValue != null )
+              {
+                m_defaultImageColumn = column;
+                break;
+              }
             }
           }
         }
@@ -2093,57 +1965,6 @@ namespace Xceed.Wpf.DataGrid
       return this.CustomItemContainerGenerator.GetGroupFromItem( dataItem );
     }
 
-    internal static void HandleColumnsCollectionChanged(
-      NotifyCollectionChangedEventArgs e,
-      ColumnCollection columns,
-      ReadOnlyColumnCollection visibleColumns,
-      HashedLinkedList<ColumnBase> columnsByVisiblePosition )
-    {
-      if( columns == null )
-        throw new ArgumentNullException( "columns" );
-
-      if( visibleColumns == null )
-        throw new ArgumentNullException( "visibleColumns" );
-
-      if( columnsByVisiblePosition == null )
-        throw new ArgumentNullException( "columnsByVisiblePosition" );
-
-      bool needGeneratorHardReset = false;
-
-      if( e.OldItems != null )
-      {
-        if( ( e.Action == NotifyCollectionChangedAction.Remove )
-          || ( e.Action == NotifyCollectionChangedAction.Replace )
-          || ( e.Action == NotifyCollectionChangedAction.Reset ) )
-        {
-          if( e.OldItems.Count > 0 )
-            needGeneratorHardReset = true;
-        }
-      }
-
-      DataGridContext.UpdateVisibleColumns( columns, visibleColumns, columnsByVisiblePosition, e.NewItems, null );
-
-      // When a column is removed, we need to clear the Generator from every container to avoid problem
-      // when a Column with the same field name is removed thant reinserted with 2 different instances
-      if( needGeneratorHardReset )
-      {
-        DataGridControl dataGridControl = columns.DataGridControl;
-        if( dataGridControl != null )
-        {
-          if( dataGridControl.CustomItemContainerGenerator != null )
-          {
-            dataGridControl.CustomItemContainerGenerator.RemoveAllAndNotify();
-          }
-
-          // We only reset the fixed region if the column is part of the master context 
-          if( ( dataGridControl.DataGridContext != null ) && ( dataGridControl.DataGridContext.SourceDetailConfiguration == null ) )
-          {
-            dataGridControl.ResetFixedRegions();
-          }
-        }
-      }
-    }
-
     internal IDisposable SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers trigger )
     {
       return m_dataGridControl.SetQueueBringIntoViewRestrictions( trigger );
@@ -2161,9 +1982,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal void NotifyItemsSourceChanged()
     {
-      this.NotifyPropertyChanged( "HasDetails" );
-
-      m_dataGridControl.QueueDataGridContextPeerChlidrenRefresh( this );
+      this.OnPropertyChanged( "HasDetails" );
     }
 
     internal void DelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers trigger )
@@ -2203,42 +2022,37 @@ namespace Xceed.Wpf.DataGrid
         //set the flag that indicates that we are already processing a SetCurrent
         m_dataGridControl.IsSetCurrentInProgress = true;
 
-        DataGridContext oldCurrentContext = m_dataGridControl.CurrentContext;
-        DataGridContext newCurrentContext = this;
+        var oldCurrentContext = m_dataGridControl.CurrentContext;
+        var newCurrentContext = this;
 
         //store the previous public current item, so I can detect a change and lift the PropertyChanged for this properties
-        object oldCurrentItem = oldCurrentContext.InternalCurrentItem;
-        object oldPublicCurrentItem = oldCurrentContext.CurrentItem;
-        ColumnBase oldCurrentColumn = oldCurrentContext.CurrentColumn;
-        Row oldCurrentRow = oldCurrentContext.CurrentRow;
+        var oldCurrentItem = oldCurrentContext.InternalCurrentItem;
+        var oldPublicCurrentItem = oldCurrentContext.CurrentItem;
+        var oldCurrentColumn = oldCurrentContext.CurrentColumn;
+        var oldCurrentRow = oldCurrentContext.CurrentRow;
 
-        //if item is not realized or if the item passed is not a Data Item (header, footer or group), then the 
-        //old current cell will be null
-        Cell oldCurrentCell = ( oldCurrentRow == null )
-          ? null : oldCurrentRow.Cells[ oldCurrentColumn ];
+        //if item is not realized or if the item passed is not a Data Item (header, footer or group), then the old current cell will be null
+        var oldCurrentCell = ( oldCurrentRow == null ) ? null : oldCurrentRow.Cells[ oldCurrentColumn ];
 
-        Row newCurrentRow = ( containerRow != null )
-          ? containerRow : Row.FromContainer( this.GetContainerFromItem( item ) );
+        var newCurrentRow = ( containerRow != null ) ? containerRow : Row.FromContainer( this.GetContainerFromItem( item ) );
+        var newCurrentCell = default( Cell );
 
         //verify that set Current is not called on a column that cannot be current
         if( newCurrentRow != null )
         {
-          if( ( column != null )
-            && ( ( ( column.ReadOnly )
-            && ( !newCurrentRow.Cells[ column ].GetCalculatedCanBeCurrent() ) ) ) )
+          newCurrentCell = newCurrentRow.Cells[ column ];
+          if( ( column != null ) && column.ReadOnly && ( newCurrentCell != null ) && !newCurrentCell.GetCalculatedCanBeCurrent() )
             throw new DataGridException( "SetCurrent cannot be invoked if the column cannot be current.", m_dataGridControl );
         }
 
-        //if item is not realized or if the item passed is not a Data Item (header, footer or group), then the 
-        //new current cell will be null
-        Cell newCurrentCell = ( newCurrentRow == null ) ? null : newCurrentRow.Cells[ column ];
-        bool currentCellChanged = ( newCurrentCell != oldCurrentCell );
+        var currentCellChanged = ( newCurrentCell != oldCurrentCell );
 
-        if( ( ( item != oldCurrentItem ) || ( oldCurrentContext != newCurrentContext ) )
-          && ( oldCurrentRow != null ) )
+        if( ( ( item != oldCurrentItem ) || ( oldCurrentContext != newCurrentContext ) ) && ( oldCurrentRow != null ) )
         {
           if( Row.IsCellEditorDisplayConditionsSet( oldCurrentRow, CellEditorDisplayConditions.RowIsCurrent ) )
+          {
             oldCurrentRow.RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions.RowIsCurrent );
+          }
 
           oldCurrentRow.SetIsCurrent( false );
 
@@ -2251,29 +2065,31 @@ namespace Xceed.Wpf.DataGrid
           {
             //restore the Cell and the Row's IsCurrent Flag
             if( oldCurrentCell != null )
+            {
               oldCurrentCell.SetIsCurrent( true );
+            }
 
             oldCurrentRow.SetIsCurrent( true );
             throw;
           }
         }
 
-        // For this if, the assumption is that current item hasn't changed, but current column does... (previous if will have 
-        // caught the case where current item changed ).
+        //For this if, the assumption is that current item hasn't changed, but current column has... (previous if will have caught the case where current item changed).
 
         //if the currentCell has changed and the old current cell still exists.
         if( ( currentCellChanged ) && ( oldCurrentCell != null ) )
         {
           //clear the CellIsCurrent editor display conditions
           if( Cell.IsCellEditorDisplayConditionsSet( oldCurrentCell, CellEditorDisplayConditions.CellIsCurrent ) )
+          {
             oldCurrentCell.RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions.CellIsCurrent );
+          }
 
           oldCurrentCell.SetIsCurrent( false );
 
           try
           {
-            //cancel any ongoing editing on the cell. (this has no effect if row or cell is not being edited.
-            //this line can throw but no action is to be done.
+            //cancel any ongoing editing on the cell. (this has no effect if row or cell is not being edited. This line can throw but no action is to be done.
             oldCurrentCell.EndEdit();
           }
           catch( DataGridException )
@@ -2283,10 +2099,9 @@ namespace Xceed.Wpf.DataGrid
           }
         }
 
-        if( ( item != oldCurrentItem )
-          || ( oldCurrentContext != newCurrentContext ) )
+        if( ( item != oldCurrentItem ) || ( oldCurrentContext != newCurrentContext ) )
         {
-          DataGridCurrentChangingEventArgs currentChangingEventArgs = new DataGridCurrentChangingEventArgs( oldCurrentContext, oldCurrentItem, newCurrentContext, item, isCancelable );
+          var currentChangingEventArgs = new DataGridCurrentChangingEventArgs( oldCurrentContext, oldCurrentItem, newCurrentContext, item, isCancelable );
           m_dataGridControl.RaiseCurrentChanging( currentChangingEventArgs );
 
           if( isCancelable && currentChangingEventArgs.Cancel )
@@ -2295,7 +2110,9 @@ namespace Xceed.Wpf.DataGrid
             if( oldCurrentRow != null )
             {
               if( oldCurrentCell != null )
+              {
                 oldCurrentCell.SetIsCurrent( true );
+              }
 
               oldCurrentRow.SetIsCurrent( true );
             }
@@ -2307,12 +2124,11 @@ namespace Xceed.Wpf.DataGrid
         //If they are different, clean the previously current DataGridContext
         if( oldCurrentContext != newCurrentContext )
         {
-          oldCurrentContext.SetCurrentItemHelper( null, -1 );
-          oldCurrentContext.SetInternalCurrentItemHelper( null );
-          oldCurrentContext.SetInternalCurrentItemNamesTree( null );
+          oldCurrentContext.SetCurrentItem( null, -1 );
+          oldCurrentContext.SetInternalCurrentItem( null );
           //preserve current column on the old DataGridContext
 
-          oldCurrentContext.SetIsCurrentHelper( false );
+          oldCurrentContext.SetIsCurrent( false );
         }
 
         if( !sourceDataItemIndex.HasValue )
@@ -2321,35 +2137,24 @@ namespace Xceed.Wpf.DataGrid
         }
 
         // All the stuff that can throw is done
-        newCurrentContext.SetInternalCurrentItemHelper( item );
-        newCurrentContext.SetIsCurrentHelper( true );
-
-        if( ( item != null ) && ( item.GetType() == typeof( GroupHeaderFooterItem ) ) )
-        {
-          GroupHeaderFooterItem groupHeaderItem = ( GroupHeaderFooterItem )item;
-          newCurrentContext.SetInternalCurrentItemNamesTree( newCurrentContext.CustomItemContainerGenerator.GetNamesTreeFromGroup( groupHeaderItem.Group ) );
-        }
-        else
-        {
-          newCurrentContext.SetInternalCurrentItemNamesTree( null );
-        }
+        newCurrentContext.SetInternalCurrentItem( item );
+        newCurrentContext.SetIsCurrent( true );
 
         // change the CurrentRow and CurentColumn
         if( ( item != null ) && ( sourceDataItemIndex.Value != -1 ) )
         {
-          newCurrentContext.SetCurrentItemHelper( item, sourceDataItemIndex.Value );
+          newCurrentContext.SetCurrentItem( item, sourceDataItemIndex.Value );
         }
         else
         {
-          newCurrentContext.SetCurrentItemHelper( null, -1 );
+          newCurrentContext.SetCurrentItem( null, -1 );
         }
 
         newCurrentContext.SetCurrentColumnHelper( column );
         m_dataGridControl.SetCurrentDataGridContextHelper( this );
 
         // We must refetch the container for the current item in case EndEdit triggers a reset on the 
-        // CustomItemContainerGenerator and remap this item to a container other than the one previously
-        // fetched
+        // CustomItemContainerGenerator and remap this item to a container other than the one previously fetched
         newCurrentRow = Row.FromContainer( newCurrentContext.GetContainerFromItem( item ) );
         newCurrentCell = ( newCurrentRow == null ) ? null : newCurrentRow.Cells[ column ];
 
@@ -2362,7 +2167,9 @@ namespace Xceed.Wpf.DataGrid
 
           //update the RowIsCurrent display condition
           if( Row.IsCellEditorDisplayConditionsSet( newCurrentRow, CellEditorDisplayConditions.RowIsCurrent ) )
+          {
             newCurrentRow.SetDisplayEditorMatchingCondition( CellEditorDisplayConditions.RowIsCurrent );
+          }
 
           //Update the IsCurrent flag
           newCurrentRow.SetIsCurrent( true );
@@ -2370,15 +2177,13 @@ namespace Xceed.Wpf.DataGrid
           //if the current row changed, make sure to check the appropriate edition triggers.
           if( currentRowChanged == true )
           {
-            //if enterEditTriggers tells to enter edition mode AND no current cell is going to be set on the new current row
-            if( ( newCurrentRow.IsEditTriggerSet( EditTriggers.RowIsCurrent ) )
-              && ( newCurrentCell == null ) )
+            //if EditTriggers tells to enter editing mode AND no current cell is set on the new current row
+            if( ( newCurrentRow.IsEditTriggerSet( EditTriggers.RowIsCurrent ) ) && ( newCurrentCell == null ) )
             {
               //To prevent re-entrancy of the SetCurrent fonction (since Row.BeginEdit will call Cell.BeginEdit which will call SetCurrent if not current already)
               if( this.VisibleColumns.Count > 0 )
               {
-                int firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( this, newCurrentRow );
-
+                var firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( this, newCurrentRow );
                 if( firstFocusableColumn < 0 )
                   throw new DataGridException( "Trying to edit while no cell is focusable. ", m_dataGridControl );
 
@@ -2395,7 +2200,9 @@ namespace Xceed.Wpf.DataGrid
         {
           //update the CellIsCurrent display condition
           if( Cell.IsCellEditorDisplayConditionsSet( newCurrentCell, CellEditorDisplayConditions.CellIsCurrent ) )
+          {
             newCurrentCell.SetDisplayEditorMatchingCondition( CellEditorDisplayConditions.CellIsCurrent );
+          }
 
           newCurrentCell.SetIsCurrent( true );
 
@@ -2436,14 +2243,21 @@ namespace Xceed.Wpf.DataGrid
           {
             if( m_dataGridControl.IsBringIntoViewAllowed( trigger ) )
             {
-              if( newCurrentCell != null )
+              if( !m_dataGridControl.IsBringIntoViewDelayed )
               {
-                newCurrentCell.BringIntoView();
+                if( newCurrentCell != null )
+                {
+                  newCurrentCell.BringIntoView();
+                }
+                else
+                {
+                  // Ensure the item is visible visible
+                  newCurrentRow.BringIntoView();
+                }
               }
               else
               {
-                // Ensure the item is visible visible
-                newCurrentRow.BringIntoView();
+                m_dataGridControl.DelayBringIntoViewAndFocusCurrent( trigger );
               }
             }
 
@@ -2494,20 +2308,23 @@ namespace Xceed.Wpf.DataGrid
           }
           finally
           {
-            m_dataGridControl.SelectionChangerManager.End( false, false, false );
+            m_dataGridControl.SelectionChangerManager.End( false, false );
           }
         }
 
         if( this.CurrentItem != oldPublicCurrentItem )
-          this.NotifyPropertyChanged( "CurrentItem" );
+        {
+          this.OnPropertyChanged( "CurrentItem" );
+        }
 
         if( column != oldCurrentColumn )
-          this.NotifyPropertyChanged( "CurrentColumn" );
+        {
+          this.OnPropertyChanged( "CurrentColumn" );
+        }
 
-        if( ( item != oldCurrentItem )
-          || ( oldCurrentContext != newCurrentContext ) )
+        if( ( item != oldCurrentItem ) || ( oldCurrentContext != newCurrentContext ) )
         {
-          DataGridCurrentChangedEventArgs currentChangedEventArgs = new DataGridCurrentChangedEventArgs( oldCurrentContext, oldCurrentItem, newCurrentContext, item );
+          var currentChangedEventArgs = new DataGridCurrentChangedEventArgs( oldCurrentContext, oldCurrentItem, newCurrentContext, item );
           m_dataGridControl.RaiseCurrentChanged( currentChangedEventArgs );
         }
       }
@@ -2564,175 +2381,33 @@ namespace Xceed.Wpf.DataGrid
 
         case NotifyCollectionChangedAction.Reset:
 
-          groupLevelDescriptions.Clear();
-
-          foreach( GroupDescription desc in groupDescriptions )
-          {
-            GroupLevelDescription newInfo = DataGridContext.CreateGroupLevelDescription( columns, desc );
-
-            groupLevelDescriptions.Add( newInfo );
-          }
-
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-
-          GroupLevelDescription movedGroupLevelDescription = groupLevelDescriptions[ e.OldStartingIndex ];
-          groupLevelDescriptions.RemoveAt( e.OldStartingIndex );
-          groupLevelDescriptions.Insert( e.NewStartingIndex, movedGroupLevelDescription );
-
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-
-          groupLevelDescriptions.RemoveAt( e.OldStartingIndex );
-          GroupLevelDescription replaceInfo = DataGridContext.CreateGroupLevelDescription( columns, ( GroupDescription )e.NewItems[ 0 ] );
-
-          groupLevelDescriptions.Insert( e.NewStartingIndex, replaceInfo );
-
-          break;
-      }
-    }
-
-    internal static void UpdateVisibleColumns(
-      ColumnCollection columns,
-      ReadOnlyColumnCollection visibleColumns,
-      HashedLinkedList<ColumnBase> columnsByVisiblePosition,
-      IList triggeringColumns,
-      ColumnVisiblePositionChangedEventArgs visiblePositionChangedArgs )
-    {
-      if( columns == null )
-        throw new ArgumentNullException( "columns" );
-
-      if( visibleColumns == null )
-        throw new ArgumentNullException( "visibleColumns" );
-
-      if( columnsByVisiblePosition == null )
-        throw new ArgumentNullException( "columnsByVisiblePosition" );
-
-      if( columns.ProcessingVisibleColumnsUpdate.IsSet )
-        return;
-
-      if( columns.IsDeferVisibleColumnsUpdate )
-        return;
-
-      using( columns.ProcessingVisibleColumnsUpdate.Set() )
-      {
-        columns.NotifyVisibleColumnsUpdating();
-
-        columnsByVisiblePosition.Clear();
-
-        int columnCount = columns.Count;
-        ColumnBase currentColumn;
-
-        // Add the Columns which are not part of the triggering columns collection.
-        for( int currentIndex = 0; currentIndex < columnCount; currentIndex++ )
-        {
-          currentColumn = columns[ currentIndex ];
-
-          if( ( triggeringColumns == null ) || ( !triggeringColumns.Contains( currentColumn ) ) )
-          {
-            DataGridContext.InsertColumnByVisiblePosition( columnsByVisiblePosition, currentColumn );
-          }
-        }
-
-        // Add the Columns which are part of the triggering columns collection
-        // (their VisiblePosition have priority over the existing ones).
-        if( triggeringColumns != null )
-        {
-          if( visiblePositionChangedArgs == null )
-          {
-            // From a ColumnCollection change
-            foreach( ColumnBase column in triggeringColumns )
-            {
-              DataGridContext.InsertColumnByVisiblePosition( columnsByVisiblePosition, column );
-            }
-          }
-          else
-          {
-            // From a Column.VisiblePosition change
-            ColumnBase column = visiblePositionChangedArgs.TriggeringColumn;
-
-            LinkedListNode<ColumnBase> oldPositionNode = null;
-            LinkedListNode<ColumnBase> listNode = columnsByVisiblePosition.First;
-
-            while( listNode != null )
-            {
-              if( listNode.Value.VisiblePosition >= column.VisiblePosition )
-              {
-                oldPositionNode = listNode;
-                break;
-              }
-              listNode = listNode.Next;
-            }
-
-            // If there were already some columns, the desired. If oldPositionNode is null, it means 
-            // there were no column  at the desired VisiblePosition. We must add it at the end of the 
-            // list since the new column VisiblePosition is greater than the actual columns VisiblePosition
-            if( oldPositionNode != null )
-            {
-              if( visiblePositionChangedArgs.PositionDelta > 0 )
-              {
-                columnsByVisiblePosition.AddAfter( oldPositionNode, column );
-              }
-              else if( visiblePositionChangedArgs.PositionDelta < 0 )
-              {
-                columnsByVisiblePosition.AddBefore( oldPositionNode, column );
-              }
-            }
-            else
-            {
-              columnsByVisiblePosition.AddLast( column );
-            }
-          }
-        }
+          groupLevelDescriptions.Clear();
 
-        var dataGridControl = columns.DataGridControl;
-        var mainColumn = columns.MainColumn;
-        if( ( dataGridControl != null ) && ( mainColumn != null ) && ( dataGridControl.AreDetailsFlatten ) )
-        {
-          var firstNode = columnsByVisiblePosition.First;
-          if( ( firstNode == null ) || ( firstNode.Value != mainColumn ) )
+          foreach( GroupDescription desc in groupDescriptions )
           {
-            columnsByVisiblePosition.Remove( mainColumn );
-            columnsByVisiblePosition.AddFirst( mainColumn );
+            GroupLevelDescription newInfo = DataGridContext.CreateGroupLevelDescription( columns, desc );
+
+            groupLevelDescriptions.Add( newInfo );
           }
-        }
 
-        // Fill the VisibleColumns collection and 
-        // update all the columns' VisiblePosition, IsFirstVisible, and IsLastVisible properties.
-        visibleColumns.InternalClear();
+          break;
 
-        int i = 0;
-        LinkedListNode<ColumnBase> columnNode = columnsByVisiblePosition.First;
+        case NotifyCollectionChangedAction.Move:
 
-        // While is used to be sure Columns are returned in ascendant order
-        while( columnNode != null )
-        {
-          currentColumn = columnNode.Value;
+          GroupLevelDescription movedGroupLevelDescription = groupLevelDescriptions[ e.OldStartingIndex ];
+          groupLevelDescriptions.RemoveAt( e.OldStartingIndex );
+          groupLevelDescriptions.Insert( e.NewStartingIndex, movedGroupLevelDescription );
 
-          using( currentColumn.InhibitVisiblePositionChanging() )
-          {
-            currentColumn.VisiblePosition = i++;
-            currentColumn.ClearIsFirstVisible();
-            currentColumn.ClearIsLastVisible();
+          break;
 
-            if( currentColumn.Visible )
-            {
-              visibleColumns.InternalAdd( currentColumn );
-            }
-          }
+        case NotifyCollectionChangedAction.Replace:
 
-          columnNode = columnNode.Next;
-        }
+          groupLevelDescriptions.RemoveAt( e.OldStartingIndex );
+          GroupLevelDescription replaceInfo = DataGridContext.CreateGroupLevelDescription( columns, ( GroupDescription )e.NewItems[ 0 ] );
 
-        if( visibleColumns.Count > 0 )
-        {
-          visibleColumns[ 0 ].SetIsFirstVisible( true );
-          visibleColumns[ visibleColumns.Count - 1 ].SetIsLastVisible( true );
-        }
+          groupLevelDescriptions.Insert( e.NewStartingIndex, replaceInfo );
 
-        columns.DispatchNotifyVisibleColumnsUpdated();
+          break;
       }
     }
 
@@ -2799,7 +2474,7 @@ namespace Xceed.Wpf.DataGrid
       }
       finally
       {
-        selectionManager.End( false, false, false );
+        selectionManager.End( false, false );
       }
     }
 
@@ -2868,6 +2543,8 @@ namespace Xceed.Wpf.DataGrid
       return false;
     }
 
+
+
     //---------- PRIVATE METHODS ----------
 
     private void ClearViewPropertyBindings()
@@ -3122,15 +2799,16 @@ namespace Xceed.Wpf.DataGrid
     {
       Debug.Assert( this.Columns[ args.AutoFilterColumnFieldName ] != null );
 
-      ReadOnlyObservableHashList readOnlyObservableHashList = null;
-
-      if( this.DistinctValues == null )
+      var distinctValues = this.DistinctValues;
+      if( distinctValues == null )
         return;
 
+      var readOnlyObservableHashList = default( ReadOnlyObservableHashList );
+
       // We force the creation of DistinctValues for this field in every DataGridCollectionView
-      if( this.DistinctValues.TryGetValue( args.AutoFilterColumnFieldName, out readOnlyObservableHashList ) )
+      if( distinctValues.TryGetValue( args.AutoFilterColumnFieldName, out readOnlyObservableHashList ) )
       {
-        foreach( object item in readOnlyObservableHashList )
+        foreach( var item in readOnlyObservableHashList )
         {
           args.DistinctValues.Add( item );
         }
@@ -3244,31 +2922,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void CreateStandaloneCollections()
-    {
-      m_columns = new ColumnCollection( this.DataGridControl, null );
-      VisibilityChangingEventManager.AddListener( m_columns, this );
-      VisibilityChangedEventManager.AddListener( m_columns, this );
-
-      m_visibleColumns = new ReadOnlyColumnCollection();
-      m_columnsByVisiblePosition = new HashedLinkedList<ColumnBase>();
-      m_groupLevelDescriptions = new GroupLevelDescriptionCollection();
-
-      //in this particular case, I need to create a SortDescriptionsSyncContext to ensure I will be able to synchronize access to the sort descriptions collection.
-      m_sortDescriptionsSyncContext = new SortDescriptionsSyncContext();
-
-      //Register to the Columns Collection's CollectionChanged event to manage the Removal of the CurrentColumn.
-      CollectionChangedEventManager.AddListener( m_columns, this );
-
-      // Register to the VisibleColumnsChanged to update, if need be, the columns desired width when column stretching is active and there's a column reordering.
-      CollectionChangedEventManager.AddListener( m_visibleColumns, this );
-    }
-
     private void HandleMasterColumnsCollectionChanged( NotifyCollectionChangedEventArgs e )
     {
-      bool removeCurrentColumn = false;
-      bool needGeneratorHardReset = false;
-      ColumnBase currentColumn = this.CurrentColumn;
+      var removeCurrentColumn = false;
+      var needGeneratorHardReset = false;
+      var currentColumn = this.CurrentColumn;
 
       //If( e.Action == Add ), there is nothing to do.
 
@@ -3297,26 +2955,29 @@ namespace Xceed.Wpf.DataGrid
           needGeneratorHardReset = true;
         }
       }
+      //Nothing to do because the way to change the visible position of a column is through its VisiblePosition property.
       else if( e.Action == NotifyCollectionChangedAction.Move )
       {
-        //Nothing to do because the way to change the visible position of a column is through its VisiblePosition property.
         return;
       }
 
-      ColumnBase closestColumn = null;
+      var closestColumn = default( ColumnBase );
 
+      //Select the current column's closest visible column while its possible
       if( removeCurrentColumn )
       {
         closestColumn = DataGridContext.GetClosestColumn( currentColumn, this.ColumnsByVisiblePosition );
       }
 
-      // When a column is removed, we need to clear the Generator from every container to avoid problem
-      // when a Column with the same field name is removed thant reinserted with 2 different instances
+      // When a column is removed, we need to clear the Generator from every container to avoid problems
+      // if the column is added again, but using a different instance (i.e. a new column with the same fieldname).
       if( needGeneratorHardReset )
       {
         // We only reset the fixed region if the column is part of the master context 
         if( this.SourceDetailConfiguration == null )
+        {
           this.DataGridControl.ResetFixedRegions();
+        }
 
         this.DataGridControl.CustomItemContainerGenerator.RemoveAllAndNotify();
       }
@@ -3329,10 +2990,10 @@ namespace Xceed.Wpf.DataGrid
         this.UpdateColumnSortCommand.Execute();
       }
 
-      DataGridContext.HandleColumnsCollectionChanged( e, this.Columns, this.VisibleColumns as ReadOnlyColumnCollection, this.ColumnsByVisiblePosition );
-
       if( removeCurrentColumn )
       {
+        // Now that the columns collections have been updated, it is time to set the new current column if necessary.
+        // The new current column that was identified earlier may have been removed from the visible columns after the collections update.
         if( ( closestColumn != null ) && !this.Columns.Contains( closestColumn ) )
         {
           closestColumn = null;
@@ -3341,14 +3002,10 @@ namespace Xceed.Wpf.DataGrid
         this.SetCurrentColumnCore( closestColumn, false, m_dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ColumnsCollectionChanged );
       }
 
-      if( m_columns != null )
-      {
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations(
-          m_columns.FieldNameToColumnDictionary,
-          this.ItemsSourceCollection,
-          this.ItemsSourceFieldDescriptors,
-          this.AutoCreateForeignKeyConfigurations );
-      }
+      ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations( this.Columns,
+                                                                     this.ItemsSourceCollection,
+                                                                     m_itemsSourcePropertyDescriptions,
+                                                                     this.AutoCreateForeignKeyConfigurations );
     }
 
     internal static ColumnBase GetClosestColumn( ColumnBase reference, HashedLinkedList<ColumnBase> columnsByVisiblePosition )
@@ -3375,11 +3032,11 @@ namespace Xceed.Wpf.DataGrid
       return newColumn;
     }
 
-    private void SetupViewProperties( bool initialization = false )
+    private void SetupViewProperties()
     {
       this.ClearViewPropertyBindings();
 
-      Views.ViewBase view = m_dataGridControl.GetView( !initialization );
+      Views.ViewBase view = m_dataGridControl.GetView();
       if( view == null )
         return;
 
@@ -3401,13 +3058,157 @@ namespace Xceed.Wpf.DataGrid
         //Note: we place the shared and non-shared properties in the same pool (makes no differences beyond this point ).
         m_viewProperties.Add( viewProperty );
 
-        this.NotifyPropertyChanged( dependencyProperty.Name );
+        this.OnPropertyChanged( dependencyProperty.Name );
       }
     }
 
     private void InitializeViewProperties()
     {
-      TableflowView.SetFixedColumnSplitterTranslation( this, new TranslateTransform() );
+      if( !this.IsAFlattenDetail )
+      {
+        TableflowView.SetFixedColumnSplitterTranslation( this, new TranslateTransform() );
+      }
+    }
+
+    private void HookToItemPropertiesChanged()
+    {
+      var collectionView = this.ItemsSourceCollection as DataGridCollectionViewBase;
+      if( collectionView == null )
+        return;
+
+      this.RegisterItemProperties( collectionView.ItemProperties );
+    }
+
+    private void UnhookToItemPropertiesChanged( DataGridCollectionViewBase collectionView )
+    {
+      if( collectionView == null )
+        return;
+
+      this.UnregisterItemProperties( collectionView.ItemProperties );
+    }
+
+    private void UpdateColumns()
+    {
+      Debug.Assert( m_detailConfig == null );
+
+      ItemsSourceHelper.ResetPropertyDescriptions( m_itemsSourcePropertyDescriptions, m_itemPropertyMap, m_dataGridControl, m_dataGridControlItemsSource );
+
+      if( m_dataGridControl.AutoCreateColumns )
+      {
+        ItemsSourceHelper.UpdateColumnsFromPropertyDescriptions( m_columnManager, m_dataGridControl.DefaultCellEditors, m_itemsSourcePropertyDescriptions, this.AutoCreateForeignKeyConfigurations );
+      }
+    }
+
+    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      CollectionChangedEventManager.AddListener( itemProperties, this );
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.RegisterItemProperty( itemProperty );
+      }
+    }
+
+    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.UnregisterItemProperty( itemProperty );
+      }
+
+      CollectionChangedEventManager.RemoveListener( itemProperties, this );
+    }
+
+    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      PropertyChangedEventManager.AddListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
+      this.RegisterItemProperties( itemProperty.ItemPropertiesInternal );
+    }
+
+    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      this.UnregisterItemProperties( itemProperty.ItemPropertiesInternal );
+      PropertyChangedEventManager.RemoveListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
+    }
+
+    private void OnItemPropertiesCollectionChanged( DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e )
+    {
+      Debug.Assert( m_detailConfig == null );
+
+      var rootCollection = ItemsSourceHelper.GetRootCollection( collection );
+      if( rootCollection == null )
+        return;
+
+      if( rootCollection == ( ( DataGridCollectionViewBase )m_dataGridControlItemsSource ).ItemProperties )
+      {
+        if( e.Action == NotifyCollectionChangedAction.Reset )
+          throw new NotSupportedException();
+
+        if( e.Action == NotifyCollectionChangedAction.Move )
+          return;
+
+        if( e.OldItems != null )
+        {
+          foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
+          {
+            this.UnregisterItemProperty( itemProperty );
+          }
+        }
+
+        if( e.NewItems != null )
+        {
+          foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
+          {
+            this.RegisterItemProperty( itemProperty );
+          }
+        }
+
+        this.UpdateColumns();
+      }
+      else
+      {
+        Debug.Fail( "The collection is not linked to the collection view's item properties." );
+        this.UnregisterItemProperties( collection );
+      }
+    }
+
+    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
+    {
+      Debug.Assert( m_detailConfig == null );
+
+      var rootCollection = ItemsSourceHelper.GetRootCollection( itemProperty );
+      if( rootCollection == null )
+        return;
+
+      if( rootCollection != ( ( DataGridCollectionViewBase )m_dataGridControlItemsSource ).ItemProperties )
+      {
+        Debug.Fail( "The collection is not linked to the detail configuration's item properties." );
+        this.UnregisterItemProperty( itemProperty );
+        return;
+      }
+
+      if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
+      {
+        var itemProperties = itemProperty.ItemPropertiesInternal;
+        if( itemProperties != null )
+        {
+          this.UnregisterItemProperties( itemProperties );
+          this.RegisterItemProperties( itemProperties );
+          this.UpdateColumns();
+        }
+      }
     }
 
     private void OnDetailConfigRequestingDelayBringIntoViewAndFocusCurrent( object sender, RequestingDelayBringIntoViewAndFocusCurrentEventArgs e )
@@ -3465,14 +3266,7 @@ namespace Xceed.Wpf.DataGrid
     protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
       base.OnPropertyChanged( e );
-
-      if( ( m_viewProperties != null ) && ( m_viewProperties.Count > 0 ) )
-      {
-        if( m_viewProperties.Contains( new Views.ViewBase.ViewPropertyStruct( e.Property ) ) == true )
-        {
-          this.NotifyPropertyChanged( e.Property.Name );
-        }
-      }
+      this.OnPropertyChanged( e.Property.Name );
     }
 
     //---------- INTERFACES ----------
@@ -3481,10 +3275,13 @@ namespace Xceed.Wpf.DataGrid
 
     public event PropertyChangedEventHandler PropertyChanged;
 
-    private void NotifyPropertyChanged( string propertyName )
+    private void OnPropertyChanged( string propertyName )
     {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
     }
 
     #endregion
@@ -3492,85 +3289,79 @@ namespace Xceed.Wpf.DataGrid
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
+        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
+
         if( sender == m_items )
         {
-          var args = ( ( NotifyCollectionChangedEventArgs )e ).GetRangeActionOrSelf();
+          var args = eventArgs.GetRangeActionOrSelf();
 
           this.Items_CollectionChanged( sender, args );
-          return true;
         }
         if( sender == this.DetailConfigurations )
         {
-          this.NotifyPropertyChanged( "HasDetails" );
-          return true;
+          this.OnPropertyChanged( "HasDetails" );
         }
-        else if( sender == m_columns )
+        else if( sender == m_columnManager.Columns )
         {
           //Master Level columns collection changed
-          this.HandleMasterColumnsCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
-          return true;
+          this.HandleMasterColumnsCollectionChanged( eventArgs );
         }
         else if( sender == this.VisibleColumns )
         {
-          ColumnStretchMode mode = ColumnStretchMode.None;
+          var mode = ColumnStretchMode.None;
 
           if( this.GetViewPropertyValue<ColumnStretchMode>( "ColumnStretchMode", ref mode ) )
           {
             if( ( mode == ColumnStretchMode.First ) || ( mode == ColumnStretchMode.Last ) )
             {
-              NotifyCollectionChangedEventArgs notifyArgs = ( NotifyCollectionChangedEventArgs )e;
-
-              if( notifyArgs.NewItems != null )
+              if( eventArgs.NewItems != null )
               {
-                foreach( ColumnBase column in notifyArgs.NewItems )
+                foreach( ColumnBase column in eventArgs.NewItems )
                 {
                   column.ClearValue( ColumnBase.DesiredWidthProperty );
                 }
               }
             }
           }
-
-          return true;
         }
         else if( sender == m_items.SortDescriptions )
         {
-          this.OnSortDescriptionsChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
+          this.OnSortDescriptionsChanged( sender, eventArgs );
         }
         else if( sender == m_items.GroupDescriptions )
         {
-          this.OnGroupDescriptionsChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
+          this.OnGroupDescriptionsChanged( sender, eventArgs );
+        }
+        else if( sender is DataGridItemPropertyCollection )
+        {
+          this.OnItemPropertiesCollectionChanged( ( DataGridItemPropertyCollection )sender, eventArgs );
         }
       }
-      else if( managerType == typeof( VisibilityChangingEventManager ) )
-      {
-        DataGridContext.UnselectAllCells( this );
-
-        return true;
-      }
-      else if( managerType == typeof( VisibilityChangedEventManager ) )
+      else if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        var wrappedEventArgs = ( ColumnCollection.WrappedEventEventArgs )e;
-
-        DataGridContext.UpdateVisibleColumns( this.Columns, this.VisibleColumns as ReadOnlyColumnCollection, this.ColumnsByVisiblePosition,
-          new object[] { wrappedEventArgs.WrappedSender }, wrappedEventArgs.WrappedEventArgs as ColumnVisiblePositionChangedEventArgs );
+        var eventArgs = ( PropertyChangedEventArgs )e;
 
-        return true;
+        if( sender is DataGridItemPropertyBase )
+        {
+          this.OnItemPropertyPropertyChanged( ( DataGridItemPropertyBase )sender, eventArgs );
+        }
       }
-      else if( managerType == typeof( VisibleColumnsUpdatingEventManager ) )
+      else if( managerType == typeof( ColumnsLayoutChangingEventManager ) )
       {
         DataGridContext.UnselectAllCells( this );
-
-        return true;
       }
-      else if( managerType == typeof( VisibleColumnsUpdatedEventManager ) )
+      else if( managerType == typeof( ColumnsLayoutChangedEventManager ) )
       {
         // Only force a reset if at least one Row has not used an IVirtualizingCellsHost as PART_CellsHost
-        if( this.DataGridControl.ForceGeneratorReset == true )
+        if( m_dataGridControl.ForceGeneratorReset )
         {
           //forces the collection view to refresh (therefore, regenerates all the items ).
           this.CustomItemContainerGenerator.RemoveAllAndNotify();
@@ -3583,18 +3374,17 @@ namespace Xceed.Wpf.DataGrid
         }
 
         this.DefaultImageColumnDetermined = false;
-        return true;
       }
       else if( managerType == typeof( PreBatchCollectionChangedEventManager ) )
       {
         Debug.Assert( m_deferSelectionChangedOnItemsCollectionChanged == null );
 
-        if( m_deferSelectionChangedOnItemsCollectionChanged == null )
+        // When using DataGridVirtualizingCollectionViewBase, we should keep the "Replace" action
+        // in order to call UpdateSelectionAfterSourceCollectionChanged with a Replace instead of a Reset.
+        if( m_deferSelectionChangedOnItemsCollectionChanged == null && !( sender is DataGridVirtualizingCollectionViewBase ) )
         {
           m_deferSelectionChangedOnItemsCollectionChanged = new DeferSelectionChangedOnItemsCollectionChangedDisposable( this );
         }
-
-        return true;
       }
       else if( managerType == typeof( PostBatchCollectionChangedEventManager ) )
       {
@@ -3604,77 +3394,51 @@ namespace Xceed.Wpf.DataGrid
           m_deferSelectionChangedOnItemsCollectionChanged = null;
           disposable.Dispose();
         }
-
-        return true;
       }
       else if( managerType == typeof( RealizedContainersRequestedEventManager ) )
       {
-        RealizedContainersRequestedEventArgs eventArgs = ( RealizedContainersRequestedEventArgs )e;
+        var eventArgs = ( RealizedContainersRequestedEventArgs )e;
         this.GetRealizedItems( eventArgs.RealizedContainers );
-        return true;
       }
       else if( managerType == typeof( DistinctValuesRequestedEventManager ) )
       {
-        DistinctValuesRequestedEventArgs eventArgs = ( DistinctValuesRequestedEventArgs )e;
+        var eventArgs = ( DistinctValuesRequestedEventArgs )e;
         this.MergeDistinctValues( eventArgs );
-        return true;
       }
       else if( managerType == typeof( AllowDetailToggleChangedEventManager ) )
       {
-        this.NotifyPropertyChanged( "AllowDetailToggle" );
-        return true;
+        this.OnPropertyChanged( "AllowDetailToggle" );
       }
       else if( managerType == typeof( ViewChangedEventManager ) )
       {
         this.SetupViewProperties();
         this.InitializeViewProperties();
-        return true;
       }
       else if( managerType == typeof( CurrentColumnChangedEventManager ) )
       {
-        this.NotifyPropertyChanged( "CurrentColumn" );
-        return true;
+        this.OnPropertyChanged( "CurrentColumn" );
       }
       else if( managerType == typeof( GroupConfigurationSelectorChangedEventManager ) )
       {
         this.OnGroupConfigurationSelectorChanged();
-        return true;
       }
       else if( managerType == typeof( DetailVisibilityChangedEventManager ) )
       {
-        this.NotifyPropertyChanged( "HasDetails" );
-        return true;
+        this.OnPropertyChanged( "HasDetails" );
       }
       else if( managerType == typeof( MaxGroupLevelsChangedEventManager ) )
       {
-        this.NotifyPropertyChanged( "MaxGroupLevels" );
-        return true;
+        this.OnPropertyChanged( "MaxGroupLevels" );
       }
       else if( managerType == typeof( MaxSortLevelsChangedEventManager ) )
       {
-        this.NotifyPropertyChanged( "MaxSortLevels" );
-        return true;
-      }
-      else if( managerType == typeof( ItemPropertiesChangedEventManager ) )
-      {
-        this.ItemsSourceFieldDescriptors = null;
-        bool autoCreateColumns = ( m_detailConfig == null ) ? m_dataGridControl.AutoCreateColumns : m_detailConfig.AutoCreateColumns;
-
-        if( autoCreateColumns )
-        {
-          ItemsSourceHelper.UpdateColumnsOnItemsPropertiesChanged(
-            this.DataGridControl, this.Columns, this.AutoCreateForeignKeyConfigurations,
-            ( NotifyCollectionChangedEventArgs )e, ( DataGridItemPropertyCollection )sender );
-        }
-
-        return true;
+        this.OnPropertyChanged( "MaxSortLevels" );
       }
       else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
       {
         var dataGridCollectionViewBase = m_dataGridControlItemsSource as DataGridCollectionViewBase;
 
-        // GenerateColumnsFromItemsSourceFields is already done in DataGridControl.ProcessDelayedItemsSourceChanged
-        // no need to do it here.
+        // GenerateColumnsFromItemsSourceFields is already done in DataGridControl.ProcessDelayedItemsSourceChanged no need to do it here.
         this.UnhookToItemPropertiesChanged( dataGridCollectionViewBase );
 
         if( dataGridCollectionViewBase != null )
@@ -3705,11 +3469,13 @@ namespace Xceed.Wpf.DataGrid
             collectionView.PrepareRootContextForDeferRefresh( this );
           }
         }
-
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
@@ -3717,14 +3483,13 @@ namespace Xceed.Wpf.DataGrid
     #region Private Fields
 
     private BitVector32 m_flags = new BitVector32();
-    private CurrencyManager m_currencyManager;
-    private List<Views.ViewBase.ViewPropertyStruct> m_viewProperties = new List<Views.ViewBase.ViewPropertyStruct>();
-    PropertyDescriptorCollection m_viewPropertiesDescriptors; // = null
+    private readonly CurrencyManager m_currencyManager;
+    private readonly ICollection<Views.ViewBase.ViewPropertyStruct> m_viewProperties = new List<Views.ViewBase.ViewPropertyStruct>();
+    private PropertyDescriptorCollection m_viewPropertiesDescriptors; // = null
     private DefaultDetailConfiguration m_defaultDetailConfiguration; // = null
-    private RecyclingManager m_recyclingManager; // = null
     private ColumnBase m_defaultImageColumn; // = null
     private int m_deferRestoreStateCount; // = 0;
-    private Dictionary<object, ContainerSizeState> m_sizeStateDictionary = new Dictionary<object, ContainerSizeState>();
+    private readonly Dictionary<object, ContainerSizeState> m_sizeStateDictionary = new Dictionary<object, ContainerSizeState>();
     private IEnumerable m_dataGridControlItemsSource;
     private DeferSelectionChangedOnItemsCollectionChangedDisposable m_deferSelectionChangedOnItemsCollectionChanged; // = null
 
@@ -3808,20 +3573,20 @@ namespace Xceed.Wpf.DataGrid
         // We only cache the full property list.
         if( m_viewPropertiesDescriptors == null )
         {
-          Xceed.Wpf.DataGrid.Views.ViewBase view = this.DataGridControl.GetView();
+          var view = m_dataGridControl.GetView();
           Debug.Assert( view != null );
 
           if( view == null )
             return PropertyDescriptorCollection.Empty;
 
-          ViewBindingPropertyDescriptor[] properties = new ViewBindingPropertyDescriptor[ m_viewProperties.Count ];
-          for( int i = 0; i < m_viewProperties.Count; i++ )
+          var properties = new ViewBindingPropertyDescriptor[ m_viewProperties.Count ];
+          var defaultDetailConfiguration = this.GetDefaultDetailConfigurationForContext();
+          var index = 0;
+
+          foreach( var property in m_viewProperties )
           {
-            properties[ i ] = new ViewBindingPropertyDescriptor( m_detailConfig,
-                                                                  this.GetDefaultDetailConfigurationForContext(),
-                                                                  m_dataGridControl.GetView(),
-                                                                  m_viewProperties[ i ].DependencyProperty,
-                                                                  m_viewProperties[ i ].ViewPropertyMode );
+            properties[ index ] = new ViewBindingPropertyDescriptor( m_detailConfig, defaultDetailConfiguration, view, property.DependencyProperty, property.ViewPropertyMode );
+            index++;
           }
 
           m_viewPropertiesDescriptors = new PropertyDescriptorCollection( properties );
@@ -3845,57 +3610,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Automation
-
-    private static readonly DependencyPropertyKey AutomationPeerPropertyKey =
-      DependencyProperty.RegisterReadOnly( "AutomationPeer", typeof( DataGridContextAutomationPeer ), typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.NotDataBindable ) );
-
-    private static readonly DependencyProperty AutomationPeerProperty = AutomationPeerPropertyKey.DependencyProperty;
-
-    internal DataGridContextAutomationPeer Peer
-    {
-      get
-      {
-        return this.GetValue( AutomationPeerProperty ) as DataGridContextAutomationPeer;
-      }
-      set
-      {
-        this.SetValue( AutomationPeerPropertyKey, value );
-      }
-    }
-
-    internal AutomationPeer PeerSource
-    {
-      get
-      {
-        if( m_parentItem == null )
-          return FrameworkElementAutomationPeer.CreatePeerForElement( m_dataGridControl );
-
-        return this.Peer;
-      }
-    }
-
-    internal void RaiseIsSelectedChangedAutomationEvent( DependencyObject container, bool isSelected )
-    {
-      DataGridContextAutomationPeer peer = this.Peer;
-
-      if( ( peer != null ) && ( peer.ItemPeers != null ) )
-      {
-        object item = this.GetItemFromContainer( container );
-
-        if( item != null )
-        {
-          Xceed.Wpf.DataGrid.Automation.DataGridItemAutomationPeer itemPeer = peer.ItemPeers[ item ] as Xceed.Wpf.DataGrid.Automation.DataGridItemAutomationPeer;
-
-          if( itemPeer != null )
-            itemPeer.RaiseAutomationIsSelectedChanged( isSelected );
-        }
-      }
-    }
-
-    #endregion Automation
-
     //---------- SUB CLASSES ----------
 
     #region DeferRestoreStateDisposable Private Class
@@ -3920,8 +3634,8 @@ namespace Xceed.Wpf.DataGrid
 
       private void Dispose( bool disposing )
       {
-        var wr = m_dataGridContext;
-        if( Interlocked.CompareExchange<WeakReference>( ref m_dataGridContext, null, wr ) == null )
+        var wr = Interlocked.Exchange( ref m_dataGridContext, null );
+        if( wr == null )
           return;
 
         var dataGridContext = ( DataGridContext )wr.Target;
@@ -3966,10 +3680,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( m_eventArgs != null )
         {
-          if( m_eventArgs.Action != NotifyCollectionChangedAction.Reset )
-          {
-            m_eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-          }
+          m_eventArgs = NotifyBatchCollectionChangedEventArgs.Combine( m_eventArgs, e );
         }
         else
         {
@@ -3988,8 +3699,8 @@ namespace Xceed.Wpf.DataGrid
         if( !disposing )
           return;
 
-        var wr = m_dataGridContext;
-        if( Interlocked.CompareExchange<WeakReference>( ref m_dataGridContext, null, wr ) == null )
+        var wr = Interlocked.Exchange( ref m_dataGridContext, null );
+        if( wr == null )
           return;
 
         var eventArgs = m_eventArgs;
@@ -4003,11 +3714,6 @@ namespace Xceed.Wpf.DataGrid
         dataGridContext.UpdateSelectionAfterSourceCollectionChanged( eventArgs );
       }
 
-      ~DeferSelectionChangedOnItemsCollectionChangedDisposable()
-      {
-        this.Dispose( false );
-      }
-
       private WeakReference m_dataGridContext;
       private NotifyCollectionChangedEventArgs m_eventArgs; //null
     }
@@ -4018,7 +3724,7 @@ namespace Xceed.Wpf.DataGrid
 
     private class ViewBindingPropertyDescriptor : PropertyDescriptor
     {
-      public ViewBindingPropertyDescriptor( DetailConfiguration detailConfig, DefaultDetailConfiguration defaultDetailConfig, Xceed.Wpf.DataGrid.Views.ViewBase view, DependencyProperty dp, ViewPropertyMode viewPropertyMode )
+      public ViewBindingPropertyDescriptor( DetailConfiguration detailConfig, DefaultDetailConfiguration defaultDetailConfig, Views.ViewBase view, DependencyProperty dp, ViewPropertyMode viewPropertyMode )
         : base( dp.Name, null )
       {
         if( dp == null )
@@ -4081,7 +3787,7 @@ namespace Xceed.Wpf.DataGrid
 
       #region View Read-Only Property
 
-      public Xceed.Wpf.DataGrid.Views.ViewBase View
+      public Views.ViewBase View
       {
         get
         {
@@ -4089,7 +3795,7 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      private Xceed.Wpf.DataGrid.Views.ViewBase m_view;
+      private Views.ViewBase m_view;
 
       #endregion
 
@@ -4122,36 +3828,35 @@ namespace Xceed.Wpf.DataGrid
 
       public override object GetValue( object component )
       {
-        object retval = null;
-        DependencyObject dependencyObject = component as DependencyObject;
-        if( dependencyObject != null )
+        if( m_viewPropertyMode == ViewPropertyMode.Routed )
         {
-          retval = dependencyObject.GetValue( m_dp );
-        }
+          var source = ( DependencyObject )m_defaultDetailConfig ?? m_detailConfig;
 
-        //If there isa a DefaultDetailConfig, process it in precedence to the DetailConfig
-        if( m_defaultDetailConfig != null )
-        {
-          //AND there is NO local value set on it.
-          object localValue = m_defaultDetailConfig.ReadLocalValue( m_dp );
-          if( ( localValue == DependencyProperty.UnsetValue ) && ( this.ViewPropertyMode == ViewPropertyMode.Routed ) )
-          {
-            //then use the View's Value.
-            retval = m_view.GetValue( m_dp );
-          }
-        }
-        //If there isa a DetailConfig
-        else if( m_detailConfig != null )
-        {
-          //AND there is NO local value set on it.
-          object localValue = m_detailConfig.ReadLocalValue( m_dp );
-          if( ( localValue == DependencyProperty.UnsetValue ) && ( this.ViewPropertyMode == ViewPropertyMode.Routed ) )
+          //If there is a DefaultDetailConfig, process it in precedence to the DetailConfig.
+          if( source != null )
           {
-            //then use the View's Value.
-            retval = m_view.GetValue( m_dp );
+            var valueSource = DependencyPropertyHelper.GetValueSource( source, m_dp );
+
+            switch( valueSource.BaseValueSource )
+            {
+              // Pick the value on the view.
+              case BaseValueSource.Default:
+              case BaseValueSource.Inherited:
+              case BaseValueSource.Unknown:
+                return m_view.GetValue( m_dp );
+
+              // Pick the value on the source component itself.
+              default:
+                break;
+            }
           }
         }
-        return retval;
+
+        var dependencyObject = component as DependencyObject;
+        if( dependencyObject != null )
+          return dependencyObject.GetValue( m_dp );
+
+        return null;
       }
 
       public override bool IsReadOnly
@@ -4177,13 +3882,11 @@ namespace Xceed.Wpf.DataGrid
 
       public override void SetValue( object component, object value )
       {
-        DependencyObject dependencyObject = component as DependencyObject;
-        if( dependencyObject != null )
-        {
-          dependencyObject.SetValue( m_dp, value );
-          return;
-        }
-        throw new ArgumentException( "SetValue was called for an object which is not a DependencyObject.", component.ToString() );
+        var dependencyObject = component as DependencyObject;
+        if( dependencyObject == null )
+          throw new ArgumentException( "SetValue was called for an object which is not a DependencyObject.", component.ToString() );
+
+        dependencyObject.SetValue( m_dp, value );
       }
 
       public override bool ShouldSerializeValue( object component )
@@ -4542,16 +4245,22 @@ namespace Xceed.Wpf.DataGrid
       protected override string GetColumnName( ColumnBase column )
       {
         var dataGridContext = this.DataGridContext;
-        if( dataGridContext == null )
+        if( ( dataGridContext == null ) || ( column == null ) )
           return null;
 
-        var fieldNameMap = dataGridContext.ItemPropertyMap;
-        string fieldName;
-
-        if( !fieldNameMap.TryGetItemPropertyName( column, out fieldName ) )
-          return null;
+        var itemPropertyMap = dataGridContext.ItemPropertyMap;
+        if( ( itemPropertyMap != null ) && itemPropertyMap.IsMapping )
+        {
+          string fieldName;
+          if( DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, column.FieldName, out fieldName ) )
+            return fieldName;
+        }
+        else
+        {
+          return column.FieldName;
+        }
 
-        return fieldName;
+        return null;
       }
 
       protected override GroupDescription GetGroupDescription( ColumnBase column )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
index ffe2998b..50d4c3dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
@@ -22,6 +22,8 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
+using System.Linq;
+using System.Printing;
 using System.Security;
 using System.Security.Permissions;
 using System.Windows;
@@ -35,10 +37,9 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using Xceed.Utils.Wpf;
 using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Automation;
 using Xceed.Wpf.DataGrid.Export;
+using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -47,13 +48,17 @@ namespace Xceed.Wpf.DataGrid
   [StyleTypedProperty( Property = "CellErrorStyle", StyleTargetType = typeof( Cell ) )]
   public partial class DataGridControl : ItemsControl, INotifyPropertyChanged, IDocumentPaginatorSource, IWeakEventListener
   {
+    #region Static Fields
+
+    internal static readonly string SelectionModeToUsePropertyName = PropertyHelper.GetPropertyName( ( DataGridControl d ) => d.SelectionModeToUse );
+
+    #endregion
+
     static DataGridControl()
     {
       FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( TableflowView.GetDefaultStyleKey( typeof( TableflowView ), typeof( DataGridControl ) ) ) );
 
-      ItemsControl.ItemsSourceProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( null,
-        new CoerceValueCallback( DataGridControl.ItemsSourceCoerceCallback ) ) );
-
+      ItemsControl.ItemsSourceProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( DataGridControl.ItemsSourceCoerceCallback ) ) );
       ItemsControl.GroupStyleSelectorProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnGroupStyleSelectorChanged ) ) );
 
       KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( KeyboardNavigationMode.Contained ) );
@@ -70,32 +75,24 @@ namespace Xceed.Wpf.DataGrid
       DataGridControl.DataGridContextProperty = DataGridControl.DataGridContextPropertyKey.DependencyProperty;
       DataGridControl.StatContextProperty = DataGridControl.StatContextPropertyKey.DependencyProperty;
       DataGridControl.GroupLevelDescriptionsProperty = DataGridControl.GroupLevelDescriptionsPropertyKey.DependencyProperty;
-      DataGridControl.DetailConfigurationsProperty = DataGridControl.DetailConfigurationsPropertyKey.DependencyProperty;
       DataGridControl.HasExpandedDetailsProperty = DataGridControl.HasExpandedDetailsPropertyKey.DependencyProperty;
     }
 
     public DataGridControl()
     {
       m_selectionChangerManager = new SelectionManager( this );
+      m_columnManagerRowConfiguration = new ColumnManagerRowConfiguration();
 
       this.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
 
       //set the FixedItem for the gridControl to NotSet, this is to prevent problems with nested DataGridControls
       DataGridControl.SetFixedItem( this, DataGridControl.NotSet );
 
-      this.SetDetailConfigurations( new DetailConfigurationCollection( this, null ) );
-      this.DetailConfigurations.CollectionChanged += this.OnDetailConfigurationsChanged;
-
       this.CommandBindings.Add( new CommandBinding( DataGridCommands.ExpandGroup, this.OnExpandGroupExecuted, this.OnExpandGroupCanExecute ) );
-
       this.CommandBindings.Add( new CommandBinding( DataGridCommands.CollapseGroup, this.OnCollapseGroupExecuted, this.OnCollapseGroupCanExecute ) );
-
       this.CommandBindings.Add( new CommandBinding( DataGridCommands.ToggleGroupExpansion, this.OnToggleGroupExecuted, this.OnToggleGroupCanExecute ) );
-
       this.CommandBindings.Add( new CommandBinding( ApplicationCommands.SelectAll, this.OnSelectAllExecuted, this.OnSelectAllCanExecute ) );
 
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.ClearFilter, this.OnClearFilterExecuted ) );
-
       // We keep a references to be able to remove the CommandBindings when they are not required (feature disabled)
       m_refreshCommandBinding = new CommandBinding( DataGridCommands.Refresh, this.OnRefreshExecuted, this.OnRefreshCanExecute );
       this.CommandBindings.Add( m_refreshCommandBinding );
@@ -115,7 +112,7 @@ namespace Xceed.Wpf.DataGrid
       m_localDataGridContext = dataGridContext;
 
       //so that at least one DataGridContext is always current
-      dataGridContext.SetIsCurrentHelper( true );
+      dataGridContext.SetIsCurrent( true );
       this.SetCurrentDataGridContextHelper( dataGridContext );
 
       this.SetValue( DataGridControl.ColumnsPropertyKey, dataGridContext.Columns );
@@ -138,75 +135,77 @@ namespace Xceed.Wpf.DataGrid
       }
 
       this.Loaded += new RoutedEventHandler( DataGridControl_Loaded );
-      this.LayoutUpdated += new EventHandler( DataGridControl_LayoutUpdated );
     }
 
     #region INITIALIZATION
 
     public override void BeginInit()
     {
-      m_beginInitCount++;
+      m_initCount++;
+      if( m_initCount != 1 )
+        return;
+
+      Debug.Assert( m_deferColumnsUpdate == null );
+      m_deferColumnsUpdate = this.DataGridContext.DeferColumnsUpdate();
+      Debug.Assert( m_deferColumnsUpdate != null );
 
-      if( m_columnsInitDisposable == null )
+      m_deferColumnsNotifications = this.Columns.DeferNotifications();
+
+      var dataGridCollectionViewBase = this.DataGridContext.Items as DataGridCollectionViewBase;
+      if( dataGridCollectionViewBase != null )
       {
-        m_columnsInitDisposable = this.Columns.DeferColumnAdditionMessages();
+        m_deferItemPropertiesUpdate = dataGridCollectionViewBase.ItemProperties.DeferCollectionChanged();
       }
 
-      // The FrameworkElement implementation does not support nested BeginInit/EndInit
-      if( m_beginInitCount == 1 )
-        base.BeginInit();
+      base.BeginInit();
     }
 
     public override void EndInit()
     {
-      if( m_beginInitCount > 0 )
-        m_beginInitCount--;
+      m_initCount--;
+      if( m_initCount != 0 )
+        return;
 
-      if( m_beginInitCount == 0 )
+      // Set a view if none is set at this point.  This will also make sure that eventual implicit style declarations for the default View in user applications will work.
+      if( this.View == null )
       {
-        if( m_columnsInitDisposable != null )
-        {
-          m_columnsInitDisposable.Dispose();
-          m_columnsInitDisposable = null;
-        }
+        this.View = this.GetDefaultView() as UIViewBase;
+      }
 
-        // Reassociate the default view to the grid at the last moment so that  eventual implicit style declarations for the default View in user applications will work.
-        if( this.View == null )
-        {
-          this.OnViewChanged( null, this.GetDefaultView() );
-        }
+      if( this.ItemsSourceChangedDelayed )
+      {
+        this.ItemsSourceChangedDelayed = false;
+        this.ProcessDelayedItemsSourceChanged();
+      }
 
-        if( this.ItemsSourceChangedDelayed )
-        {
-          this.ItemsSourceChangedDelayed = false;
-          this.ProcessDelayedItemsSourceChanged();
-        }
+      var dataGridContext = this.DataGridContext;
+      var columnManager = dataGridContext.ColumnManager;
 
-        //see if any of the GroupLevelDescriptions are matched to a column but aren't bound ( case 102437 ) and update then (bind them) if necessary
-        this.DataGridContext.SetupTitleBindingForGroupLevelDescriptions();
+      columnManager.Initialize( this );
+      columnManager.SetFixedColumnCount( TableView.GetFixedColumnCount( dataGridContext ) );
 
+      //see if any of the GroupLevelDescriptions are matched to a column but aren't bound ( case 102437 ) and update then (bind them) if necessary
+      dataGridContext.SetupTitleBindingForGroupLevelDescriptions();
 
-        // The FrameworkElement implementation does not support nested BeginInit/EndInit
-        base.EndInit();
+      if( m_deferItemPropertiesUpdate != null )
+      {
+        var collectionViewDisposable = m_deferItemPropertiesUpdate;
+        m_deferItemPropertiesUpdate = null;
+        collectionViewDisposable.Dispose();
       }
-    }
 
-    private void DataGridControl_LayoutUpdated( object sender, EventArgs e )
-    {
-      if( m_dataGridContextToRefreshPeerChlidren == null )
-        return;
-
-      foreach( DataGridContext dataGridContext in m_dataGridContextToRefreshPeerChlidren )
-      {
-        DataGridContextAutomationPeer dataGridContextPeer = dataGridContext.Peer;
+      var columnsNotificationsDisposable = m_deferColumnsNotifications;
+      m_deferColumnsNotifications = null;
+      columnsNotificationsDisposable.Dispose();
 
-        if( dataGridContextPeer == null )
-          continue;
+      Debug.Assert( m_deferColumnsUpdate != null );
+      var columnsUpdateDisposable = m_deferColumnsUpdate;
+      m_deferColumnsUpdate = null;
+      columnsUpdateDisposable.Dispose();
 
-        dataGridContextPeer.ResetChildrenCache();
-      }
+      m_customItemContainerGenerator.ForceReset = true;
 
-      m_dataGridContextToRefreshPeerChlidren = null;
+      base.EndInit();
     }
 
     private void DataGridControl_Loaded( object sender, RoutedEventArgs e )
@@ -222,7 +221,7 @@ namespace Xceed.Wpf.DataGrid
       // to make the parent control load faster.  A new layout pass
       // must be forced to render the datagrid content correctly.  The layout
       // pass isn't inhibited when the grid is use for printing purpose.
-      if( ( this.DeferInitialLayoutPass ) && ( m_isFirstTimeLoaded ) && ( !this.IsPrinting ) )
+      if( ( this.DeferInitialLayoutPass ) && ( m_isFirstTimeLoaded )  )
       {
         m_isFirstTimeLoaded = false;
 
@@ -263,26 +262,26 @@ namespace Xceed.Wpf.DataGrid
 
     private void UnhookToUnloaded()
     {
-      FrameworkElement parentWindow = ( m_parentWindow == null )
-        ? this : m_parentWindow.Target as FrameworkElement;
+      var parentWindow = ( m_parentWindow != null ) ? m_parentWindow.Target as FrameworkElement : this;
+      if( parentWindow == null )
+        return;
 
       FrameworkElementUnloadedEventManager.RemoveListener( parentWindow, this );
     }
 
-    internal bool IsInInit
-    {
-      get
-      {
-        return ( m_columnsInitDisposable != null );
-      }
-    }
+    private int m_initCount; //0
+    private IDisposable m_deferColumnsUpdate; //null
+    private IDisposable m_deferColumnsNotifications; //null
+    private IDisposable m_deferItemPropertiesUpdate; //null
 
-    #endregion INITIALIZATION
+    #endregion
 
     #region ParentDataGridControl Attached Property
 
     internal static readonly DependencyPropertyKey ParentDataGridControlPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "ParentDataGridControl", typeof( DataGridControl ), typeof( DataGridControl ),
+      "ParentDataGridControl",
+      typeof( DataGridControl ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty ParentDataGridControlProperty;
@@ -293,12 +292,14 @@ namespace Xceed.Wpf.DataGrid
       return ( DataGridControl )obj.GetValue( DataGridControl.ParentDataGridControlProperty );
     }
 
-    #endregion ParentDataGridControl Attached Property
+    #endregion
 
     #region DataGridContext Attached Property
 
     internal static readonly DependencyPropertyKey DataGridContextPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "DataGridContext", typeof( DataGridContext ), typeof( DataGridControl ),
+      "DataGridContext",
+      typeof( DataGridContext ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty DataGridContextProperty;
@@ -313,14 +314,16 @@ namespace Xceed.Wpf.DataGrid
       obj.SetValue( DataGridControl.DataGridContextPropertyKey, value );
     }
 
-    private DataGridContext m_localDataGridContext; // = null
+    private readonly DataGridContext m_localDataGridContext; // = null
 
-    #endregion DataGridContext Attached Property
+    #endregion
 
     #region Container Attached Property
 
     private static readonly DependencyPropertyKey ContainerPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "Container", typeof( FrameworkElement ), typeof( DataGridControl ),
+      "Container",
+      typeof( FrameworkElement ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty ContainerProperty = DataGridControl.ContainerPropertyKey.DependencyProperty;
@@ -332,7 +335,6 @@ namespace Xceed.Wpf.DataGrid
 
     internal static void SetContainer( DependencyObject obj, object value )
     {
-      Debug.Assert( ( value == null ) || ( value is IDataGridItemContainer ) );
       obj.SetValue( DataGridControl.ContainerPropertyKey, value );
     }
 
@@ -341,12 +343,14 @@ namespace Xceed.Wpf.DataGrid
       obj.ClearValue( DataGridControl.ContainerPropertyKey );
     }
 
-    #endregion Container Attached Property
+    #endregion
 
     #region IsContainerPrepared Attached Property
 
     private static readonly DependencyPropertyKey IsContainerPreparedPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "IsContainerPrepared", typeof( bool ), typeof( DataGridControl ),
+      "IsContainerPrepared",
+      typeof( bool ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( false ) );
 
     private static readonly DependencyProperty IsContainerPreparedProperty = DataGridControl.IsContainerPreparedPropertyKey.DependencyProperty;
@@ -366,12 +370,14 @@ namespace Xceed.Wpf.DataGrid
       obj.ClearValue( DataGridControl.IsContainerPreparedPropertyKey );
     }
 
-    #endregion IsContainerPrepared Attached Property
+    #endregion
 
     #region StatContext Attached Property
 
     internal static readonly DependencyPropertyKey StatContextPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "StatContext", typeof( object ), typeof( DataGridControl ),
+      "StatContext",
+      typeof( object ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty StatContextProperty;
@@ -386,24 +392,14 @@ namespace Xceed.Wpf.DataGrid
       obj.SetValue( DataGridControl.StatContextPropertyKey, statContext );
     }
 
-    #endregion StatContext Attached Property
-
-    #region HasDetails Read-Only Property
-
-    public bool HasDetails
-    {
-      get
-      {
-        return ( this.DetailConfigurations.Count > 0 );
-      }
-    }
-
     #endregion
 
     #region HasExpandedDetails Attached Property
 
     internal static readonly DependencyPropertyKey HasExpandedDetailsPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "HasExpandedDetails", typeof( bool ), typeof( DataGridControl ),
+      "HasExpandedDetails",
+      typeof( bool ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty HasExpandedDetailsProperty;
@@ -418,12 +414,15 @@ namespace Xceed.Wpf.DataGrid
       obj.SetValue( DataGridControl.HasExpandedDetailsPropertyKey, value );
     }
 
-    #endregion HasDetails Attached Property
+    #endregion
 
     #region Columns Read-Only Property
 
-    private static readonly DependencyPropertyKey ColumnsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Columns", typeof( ColumnCollection ), typeof( DataGridControl ), new PropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey ColumnsPropertyKey = DependencyProperty.RegisterReadOnly(
+      "Columns",
+      typeof( ColumnCollection ),
+      typeof( DataGridControl ),
+      new PropertyMetadata( null ) );
 
     public static readonly DependencyProperty ColumnsProperty;
 
@@ -435,12 +434,14 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Columns Read-Only Property
+    #endregion
 
     #region VisibleColumns Read-Only Property
 
     private static readonly DependencyPropertyKey VisibleColumnsPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "VisibleColumns", typeof( ReadOnlyObservableCollection<ColumnBase> ), typeof( DataGridControl ),
+      "VisibleColumns",
+      typeof( ReadOnlyObservableCollection<ColumnBase> ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static readonly DependencyProperty VisibleColumnsProperty;
@@ -458,7 +459,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion VisibleColumns Read-Only Property
+    #endregion
 
     #region ColumnsByVisiblePosition Read-Only Property
 
@@ -470,12 +471,14 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ColumnsByVisiblePosition Read-Only Property
+    #endregion
 
     #region CellEditorDisplayConditions Property
 
     public static readonly DependencyProperty CellEditorDisplayConditionsProperty = DependencyProperty.RegisterAttached(
-      "CellEditorDisplayConditions", typeof( CellEditorDisplayConditions ), typeof( DataGridControl ),
+      "CellEditorDisplayConditions",
+      typeof( CellEditorDisplayConditions ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( CellEditorDisplayConditions.None, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public CellEditorDisplayConditions CellEditorDisplayConditions
@@ -490,7 +493,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellEditorDisplayConditions Property
+    #endregion
 
     #region DefaultCellEditors Property
 
@@ -502,14 +505,16 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private Dictionary<Type, CellEditor> m_defaultCellEditors = new Dictionary<Type, CellEditor>();
+    private readonly Dictionary<Type, CellEditor> m_defaultCellEditors = new Dictionary<Type, CellEditor>();
 
-    #endregion DefaultCellEditors Property
+    #endregion
 
     #region CellErrorStyle Property
 
     public static readonly DependencyProperty CellErrorStyleProperty = DependencyProperty.RegisterAttached(
-      "CellErrorStyle", typeof( Style ), typeof( DataGridControl ),
+      "CellErrorStyle",
+      typeof( Style ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public Style CellErrorStyle
@@ -525,15 +530,17 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellErrorStyle Property
+    #endregion
 
     #region HasValidationError Property
 
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasValidationError", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
+      "HasValidationError",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty HasValidationErrorProperty =
-      HasValidationErrorPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty HasValidationErrorProperty = DataGridControl.HasValidationErrorPropertyKey.DependencyProperty;
 
     public bool HasValidationError
     {
@@ -558,7 +565,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion HasValidationError Property
+    #endregion
 
     #region ValidationMode Property
 
@@ -583,12 +590,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ValidationMode Property
+    #endregion
 
     #region SelectedItems Read-Only Property
 
-    private static readonly DependencyPropertyKey SelectedItemsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "SelectedItems", typeof( IList ), typeof( DataGridControl ), new PropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey SelectedItemsPropertyKey = DependencyProperty.RegisterReadOnly(
+      "SelectedItems",
+      typeof( IList ),
+      typeof( DataGridControl ),
+      new PropertyMetadata( null ) );
 
     public static readonly DependencyProperty SelectedItemsProperty;
 
@@ -600,12 +610,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SelectedItems Read-Only Property
+    #endregion
 
     #region SelectedRanges Read-Only Property
 
-    private static readonly DependencyPropertyKey SelectedItemRangesPropertyKey =
-        DependencyProperty.RegisterReadOnly( "SelectedItemRanges", typeof( IList<SelectionRange> ), typeof( DataGridControl ), new PropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey SelectedItemRangesPropertyKey = DependencyProperty.RegisterReadOnly(
+      "SelectedItemRanges",
+      typeof( IList<SelectionRange> ),
+      typeof( DataGridControl ),
+      new PropertyMetadata( null ) );
 
     public static readonly DependencyProperty SelectedItemRangesProperty;
 
@@ -617,12 +630,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SelectedItemRanges Read-Only Property
+    #endregion
 
     #region SelectedCellRanges Read-Only Property
 
-    private static readonly DependencyPropertyKey SelectedCellRangesPropertyKey =
-        DependencyProperty.RegisterReadOnly( "SelectedCellRanges", typeof( IList<SelectionCellRange> ), typeof( DataGridControl ), new PropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey SelectedCellRangesPropertyKey = DependencyProperty.RegisterReadOnly(
+      "SelectedCellRanges",
+      typeof( IList<SelectionCellRange> ),
+      typeof( DataGridControl ),
+      new PropertyMetadata( null ) );
 
     public static readonly DependencyProperty SelectedCellRangesProperty;
 
@@ -634,12 +650,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SelectedCellRanges Read-Only Property
+    #endregion
 
     #region SelectedItem Property
 
-    public static readonly DependencyProperty SelectedItemProperty =
-        DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( DataGridControl ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedItemChanged ), new CoerceValueCallback( OnCoerceSelectedItem ) ) );
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register(
+      "SelectedItem",
+      typeof( object ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( DataGridControl.OnSelectedItemChanged ), new CoerceValueCallback( DataGridControl.OnCoerceSelectedItem ) ) );
 
     public object SelectedItem
     {
@@ -660,59 +679,59 @@ namespace Xceed.Wpf.DataGrid
 
     private static object OnCoerceSelectedItem( DependencyObject sender, object value )
     {
-      DataGridControl dataGridControl = ( DataGridControl )sender;
+      var self = sender as DataGridControl;
+      if( self == null )
+        return value;
 
-      if( ( value != null ) && ( !dataGridControl.m_skipCoerceSelectedItemCheck ) )
+      if( ( value != null ) && ( !self.m_skipCoerceSelectedItemCheck ) )
       {
-        if( !dataGridControl.Items.Contains( value ) )
+        if( !self.Items.Contains( value ) )
         {
-          dataGridControl.SelectedItemPropertyNeedCoerce = true;
+          self.SelectedItemPropertyNeedCoerce = true;
           return DependencyProperty.UnsetValue;
         }
       }
 
-      dataGridControl.SelectedItemPropertyNeedCoerce = false;
+      self.SelectedItemPropertyNeedCoerce = false;
       return value;
     }
 
     private static void OnSelectedItemChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGrid = ( DataGridControl )sender;
+      var self = sender as DataGridControl;
+      if( ( self == null ) || self.m_selectionChangerManager.IsActive )
+        return;
 
-      if( dataGrid != null )
+      self.m_selectionChangerManager.Begin();
+
+      try
       {
-        if( !dataGrid.m_selectionChangerManager.IsActive )
+        if( e.NewValue == null )
         {
-          dataGrid.m_selectionChangerManager.Begin();
-
-          try
-          {
-            if( e.NewValue == null )
-            {
-              dataGrid.m_selectionChangerManager.UnselectAll();
-            }
-            else
-            {
-              dataGrid.m_selectionChangerManager.SelectJustThisItem(
-                dataGrid.DataGridContext, dataGrid.Items.IndexOf( e.NewValue ), e.NewValue );
-            }
-          }
-          finally
-          {
-            dataGrid.m_selectionChangerManager.End( false, false, true );
-          }
+          self.m_selectionChangerManager.UnselectAll();
         }
+        else
+        {
+          self.m_selectionChangerManager.SelectJustThisItem( self.DataGridContext, self.Items.IndexOf( e.NewValue ), e.NewValue );
+        }
+      }
+      finally
+      {
+        self.m_selectionChangerManager.End( false, true );
       }
     }
 
     private bool m_skipCoerceSelectedItemCheck;
 
-    #endregion SelectedItem Property
+    #endregion
 
     #region SelectedIndex Property
 
-    public static readonly DependencyProperty SelectedIndexProperty =
-        DependencyProperty.Register( "SelectedIndex", typeof( int ), typeof( DataGridControl ), new FrameworkPropertyMetadata( -1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedIndexChanged ), new CoerceValueCallback( OnCoerceSelectedIndex ) ) );
+    public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register(
+      "SelectedIndex",
+      typeof( int ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( -1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( DataGridControl.OnSelectedIndexChanged ), new CoerceValueCallback( DataGridControl.OnCoerceSelectedIndex ) ) );
 
     public int SelectedIndex
     {
@@ -728,55 +747,52 @@ namespace Xceed.Wpf.DataGrid
 
     private static object OnCoerceSelectedIndex( DependencyObject sender, object value )
     {
-      DataGridControl dataGrid = sender as DataGridControl;
+      var self = sender as DataGridControl;
+      if( self == null )
+        return value;
 
-      int newValue = ( int )value;
+      var newValue = ( int )value;
 
-      if( ( newValue < -1 ) || ( newValue >= dataGrid.Items.Count ) )
+      if( ( newValue < -1 ) || ( newValue >= self.Items.Count ) )
       {
-        dataGrid.SelectedIndexPropertyNeedCoerce = true;
+        self.SelectedIndexPropertyNeedCoerce = true;
         return DependencyProperty.UnsetValue;
       }
 
-      dataGrid.SelectedIndexPropertyNeedCoerce = false;
+      self.SelectedIndexPropertyNeedCoerce = false;
       return value;
     }
 
     private static void OnSelectedIndexChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGrid = sender as DataGridControl;
+      var self = sender as DataGridControl;
+      if( ( self == null ) || self.m_selectionChangerManager.IsActive )
+        return;
 
-      if( dataGrid != null )
-      {
-        int newValue = ( int )e.NewValue;
+      var newValue = ( int )e.NewValue;
 
-        if( !dataGrid.m_selectionChangerManager.IsActive )
-        {
-          dataGrid.m_selectionChangerManager.Begin();
+      self.m_selectionChangerManager.Begin();
 
-          try
-          {
-            if( ( newValue >= 0 ) && ( newValue < dataGrid.Items.Count ) )
-            {
-              //affect the item as the new selection
-              dataGrid.m_selectionChangerManager.SelectJustThisItem(
-                dataGrid.DataGridContext, newValue, dataGrid.Items[ newValue ] );
-            }
-            else
-            {
-              //clear the selection.
-              dataGrid.m_selectionChangerManager.UnselectAll();
-            }
-          }
-          finally
-          {
-            dataGrid.m_selectionChangerManager.End( false, false, true );
-          }
+      try
+      {
+        if( ( newValue >= 0 ) && ( newValue < self.Items.Count ) )
+        {
+          //affect the item as the new selection
+          self.m_selectionChangerManager.SelectJustThisItem( self.DataGridContext, newValue, self.Items[ newValue ] );
+        }
+        else
+        {
+          //clear the selection.
+          self.m_selectionChangerManager.UnselectAll();
         }
       }
+      finally
+      {
+        self.m_selectionChangerManager.End( false, true );
+      }
     }
 
-    #endregion SelectedIndex Property
+    #endregion
 
     #region GlobalSelectedItems Read-Only Property
 
@@ -784,9 +800,9 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        foreach( DataGridContext context in this.SelectedContexts )
+        foreach( var context in this.SelectedContexts )
         {
-          foreach( object selectedItem in context.SelectedItems )
+          foreach( var selectedItem in context.SelectedItems )
           {
             yield return selectedItem;
           }
@@ -796,7 +812,7 @@ namespace Xceed.Wpf.DataGrid
 
     internal void NotifyGlobalSelectedItemsChanged()
     {
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "GlobalSelectedItems" ) );
+      this.OnPropertyChanged( "GlobalSelectedItems" );
     }
 
     #endregion
@@ -808,23 +824,26 @@ namespace Xceed.Wpf.DataGrid
       get
       {
         if( m_readOnlySelectedContexts == null )
+        {
           m_readOnlySelectedContexts = new ReadOnlyCollection<DataGridContext>( m_selectedContexts );
+        }
 
         return m_readOnlySelectedContexts;
       }
     }
 
-    private List<DataGridContext> m_selectedContexts = new List<DataGridContext>();
+    private readonly List<DataGridContext> m_selectedContexts = new List<DataGridContext>();
     private ReadOnlyCollection<DataGridContext> m_readOnlySelectedContexts;
 
-    #endregion SelectedContexts Read-Only Property
+    #endregion
 
     #region SelectionMode Property
 
-    public static readonly DependencyProperty SelectionModeProperty =
-        DependencyProperty.Register( "SelectionMode", typeof( SelectionMode ), typeof( DataGridControl ),
-        new UIPropertyMetadata( SelectionMode.Extended,
-          new PropertyChangedCallback( DataGridControl.OnSelectionModeChanged ) ) );
+    public static readonly DependencyProperty SelectionModeProperty = DependencyProperty.Register(
+      "SelectionMode",
+      typeof( SelectionMode ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( SelectionMode.Extended, new PropertyChangedCallback( DataGridControl.OnSelectionModeChanged ) ) );
 
     public SelectionMode SelectionMode
     {
@@ -848,17 +867,20 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnSelectionModeChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
     }
 
-    #endregion SelectionMode Property
+    #endregion
 
     #region SelectionUnit Property
 
-    public static readonly DependencyProperty SelectionUnitProperty =
-        DependencyProperty.Register( "SelectionUnit", typeof( SelectionUnit ), typeof( DataGridControl ),
-        new UIPropertyMetadata( SelectionUnit.Row,
-          new PropertyChangedCallback( DataGridControl.OnSelectionUnitChanged ),
-          new CoerceValueCallback( DataGridControl.SelectionUnitCoerceValueCallback ) ) );
+    public static readonly DependencyProperty SelectionUnitProperty = DependencyProperty.Register(
+      "SelectionUnit",
+      typeof( SelectionUnit ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( SelectionUnit.Row, new PropertyChangedCallback( DataGridControl.OnSelectionUnitChanged ) ) );
 
     public SelectionUnit SelectionUnit
     {
@@ -874,43 +896,37 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnSelectionUnitChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGrid = ( DataGridControl )sender;
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
 
-      if( dataGrid != null )
-      {
-        SelectionUnit selectionUnit = ( SelectionUnit )e.NewValue;
+      var selectionUnit = ( SelectionUnit )e.NewValue;
 
-        dataGrid.m_selectionChangerManager.Begin();
+      self.m_selectionChangerManager.Begin();
 
-        try
-        {
-          switch( selectionUnit )
-          {
-            case SelectionUnit.Row:
-              {
-                dataGrid.m_selectionChangerManager.UnselectAllCells();
-                break;
-              }
-            case SelectionUnit.Cell:
-              {
-                dataGrid.m_selectionChangerManager.UnselectAllItems();
-                break;
-              }
-          }
-        }
-        finally
+      try
+      {
+        switch( selectionUnit )
         {
-          dataGrid.m_selectionChangerManager.End( false, false, true );
+          case SelectionUnit.Row:
+            {
+              self.m_selectionChangerManager.UnselectAllCells();
+              break;
+            }
+          case SelectionUnit.Cell:
+            {
+              self.m_selectionChangerManager.UnselectAllItems();
+              break;
+            }
         }
       }
+      finally
+      {
+        self.m_selectionChangerManager.End( false, true );
+      }
     }
 
-    private static object SelectionUnitCoerceValueCallback( DependencyObject sender, object value )
-    {
-      return value;
-    }
-
-    #endregion SelectionUnit Property
+    #endregion
 
     #region CurrentItem Property
 
@@ -933,11 +949,11 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return ( !this.IsPrinting ) && ( this.SynchronizeCurrent );
+        return ( this.SynchronizeCurrent );
       }
     }
 
-    #endregion CurrentItem Property
+    #endregion
 
     #region CurrentColumn Property
 
@@ -956,7 +972,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CurrentColumn Property
+    #endregion
 
     #region CurrentContext Property
 
@@ -974,11 +990,11 @@ namespace Xceed.Wpf.DataGrid
     {
       m_currentDataGridContext = value;
 
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "CurrentContext" ) );
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "CurrentColumn" ) );
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "CurrentItem" ) );
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "GlobalCurrentItem" ) );
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "GlobalCurrentColumn" ) );
+      this.OnPropertyChanged( "CurrentContext" );
+      this.OnPropertyChanged( "CurrentColumn" );
+      this.OnPropertyChanged( "CurrentItem" );
+      this.OnPropertyChanged( "GlobalCurrentItem" );
+      this.OnPropertyChanged( "GlobalCurrentColumn" );
     }
 
     private DataGridContext m_currentDataGridContext; // = null
@@ -1011,8 +1027,6 @@ namespace Xceed.Wpf.DataGrid
 
     #region DragDropAdornerDecorator Property
 
-    private AdornerDecorator m_dragDropAdornerDecorator;
-
     internal AdornerDecorator DragDropAdornerDecorator
     {
       get
@@ -1021,12 +1035,17 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private AdornerDecorator m_dragDropAdornerDecorator;
+
     #endregion
 
     #region AutoCreateColumns Property
 
-    public static readonly DependencyProperty AutoCreateColumnsProperty =
-        DependencyProperty.Register( "AutoCreateColumns", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( true ) );
+    public static readonly DependencyProperty AutoCreateColumnsProperty = DependencyProperty.Register(
+      "AutoCreateColumns",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( true ) );
 
     public bool AutoCreateColumns
     {
@@ -1040,31 +1059,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoCreateColumns Property
-
-    #region AutoCreateDetailConfigurations Property
-
-    internal static readonly DependencyProperty AutoCreateDetailConfigurationsProperty =
-        DependencyProperty.Register( "AutoCreateDetailConfigurations", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false, null, new CoerceValueCallback( DataGridControl.AutoCreateDetailConfigurationsCoerceValueCallback ) ) );
-
-    internal bool AutoCreateDetailConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AutoCreateDetailConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoCreateDetailConfigurationsProperty, value );
-      }
-    }
-
-    private static object AutoCreateDetailConfigurationsCoerceValueCallback( DependencyObject sender, object value )
-    {
-      return value;
-    }
-
-    #endregion AutoCreateColumns Property
+    #endregion
 
     #region AutoCreateForeignKeyConfigurations Property
 
@@ -1090,39 +1085,22 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnAutoCreateForeignKeyConfigurationsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = sender as DataGridControl;
+      var self = sender as DataGridControl;
+      if( ( self == null ) || !self.AutoCreateForeignKeyConfigurations )
+        return;
 
-      if( ( dataGridControl != null ) && ( dataGridControl.AutoCreateForeignKeyConfigurations ) )
-      {
-        dataGridControl.SynchronizeForeignKeyConfigurations();
-      }
+      self.SynchronizeForeignKeyConfigurations();
     }
 
     #endregion
 
-    #region AutoRemoveColumnsAndDetailConfigurations Property
-
-    public static readonly DependencyProperty AutoRemoveColumnsAndDetailConfigurationsProperty =
-        DependencyProperty.Register( "AutoRemoveColumnsAndDetailConfigurations", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( true ) );
-
-    public bool AutoRemoveColumnsAndDetailConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AutoRemoveColumnsAndDetailConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoRemoveColumnsAndDetailConfigurationsProperty, value );
-      }
-    }
-
-    #endregion AutoRemoveColumnsAndDetailConfigurations Property
-
     #region HideSelection Property
 
-    public static readonly DependencyProperty HideSelectionProperty =
-        DependencyProperty.Register( "HideSelection", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    public static readonly DependencyProperty HideSelectionProperty = DependencyProperty.Register(
+      "HideSelection",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
     public bool HideSelection
     {
@@ -1136,12 +1114,14 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion HideSelection Property
+    #endregion
 
     #region ReadOnly Property
 
     public static readonly DependencyProperty ReadOnlyProperty = DependencyProperty.RegisterAttached(
-      "ReadOnly", typeof( bool ), typeof( DataGridControl ),
+      "ReadOnly",
+      typeof( bool ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public bool ReadOnly
@@ -1156,7 +1136,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ReadOnly Property
+    #endregion
 
     #region AutoScrollCurrentItem Property
 
@@ -1178,14 +1158,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion AutoScrollCurrentItem Property
+    #endregion
 
     #region EditTriggers Property
 
     public static readonly DependencyProperty EditTriggersProperty = DependencyProperty.RegisterAttached(
-      "EditTriggers", typeof( EditTriggers ), typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( EditTriggers.BeginEditCommand | EditTriggers.ClickOnCurrentCell | EditTriggers.ActivationGesture,
-        FrameworkPropertyMetadataOptions.Inherits ) );
+      "EditTriggers",
+      typeof( EditTriggers ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( EditTriggers.BeginEditCommand | EditTriggers.ClickOnCurrentCell | EditTriggers.ActivationGesture, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public EditTriggers EditTriggers
     {
@@ -1199,12 +1180,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion EditTriggers Property
+    #endregion
 
     #region ScrollViewer Property
 
-    private ScrollViewer m_scrollViewer;
-
     internal ScrollViewer ScrollViewer
     {
       get
@@ -1213,6 +1192,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private ScrollViewer m_scrollViewer;
+
     #endregion
 
     #region ItemsHost Property
@@ -1223,15 +1204,15 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_itemsHost == null )
         {
-          ScrollViewer scrollViewer = this.ScrollViewer;
+          var scrollViewer = this.ScrollViewer;
           if( scrollViewer == null )
             return null;
 
           //this can be either a ItemsPresenter (which implements IScrollInfo and reforwards it to the ItemsPanel instantiated from the
           //ItemsPanelTemplate or the DataGridItemsHost used for the Container Recycling.
-          FrameworkElement scrollViewerContent = null;
+          var scrollViewerContent = default( FrameworkElement );
 
-          ItemsPresenter itemsPresenter = scrollViewer.Content as ItemsPresenter;
+          var itemsPresenter = scrollViewer.Content as ItemsPresenter;
           if( itemsPresenter != null )
           {
             if( VisualTreeHelper.GetChildrenCount( itemsPresenter ) > 0 )
@@ -1278,12 +1259,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemsPanel override
+    #endregion
 
     #region FixedHeadersHostPanel Property
 
-    private Panel m_fixedHeadersHostPanel;
-
     internal Panel FixedHeadersHostPanel
     {
       get
@@ -1292,22 +1271,24 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void SetFixedHeadersHostPanel( Panel fixedHeadersHostPanel )
+    private void SetFixedHeadersHostPanel( Panel panel )
     {
-      if( m_fixedHeadersHostPanel == fixedHeadersHostPanel )
+      if( m_fixedHeadersHostPanel == panel )
         return;
 
-      m_fixedHeadersHostPanel = fixedHeadersHostPanel;
+      m_fixedHeadersHostPanel = panel;
 
       if( m_fixedHeadersHostPanel != null )
+      {
         DataGridControl.RefreshFixedHeaderFooter( this, m_fixedHeadersHostPanel, this.GetView().FixedHeaders );
+      }
     }
 
-    #endregion FixedHeadersHostPanel Property
+    private Panel m_fixedHeadersHostPanel;
 
-    #region FixedFootersHostPanel Property
+    #endregion
 
-    private Panel m_fixedFootersHostPanel;
+    #region FixedFootersHostPanel Property
 
     internal Panel FixedFootersHostPanel
     {
@@ -1317,23 +1298,30 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void SetFixedFootersHostPanel( Panel fixedFootersHostPanel )
+    private void SetFixedFootersHostPanel( Panel panel )
     {
-      if( m_fixedFootersHostPanel == fixedFootersHostPanel )
+      if( m_fixedFootersHostPanel == panel )
         return;
 
-      m_fixedFootersHostPanel = fixedFootersHostPanel;
+      m_fixedFootersHostPanel = panel;
 
       if( m_fixedFootersHostPanel != null )
+      {
         DataGridControl.RefreshFixedHeaderFooter( this, m_fixedFootersHostPanel, this.GetView().FixedFooters );
+      }
     }
 
-    #endregion FixedFootersHostPanel Property
+    private Panel m_fixedFootersHostPanel;
+
+    #endregion
 
     #region IsFixedHeadersHost Attached Property
 
     public static readonly DependencyProperty IsFixedHeadersHostProperty = DependencyProperty.RegisterAttached(
-      "IsFixedHeadersHost", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsFixedHeadersHost_Changed ) ) );
+      "IsFixedHeadersHost",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsFixedHeadersHost_Changed ) ) );
 
     public static bool GetIsFixedHeadersHost( DependencyObject obj )
     {
@@ -1350,29 +1338,28 @@ namespace Xceed.Wpf.DataGrid
       if( !( bool )e.NewValue )
         return;
 
-      Panel panel = sender as Panel;
-
+      var panel = sender as Panel;
       if( panel == null )
         return;
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( sender );
-
-      DataGridControl grid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
+      var dataGridContext = DataGridControl.GetDataGridContext( sender );
+      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
 
-      if( grid != null )
+      if( dataGridControl != null )
       {
-        grid.SetFixedHeadersHostPanel( panel );
+        dataGridControl.SetFixedHeadersHostPanel( panel );
       }
     }
 
-    #endregion IsFixedHeadersHost Attached Property
+    #endregion
 
     #region IsFixedFootersHost Attached Property
 
-    public static readonly DependencyProperty IsFixedFootersHostProperty =
-        DependencyProperty.RegisterAttached( "IsFixedFootersHost", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsFixedFootersHost_Changed ) ) );
+    public static readonly DependencyProperty IsFixedFootersHostProperty = DependencyProperty.RegisterAttached(
+      "IsFixedFootersHost",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsFixedFootersHost_Changed ) ) );
 
     public static bool GetIsFixedFootersHost( DependencyObject obj )
     {
@@ -1389,29 +1376,28 @@ namespace Xceed.Wpf.DataGrid
       if( !( bool )e.NewValue )
         return;
 
-      Panel panel = sender as Panel;
-
+      var panel = sender as Panel;
       if( panel == null )
         return;
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( sender );
-
-      DataGridControl grid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
+      var dataGridContext = DataGridControl.GetDataGridContext( sender );
+      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
 
-      if( grid != null )
+      if( dataGridControl != null )
       {
-        grid.SetFixedFootersHostPanel( panel );
+        dataGridControl.SetFixedFootersHostPanel( panel );
       }
     }
 
-    #endregion IsFixedFootersHost Attached Property
+    #endregion
 
     #region ItemsPrimaryAxis Property
 
-    public static readonly DependencyProperty ItemsPrimaryAxisProperty =
-        DependencyProperty.Register( "ItemsPrimaryAxis", typeof( PrimaryAxis ), typeof( DataGridControl ), new UIPropertyMetadata( PrimaryAxis.Vertical ) );
+    public static readonly DependencyProperty ItemsPrimaryAxisProperty = DependencyProperty.Register(
+      "ItemsPrimaryAxis",
+      typeof( PrimaryAxis ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( PrimaryAxis.Vertical ) );
 
     public PrimaryAxis ItemsPrimaryAxis
     {
@@ -1425,22 +1411,22 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemsPrimaryAxis Property
+    #endregion
 
     #region View Property
 
     public static readonly DependencyProperty ViewProperty = DependencyProperty.Register(
       "View",
-      typeof( Xceed.Wpf.DataGrid.Views.UIViewBase ),
+      typeof( UIViewBase ),
       typeof( DataGridControl ),
       new UIPropertyMetadata( null, new PropertyChangedCallback( DataGridControl.OnViewChanged ), new CoerceValueCallback( DataGridControl.ViewCoerceValueCallback ) ) );
 
     [TypeConverter( typeof( Markup.ViewConverter ) )]
-    public Xceed.Wpf.DataGrid.Views.UIViewBase View
+    public UIViewBase View
     {
       get
       {
-        return ( Xceed.Wpf.DataGrid.Views.UIViewBase )this.GetValue( DataGridControl.ViewProperty );
+        return ( UIViewBase )this.GetValue( DataGridControl.ViewProperty );
       }
       set
       {
@@ -1453,9 +1439,11 @@ namespace Xceed.Wpf.DataGrid
 
     private static object ViewCoerceValueCallback( DependencyObject sender, object value )
     {
-      var view = value as Xceed.Wpf.DataGrid.Views.UIViewBase;
-      if( ( view == null ) && ( sender is DataGridControl ) )
-        return ( ( DataGridControl )sender ).GetDefaultView();
+      var view = value as UIViewBase;
+      var dataGridControl = sender as DataGridControl;
+
+      if( ( view == null ) && ( dataGridControl != null ) )
+        return dataGridControl.GetDefaultView();
 
       if( view != null )
       {
@@ -1468,18 +1456,20 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnViewChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl grid = ( DataGridControl )sender;
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
 
-      //for case 1044618: leave edition mode (cancel) when view changes
-      grid.CancelEdit();
+      // Cannot stay in editing mode when the view is changed
+      self.CancelEdit();
 
-      var oldView = ( Xceed.Wpf.DataGrid.Views.ViewBase )e.OldValue;
-      var newView = ( Xceed.Wpf.DataGrid.Views.ViewBase )e.NewValue;
+      var oldView = e.OldValue as Views.ViewBase;
+      var newView = e.NewValue as Views.ViewBase;
 
-      grid.OnViewChanged( oldView, newView );
+      self.OnViewChanged( oldView, newView );
     }
 
-    private void OnViewChanged( Xceed.Wpf.DataGrid.Views.ViewBase oldView, Xceed.Wpf.DataGrid.Views.ViewBase newView )
+    private void OnViewChanged( Views.ViewBase oldView, Views.ViewBase newView )
     {
       if( oldView != null )
       {
@@ -1518,7 +1508,6 @@ namespace Xceed.Wpf.DataGrid
       // as the old ones). So, we have to force the new templates. This is mainly to setup the new ViewBindings.
       this.ReapplyTemplate();
 
-
       if( this.ViewChanged != null )
       {
         this.ViewChanged( this, EventArgs.Empty );
@@ -1534,14 +1523,17 @@ namespace Xceed.Wpf.DataGrid
       this.DelayBringIntoViewAndFocusCurrent( DispatcherPriority.Render, AutoScrollCurrentItemSourceTriggers.ViewChanged );
     }
 
-    private Xceed.Wpf.DataGrid.Views.UIViewBase m_defaultView;
+    private UIViewBase m_defaultView;
 
-    #endregion View Property
+    #endregion
 
     #region GroupLevelDescriptions Read-Only Property
 
-    private static readonly DependencyPropertyKey GroupLevelDescriptionsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "GroupLevelDescriptions", typeof( GroupLevelDescriptionCollection ), typeof( DataGridControl ), new PropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey GroupLevelDescriptionsPropertyKey = DependencyProperty.RegisterReadOnly(
+      "GroupLevelDescriptions",
+      typeof( GroupLevelDescriptionCollection ),
+      typeof( DataGridControl ),
+      new PropertyMetadata( null ) );
 
     public static readonly DependencyProperty GroupLevelDescriptionsProperty;
 
@@ -1553,34 +1545,14 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion GroupLevelDescriptions Read-Only Property
-
-    #region DetailConfigurations Read-Only Property
-
-    private static readonly DependencyPropertyKey DetailConfigurationsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "DetailConfigurations", typeof( DetailConfigurationCollection ), typeof( DataGridControl ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty DetailConfigurationsProperty;
-
-    internal DetailConfigurationCollection DetailConfigurations
-    {
-      get
-      {
-        return ( DetailConfigurationCollection )this.GetValue( DataGridControl.DetailConfigurationsProperty );
-      }
-    }
-
-    internal void SetDetailConfigurations( DetailConfigurationCollection value )
-    {
-      this.SetValue( DataGridControl.DetailConfigurationsPropertyKey, value );
-    }
-
-    #endregion DetailConfigurations Read-Only Property
+    #endregion
 
     #region NavigationBehavior Property
 
     public static readonly DependencyProperty NavigationBehaviorProperty = DependencyProperty.RegisterAttached(
-      "NavigationBehavior", typeof( NavigationBehavior ), typeof( DataGridControl ),
+      "NavigationBehavior",
+      typeof( NavigationBehavior ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( NavigationBehavior.CellOnly, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public NavigationBehavior NavigationBehavior
@@ -1595,12 +1567,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion NavigationBehavior Property
+    #endregion
 
     #region PagingBehavior Property
 
-    public static readonly DependencyProperty PagingBehaviorProperty =
-      DependencyProperty.Register(
+    public static readonly DependencyProperty PagingBehaviorProperty = DependencyProperty.Register(
       "PagingBehavior",
       typeof( PagingBehavior ),
       typeof( DataGridControl ),
@@ -1618,7 +1589,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PagingBehavior Property
+    #endregion
 
     #region ItemScrollingBehavior Property
 
@@ -1640,7 +1611,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemScrollingBehavior Property
+    #endregion
 
     #region CurrentRowInEditionState Read-Only Property
 
@@ -1652,7 +1623,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CurrentRowInEditionState Read-Only Property
+    #endregion
 
     #region CurrentItemInEdition Read-Only Property
 
@@ -1664,7 +1635,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CurrentItemInEdition Read-Only Property
+    #endregion
 
     #region FixedItem Attached Property
 
@@ -1672,7 +1643,9 @@ namespace Xceed.Wpf.DataGrid
 
     // The ownerType is set to FrameworkElement to make the inheritance works for all grid elements.
     private static readonly DependencyProperty FixedItemProperty = DependencyProperty.RegisterAttached(
-      "FixedItem", typeof( object ), typeof( DataGridControl ),
+      "FixedItem",
+      typeof( object ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( DataGridControl.NotSet, FrameworkPropertyMetadataOptions.Inherits ) );
 
     private static object GetFixedItem( DependencyObject obj )
@@ -1685,7 +1658,7 @@ namespace Xceed.Wpf.DataGrid
       obj.SetValue( DataGridControl.FixedItemProperty, value );
     }
 
-    #endregion FixedItem Attached Property
+    #endregion
 
     #region Hidden Properties
 
@@ -1754,7 +1727,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Hidden Properties
+    #endregion
 
     #region ItemContainerGenerator Property
 
@@ -1769,7 +1742,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemContainerGenerator Property
+    #endregion
 
     #region CustomItemContainerGenerator Property
 
@@ -1781,15 +1754,17 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CustomItemContainerGenerator Property
+    #endregion
 
     #region IsBeingEdited Property
 
-    private static readonly DependencyPropertyKey IsBeingEditedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsBeingEdited", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    private static readonly DependencyPropertyKey IsBeingEditedPropertyKey = DependencyProperty.RegisterReadOnly(
+      "IsBeingEdited",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty IsBeingEditedProperty =
-      IsBeingEditedPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty IsBeingEditedProperty = IsBeingEditedPropertyKey.DependencyProperty;
 
     public bool IsBeingEdited
     {
@@ -1801,22 +1776,21 @@ namespace Xceed.Wpf.DataGrid
 
     private void UpdateIsBeingEdited()
     {
-      bool isBeingEdited = ( m_currentItemInEdition != null );
+      var isBeingEdited = ( m_currentItemInEdition != null );
+      if( isBeingEdited == this.IsBeingEdited )
+        return;
 
-      if( isBeingEdited != this.IsBeingEdited )
+      if( isBeingEdited )
       {
-        if( isBeingEdited )
-        {
-          this.SetValue( DataGridControl.IsBeingEditedPropertyKey, isBeingEdited );
-        }
-        else
-        {
-          this.ClearValue( DataGridControl.IsBeingEditedPropertyKey );
-        }
+        this.SetValue( DataGridControl.IsBeingEditedPropertyKey, isBeingEdited );
+      }
+      else
+      {
+        this.ClearValue( DataGridControl.IsBeingEditedPropertyKey );
       }
     }
 
-    #endregion IsBeingEdited Property
+    #endregion
 
     #region DataGridContext Read-Only Property
 
@@ -1832,8 +1806,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region GroupConfigurationSelector Property
 
-    public static readonly DependencyProperty GroupConfigurationSelectorProperty =
-        DependencyProperty.Register( "GroupConfigurationSelector", typeof( GroupConfigurationSelector ), typeof( DataGridControl ), new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnGroupConfigurationSelectorChanged ) ) );
+    public static readonly DependencyProperty GroupConfigurationSelectorProperty = DependencyProperty.Register(
+      "GroupConfigurationSelector",
+      typeof( GroupConfigurationSelector ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnGroupConfigurationSelectorChanged ) ) );
 
     public GroupConfigurationSelector GroupConfigurationSelector
     {
@@ -1851,22 +1828,26 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnGroupConfigurationSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = sender as DataGridControl;
-      if( dataGridControl != null )
-      {
-        if( dataGridControl.GroupConfigurationSelectorChanged != null )
-        {
-          dataGridControl.GroupConfigurationSelectorChanged( dataGridControl, EventArgs.Empty );
-        }
-      }
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
+
+      var handler = self.GroupConfigurationSelectorChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( self, EventArgs.Empty );
     }
 
-    #endregion GroupConfigurationSelector Property
+    #endregion
 
     #region AllowDetailToggle Property
 
-    public static readonly DependencyProperty AllowDetailToggleProperty =
-        DependencyProperty.Register( "AllowDetailToggle", typeof( bool ), typeof( DataGridControl ), new FrameworkPropertyMetadata( true, new PropertyChangedCallback( OnAllowDetailToggleChanged ) ) );
+    public static readonly DependencyProperty AllowDetailToggleProperty = DependencyProperty.Register(
+      "AllowDetailToggle",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( true, new PropertyChangedCallback( DataGridControl.OnAllowDetailToggleChanged ) ) );
 
     public bool AllowDetailToggle
     {
@@ -1884,22 +1865,26 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnAllowDetailToggleChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = sender as DataGridControl;
-      if( dataGridControl != null )
-      {
-        if( dataGridControl.AllowDetailToggleChanged != null )
-        {
-          dataGridControl.AllowDetailToggleChanged( dataGridControl, EventArgs.Empty );
-        }
-      }
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
+
+      var handler = self.AllowDetailToggleChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( self, EventArgs.Empty );
     }
 
-    #endregion AllowDetailToggle Property
+    #endregion
 
     #region DefaultDetailConfiguration Property
 
-    public static readonly DependencyProperty DefaultDetailConfigurationProperty =
-        DependencyProperty.Register( "DefaultDetailConfiguration", typeof( DefaultDetailConfiguration ), typeof( DataGridControl ), new FrameworkPropertyMetadata( null ) );
+    public static readonly DependencyProperty DefaultDetailConfigurationProperty = DependencyProperty.Register(
+      "DefaultDetailConfiguration",
+      typeof( DefaultDetailConfiguration ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( null ) );
 
     public DefaultDetailConfiguration DefaultDetailConfiguration
     {
@@ -1913,12 +1898,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion DefaultDetailConfiguration Property
+    #endregion
 
     #region DefaultGroupConfiguration Property
 
-    public static readonly DependencyProperty DefaultGroupConfigurationProperty =
-        DependencyProperty.Register( "DefaultGroupConfiguration", typeof( GroupConfiguration ), typeof( DataGridControl ), new FrameworkPropertyMetadata( null ) );
+    public static readonly DependencyProperty DefaultGroupConfigurationProperty = DependencyProperty.Register(
+      "DefaultGroupConfiguration",
+      typeof( GroupConfiguration ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( null ) );
 
     public GroupConfiguration DefaultGroupConfiguration
     {
@@ -1932,12 +1920,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion DefaultGroupConfiguration Property
+    #endregion
 
     #region ContainerGroupConfiguration Attached Property
 
-    internal static readonly DependencyProperty ContainerGroupConfigurationProperty =
-        DependencyProperty.RegisterAttached( "ContainerGroupConfiguration", typeof( GroupConfiguration ), typeof( DataGridControl ), new UIPropertyMetadata( null ) );
+    internal static readonly DependencyProperty ContainerGroupConfigurationProperty = DependencyProperty.RegisterAttached(
+      "ContainerGroupConfiguration",
+      typeof( GroupConfiguration ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( null ) );
 
     internal static GroupConfiguration GetContainerGroupConfiguration( DependencyObject obj )
     {
@@ -1949,7 +1940,7 @@ namespace Xceed.Wpf.DataGrid
       obj.SetValue( DataGridControl.ContainerGroupConfigurationProperty, value );
     }
 
-    #endregion ContainerGroupConfiguration Attached Property
+    #endregion
 
     #region ItemsSourceName Property
 
@@ -1964,8 +1955,12 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
+        if( value == m_itemsSourceName )
+          return;
+
         m_itemsSourceName = value;
-        this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "ItemsSourceName" ) );
+
+        this.OnPropertyChanged( "ItemsSourceName" );
       }
     }
 
@@ -1976,8 +1971,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region ItemsSourceNameTemplate Property
 
-    public static readonly DependencyProperty ItemsSourceNameTemplateProperty =
-        DependencyProperty.Register( "ItemsSourceNameTemplate", typeof( DataTemplate ), typeof( DataGridControl ), new UIPropertyMetadata( null ) );
+    public static readonly DependencyProperty ItemsSourceNameTemplateProperty = DependencyProperty.Register(
+      "ItemsSourceNameTemplate",
+      typeof( DataTemplate ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( null ) );
 
     public DataTemplate ItemsSourceNameTemplate
     {
@@ -1991,31 +1989,33 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemsSourceNameTemplate Property
+    #endregion
 
     #region UpdateSourceTrigger Property
 
-    public static readonly DependencyProperty UpdateSourceTriggerProperty =
-        DependencyProperty.Register( "UpdateSourceTrigger", typeof( DataGridUpdateSourceTrigger ), typeof( DataGridControl ), new UIPropertyMetadata( DataGridUpdateSourceTrigger.RowEndingEdit ) );
+    public static readonly DependencyProperty UpdateSourceTriggerProperty = DependencyProperty.Register(
+      "UpdateSourceTrigger",
+      typeof( DataGridUpdateSourceTrigger ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( DataGridUpdateSourceTrigger.RowEndingEdit ) );
 
     public DataGridUpdateSourceTrigger UpdateSourceTrigger
     {
       get
       {
-        return ( DataGridUpdateSourceTrigger )GetValue( UpdateSourceTriggerProperty );
+        return ( DataGridUpdateSourceTrigger )this.GetValue( DataGridControl.UpdateSourceTriggerProperty );
       }
       set
       {
-        SetValue( UpdateSourceTriggerProperty, value );
+        this.SetValue( DataGridControl.UpdateSourceTriggerProperty, value );
       }
     }
 
-    #endregion UpdateSourceTrigger Property
+    #endregion
 
     #region ForceGeneratorReset Property
 
-    // This property is used to avoid a reset when Column Virtualization is
-    // on and all Row instances are using FixedCellPanel as PART_CellsHost
+    // This property is used to avoid a reset when Column Virtualization is on and all Row instances are using FixedCellPanel as PART_CellsHost
     internal bool ForceGeneratorReset
     {
       get
@@ -2038,7 +2038,6 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-
         if( m_clipboardExporters == null )
         {
           m_clipboardExporters = new Dictionary<string, ClipboardExporterBase>();
@@ -2056,8 +2055,13 @@ namespace Xceed.Wpf.DataGrid
             csvClipboardExporter.FormatSettings.Separator = '\t';
             csvClipboardExporter.FormatSettings.TextQualifier = '"';
             m_clipboardExporters.Add( DataFormats.Text, csvClipboardExporter );
-          }
 
+            // Configure HTML exporter
+            m_clipboardExporters.Add( DataFormats.Html, new HtmlClipboardExporter() );
+
+            // Configure Unicode ClipboardExporter 
+            m_clipboardExporters.Add( DataFormats.UnicodeText, new UnicodeCsvClipboardExporter() );
+          }
         }
 
         return m_clipboardExporters;
@@ -2070,8 +2074,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region IsDeleteCommandEnabled Property
 
-    public static readonly DependencyProperty IsDeleteCommandEnabledProperty =
-      DependencyProperty.Register( "IsDeleteCommandEnabled", typeof( bool ), typeof( DataGridControl ), new FrameworkPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsDeleteCommandEnabledChanged ) ) );
+    public static readonly DependencyProperty IsDeleteCommandEnabledProperty = DependencyProperty.Register(
+      "IsDeleteCommandEnabled",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsDeleteCommandEnabledChanged ) ) );
 
     public bool IsDeleteCommandEnabled
     {
@@ -2085,28 +2092,29 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnIsDeleteCommandEnabledChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    private static void OnIsDeleteCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = obj as DataGridControl;
-
-      if( dataGridControl == null )
+      var self = sender as DataGridControl;
+      if( self == null )
         return;
 
       // On keep the command binding active if it is required
       if( ( bool )e.NewValue )
       {
-        if( !dataGridControl.CommandBindings.Contains( dataGridControl.m_deleteCommandBinding ) )
-          dataGridControl.CommandBindings.Add( dataGridControl.m_deleteCommandBinding );
+        if( !self.CommandBindings.Contains( self.m_deleteCommandBinding ) )
+        {
+          self.CommandBindings.Add( self.m_deleteCommandBinding );
+        }
       }
       else
       {
-        dataGridControl.CommandBindings.Remove( dataGridControl.m_deleteCommandBinding );
+        self.CommandBindings.Remove( self.m_deleteCommandBinding );
       }
 
       CommandManager.InvalidateRequerySuggested();
     }
 
-    #endregion IsDeleteCommandEnabled Property
+    #endregion
 
     #region IsCopyCommandEnabled Property
 
@@ -2128,22 +2136,23 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnIsCopyCommandEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    private static void OnIsCopyCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = o as DataGridControl;
-
-      if( dataGridControl == null )
+      var self = sender as DataGridControl;
+      if( self == null )
         return;
 
       // On keep the command binding active if it is required
       if( ( bool )e.NewValue )
       {
-        if( !dataGridControl.CommandBindings.Contains( dataGridControl.m_copyCommandBinding ) )
-          dataGridControl.CommandBindings.Add( dataGridControl.m_copyCommandBinding );
+        if( !self.CommandBindings.Contains( self.m_copyCommandBinding ) )
+        {
+          self.CommandBindings.Add( self.m_copyCommandBinding );
+        }
       }
       else
       {
-        dataGridControl.CommandBindings.Remove( dataGridControl.m_copyCommandBinding );
+        self.CommandBindings.Remove( self.m_copyCommandBinding );
       }
 
       CommandManager.InvalidateRequerySuggested();
@@ -2153,8 +2162,10 @@ namespace Xceed.Wpf.DataGrid
 
     #region IsRefreshCommandEnabled Property
 
-    public static readonly DependencyProperty IsRefreshCommandEnabledProperty =
-      DependencyProperty.Register( "IsRefreshCommandEnabled", typeof( bool ), typeof( DataGridControl ),
+    public static readonly DependencyProperty IsRefreshCommandEnabledProperty = DependencyProperty.Register(
+      "IsRefreshCommandEnabled",
+      typeof( bool ),
+      typeof( DataGridControl ),
       new FrameworkPropertyMetadata( true, new PropertyChangedCallback( DataGridControl.OnIsRefreshCommandEnabledChanged ) ) );
 
     public bool IsRefreshCommandEnabled
@@ -2169,34 +2180,37 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private static void OnIsRefreshCommandEnabledChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    private static void OnIsRefreshCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = obj as DataGridControl;
-
-      if( dataGridControl == null )
+      var self = sender as DataGridControl;
+      if( self == null )
         return;
 
       // On keep the command binding active if it is required
       if( ( bool )e.NewValue )
       {
-        if( !dataGridControl.CommandBindings.Contains( dataGridControl.m_refreshCommandBinding ) )
-          dataGridControl.CommandBindings.Add( dataGridControl.m_refreshCommandBinding );
+        if( !self.CommandBindings.Contains( self.m_refreshCommandBinding ) )
+        {
+          self.CommandBindings.Add( self.m_refreshCommandBinding );
+        }
       }
       else
       {
-        dataGridControl.CommandBindings.Remove( dataGridControl.m_refreshCommandBinding );
+        self.CommandBindings.Remove( self.m_refreshCommandBinding );
       }
 
       CommandManager.InvalidateRequerySuggested();
     }
 
-    #endregion IsRefreshCommandEnabled Property
+    #endregion
 
     #region MaxSortLevels Property
 
-    public static readonly DependencyProperty MaxSortLevelsProperty =
-        DependencyProperty.Register( "MaxSortLevels", typeof( int ), typeof( DataGridControl ),
-        new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxSortLevelsChanged ) ) );
+    public static readonly DependencyProperty MaxSortLevelsProperty = DependencyProperty.Register(
+      "MaxSortLevels",
+      typeof( int ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxSortLevelsChanged ) ) );
 
     public int MaxSortLevels
     {
@@ -2214,23 +2228,26 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnMaxSortLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = sender as DataGridControl;
-      if( dataGridControl != null )
-      {
-        if( dataGridControl.MaxSortLevelsChanged != null )
-        {
-          dataGridControl.MaxSortLevelsChanged( dataGridControl, EventArgs.Empty );
-        }
-      }
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
+
+      var handler = self.MaxSortLevelsChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( self, EventArgs.Empty );
     }
 
-    #endregion MaxSortLevels Property
+    #endregion
 
     #region MaxGroupLevels Property
 
-    public static readonly DependencyProperty MaxGroupLevelsProperty =
-        DependencyProperty.Register( "MaxGroupLevels", typeof( int ), typeof( DataGridControl ),
-        new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxGroupLevelsChanged ) ) );
+    public static readonly DependencyProperty MaxGroupLevelsProperty = DependencyProperty.Register(
+      "MaxGroupLevels",
+      typeof( int ),
+      typeof( DataGridControl ),
+      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxGroupLevelsChanged ) ) );
 
     public int MaxGroupLevels
     {
@@ -2248,63 +2265,73 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnMaxGroupLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DataGridControl dataGridControl = sender as DataGridControl;
-      if( dataGridControl != null )
-      {
-        if( dataGridControl.MaxGroupLevelsChanged != null )
-        {
-          dataGridControl.MaxGroupLevelsChanged( dataGridControl, EventArgs.Empty );
-        }
-      }
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
+
+      var handler = self.MaxGroupLevelsChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( self, EventArgs.Empty );
     }
 
-    #endregion MaxGroupLevels Property
+    #endregion
 
     #region SynchronizeSelectionWithCurrent Property
 
-    public static readonly DependencyProperty SynchronizeSelectionWithCurrentProperty =
-        DependencyProperty.Register( "SynchronizeSelectionWithCurrent", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    public static readonly DependencyProperty SynchronizeSelectionWithCurrentProperty = DependencyProperty.Register(
+      "SynchronizeSelectionWithCurrent",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
     public bool SynchronizeSelectionWithCurrent
     {
       get
       {
-        return ( bool )GetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty );
+        return ( bool )this.GetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty );
       }
       set
       {
-        SetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty, value );
+        this.SetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty, value );
       }
     }
 
-    #endregion SynchronizeSelectionWithCurrent Property
+    #endregion
 
     #region SynchronizeCurrent Property
 
-    public static readonly DependencyProperty SynchronizeCurrentProperty =
-        DependencyProperty.Register( "SynchronizeCurrent", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( true ) );
+    public static readonly DependencyProperty SynchronizeCurrentProperty = DependencyProperty.Register(
+      "SynchronizeCurrent",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( true ) );
 
     public bool SynchronizeCurrent
     {
       get
       {
-        return ( bool )GetValue( DataGridControl.SynchronizeCurrentProperty );
+        return ( bool )this.GetValue( DataGridControl.SynchronizeCurrentProperty );
       }
       set
       {
-        SetValue( DataGridControl.SynchronizeCurrentProperty, value );
+        this.SetValue( DataGridControl.SynchronizeCurrentProperty, value );
       }
     }
 
-    #endregion SynchronizeCurrent Property
+    #endregion
 
     #region PreserveExtendedSelection Property
 
     [Obsolete( "The PreserveExtendedSelection dependency property is obsolete.", false )]
     [Browsable( false )]
     [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty PreserveExtendedSelectionProperty =
-        DependencyProperty.Register( "PreserveExtendedSelection", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    public static readonly DependencyProperty PreserveExtendedSelectionProperty = DependencyProperty.Register(
+      "PreserveExtendedSelection",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
     [Obsolete( "The PreserveExtendedSelection property is obsolete.", false )]
     [Browsable( false )]
@@ -2314,26 +2341,29 @@ namespace Xceed.Wpf.DataGrid
       get
       {
 #pragma warning disable 618
-        return ( bool )GetValue( DataGridControl.PreserveExtendedSelectionProperty );
+        return ( bool )this.GetValue( DataGridControl.PreserveExtendedSelectionProperty );
 #pragma warning restore 618
       }
       set
       {
 #pragma warning disable 618
-        SetValue( DataGridControl.PreserveExtendedSelectionProperty, value );
+        this.SetValue( DataGridControl.PreserveExtendedSelectionProperty, value );
 #pragma warning restore 618
       }
     }
 
-    #endregion PreserveExtendedSelection
+    #endregion
 
     #region PreserveSelectionWhenEnteringEdit Property
 
     [Obsolete( "The PreserveSelectionWhenEnteringEdit dependency property is obsolete.", false )]
     [Browsable( false )]
     [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty PreserveSelectionWhenEnteringEditProperty =
-        DependencyProperty.Register( "PreserveSelectionWhenEnteringEdit", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false ) );
+    public static readonly DependencyProperty PreserveSelectionWhenEnteringEditProperty = DependencyProperty.Register(
+      "PreserveSelectionWhenEnteringEdit",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false ) );
 
     [Obsolete( "The PreserveSelectionWhenEnteringEdit property is obsolete.", false )]
     [Browsable( false )]
@@ -2343,18 +2373,18 @@ namespace Xceed.Wpf.DataGrid
       get
       {
 #pragma warning disable 618
-        return ( bool )GetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty );
+        return ( bool )this.GetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty );
 #pragma warning restore 618
       }
       set
       {
 #pragma warning disable 618
-        SetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty, value );
+        this.SetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty, value );
 #pragma warning restore 618
       }
     }
 
-    #endregion PreserveSelectionWhenEnteringEdit
+    #endregion
 
     #region ItemsSourceChangedDelayed Private Property
 
@@ -2404,6 +2434,20 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region ColumnManagerRowConfiguration Internal Property
+
+    internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
+    {
+      get
+      {
+        return m_columnManagerRowConfiguration;
+      }
+    }
+
+    private readonly ColumnManagerRowConfiguration m_columnManagerRowConfiguration;
+
+    #endregion
+
     #region IsBoundToDataGridVirtualizingCollectionViewBase Private Property
 
     private bool IsBoundToDataGridVirtualizingCollectionViewBase
@@ -2464,6 +2508,18 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region MouseDownSelectionRangePoint Property
+
+    internal SelectionRangePoint MouseDownSelectionRangePoint
+    {
+      get
+      {
+        return m_mouseDownSelectionRangePoint;
+      }
+    }
+
+    #endregion
+
     #region HandlesScrolling Property
 
     protected override bool HandlesScrolling
@@ -2478,8 +2534,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region ConnectionState ReadOnly Dependency Property
 
-    private static readonly DependencyPropertyKey ConnectionStatePropertyKey =
-        DependencyProperty.RegisterReadOnly( "ConnectionState", typeof( DataGridConnectionState ), typeof( DataGridControl ), new UIPropertyMetadata( DataGridConnectionState.Idle ) );
+    private static readonly DependencyPropertyKey ConnectionStatePropertyKey = DependencyProperty.RegisterReadOnly(
+      "ConnectionState",
+      typeof( DataGridConnectionState ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( DataGridConnectionState.Idle ) );
 
     public static readonly DependencyProperty ConnectionStateProperty = DataGridControl.ConnectionStatePropertyKey.DependencyProperty;
 
@@ -2503,12 +2562,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ConnectionState ReadOnly Dependency Property
+    #endregion
 
     #region ConnectionError ReadOnly Dependency Property
 
-    private static readonly DependencyPropertyKey ConnectionErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "ConnectionError", typeof( object ), typeof( DataGridControl ), new UIPropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey ConnectionErrorPropertyKey = DependencyProperty.RegisterReadOnly(
+      "ConnectionError",
+      typeof( object ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( null ) );
 
     public static readonly DependencyProperty ConnectionErrorProperty = DataGridControl.ConnectionErrorPropertyKey.DependencyProperty;
 
@@ -2532,7 +2594,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ConnectionError ReadOnly Dependency Property
+    #endregion
 
     #region DeferInitialLayoutPass Property
 
@@ -2556,47 +2618,70 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region AreDetailsFlatten Internal Property
+    #region ItemsSourcePropertyDescriptions Internal Property
 
-    internal bool AreDetailsFlatten
+    internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
     {
       get
       {
-        var currentView = this.GetView( false );
-        if( currentView == null )
-          return false;
+        return m_itemsSourcePropertyDescriptions;
+      }
+    }
 
-        var attributes = currentView.GetType().GetCustomAttributes( typeof( MasterDetailLayoutAttribute ), true );
-        if( ( attributes == null ) || ( attributes.Length == 0 ) )
-          return false;
+    private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions = new PropertyDescriptionRouteDictionary();
+
+    #endregion
 
-        var attribute = ( MasterDetailLayoutAttribute )attributes[ 0 ];
+    #region ItemPropertyMap Internal Property
 
-        return ( attribute.MasterDetailLayoutMode == MasterDetailLayoutMode.Flatten );
+    internal DataGridItemPropertyMap ItemPropertyMap
+    {
+      get
+      {
+        return m_itemPropertyMap;
       }
     }
 
+    private readonly DataGridItemPropertyMap m_itemPropertyMap = new DataGridItemPropertyMap();
+
     #endregion
 
-    #region GridUniqueName "conditional" Property
+    #region AreDetailsFlatten Internal Property
 
-    private string GridUniqueName
+    internal bool AreDetailsFlatten
     {
       get
       {
-        return m_gridUniqueName;
-      }
-      set
-      {
-        if( value != m_gridUniqueName )
+        var view = this.GetView();
+        if( view == null )
+          return false;
+
+        var viewType = view.GetType();
+        if( viewType != m_areDetailsFlattenCache.Key )
         {
-          m_gridUniqueName = value;
-          m_customItemContainerGenerator.ResetLog( value );
+          var attributes = viewType.GetCustomAttributes( typeof( MasterDetailLayoutAttribute ), true );
+          var flatten = ( attributes != null )
+                     && ( attributes.Length > 0 )
+                     && ( ( ( MasterDetailLayoutAttribute )attributes[ 0 ] ).MasterDetailLayoutMode == MasterDetailLayoutMode.Flatten );
+
+          m_areDetailsFlattenCache = new KeyValuePair<Type, bool>( viewType, flatten );
         }
+
+        return m_areDetailsFlattenCache.Value;
       }
     }
 
-    private string m_gridUniqueName;
+    private KeyValuePair<Type, bool> m_areDetailsFlattenCache;
+
+    #endregion
+
+    #region GridUniqueName Property
+
+    internal string GridUniqueName
+    {
+      get;
+      set;
+    }
 
     #endregion
 
@@ -2606,24 +2691,28 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region DetailsChanged event
+    #region DetailsChanged Event
 
     internal event EventHandler DetailsChanged;
 
     private void OnDetailsChanged( object sender, EventArgs e )
     {
-      if( this.DetailsChanged != null )
-      {
-        this.DetailsChanged( sender, e );
-      }
+      var handler = this.DetailsChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( sender, e );
     }
 
     #endregion
 
     #region DeletingSelectedItems Event
 
-    public static readonly RoutedEvent DeletingSelectedItemsEvent =
-      EventManager.RegisterRoutedEvent( "DeletingSelectedItems", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( DataGridControl ) );
+    public static readonly RoutedEvent DeletingSelectedItemsEvent = EventManager.RegisterRoutedEvent(
+      "DeletingSelectedItems",
+      RoutingStrategy.Bubble,
+      typeof( CancelRoutedEventHandler ),
+      typeof( DataGridControl ) );
 
     public event CancelRoutedEventHandler DeletingSelectedItems
     {
@@ -2642,12 +2731,15 @@ namespace Xceed.Wpf.DataGrid
       this.RaiseEvent( e );
     }
 
-    #endregion DeletingSelectedItems Event
+    #endregion
 
     #region SelectedItemsDeleted Event
 
-    public static readonly RoutedEvent SelectedItemsDeletedEvent =
-      EventManager.RegisterRoutedEvent( "SelectedItemsDeleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DataGridControl ) );
+    public static readonly RoutedEvent SelectedItemsDeletedEvent = EventManager.RegisterRoutedEvent(
+      "SelectedItemsDeleted",
+      RoutingStrategy.Bubble,
+      typeof( RoutedEventHandler ),
+      typeof( DataGridControl ) );
 
     public event RoutedEventHandler SelectedItemsDeleted
     {
@@ -2663,16 +2755,18 @@ namespace Xceed.Wpf.DataGrid
 
     protected virtual void OnSelectedItemsDeleted()
     {
-      RoutedEventArgs e = new RoutedEventArgs( DataGridControl.SelectedItemsDeletedEvent, this );
-      this.RaiseEvent( e );
+      this.RaiseEvent( new RoutedEventArgs( DataGridControl.SelectedItemsDeletedEvent, this ) );
     }
 
-    #endregion SelectedItemsDeleted Event
+    #endregion
 
     #region SelectionChanged Event
 
-    public static readonly RoutedEvent SelectionChangedEvent =
-      EventManager.RegisterRoutedEvent( "SelectionChanged", RoutingStrategy.Bubble, typeof( DataGridSelectionChangedEventHandler ), typeof( DataGridControl ) );
+    public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(
+      "SelectionChanged",
+      RoutingStrategy.Bubble,
+      typeof( DataGridSelectionChangedEventHandler ),
+      typeof( DataGridControl ) );
 
     public event DataGridSelectionChangedEventHandler SelectionChanged
     {
@@ -2696,12 +2790,15 @@ namespace Xceed.Wpf.DataGrid
       this.OnSelectionChanged( e );
     }
 
-    #endregion SelectionChanged Event
+    #endregion
 
     #region SelectionChanging Event
 
-    public static readonly RoutedEvent SelectionChangingEvent =
-      EventManager.RegisterRoutedEvent( "SelectionChanging", RoutingStrategy.Bubble, typeof( DataGridSelectionChangingEventHandler ), typeof( DataGridControl ) );
+    public static readonly RoutedEvent SelectionChangingEvent = EventManager.RegisterRoutedEvent(
+      "SelectionChanging",
+      RoutingStrategy.Bubble,
+      typeof( DataGridSelectionChangingEventHandler ),
+      typeof( DataGridControl ) );
 
     public event DataGridSelectionChangingEventHandler SelectionChanging
     {
@@ -2728,12 +2825,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion SelectionChanging Event
+    #endregion
 
     #region DeletingSelectedItemError Event
 
-    public static readonly RoutedEvent DeletingSelectedItemErrorEvent =
-      EventManager.RegisterRoutedEvent( "DeletingSelectedItemError", RoutingStrategy.Bubble, typeof( DeletingSelectedItemErrorRoutedEventHandler ), typeof( DataGridControl ) );
+    public static readonly RoutedEvent DeletingSelectedItemErrorEvent = EventManager.RegisterRoutedEvent(
+      "DeletingSelectedItemError",
+      RoutingStrategy.Bubble,
+      typeof( DeletingSelectedItemErrorRoutedEventHandler ),
+      typeof( DataGridControl ) );
 
     public event DeletingSelectedItemErrorRoutedEventHandler DeletingSelectedItemError
     {
@@ -2752,7 +2852,7 @@ namespace Xceed.Wpf.DataGrid
       this.RaiseEvent( e );
     }
 
-    #endregion DeletingSelectedItemError Event
+    #endregion
 
     #region CurrentChanging Event
 
@@ -2818,131 +2918,259 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Event handlers
+    #region SortDirectionChanging Event
 
-    private static void OnFlowDirectionPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    public static readonly RoutedEvent SortDirectionChangingEvent = EventManager.RegisterRoutedEvent(
+      "SortDirectionChanging",
+      RoutingStrategy.Bubble,
+      typeof( ColumnSortDirectionChangingEventHandler ),
+      typeof( DataGridControl ) );
+
+    public event ColumnSortDirectionChangingEventHandler SortDirectionChanging
     {
-      DataGridControl dataGrid = sender as DataGridControl;
-      if( dataGrid != null )
+      add
+      {
+        base.AddHandler( DataGridControl.SortDirectionChangingEvent, value );
+      }
+      remove
       {
-        dataGrid.CustomItemContainerGenerator.ResetGeneratorContent();
+        base.RemoveHandler( DataGridControl.SortDirectionChangingEvent, value );
       }
     }
 
-    private void OnDataGridCollectionView_RootGroupChanged( object sender, EventArgs e )
+    protected virtual void OnSortDirectionChanging( ColumnSortDirectionChangingEventArgs e )
     {
-      this.SetValue( DataGridControl.StatContextPropertyKey, ( ( DataGridCollectionView )sender ).RootGroup );
+      this.RaiseEvent( e );
     }
 
-    private void OnDetailConfigurationsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    internal void RaiseSortDirectionChanging( ColumnSortDirectionChangingEventArgs e )
     {
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "HasDetails" ) );
+      this.OnSortDirectionChanging( e );
+    }
 
-      DataGridDetailDescriptionCollection detailDescriptions = null;
-      DataGridCollectionViewBase dataGridCollectionViewBase = this.ItemsSource as DataGridCollectionViewBase;
+    #endregion
 
-      if( dataGridCollectionViewBase != null )
-        detailDescriptions = dataGridCollectionViewBase.DetailDescriptions;
+    #region GroupCollapsing Event
 
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Replace:
-        case NotifyCollectionChangedAction.Add:
-          DetailConfiguration.SynchronizeAddedConfigurations( e.NewItems, detailDescriptions );
-          break;
-        case NotifyCollectionChangedAction.Reset:
-        case NotifyCollectionChangedAction.Remove:
-        case NotifyCollectionChangedAction.Move:
-        default:
-          break;
-      }
-    }
+    public static readonly RoutedEvent GroupCollapsingEvent = EventManager.RegisterRoutedEvent(
+      "GroupCollapsing",
+      RoutingStrategy.Bubble,
+      typeof( GroupExpansionChangingEventHandler ),
+      typeof( DataGridControl ) );
 
-    private void OnDataGridDetailDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    public event GroupExpansionChangingEventHandler GroupCollapsing
     {
-      DataGridDetailDescriptionCollection detailDescriptions = sender as DataGridDetailDescriptionCollection;
-      Debug.Assert( detailDescriptions != null );
-
-      switch( e.Action )
+      add
       {
-        case NotifyCollectionChangedAction.Reset:
-        case NotifyCollectionChangedAction.Replace:
-        case NotifyCollectionChangedAction.Remove:
-        case NotifyCollectionChangedAction.Add:
-          DetailConfiguration.SynchronizeDetailConfigurations(
-            detailDescriptions,
-            this.DetailConfigurations,
-            this.AutoCreateDetailConfigurations,
-            this.AutoCreateForeignKeyConfigurations,
-            this.AutoRemoveColumnsAndDetailConfigurations );
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-          //Don't care about the move. 
-          break;
-
-        default:
-          break;
+        base.AddHandler( DataGridControl.GroupCollapsingEvent, value );
+      }
+      remove
+      {
+        base.RemoveHandler( DataGridControl.GroupCollapsingEvent, value );
       }
     }
 
-    private static void OnGroupStyleSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    protected virtual void OnGroupCollapsing( GroupExpansionChangingEventArgs e )
     {
-      throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
+      this.RaiseEvent( e );
     }
 
-    private static void GroupStyle_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    internal void RaiseGroupCollapsing( GroupExpansionChangingEventArgs e )
     {
-      if( e.Action == NotifyCollectionChangedAction.Add )
-      {
-        throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
-      }
+      this.OnGroupCollapsing( e );
     }
 
     #endregion
 
-    #region Drag Management
+    #region GroupCollapsed Event
 
-    public bool AllowDrag
+    public static readonly RoutedEvent GroupCollapsedEvent = EventManager.RegisterRoutedEvent(
+      "GroupCollapsed",
+      RoutingStrategy.Bubble,
+      typeof( GroupExpansionChangedEventHandler ),
+      typeof( DataGridControl ) );
+
+    public event GroupExpansionChangedEventHandler GroupCollapsed
     {
-      get
+      add
       {
-        return ( bool )GetValue( DataGridControl.AllowDragProperty );
+        base.AddHandler( DataGridControl.GroupCollapsedEvent, value );
       }
-      set
+      remove
+      {
+        base.RemoveHandler( DataGridControl.GroupCollapsedEvent, value );
+      }
+    }
+
+    protected virtual void OnGroupCollapsed( GroupExpansionChangedEventArgs e )
+    {
+      this.RaiseEvent( e );
+    }
+
+    internal void RaiseGroupCollapsed( GroupExpansionChangedEventArgs e )
+    {
+      this.OnGroupCollapsed( e );
+    }
+
+    #endregion
+
+    #region GroupExpanding Event
+
+    public static readonly RoutedEvent GroupExpandingEvent = EventManager.RegisterRoutedEvent(
+      "GroupExpanding",
+      RoutingStrategy.Bubble,
+      typeof( GroupExpansionChangingEventHandler ),
+      typeof( DataGridControl ) );
+
+    public event GroupExpansionChangingEventHandler GroupExpanding
+    {
+      add
+      {
+        base.AddHandler( DataGridControl.GroupExpandingEvent, value );
+      }
+      remove
+      {
+        base.RemoveHandler( DataGridControl.GroupExpandingEvent, value );
+      }
+    }
+
+    protected virtual void OnGroupExpanding( GroupExpansionChangingEventArgs e )
+    {
+      this.RaiseEvent( e );
+    }
+
+    internal void RaiseGroupExpanding( GroupExpansionChangingEventArgs e )
+    {
+      this.OnGroupExpanding( e );
+    }
+
+    #endregion
+
+    #region GroupExpanded Event
+
+    public static readonly RoutedEvent GroupExpandedEvent = EventManager.RegisterRoutedEvent(
+      "GroupExpanded",
+      RoutingStrategy.Bubble,
+      typeof( GroupExpansionChangedEventHandler ),
+      typeof( DataGridControl ) );
+
+    public event GroupExpansionChangedEventHandler GroupExpanded
+    {
+      add
       {
-        SetValue( DataGridControl.AllowDragProperty, value );
+        base.AddHandler( DataGridControl.GroupExpandedEvent, value );
       }
+      remove
+      {
+        base.RemoveHandler( DataGridControl.GroupExpandedEvent, value );
+      }
+    }
+
+    protected virtual void OnGroupExpanded( GroupExpansionChangedEventArgs e )
+    {
+      this.RaiseEvent( e );
     }
 
-    public static readonly DependencyProperty AllowDragProperty =
-        DependencyProperty.Register( "AllowDrag", typeof( bool ), typeof( DataGridControl ), new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnAllowDragPropertyChanged ) ) );
+    internal void RaiseGroupExpanded( GroupExpansionChangedEventArgs e )
+    {
+      this.OnGroupExpanded( e );
+    }
+
+    #endregion
+
+    #region Event Handlers
+
+    private static void OnFlowDirectionPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as DataGridControl;
+      if( self == null )
+        return;
+
+      self.CustomItemContainerGenerator.ResetGeneratorContent();
+    }
 
-    private static void OnAllowDragPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    private void OnDataGridCollectionView_PropertyChanged( DataGridCollectionViewBase sender, PropertyChangedEventArgs e )
     {
-      DataGridControl dataGrid = obj as DataGridControl;
+      Debug.Assert( sender != null );
+      Debug.Assert( e != null );
+
+      var propertyName = e.PropertyName;
 
-      if( ( dataGrid == null ) || ( ( bool )e.NewValue ) )
+      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.RootGroupPropertyName ) )
       {
+        this.SetValue( DataGridControl.StatContextPropertyKey, sender.RootGroup );
+      }
+    }
+
+    private void OnDataGridDetailDescriptionsChanged( DataGridDetailDescriptionCollection sender, NotifyCollectionChangedEventArgs e )
+    {
+      if( sender == null )
         return;
+
+      switch( e.Action )
+      {
+        case NotifyCollectionChangedAction.Reset:
+        case NotifyCollectionChangedAction.Replace:
+        case NotifyCollectionChangedAction.Remove:
+        case NotifyCollectionChangedAction.Add:
+         break;
+
+        case NotifyCollectionChangedAction.Move:
+          //Don't care about the move. 
+          break;
+
+        default:
+          break;
       }
+    }
 
-      dataGrid.ResetDragDataObject();
+    private static void OnGroupStyleSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
     }
 
-    internal bool UseDragBehavior
+    private static void GroupStyle_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      if( e.Action == NotifyCollectionChangedAction.Add )
+      {
+        throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
+      }
+    }
+
+    #endregion
+
+    #region Drag Management
+
+    public static readonly DependencyProperty AllowDragProperty = DependencyProperty.Register(
+      "AllowDrag",
+      typeof( bool ),
+      typeof( DataGridControl ),
+      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnAllowDragPropertyChanged ) ) );
+
+    public bool AllowDrag
     {
       get
       {
-        return this.AllowDrag;
+        return ( bool )GetValue( DataGridControl.AllowDragProperty );
+      }
+      set
+      {
+        this.SetValue( DataGridControl.AllowDragProperty, value );
       }
     }
 
-    internal IDataObject DragDataObject
+    private static void OnAllowDragPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as DataGridControl;
+      if( ( self == null ) || ( ( bool )e.NewValue ) )
+        return;
+    }
+
+    internal bool UseDragBehavior
     {
       get
       {
-        return m_dragDataObject;
+        return false;
       }
     }
 
@@ -2956,36 +3184,18 @@ namespace Xceed.Wpf.DataGrid
 
     internal void DoDrag( MouseEventArgs e )
     {
-      if( !this.AllowDrag )
-        return;
-
-      //If we have effect, it means the drag is already processing, no need to do anything further.
-      if( m_dragDropEffects != null )
-        return;
-
-      // Compare the present mouse position to the inital drag position, as to start the drag only if there is a reasonable mouse movement
-      if( ( m_initialDragPosition != null ) && ( m_initialDragPosition.HasValue ) )
-      {
-        Point currentMousePosition = e.GetPosition( this );
-
-        if( DragDropHelper.IsMouseMoveDrag( m_initialDragPosition.Value, currentMousePosition ) )
-        {
-          //The first time the drag operation starts, we need to initialize the data that will be dragged.
-          if( m_dragDataObject == null )
-          {
-            this.PrepareDragDataObject( e );
-          }
-
-          m_dragDropEffects = DragDrop.DoDragDrop( this, m_dragDataObject, DragDropEffects.Copy );
-        }
-      }
+      return;
     }
 
     internal void ResetDragDataObject()
     {
       m_dragDataObject = null;
       m_initialDragPosition = null;
-      m_dragDropEffects = null;
+    }
+
+    internal IDisposable InhibitDrag()
+    {
+      return m_inhibitDrag.Set();
     }
 
     private void PrepareDragDataObject( MouseEventArgs e )
@@ -3007,9 +3217,9 @@ namespace Xceed.Wpf.DataGrid
 
     private IDataObject m_dragDataObject; // = null;
     private Nullable<Point> m_initialDragPosition; // = null;
-    private Nullable<DragDropEffects> m_dragDropEffects; // = null;
+    private readonly AutoResetFlag m_inhibitDrag = AutoResetFlagFactory.Create( false );
 
-    #endregion Drag Management
+    #endregion
 
     #region VIEWBASE METHODS
 
@@ -3036,19 +3246,18 @@ namespace Xceed.Wpf.DataGrid
 
     private void View_ThemeChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      this.QueueDataGridContextPeerChlidrenRefresh( this.DataGridContext );
 
       // We need to reevaluate the CurrentContext when it is a detail context since the details are cleared and recreated when the theme changes and no update is
       // made to the current item itself. We dispatch it with a high priority in order to be sure it is executed before a potential BringIntoView of the current item.
       if( this.CurrentContext != this.DataGridContext )
       {
-        this.Dispatcher.BeginInvoke( new Action( delegate()
+        this.Dispatcher.BeginInvoke( new Action( delegate ()
         {
           this.UpdateCurrentContextOnThemeChanged( this.CurrentContext );
         } ), DispatcherPriority.Normal );
       }
 
-      Xceed.Wpf.DataGrid.Views.ViewBase view = this.GetView();
+      var view = this.GetView();
 
       this.SaveDataGridContextState( this.DataGridContext, true, int.MaxValue );
 
@@ -3065,11 +3274,11 @@ namespace Xceed.Wpf.DataGrid
       // Reset the flag
       this.ForceGeneratorReset = false;
 
-      ControlTemplate oldTemplate = this.Template;
+      var oldTemplate = this.Template;
 
       this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( DataGridControl ) );
 
-      ControlTemplate newTemplate = this.Template;
+      var newTemplate = this.Template;
 
       this.ClearValue( DataGridControl.ParentDataGridControlPropertyKey );
       this.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
@@ -3077,7 +3286,9 @@ namespace Xceed.Wpf.DataGrid
       // When a null Theme is set or the new Theme is the already the applied System Theme, we detect if the
       // template changed after setting the DefaultStyleKey to refresh the FixedHeaders and FixedFooters
       if( oldTemplate == newTemplate )
+      {
         this.ResetFixedRegions();
+      }
 
       // Make sure the current item is into view.
       this.DelayBringIntoViewAndFocusCurrent( DispatcherPriority.Render, AutoScrollCurrentItemSourceTriggers.ThemeChanged );
@@ -3089,21 +3300,7 @@ namespace Xceed.Wpf.DataGrid
     /// </summary>
     private void InvalidateViewStyle()
     {
-      if( this.IsPrinting )
-      {
-        Xceed.Wpf.DataGrid.Views.ViewBase viewBase = this.GetView();
-
-        // If more than one DataGridPaginator is paginating, the ViewStyle is already invalidated and
-        // the PrintView is already a logical child.
-        if( LogicalTreeHelper.GetParent( viewBase ) == null )
-        {
-          this.AddLogicalChild( viewBase );
-        }
-      }
-      else
-      {
-        this.AddLogicalChild( this.GetView() );
-      }
+      this.AddLogicalChild( this.View );
     }
 
     [Browsable( false )]
@@ -3117,32 +3314,22 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal Xceed.Wpf.DataGrid.Views.ViewBase GetView( bool getViewOrDefault = true )
+    internal Views.ViewBase GetView()
     {
-      UIViewBase view = this.View;
-      if( view != null )
-        return view;
-
-      if( getViewOrDefault )
-      {
-        this.View = this.GetDefaultView() as UIViewBase;
-        return this.View;
-      }
-
-      return null;
+      return this.View;
     }
 
-    private Xceed.Wpf.DataGrid.Views.ViewBase GetDefaultView()
+    private Views.ViewBase GetDefaultView()
     {
       if( m_defaultView == null )
       {
-        m_defaultView = new Xceed.Wpf.DataGrid.Views.TableflowView();
+        m_defaultView = new TableflowView();
       }
 
       return m_defaultView;
     }
 
-    #endregion VIEWBASE METHODS
+    #endregion
 
     #region FOCUS
 
@@ -3260,26 +3447,33 @@ namespace Xceed.Wpf.DataGrid
       Debug.Assert( ( column == null ) || ( itemContainerDataGridContext.Columns.Contains( column ) ) );
 #endif
 
-      UIElement toFocus = null;
+      var toFocus = default( UIElement );
 
-      Row row = Row.FromContainer( itemContainer );
-
-      IDisposable preventMakeVisibleDisposable = null;
+      var row = Row.FromContainer( itemContainer );
+      var preventMakeVisibleDisposable = default( IDisposable );
 
       try
       {
         if( row != null )
         {
-          Cell cell = row.Cells[ column ];
+          //ColumnManagerRow and derived classes should not be focused
+          if( row.IsUnfocusable )
+            return false;
 
-          // The Cell must be in VisualTree to be able to get the focus, else, .Focus() will always return false
-          if( cell != null )
+          var cell = default( Cell );
+          if( column != null )
           {
-            cell.EnsureInVisualTree();
+            cell = row.Cells[ column ];
 
-            if( preventMakeVisibleIfCellFocused )
+            // The cell must be in VisualTree to be able to get the focus, else, .Focus() will always return false
+            if( cell != null )
             {
-              preventMakeVisibleDisposable = cell.InhibitMakeVisible();
+              cell.EnsureInVisualTree();
+
+              if( preventMakeVisibleIfCellFocused )
+              {
+                preventMakeVisibleDisposable = cell.InhibitMakeVisible();
+              }
             }
           }
 
@@ -3303,9 +3497,10 @@ namespace Xceed.Wpf.DataGrid
               toFocus = cell;
             }
 
-            bool currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
+            var currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
 
-            //If the focus is already within the Cell to focus, then don't touch a thing.  It means the item to focus should be the Keyboard focused element - Already focused
+            // If the focus is already within the Cell to focus, there is noting to do.  The item to focus should be the Keyboard focused element - hence, already focused.
+            // Verify cell.IsBeingEdited to prevent the focus to stay on the editor when in fact the editing process is being canceled (pressing ESC).
             if( ( currentFocusIsInsideCell ) && ( preserveEditorFocus ) && ( cell.IsBeingEdited ) )
               return true;
           }
@@ -3327,7 +3522,7 @@ namespace Xceed.Wpf.DataGrid
           {
             toFocus = cell;
 
-            bool currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
+            var currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
 
             //If the focus is already within the Cell to focus, then don't touch a thing.  It means the item to focus should be the Keyboard focused element - Already focused
             if( ( currentFocusIsInsideCell ) && ( preserveEditorFocus ) )
@@ -3338,16 +3533,16 @@ namespace Xceed.Wpf.DataGrid
         {
           toFocus = itemContainer;
 
-          //if the container for the item is not a Row, and the focus is already within that item then don't touch the focus.
-          bool partOfContainer = TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, toFocus );
-
-          if( partOfContainer )
-          {
+          if( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, toFocus ) )
             return true;
-          }
         }
 
-        return DataGridControl.SetFocusUIElementHelper( toFocus );
+        // If setting the focus on a row fails, we must try to focus the item container in case the target row is not the topmost container,
+        // i.e. a StatRow that is contained in a a GroupHeaderControl.
+        if( ( toFocus != itemContainer ) && DataGridControl.SetFocusUIElementHelper( toFocus ) )
+          return true;
+
+        return DataGridControl.SetFocusUIElementHelper( itemContainer );
       }
       finally
       {
@@ -3384,10 +3579,21 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion FOCUS
+    #endregion
 
     #region BRING INTO VIEW
 
+    internal bool IsBringIntoViewDelayed
+    {
+      get
+      {
+        var itemsHost = this.ItemsHost as DataGridItemsHost;
+
+        return ( itemsHost != null )
+            && ( itemsHost.DelayBringIntoView );
+      }
+    }
+
     internal IDisposable SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers trigger )
     {
       return m_inhibitAutoScroll.SetRestriction( trigger );
@@ -3462,17 +3668,22 @@ namespace Xceed.Wpf.DataGrid
       if( itemsHostDataGridContext == null )
         return false;
 
-      //if a container exists, call bring into view on it!
-      var container = dataGridContext.GetContainerFromItem( item ) as FrameworkElement;
-      if( container != null )
+      // We don't want to call BringIntoView directly on the container if a layout pass
+      // is scheduled.
+      if( !this.IsBringIntoViewDelayed )
       {
-        container.BringIntoView();
+        // If a container exists, call bring into view on it!
+        var container = dataGridContext.GetContainerFromItem( item ) as FrameworkElement;
+        if( container != null )
+        {
+          container.BringIntoView();
 
-        //flag the function as being successful
-        return true;
+          //flag the function as being successful
+          return true;
+        }
       }
 
-      // The container does not exist, it is not yet realized.
+      // The container does not exist, it is not yet realized or the action is delayed.
 
       // If we are not virtualizing any items, return.
       // The call to SetFocusHelper when the BringIntoView completes will call a FrameworkElement BringIntoView
@@ -3565,7 +3776,7 @@ namespace Xceed.Wpf.DataGrid
       return ( ( source & comparand ) == comparand );
     }
 
-    #endregion BRING INTO VIEW
+    #endregion
 
     #region COMMANDS
 
@@ -3573,98 +3784,66 @@ namespace Xceed.Wpf.DataGrid
     {
       e.CanExecute = false;
 
-      CollectionViewGroup group = e.Parameter as CollectionViewGroup;
-      if( ( e.Parameter != null ) && ( group != null ) )
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      if( this.DataGridContext.IsGroupExpanded( group, false ) == false )
       {
-        try
-        {
-          if( this.DataGridContext.IsGroupExpandedCore( group, true ) == false )
-          {
-            e.CanExecute = true;
-          }
-        }
-        catch( InvalidOperationException )
-        { //suppress
-        }
+        e.CanExecute = true;
       }
     }
 
     protected virtual void OnExpandGroupExecuted( object sender, ExecutedRoutedEventArgs e )
     {
-      CollectionViewGroup cvg = e.Parameter as CollectionViewGroup;
-      if( cvg != null )
-      {
-        try
-        {
-          this.DataGridContext.ExpandGroup( cvg );
-        }
-        catch( InvalidOperationException )
-        {
-          //suppress
-        }
-      }
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      this.DataGridContext.ExpandGroup( group );
     }
 
     private void OnCollapseGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
     {
       e.CanExecute = false;
 
-      CollectionViewGroup group = e.Parameter as CollectionViewGroup;
-      if( ( e.Parameter != null ) && ( group != null ) )
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      if( this.DataGridContext.IsGroupExpanded( group, false ) == true )
       {
-        try
-        {
-          if( this.DataGridContext.IsGroupExpandedCore( group, true ) == true )
-          {
-            e.CanExecute = true;
-          }
-        }
-        catch( InvalidOperationException )
-        { //suppress
-        }
+        e.CanExecute = true;
       }
     }
 
     protected virtual void OnCollapseGroupExecuted( object sender, ExecutedRoutedEventArgs e )
     {
-      CollectionViewGroup cvg = e.Parameter as CollectionViewGroup;
-      if( cvg != null )
-      {
-        try
-        {
-          this.DataGridContext.CollapseGroup( cvg );
-        }
-        catch( InvalidOperationException )
-        {
-          //suppress
-        }
-      }
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      this.DataGridContext.CollapseGroup( group );
     }
 
     private void OnToggleGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
     {
       e.CanExecute = false;
 
-      if( ( e.Parameter != null ) && ( e.Parameter is CollectionViewGroup ) )
-      {
-        e.CanExecute = true;
-      }
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      e.CanExecute = this.DataGridContext.IsGroupExpanded( group, false ).HasValue;
     }
 
     protected virtual void OnToggleGroupExecuted( object sender, ExecutedRoutedEventArgs e )
     {
-      CollectionViewGroup cvg = e.Parameter as CollectionViewGroup;
-      if( cvg != null )
-      {
-        try
-        {
-          this.DataGridContext.ToggleGroupExpansion( cvg );
-        }
-        catch( InvalidOperationException )
-        {
-          //suppress
-        }
-      }
+      var group = e.Parameter as CollectionViewGroup;
+      if( group == null )
+        return;
+
+      this.DataGridContext.ToggleGroupExpansion( group );
     }
 
     private void OnSelectAllCanExecute( object sender, CanExecuteRoutedEventArgs e )
@@ -3698,14 +3877,7 @@ namespace Xceed.Wpf.DataGrid
       }
       finally
       {
-        try
-        {
-          this.SelectionChangerManager.End( false, true, false );
-        }
-        catch( DataGridException )
-        {
-          // This is to swallow when selection is aborted
-        }
+        this.SelectionChangerManager.End( true, false );
       }
     }
 
@@ -3748,21 +3920,15 @@ namespace Xceed.Wpf.DataGrid
     {
       foreach( DataGridContext dataGridContext in this.SelectedContexts )
       {
-        if( ( !dataGridContext.IsDeleteCommandEnabled ) ||
-          ( dataGridContext.SelectedItems.Count == 0 ) )
-        {
+        if( ( !dataGridContext.IsDeleteCommandEnabled ) || ( dataGridContext.SelectedItems.Count == 0 ) )
           continue;
-        }
 
-        DataGridCollectionViewBase dataGridCollectionViewBase =
-          dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+        DataGridCollectionViewBase dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
-        IList list = ( dataGridCollectionViewBase == null )
-          ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection )
-          : null; // If we already have a DataGridCollectionView, no need to look for an IList source.
+        // If we already have a DataGridCollectionView, no need to look for an IList source.
+        IList list = ( dataGridCollectionViewBase == null ) ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection ) : null;
 
-        if( ( dataGridCollectionViewBase != null )
-          || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
+        if( ( dataGridCollectionViewBase != null ) || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
         {
           // Ensure that at least on item can be deleted.
           foreach( object item in dataGridContext.SelectedItems )
@@ -3821,15 +3987,12 @@ namespace Xceed.Wpf.DataGrid
         if( ( !dataGridContext.IsDeleteCommandEnabled ) || ( selectedItems.Length == 0 ) )
           continue;
 
-        DataGridCollectionViewBase dataGridCollectionViewBase =
-          dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+        DataGridCollectionViewBase dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
-        IList list = ( dataGridCollectionViewBase == null )
-          ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection )
-          : null; // If we already have a DataGridCollectionView, no need to look for an IList source.
+        // If we already have a DataGridCollectionView, no need to look for an IList source.
+        IList list = ( dataGridCollectionViewBase == null ) ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection ) : null;
 
-        if( ( dataGridCollectionViewBase != null )
-          || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
+        if( ( dataGridCollectionViewBase != null ) || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
         {
           foreach( object item in selectedItems )
           {
@@ -3846,14 +4009,18 @@ namespace Xceed.Wpf.DataGrid
                   itemIndex = dataGridCollectionViewBase.IndexOf( item );
 
                   if( itemIndex != -1 )
+                  {
                     dataGridCollectionViewBase.RemoveAt( itemIndex );
+                  }
                 }
                 else if( list != null )
                 {
                   itemIndex = list.IndexOf( item );
 
                   if( itemIndex != -1 )
+                  {
                     list.RemoveAt( itemIndex );
+                  }
                 }
 
                 retry = false;
@@ -3861,7 +4028,9 @@ namespace Xceed.Wpf.DataGrid
               }
               catch( Exception ex )
               {
-                DeletingSelectedItemErrorRoutedEventArgs deletingItemErrorArgs = new DeletingSelectedItemErrorRoutedEventArgs( item, ex, DataGridControl.DeletingSelectedItemErrorEvent, this );
+                DeletingSelectedItemErrorRoutedEventArgs deletingItemErrorArgs =
+                    new DeletingSelectedItemErrorRoutedEventArgs( item, ex, DataGridControl.DeletingSelectedItemErrorEvent, this );
+
                 this.OnDeletingSelectedItemError( deletingItemErrorArgs );
 
                 switch( deletingItemErrorArgs.Action )
@@ -3881,7 +4050,9 @@ namespace Xceed.Wpf.DataGrid
       }
 
       if( raiseItemDeleted )
+      {
         this.OnSelectedItemsDeleted();
+      }
     }
 
     private void OnRefreshCanExecute( object sender, CanExecuteRoutedEventArgs e )
@@ -3904,54 +4075,25 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected virtual void OnClearFilterExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      DataGridCollectionViewBase dgcv = this.ItemsSource as DataGridCollectionViewBase;
-
-      if( dgcv != null )
-      {
-        using( dgcv.DeferRefresh() )
-        {
-          foreach( DataGridItemPropertyBase itemProperty in dgcv.ItemProperties )
-          {
-            if( itemProperty.FilterCriterion != null )
-            {
-              itemProperty.FilterCriterion = null;
-            }
-          }
-
-          foreach( DataGridDetailDescription detailDescription in dgcv.DetailDescriptions )
-          {
-            foreach( DataGridItemPropertyBase itemProperty in detailDescription.ItemProperties )
-            {
-              if( itemProperty.FilterCriterion != null )
-              {
-                itemProperty.FilterCriterion = null;
-              }
-            }
-          }
-        }
-      }
-    }
-
     #endregion
 
     #region SOURCE HANDLING
 
     private void ProcessDelayedItemsSourceChanged()
     {
+      var dataGridContext = this.DataGridContext;
+
       if( this.ShouldSynchronizeCurrentItem )
       {
-        DataGridContext localContext = this.DataGridContext;
-        object currentItem = this.Items.CurrentItem;
-        int currentItemIndex = this.Items.CurrentPosition;
+        var currentItem = this.Items.CurrentItem;
+        var currentItemIndex = this.Items.CurrentPosition;
 
         if( ( this.Items.IsCurrentAfterLast ) || ( this.Items.IsCurrentBeforeFirst ) )
         {
           currentItemIndex = -1;
         }
 
-        localContext.SetCurrent( currentItem, null, currentItemIndex, null, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ItemsSourceChanged );
+        dataGridContext.SetCurrent( currentItem, null, currentItemIndex, null, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ItemsSourceChanged );
 
         if( !this.SynchronizeSelectionWithCurrent )
         {
@@ -3959,12 +4101,9 @@ namespace Xceed.Wpf.DataGrid
 
           try
           {
-            if( ( this.SelectionUnit == SelectionUnit.Row )
-              && ( !this.Items.IsCurrentAfterLast )
-              && ( !this.Items.IsCurrentBeforeFirst )
-              && ( currentItemIndex != -1 ) )
+            if( ( this.SelectionUnit == SelectionUnit.Row ) && ( !this.Items.IsCurrentAfterLast ) && ( !this.Items.IsCurrentBeforeFirst ) && ( currentItemIndex != -1 ) )
             {
-              m_selectionChangerManager.SelectJustThisItem( localContext, currentItemIndex, currentItem );
+              m_selectionChangerManager.SelectJustThisItem( dataGridContext, currentItemIndex, currentItem );
             }
             else
             {
@@ -3973,61 +4112,57 @@ namespace Xceed.Wpf.DataGrid
           }
           finally
           {
-            m_selectionChangerManager.End( true, false, false );
+            m_selectionChangerManager.End( false, false );
           }
         }
       }
 
-      this.DataGridContext.ItemsSourceFieldDescriptors = null;
-      ItemsSourceHelper.CleanUpColumns( this.Columns, this.AutoRemoveColumnsAndDetailConfigurations );
-      this.GenerateColumnsFromItemsSourceFields();
+      var columnManager = dataGridContext.ColumnManager;
 
-      DataGridCollectionView dataGridCollectionView = this.ItemsSource as DataGridCollectionView;
-
-      if( dataGridCollectionView != null )
+      using( columnManager.DeferUpdate( new ColumnHierarchyManager.UpdateOptions( TableView.GetFixedColumnCount( dataGridContext ), true ) ) )
       {
-        RootGroupChangedEventManager.AddListener( dataGridCollectionView, this );
-        this.SetValue( DataGridControl.StatContextPropertyKey, dataGridCollectionView.RootGroup );
+        ItemsSourceHelper.ResetPropertyDescriptions( m_itemsSourcePropertyDescriptions, m_itemPropertyMap, this, this.ItemsSource );
+        ItemsSourceHelper.CleanUpColumns( this.Columns, false );
 
-        CollectionChangedEventManager.AddListener( dataGridCollectionView.DetailDescriptions, this );
-
-        DetailConfiguration.SynchronizeDetailConfigurations(
-          dataGridCollectionView.DetailDescriptions,
-          this.DetailConfigurations,
-          this.AutoCreateDetailConfigurations,
-          this.AutoCreateForeignKeyConfigurations,
-          this.AutoRemoveColumnsAndDetailConfigurations );
+        if( this.AutoCreateColumns )
+        {
+          ItemsSourceHelper.CreateColumnsFromPropertyDescriptions( this.DataGridContext.ColumnManager,
+                                                                   this.DefaultCellEditors,
+                                                                   m_itemsSourcePropertyDescriptions,
+                                                                   this.AutoCreateForeignKeyConfigurations );
+        }
 
-        ProxyCollectionRefreshEventManager.AddListener( dataGridCollectionView, this );
-        ProxyGroupDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
-        ProxySortDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
-        ProxyAutoFilterValuesChangedEventManager.AddListener( dataGridCollectionView, this );
-        ProxyApplyingFilterCriteriasEventManager.AddListener( dataGridCollectionView, this );
-      }
-      else
-      {
-        DetailConfiguration.CleanupDetailConfigurations( this.DetailConfigurations, this.AutoRemoveColumnsAndDetailConfigurations );
-        this.ClearValue( DataGridControl.StatContextPropertyKey );
-      }
+        var dataGridCollectionView = this.ItemsSource as DataGridCollectionView;
+        if( dataGridCollectionView != null )
+        {
+          PropertyChangedEventManager.AddListener( dataGridCollectionView, this, string.Empty );
+          this.SetValue( DataGridControl.StatContextPropertyKey, dataGridCollectionView.RootGroup );
 
-      DataGridVirtualizingCollectionViewBase virtualizingCollectionView = this.ItemsSource as DataGridVirtualizingCollectionViewBase;
+          ProxyCollectionRefreshEventManager.AddListener( dataGridCollectionView, this );
+          ProxyGroupDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
+          ProxySortDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
+        }
+        else
+        {
+          this.ClearValue( DataGridControl.StatContextPropertyKey );
+        }
 
-      // Keep if the source is bound to DataGridVirtualizingCollectionView
-      // to avoid preserving ContainerSizeState to avoid memory leaks
-      this.IsBoundToDataGridVirtualizingCollectionViewBase = ( virtualizingCollectionView != null );
+        var virtualizingCollectionView = this.ItemsSource as DataGridVirtualizingCollectionViewBase;
 
-      if( this.IsBoundToDataGridVirtualizingCollectionViewBase )
-      {
-        ConnectionStateChangedEventManager.AddListener( virtualizingCollectionView, this );
-        ConnectionErrorChangedEventManager.AddListener( virtualizingCollectionView, this );
-      }
+        // Keep if the source is bound to DataGridVirtualizingCollectionView to avoid preserving ContainerSizeState to avoid memory leaks
+        this.IsBoundToDataGridVirtualizingCollectionViewBase = ( virtualizingCollectionView != null );
 
-      this.DataGridContext.NotifyItemsSourceChanged();
+        if( this.IsBoundToDataGridVirtualizingCollectionViewBase )
+        {
+          ConnectionStateChangedEventManager.AddListener( virtualizingCollectionView, this );
+          ConnectionErrorChangedEventManager.AddListener( virtualizingCollectionView, this );
+        }
 
-      if( this.ItemsSourceChangeCompleted != null )
-      {
-        this.ItemsSourceChangeCompleted( this, EventArgs.Empty );
+        columnManager.Initialize( this );
       }
+
+      dataGridContext.NotifyItemsSourceChanged();
+      this.OnItemsSourceChangeCompleted();
     }
 
     [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.CreatingNewItem and InitializingNewItem events.", false )]
@@ -4048,6 +4183,15 @@ namespace Xceed.Wpf.DataGrid
 
     public event EventHandler ItemsSourceChangeCompleted;
 
+    private void OnItemsSourceChangeCompleted()
+    {
+      var handler = this.ItemsSourceChangeCompleted;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
+    }
+
     protected override void OnItemsSourceChanged( IEnumerable oldValue, IEnumerable newValue )
     {
       base.OnItemsSourceChanged( oldValue, newValue );
@@ -4082,14 +4226,14 @@ namespace Xceed.Wpf.DataGrid
 
       if( !object.Equals( this.ItemsSourceName, oldItemsSourceName ) )
       {
-        this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( "ItemsSourceName" ) );
+        this.OnPropertyChanged( "ItemsSourceName" );
       }
 
       DataGridContext localContext = this.DataGridContext;
       this.UpdateCurrentRowInEditionCellStates( null, null );
       localContext.ClearSizeStates();
 
-      if( m_beginInitCount > 0 )
+      if( m_initCount != 0 )
       {
         this.ItemsSourceChangedDelayed = true;
       }
@@ -4102,14 +4246,11 @@ namespace Xceed.Wpf.DataGrid
 
       if( dataGridCollectionView != null )
       {
-        RootGroupChangedEventManager.RemoveListener( dataGridCollectionView, this );
-        CollectionChangedEventManager.RemoveListener( dataGridCollectionView.DetailDescriptions, this );
+        PropertyChangedEventManager.RemoveListener( dataGridCollectionView, this, string.Empty );
 
         ProxyCollectionRefreshEventManager.RemoveListener( dataGridCollectionView, this );
         ProxyGroupDescriptionsChangedEventManager.RemoveListener( dataGridCollectionView, this );
         ProxySortDescriptionsChangedEventManager.RemoveListener( dataGridCollectionView, this );
-        ProxyAutoFilterValuesChangedEventManager.RemoveListener( dataGridCollectionView, this );
-        ProxyApplyingFilterCriteriasEventManager.RemoveListener( dataGridCollectionView, this );
 
         m_dataGridContextsStateDictionary = null;
       }
@@ -4137,7 +4278,7 @@ namespace Xceed.Wpf.DataGrid
       if( currentItem != null )
       {
         // Use Row.FromContainer to ensure Rows in Header/Footers are returned correctly
-        Row row = Row.FromContainer( currentContext.GetContainerFromItem( currentItem ) );
+        var row = Row.FromContainer( currentContext.GetContainerFromItem( currentItem ) );
         if( ( row != null ) && ( row.IsBeingEdited ) )
         {
           row.CancelEdit();
@@ -4165,19 +4306,7 @@ namespace Xceed.Wpf.DataGrid
       return ( ( DataGridControl )sender ).OnCoerceItemsSource( value );
     }
 
-    private void GenerateColumnsFromItemsSourceFields()
-    {
-      if( this.AutoCreateColumns )
-      {
-        ItemsSourceHelper.GenerateColumnsFromItemsSourceFields(
-          this.DataGridContext.Columns,
-          this.DefaultCellEditors,
-          this.DataGridContext.ItemsSourceFieldDescriptors,
-          this.AutoCreateForeignKeyConfigurations );
-      }
-    }
-
-    #endregion SOURCE HANDLING
+    #endregion
 
     #region SAVE/RESTORE STATE
 
@@ -4277,30 +4406,24 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void OnDataGridCollectionView_ProxyCollectionRefresh( object sender, EventArgs e )
+    private void OnDataGridCollectionView_ProxyCollectionRefresh( DataGridCollectionView sender, EventArgs e )
     {
-      DataGridCollectionView dataGridCollectionView = ( DataGridCollectionView )sender;
-
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridCollectionView.GroupDescriptions;
+      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
+        return;
 
-      if( dataGridCollectionView.GroupDescriptions.Count > 0 )
+      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
+      if( targetDataGridContext != null )
       {
-        DataGridContext targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, dataGridCollectionView );
-
-        if( targetDataGridContext != null )
-        {
-          this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-        }
+        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
       }
     }
 
-    private void OnDataGridCollectionView_ProxyGroupDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnDataGridCollectionView_ProxyGroupDescriptionsChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
     {
-      DataGridCollectionView dataGridCollectionView = ( DataGridCollectionView )sender;
-
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridCollectionView.GroupDescriptions;
+      if( sender == null )
+        return;
 
-      int maxGroupLevelToSave = -1;
+      var maxGroupLevelToSave = -1;
 
       switch( e.Action )
       {
@@ -4316,7 +4439,6 @@ namespace Xceed.Wpf.DataGrid
             // Only save/restore the state if there's other groups located before the moved group old/new index.
             // Else, do not save, since we already know that we won't be able to find any match when restoring.
             maxGroupLevelToSave = Math.Min( e.OldStartingIndex, e.NewStartingIndex ) - 1;
-
             break;
           }
 
@@ -4342,8 +4464,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( maxGroupLevelToSave > -1 )
       {
-        DataGridContext targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, dataGridCollectionView );
-
+        var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
         if( targetDataGridContext != null )
         {
           this.SaveDataGridContextState( targetDataGridContext, false, maxGroupLevelToSave );
@@ -4351,90 +4472,63 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void OnDataGridCollectionView_ProxySortDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnDataGridCollectionView_ProxySortDescriptionsChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
     {
-      DataGridCollectionView dataGridCollectionView = ( DataGridCollectionView )sender;
-
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridCollectionView.GroupDescriptions;
+      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
+        return;
 
-      if( dataGridCollectionView.GroupDescriptions.Count > 0 )
+      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
+      if( targetDataGridContext != null )
       {
-        DataGridContext targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, dataGridCollectionView );
-
-        if( targetDataGridContext != null )
-        {
-          this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-        }
+        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
       }
     }
 
-    private void OnDataGridCollectionView_ProxyAutoFilterValuesChanged( object sender, NotifyCollectionChangedEventArgs e )
+    private void OnDataGridCollectionView_ProxyAutoFilterValuesChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
     {
-      DataGridCollectionView dataGridCollectionView = ( DataGridCollectionView )sender;
-
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridCollectionView.GroupDescriptions;
+      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
+        return;
 
-      if( dataGridCollectionView.GroupDescriptions.Count > 0 )
+      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
+      if( targetDataGridContext != null )
       {
-        DataGridContext targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView(
-          this.DataGridContext, dataGridCollectionView );
-
-        if( targetDataGridContext != null )
-          this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
+        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
       }
     }
 
-    private void OnDataGridCollectionView_ProxyApplyingFilterCriterias( object sender, EventArgs e )
+    private void OnDataGridCollectionView_ProxyApplyingFilterCriterias( DataGridCollectionView sender, EventArgs e )
     {
-      DataGridCollectionView dataGridCollectionView = ( DataGridCollectionView )sender;
-
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridCollectionView.GroupDescriptions;
+      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
+        return;
 
-      if( dataGridCollectionView.GroupDescriptions.Count > 0 )
+      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
+      if( targetDataGridContext != null )
       {
-        DataGridContext targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView(
-          this.DataGridContext, dataGridCollectionView );
-
-        if( targetDataGridContext != null )
-          this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
+        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
       }
     }
 
-    #endregion SAVE/RESTORE STATE
+    #endregion
 
     #region VIRTUALIZING COLLECTION VIEW SUPPORT
 
-    private void OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( object sender, EventArgs e )
+    private void OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( DataGridVirtualizingCollectionViewBase sender, EventArgs e )
     {
-      DataGridVirtualizingCollectionViewBase dataGridVirtualizingCollectionViewBase = sender as DataGridVirtualizingCollectionViewBase;
+      if( sender == null )
+        return;
 
-      this.SetConnectionState( dataGridVirtualizingCollectionViewBase.ConnectionState );
+      this.SetConnectionState( sender.ConnectionState );
     }
 
-    private void OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( object sender, EventArgs e )
+    private void OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( DataGridVirtualizingCollectionViewBase sender, EventArgs e )
     {
-      DataGridVirtualizingCollectionViewBase dataGridVirtualizingCollectionViewBase = sender as DataGridVirtualizingCollectionViewBase;
-
-      this.SetConnectionError( dataGridVirtualizingCollectionViewBase.ConnectionError );
-    }
-
-    #endregion VIRTUALIZING COLLECTION VIEW SUPPORT
-
-    #region PRINTING/EXPORTING
+      if( sender == null )
+        return;
 
-    internal bool IsPrinting
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.UsePrintView ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridControlFlags.UsePrintView ] = value;
-      }
+      this.SetConnectionError( sender.ConnectionError );
     }
 
-    #endregion PRINTING/EXPORTING
+    #endregion
 
     #region EDITING
 
@@ -4450,26 +4544,26 @@ namespace Xceed.Wpf.DataGrid
 
     internal static void BeginEditHelper( DataGridContext dataGridContext, object item )
     {
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.IsBeingEdited )
+      if( item == null )
         return;
 
-      if( item == null )
+      var dataGridControl = dataGridContext.DataGridControl;
+      if( dataGridControl.IsBeingEdited )
         return;
 
       if( !dataGridContext.IsContainingItem( item ) )
         throw new InvalidOperationException( "An attempt was made to call the BeginEdit method of an item that is not part of the specified context." );
 
-      DependencyObject container = dataGridContext.GetContainerFromItem( item );
+      var container = dataGridContext.GetContainerFromItem( item );
 
       //if the item is realized, then I could call the BeginEdit() directly on the container.
       if( container != null )
       {
-        Row row = Row.FromContainer( container );
-
+        var row = Row.FromContainer( container );
         if( row != null )
+        {
           row.BeginEdit();
+        }
 
         //not a row, then not editable.
       }
@@ -4488,27 +4582,27 @@ namespace Xceed.Wpf.DataGrid
 
     internal static void EndEditHelper( DataGridContext dataGridContext )
     {
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
+      var dataGridControl = dataGridContext.DataGridControl;
       if( !dataGridControl.IsBeingEdited )
         return;
 
       if( !dataGridContext.IsContainingItem( dataGridContext.DataGridControl.CurrentItemInEdition ) )
         throw new InvalidOperationException( "An attempt was made to call the EndEdit method of an item that is not part of the specified context." );
 
-      DependencyObject container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
+      var container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
 
       //if the item is realized, then I could call the EndEdit() directly on the container.
       if( container != null )
       {
-        Row row = Row.FromContainer( container );
-
+        var row = Row.FromContainer( container );
         if( row != null )
+        {
           row.EndEdit();
+        }
 
         //not a row, then not editable.
       }
-      //if the container is not realized, then I need to set things up so that when the container is realized, it's gonna resume edition.
+      //if the container is not realized, then set things up so that when the container is realized, editing will resume.
       else
       {
         DataGridControl.ProcessUnrealizedEndEdit( dataGridContext );
@@ -4522,23 +4616,23 @@ namespace Xceed.Wpf.DataGrid
 
     internal static void CancelEditHelper( DataGridContext dataGridContext )
     {
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
+      var dataGridControl = dataGridContext.DataGridControl;
       if( !dataGridControl.IsBeingEdited )
         return;
 
       if( !dataGridContext.IsCurrent )
         throw new InvalidOperationException( "An attempt was made to call the CancelEdit method on a DataGridContext that is not current." );
 
-      DependencyObject container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
+      var container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
 
       //if the item is realized, then I could call the CancelEdit() directly on the container.
       if( container != null )
       {
-        Row row = Row.FromContainer( container );
-
+        var row = Row.FromContainer( container );
         if( row != null )
+        {
           row.CancelEdit();
+        }
 
         //not a row, then not editable.
       }
@@ -4599,7 +4693,7 @@ namespace Xceed.Wpf.DataGrid
     {
       if( newCurrentItemInEdition != m_currentItemInEdition )
       {
-        Row currentRowInEdition = null;
+        var currentRowInEdition = default( Row );
 
         if( m_currentItemInEdition != null )
         {
@@ -4621,8 +4715,7 @@ namespace Xceed.Wpf.DataGrid
             // We must clear the edition state of the old Row in edition
             foreach( Cell cell in currentRowInEdition.CreatedCells )
             {
-              ColumnBase parentColumn = cell.ParentColumn;
-
+              var parentColumn = cell.ParentColumn;
               if( parentColumn == null )
                 continue;
 
@@ -4646,12 +4739,11 @@ namespace Xceed.Wpf.DataGrid
       {
         foreach( Cell cell in newCurrentItemContainer.CreatedCells )
         {
-          ColumnBase parentColumn = cell.ParentColumn;
-
+          var parentColumn = cell.ParentColumn;
           if( parentColumn == null )
             continue;
 
-          CellState cellState = new CellState();
+          var cellState = new CellState();
           cellState.SetContentBeforeRowEdition( cell.Content );
 
           parentColumn.CurrentRowInEditionCellState = cellState;
@@ -4659,10 +4751,18 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion EDITING
+    #endregion
 
     #region SELECTION/CURRENT
 
+    internal bool UseDragToSelectBehavior
+    {
+      get
+      {
+        return false;
+      }
+    }
+
     internal bool IsSetCurrentInProgress
     {
       get
@@ -4683,7 +4783,8 @@ namespace Xceed.Wpf.DataGrid
         m_queueClearCurrentColumn = null;
       }
 
-      m_queueClearCurrentColumn = this.Dispatcher.BeginInvoke( System.Windows.Threading.DispatcherPriority.DataBind, new ParametrizedGenericHandler( ClearCurrentColumnHandler ), currentItem );
+      m_queueClearCurrentColumn = this.Dispatcher.BeginInvoke( System.Windows.Threading.DispatcherPriority.DataBind,
+                                                               new ParametrizedGenericHandler( ClearCurrentColumnHandler ), currentItem );
     }
 
     internal void AddToSelectedContexts( DataGridContext context )
@@ -4708,12 +4809,12 @@ namespace Xceed.Wpf.DataGrid
         {
           try
           {
-            currentDataGridContext.SetCurrent( oldCurrentItem, null, null, null, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.Editing );
+            currentDataGridContext.SetCurrent( oldCurrentItem, null, null, null, false, false,
+                                               this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.Editing );
           }
           catch( DataGridException )
           {
-            // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-            // any other GridException.
+            // We swallow the exception if it occurs because of a validation error or Cell was read-only or any other GridException.
           }
         }
       }
@@ -4727,20 +4828,14 @@ namespace Xceed.Wpf.DataGrid
     {
       CustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
 
-      // the CurrentContext is the master DataGridContext, and
-      // this one will never change
+      // the CurrentContext is the master DataGridContext, and this one will never change
       if( currentContext == this.DataGridContext )
-      {
         return;
-      }
 
       object newCurrentItem = currentContext.CurrentItem;
 
-      // Try to get the new DataGridContext mathing the old one (containing 
-      // the old CurrentItem).
-      DataGridContext newCurrentContext = this.UpdateCurrentContextRecursive( this.DataGridContext,
-                                            currentContext,
-                                            out newCurrentItem );
+      // Try to get the new DataGridContext mathing the old one (containing the old CurrentItem).
+      DataGridContext newCurrentContext = this.UpdateCurrentContextRecursive( this.DataGridContext, currentContext, out newCurrentItem );
 
       // If it none was found, affect the master DataGridContext
       if( newCurrentContext == null )
@@ -4754,66 +4849,284 @@ namespace Xceed.Wpf.DataGrid
         this.SetCurrentDataGridContextHelper( newCurrentContext );
 
         // Set it as current using the old context CurrentItem, CurrentColumn
-        newCurrentContext.SetCurrent( newCurrentItem, null, null, currentContext.CurrentColumn, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ThemeChanged );
+        newCurrentContext.SetCurrent( newCurrentItem, null, null, currentContext.CurrentColumn, false, false,
+                                      this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ThemeChanged );
+      }
+    }
+
+    private DataGridContext UpdateCurrentContextRecursive( DataGridContext parentDataGridContext, DataGridContext oldCurrentDataGridContext, out object newCurrentItem )
+    {
+      if( parentDataGridContext == null )
+      {
+        newCurrentItem = null;
+        return null;
+      }
+
+      foreach( DataGridContext childContext in parentDataGridContext.GetChildContexts() )
+      {
+        if( childContext.SourceDetailConfiguration == oldCurrentDataGridContext.SourceDetailConfiguration )
+        {
+          object oldCurrentItem = oldCurrentDataGridContext.CurrentItem;
+
+          System.Data.DataView dataView = ItemsSourceHelper.TryGetDataViewFromDataGridContext( childContext );
+
+          System.Data.DataRowView oldCurrentDataRowView = oldCurrentItem as System.Data.DataRowView;
+
+          if( ( dataView != null ) && ( oldCurrentDataRowView != null ) )
+          {
+            System.Data.DataRow oldDataRow = oldCurrentDataRowView.Row;
+
+            foreach( System.Data.DataRowView dataRowView in dataView )
+            {
+              if( dataRowView.Row == oldDataRow )
+              {
+                newCurrentItem = dataRowView;
+                return childContext;
+              }
+            }
+          }
+          else
+          {
+            if( childContext.Items.Contains( oldCurrentItem ) )
+            {
+              newCurrentItem = oldCurrentItem;
+              return childContext;
+            }
+          }
+        }
+
+        DataGridContext foundContext = this.UpdateCurrentContextRecursive( childContext, oldCurrentDataGridContext, out newCurrentItem );
+
+        if( foundContext != null )
+          return foundContext;
+      }
+
+      newCurrentItem = null;
+      return null;
+    }
+
+    #endregion
+
+    #region DRAG TO SELECT
+
+    private AutoScrollManager AutoScrollManager
+    {
+      get
+      {
+        return m_autoScrollManager;
+      }
+      set
+      {
+        if( m_autoScrollManager != null )
+        {
+          m_autoScrollManager.AutoScrolled -= this.OnAutoScrollManagerAutoScrolled;
+        }
+
+        m_autoScrollManager = value;
+
+        if( m_autoScrollManager != null )
+        {
+          m_autoScrollManager.AutoScrolled += this.OnAutoScrollManagerAutoScrolled;
+        }
+      }
+    }
+
+    private void OnPreviewMouseDown_DragToSelect( MouseButtonEventArgs e )
+    {
+      if( !this.UseDragToSelectBehavior )
+        return;
+
+      if( e.LeftButton != MouseButtonState.Pressed )
+        return;
+
+      var source = e.OriginalSource as DependencyObject;
+      if( source == null )
+        return;
+
+      var container = DataGridControl.GetContainer( source );
+      var itemContainer = container as IDataGridItemContainer;
+      if( itemContainer == null )
+        return;
+
+      var dataGridContext = DataGridControl.GetDataGridContext( container );
+      if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
+        return;
+
+      m_startDragSelection = false;
+
+      if( container is Row )
+      {
+        m_startDragSelection = ( DataGridVirtualizingPanel.GetItemIndex( container ) >= 0 );
+      }
+    }
+
+    private void OnMouseLeftButtonUp_DragToSelect( MouseButtonEventArgs e )
+    {
+      this.AbortDragSelection();
+    }
+
+    private void OnLostMouseCapture_DragToSelect( MouseEventArgs e )
+    {
+      this.AbortDragSelection();
+    }
+
+    private void OnMouseMove_DragToSelect( MouseEventArgs e )
+    {
+      // Verify if the "Excel like drag selection" should be handled.
+      if( !this.UseDragToSelectBehavior )
+        return;
+
+      if( e.LeftButton != MouseButtonState.Pressed )
+        return;
+
+      if( !this.IsKeyboardFocusWithin )
+        return;
+
+      var autoScrollManager = this.AutoScrollManager;
+      if( autoScrollManager != null )
+      {
+        m_startDragSelection = false;
+
+        // This should happen only on the second mouse move after the mouse down.
+        // The mouse is capture so "MouseMove" and "ButtonUp" events can be handled outside the DataGridControl.
+        if( !this.IsMouseCaptured )
+        {
+          this.CaptureMouse();
+        }
+
+        autoScrollManager.HandleMouseMove( e );
+        e.Handled = this.SelectMouseOverElement();
       }
+      // This should happen only on the first mouse move after the mouse down, if it was detected that DragSelection should be processed.
+      else if( m_startDragSelection )
+      {
+        m_startDragSelection = false;
+
+        // Before starting the AutoScrollManager, make sure all the conditions that apply in OnPreviewMouseDown_DragToSelect are still valid here.
+        var source = e.OriginalSource as DependencyObject;
+        if( source == null )
+          return;
+
+        var container = DataGridControl.GetContainer( source );
+        var itemContainer = container as IDataGridItemContainer;
+        if( itemContainer == null )
+          return;
+
+        var dataGridContext = DataGridControl.GetDataGridContext( container );
+        if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
+          return;
+
+        autoScrollManager = new AutoScrollManager( this.ScrollViewer );
+        autoScrollManager.Start();
+        this.AutoScrollManager = autoScrollManager;
+      }
+    }
+
+    private void OnAutoScrollManagerAutoScrolled( object sender, EventArgs e )
+    {
+      Debug.Assert( this.UseDragToSelectBehavior );
+      this.SelectMouseOverElement();
     }
 
-    private DataGridContext UpdateCurrentContextRecursive(
-      DataGridContext parentDataGridContext,
-      DataGridContext oldCurrentDataGridContext,
-      out object newCurrentItem )
+    private void AbortDragSelection()
     {
-      if( parentDataGridContext == null )
+      var autoScrollManager = this.AutoScrollManager;
+      if( autoScrollManager != null )
       {
-        newCurrentItem = null;
-        return null;
+        autoScrollManager.Stop();
+        this.AutoScrollManager = null;
+        this.ReleaseMouseCapture();
       }
+    }
 
-      foreach( DataGridContext childContext in parentDataGridContext.GetChildContexts() )
+    private bool SelectMouseOverElement()
+    {
+      var itemsHost = this.ItemsHost;
+      var mousePosition = Mouse.GetPosition( itemsHost );
+      var hitPosition = new Point();
+
+      var width = itemsHost.ActualWidth;
+      var height = itemsHost.ActualHeight;
+
+      //Here, Since we are auto scrolling, the mouse position may be 
+      // out of the bounds of the datagrid. Get the mouse's nearest row or cell.
+      hitPosition.Y = Math.Min( Math.Max( 0d, mousePosition.Y ), height - 1 );
+      hitPosition.X = Math.Min( Math.Max( 0d, mousePosition.X ), width - 1 );
+
+      var targetItem = itemsHost.InputHitTest( hitPosition ) as DependencyObject;
+      if( targetItem == null )
+        return false;
+
+      var container = DataGridControl.GetContainer( targetItem );
+      if( container == null )
+        return false;
+
+      var dataGridContext = DataGridControl.GetDataGridContext( container );
+      if( ( dataGridContext == null ) || ( DataGridContext.DataGridControl != this ) )
+        return false;
+
+      var newPosition = default( SelectionRangePoint );
+
+      var row = container as Row;
+      if( row != null )
       {
-        if( childContext.SourceDetailConfiguration == oldCurrentDataGridContext.SourceDetailConfiguration )
-        {
-          object oldCurrentItem = oldCurrentDataGridContext.CurrentItem;
+        var sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
+        if( sourceDataItemIndex < 0 )
+          return false;
 
-          System.Data.DataView dataView =
-            ItemsSourceHelper.TryGetDataViewFromDataGridContext( childContext );
+        var columnIndex = -1;
 
-          System.Data.DataRowView oldCurrentDataRowView = oldCurrentItem as System.Data.DataRowView;
+        // Dont border finding the cell if we are not in cell selection mode.
+        if( this.SelectionUnit == DataGrid.SelectionUnit.Cell )
+        {
+          var cell = targetItem as Cell;
+          if( ( cell == null ) || ( cell.ParentColumn.DataGridControl != this ) )
+          {
+            cell = Cell.FindFromChild( this, targetItem );
+          }
 
-          if( ( dataView != null ) && ( oldCurrentDataRowView != null ) )
+          if( cell == null )
           {
-            System.Data.DataRow oldDataRow = oldCurrentDataRowView.Row;
+            // If the cell is still null, It may be because the X mouse position was out of bounds
+            // an thus, we should take the first or last visible cell in screen
+            if( mousePosition.X >= 0d && mousePosition.X < itemsHost.Width )
+              return false;
 
-            foreach( System.Data.DataRowView dataRowView in dataView )
-            {
-              if( dataRowView.Row == oldDataRow )
-              {
-                newCurrentItem = dataRowView;
-                return childContext;
-              }
-            }
+            var columnManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
+            if( columnManager == null )
+              return false;
+
+            var columns = columnManager.GetVisibleFieldNames();
+            if( columns.Count <= 0 )
+              return false;
+
+            var index = ( mousePosition.X < 0 ) ? 0 : columns.Count - 1;
+
+            columnIndex = dataGridContext.Columns[ columns[ index ] ].VisiblePosition;
           }
           else
           {
-            if( childContext.Items.Contains( oldCurrentItem ) )
-            {
-              newCurrentItem = oldCurrentItem;
-              return childContext;
-            }
+            columnIndex = cell.ParentColumn.VisiblePosition;
           }
         }
 
-        DataGridContext foundContext = this.UpdateCurrentContextRecursive( childContext, oldCurrentDataGridContext, out newCurrentItem );
+        var item = dataGridContext.GetItemFromContainer( row );
 
-        if( foundContext != null )
-          return foundContext;
+        newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, sourceDataItemIndex, columnIndex );
+      }
+      else
+      {
+        return false;
       }
 
-      newCurrentItem = null;
-      return null;
+      if( newPosition == null )
+        return false;
+
+      m_selectionChangerManager.UpdateSelection( null, newPosition, true, false, SelectionManager.UpdateSelectionSource.MouseMove );
+      return true;
     }
 
-    #endregion SELECTION/CURRENT
+    #endregion
 
     public override void OnApplyTemplate()
     {
@@ -4837,7 +5150,7 @@ namespace Xceed.Wpf.DataGrid
 
       m_itemsHost = null;
 
-      Xceed.Wpf.DataGrid.Views.ViewBase view = this.GetView();
+      Views.ViewBase view = this.GetView();
 
       if( view.UseDefaultHeadersFooters )
       {
@@ -4854,28 +5167,28 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public void ExpandGroup( CollectionViewGroup group )
+    public bool ExpandGroup( CollectionViewGroup group )
     {
       if( group == null )
         throw new ArgumentNullException( "group" );
 
-      this.DataGridContext.ExpandGroup( group );
+      return this.DataGridContext.ExpandGroup( group );
     }
 
-    public void CollapseGroup( CollectionViewGroup group )
+    public bool CollapseGroup( CollectionViewGroup group )
     {
       if( group == null )
         throw new ArgumentNullException( "group" );
 
-      this.DataGridContext.CollapseGroup( group );
+      return this.DataGridContext.CollapseGroup( group );
     }
 
-    public void ToggleGroupExpansion( CollectionViewGroup group )
+    public bool ToggleGroupExpansion( CollectionViewGroup group )
     {
       if( group == null )
         throw new ArgumentNullException( "group" );
 
-      this.DataGridContext.ToggleGroupExpansion( group );
+      return this.DataGridContext.ToggleGroupExpansion( group );
     }
 
     public bool IsGroupExpanded( CollectionViewGroup group )
@@ -4886,30 +5199,6 @@ namespace Xceed.Wpf.DataGrid
       return this.DataGridContext.IsGroupExpanded( group );
     }
 
-    public void CollapseDetails( object dataItem )
-    {
-      //This function will work only for master items.
-      //the DataGridContext and its generator will determine that the item is not present in the immediate structure
-      //and throw if the item passed is not a master item.
-      this.DataGridContext.CollapseDetails( dataItem );
-    }
-
-    public void ExpandDetails( object dataItem )
-    {
-      //This function will work only for master items.
-      //the DataGridContext and its generator will determine that the item is not present in the immediate structure
-      //and throw if the item passed is not a master item.
-      this.DataGridContext.ExpandDetails( dataItem );
-    }
-
-    public void ToggleDetailExpansion( object dataItem )
-    {
-      //This function will work only for master items.
-      //the DataGridContext and its generator will determine that the item is not present in the immediate structure
-      //and throw if the item passed is not a master item.
-      this.DataGridContext.ToggleDetailExpansion( dataItem );
-    }
-
     public bool AreDetailsExpanded( object dataItem )
     {
       //This function will work only for master items.
@@ -4917,11 +5206,6 @@ namespace Xceed.Wpf.DataGrid
       return this.DataGridContext.AreDetailsExpanded( dataItem );
     }
 
-    internal DataGridContext GetChildContext( object parentItem, DetailConfiguration detailConfiguration )
-    {
-      return this.DataGridContext.GetChildContext( parentItem, detailConfiguration );
-    }
-
     public DataGridContext GetChildContext( object parentItem, string relationName )
     {
       return this.DataGridContext.GetChildContext( parentItem, relationName );
@@ -4965,10 +5249,59 @@ namespace Xceed.Wpf.DataGrid
       return this.DataGridContext.GetParentGroupFromItem( item );
     }
 
+    public IDisposable DeferColumnsUpdate()
+    {
+      return this.DataGridContext.DeferColumnsUpdate();
+    }
+
+    public bool MoveColumnBefore( ColumnBase current, ColumnBase next )
+    {
+      return this.DataGridContext.MoveColumnBefore( current, next );
+    }
+
+    public bool MoveColumnAfter( ColumnBase current, ColumnBase previous )
+    {
+      return this.DataGridContext.MoveColumnAfter( current, previous );
+    }
+
+    public bool MoveColumnUnder( ColumnBase current, ColumnBase parent )
+    {
+      return this.DataGridContext.MoveColumnUnder( current, parent );
+    }
+
+    [Obsolete( "MoveMergedColumn is obsolete. Use MoveColumnUnder instead." )]
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    public void MoveMergedColumn( ColumnBase columnToMove, ColumnBase parentMergedColumn )
+    {
+      if( !this.MoveColumnUnder( columnToMove, parentMergedColumn ) )
+        throw new InvalidOperationException( "Failed to move the column." );
+    }
+
+    [Obsolete( "MoveMergedColumn is obsolete. Use MoveColumnUnder instead." )]
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    public void MoveMergedColumn( string columnToMove, string parentMergedColumn )
+    {
+      var level = -1;
+      var parentColumn = default( ColumnBase );
+
+      if( level == -1 )
+        throw new ArgumentException( "An attempt was made to use a column that is not part of a MergedHeader.", "parentMergedColumn" );
+
+      ColumnBase childColumn = null;
+      childColumn = this.Columns[ columnToMove ];
+      if( childColumn == null )
+        throw new ArgumentException( "An attempt was made to move an invalid child column to a parent merged column.", "childColumn" );
+
+      if( !this.MoveColumnUnder( childColumn, parentColumn ) )
+        throw new InvalidOperationException( "Failed to move the column." );
+    }
+
     protected override Size MeasureOverride( Size constraint )
     {
       //By default the measure pass must not be delayed, or if the grid is already loaded or if we are printing.
-      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded ) || ( this.IsPrinting ) || ( !m_isFirstTimeLoaded ) )
+      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded )|| ( !m_isFirstTimeLoaded ) )
         return base.MeasureOverride( constraint );
 
       return this.GetStartUpSize( constraint );
@@ -4977,7 +5310,7 @@ namespace Xceed.Wpf.DataGrid
     protected override Size ArrangeOverride( Size arrangeBounds )
     {
       //By default the measure pass must not be delayed, or if the grid is already loaded or if we are printing.
-      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded ) || ( this.IsPrinting ) || ( !m_isFirstTimeLoaded ) )
+      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded ) || ( !m_isFirstTimeLoaded ) )
         return base.ArrangeOverride( arrangeBounds );
 
       return arrangeBounds;
@@ -5005,14 +5338,14 @@ namespace Xceed.Wpf.DataGrid
         this.ForceFocus( this.ScrollViewer );
       }
 
-      IDataGridItemContainer dataGridItemContainer = element as IDataGridItemContainer;
-      Row row = element as Row;
+      var dataGridItemContainer = element as IDataGridItemContainer;
+      var row = element as Row;
 
       // Only preserve ContainerSizeState if necessary
       if( !this.IsBoundToDataGridVirtualizingCollectionViewBase
           && this.ViewPreservesContainerSize )
       {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( element );
+        var dataGridContext = DataGridControl.GetDataGridContext( element );
 
         //Save the size state of the container (this will do nothing if no size has been set on the item ).
         dataGridContext.SaveContainerSizeState( item, feContainer );
@@ -5022,7 +5355,7 @@ namespace Xceed.Wpf.DataGrid
       // calling ClearContainer on a Row inside a HeaderFooterItem.
       // HeaderFooterItem implements IDataGridItemContainer and we call
       // ClearContainer on it if not null.
-      HeaderFooterItem hfi = element as HeaderFooterItem;
+      var hfi = element as HeaderFooterItem;
 
       // If element is a HeaderFooterItem, then it cannot be a Row
       if( hfi != null )
@@ -5036,17 +5369,15 @@ namespace Xceed.Wpf.DataGrid
         //cancel edit if applicable and preserve state of the row.
         if( row.IsBeingEdited )
         {
-          RowState oldRowEditionState = m_currentRowInEditionState.Clone();
+          var oldRowEditionState = m_currentRowInEditionState.Clone();
+          var oldColumnsStates = new Dictionary<ColumnBase, CellState>();
 
-          Dictionary<ColumnBase, CellState> oldColumnsStates = new Dictionary<ColumnBase, CellState>();
-
-          Debug.Assert( item == m_currentItemInEdition, "The current item being edited on the DataGridControl differs from the one of the currently edited container." );
+          //Debug.Assert( item == m_currentItemInEdition, "The current item being edited on the DataGridControl differs from the one of the currently edited container." );
 
           // We can use row because there is only one row in edition in the DataGridControl
           foreach( Cell cell in row.CreatedCells )
           {
-            ColumnBase parentColumn = cell.ParentColumn;
-
+            var parentColumn = cell.ParentColumn;
             if( parentColumn == null )
               continue;
 
@@ -5082,8 +5413,7 @@ namespace Xceed.Wpf.DataGrid
 
           foreach( ColumnBase column in oldColumnsStates.Keys )
           {
-            CellState oldCellState = oldColumnsStates[ column ];
-            column.CurrentRowInEditionCellState = oldCellState;
+            column.CurrentRowInEditionCellState = oldColumnsStates[ column ];
           }
 
           // Though the row state is preserved, the DataGridControl is not in editing anymore.
@@ -5116,8 +5446,7 @@ namespace Xceed.Wpf.DataGrid
         dataGridItemContainer.ClearContainer();
       }
 
-      UIElement uiElement = element as UIElement;
-
+      var uiElement = element as UIElement;
       if( ( uiElement != null ) && ( ( uiElement.IsKeyboardFocusWithin ) || ( uiElement.IsKeyboardFocused ) ) )
       {
         // If the element we are cleaning up contains the focus, we ensure to refocus the ScrollViewer to have
@@ -5130,8 +5459,7 @@ namespace Xceed.Wpf.DataGrid
     {
       base.PrepareContainerForItemOverride( element, item );
 
-      //this is specific to the DataRows from the Original items list... do not want to do that in the
-      //Row.PrepareContainer()
+      //this is specific to the DataRows from the Original items list... do not want to do that in the Row.PrepareContainer()
 
       IDataGridItemContainer dataGridItemContainer = element as IDataGridItemContainer;
       Row row = element as Row;
@@ -5139,7 +5467,6 @@ namespace Xceed.Wpf.DataGrid
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( element );
       Debug.Assert( dataGridContext != null );
 
-
       if( dataGridItemContainer != null )
       {
         dataGridItemContainer.PrepareContainer( dataGridContext, item );
@@ -5203,8 +5530,7 @@ namespace Xceed.Wpf.DataGrid
         }
         else
         {
-          //this condition is for Rows that are recycled from an environment where they had
-          //and item container style to one that doesn't...
+          //this condition is for Rows that are recycled from an environment where they had and item container style to one that doesn't...
           if( row.ReadLocalValue( Row.StyleProperty ) != DependencyProperty.UnsetValue )
           {
             row.ClearValue( Row.StyleProperty );
@@ -5220,8 +5546,7 @@ namespace Xceed.Wpf.DataGrid
       //as such, I will re-determine if the item is a Row ( this time digging beyond HeaderFooterItem
 
       // Only restore ContainerSizeState if necessary
-      if( !this.IsBoundToDataGridVirtualizingCollectionViewBase
-          && this.ViewPreservesContainerSize )
+      if( !this.IsBoundToDataGridVirtualizingCollectionViewBase && this.ViewPreservesContainerSize )
       {
         //Restore the Size of the item (if there was some special size assigned to the item container previously
         dataGridContext.RestoreContainerSizeState( item, element as FrameworkElement );
@@ -5240,7 +5565,7 @@ namespace Xceed.Wpf.DataGrid
       //Only perform the BringItemIntoView if the item focused is within the host panel! 
       if( ScrollViewerHelper.IsFocusInElement( this.ItemsHost as FrameworkElement ) )
       {
-        DataGridContext currentDataGridContext = this.CurrentContext;
+        var currentDataGridContext = this.CurrentContext;
 
         //ensure that the key pressed is a Keyboard Navigation key
         switch( e.Key )
@@ -5258,40 +5583,44 @@ namespace Xceed.Wpf.DataGrid
 
           case Key.Space:
             {
-              DependencyObject originalSource = e.OriginalSource as DependencyObject;
-
-              FrameworkElement element = CustomItemContainerGenerator.FindContainerFromChildOrRowSelectorOrSelf( this, originalSource );
+              var originalSource = e.OriginalSource as DependencyObject;
+              if( originalSource == null )
+                break;
 
-              Row row = element as Row;
-              SelectionRangePoint newPosition = null;
+              var container = DataGridControl.GetContainer( originalSource );
+              if( container == null )
+                break;
 
-              if( ( row != null ) && ( !row.IsBeingEdited ) )
-              {
-                DataGridContext newDataGridContext = DataGridControl.GetDataGridContext( row );
+              var dataGridContext = DataGridControl.GetDataGridContext( container );
+              if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
+                break;
 
-                if( newDataGridContext != null )
-                {
-                  int sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
-                  object item = newDataGridContext.GetItemFromContainer( row );
-                  Cell cell = originalSource as Cell;
+              var row = container as Row;
+              var newPosition = default( SelectionRangePoint );
 
-                  if( ( cell == null ) || ( cell.ParentColumn.DataGridControl != this ) )
-                  {
-                    cell = Cell.FindFromChild( this, originalSource );
-                  }
+              if( row != null )
+              {
+                if( row.IsBeingEdited )
+                  break;
 
-                  int columnIndex = ( cell == null ) ? -1 : cell.ParentColumn.VisiblePosition;
+                var cell = Cell.FindFromChildOrSelf( this, originalSource );
+                var item = dataGridContext.GetItemFromContainer( row );
+                var itemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
+                var column = ( cell != null ) ? cell.ParentColumn : null;
+                var columnIndex = ( column != null ) ? column.VisiblePosition : -1;
 
-                  newPosition = new SelectionRangePoint( newDataGridContext, item, sourceDataItemIndex, columnIndex );
-                }
+                newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, itemIndex, columnIndex );
+              }
+              else
+              {
+                break;
               }
 
               if( newPosition != null )
               {
-                var oldPosition = SelectionRangePoint.TryCreateFromCurrent( this.CurrentContext );
+                var oldPosition = SelectionRangePoint.TryCreateFromCurrent( DataGridControl.GetDataGridContext( container ) );
 
-                m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, true,
-                  false, SelectionManager.UpdateSelectionSource.SpaceDown );
+                m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, true, false, SelectionManager.UpdateSelectionSource.SpaceDown );
 
                 e.Handled = true;
               }
@@ -5375,11 +5704,10 @@ namespace Xceed.Wpf.DataGrid
     {
       if( m_mouseDownUpdateSelectionSource == null )
       {
-        m_mouseDownUpdateSelectionSource = this.SelectionChangerManager.PushUpdateSelectionSource(
-          SelectionManager.UpdateSelectionSource.MouseDown );
+        m_mouseDownUpdateSelectionSource = this.SelectionChangerManager.PushUpdateSelectionSource( SelectionManager.UpdateSelectionSource.MouseDown );
       }
 
-      ColumnBase currentColumn = this.CurrentColumn;
+      var currentColumn = this.CurrentColumn;
 
       m_mouseDownSelectionRangePoint = SelectionRangePoint.TryCreateFromCurrent( this.CurrentContext );
 
@@ -5388,20 +5716,29 @@ namespace Xceed.Wpf.DataGrid
       if( e.Handled )
         return;
 
-      DataGridContext oldDataGridContext = this.CurrentContext;
-      Row oldRow = ( oldDataGridContext == null ) ? null : oldDataGridContext.CurrentRow;
+      var oldDataGridContext = this.CurrentContext;
+      var oldRow = ( oldDataGridContext == null ) ? null : oldDataGridContext.CurrentRow;
+
+      var source = e.OriginalSource as DependencyObject;
+      if( source == null )
+        return;
+
+      var container = DataGridControl.GetContainer( source );
+      if( container == null )
+        return;
+
+      var newDataGridContext = DataGridControl.GetDataGridContext( container );
+      if( ( newDataGridContext == null ) || ( newDataGridContext.DataGridControl != this ) )
+        return;
 
-      UIElement newContainer = CustomItemContainerGenerator.FindContainerFromChildOrRowSelectorOrSelf(
-        this, e.OriginalSource as DependencyObject );
+      var newRow = Row.FromContainer( container );
 
-      Row newRow = Row.FromContainer( newContainer );
+      this.OnPreviewMouseDown_DragToSelect( e );
 
-      // testing newContainer == null is a way to not end edition when moving
-      // the scroll bar around.
-      if( ( oldRow == null ) || ( newContainer == null ) || ( !oldRow.IsBeingEdited ) || ( newRow == oldRow ) )
+      if( ( oldRow == null ) || ( !oldRow.IsBeingEdited ) || ( newRow == oldRow ) )
         return;
 
-      ColumnBase oldCurrentColumn = oldDataGridContext.CurrentColumn;
+      var oldCurrentColumn = oldDataGridContext.CurrentColumn;
 
       bool mouseDownHandled;
       Row newFocusedRow;
@@ -5411,8 +5748,7 @@ namespace Xceed.Wpf.DataGrid
       {
         // If the source is reset during the EndEdit, we move the focus temporarely on the ScrollViewer to prevent some issue
         // when the EndEdit cause a Reset (The ScrollViewer was trying to bring into view the old editing Cell).
-        bool focused = this.ForceFocus( this.ScrollViewer );
-
+        var focused = this.ForceFocus( this.ScrollViewer );
         if( !focused )
           return;
 
@@ -5425,16 +5761,14 @@ namespace Xceed.Wpf.DataGrid
           this.UpdateLayout();
 
           IInputElement visualHit = this.InputHitTest( e.GetPosition( this ) );
-          mouseDownHandled = ( visualHit == null )
-                          || ( !object.ReferenceEquals( visualHit, e.OriginalSource ) );
+          mouseDownHandled = ( visualHit == null ) || ( !object.ReferenceEquals( visualHit, e.OriginalSource ) );
           newFocusedRow = newRow;
           newFocusedColumn = currentColumn;
         }
       }
       catch( DataGridException )
       {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
+        // We swallow exception if it occurs because of a validation error or Cell was read-only or any other GridException.
         mouseDownHandled = true;
         newFocusedRow = oldRow;
         newFocusedColumn = oldCurrentColumn;
@@ -5467,44 +5801,45 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       var source = e.OriginalSource as DependencyObject;
+      if( source == null )
+        return;
 
-      FrameworkElement element = CustomItemContainerGenerator.FindContainerFromChildOrRowSelectorOrSelf( this, source );
+      var container = DataGridControl.GetContainer( source );
+      if( ( container == null ) || ( !container.IsKeyboardFocused && !container.IsKeyboardFocusWithin ) )
+        return;
 
-      if( element == null || ( !element.IsKeyboardFocused && !element.IsKeyboardFocusWithin ) )
+      var dataGridContext = DataGridControl.GetDataGridContext( container );
+      if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
         return;
 
-      var row = element as Row;
-      SelectionRangePoint newPosition = null;
-      bool rowIsBeingEdited = false;
+      var row = container as Row;
+      var newPosition = default( SelectionRangePoint );
+      var rowIsBeingEdited = false;
 
       if( row != null )
       {
-        var dataGridContext = DataGridControl.GetDataGridContext( row );
-        if( dataGridContext == null )
-          return;
-
         var cell = Cell.FindFromChildOrSelf( this, source );
         if( ( cell != null ) && ( this.SelectionUnit == SelectionUnit.Cell ) && ( !cell.IsKeyboardFocused ) && ( !cell.IsKeyboardFocusWithin ) )
           return;
 
-        var itemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
         var item = dataGridContext.GetItemFromContainer( row );
-
+        var itemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
         var column = ( cell != null ) ? cell.ParentColumn : null;
         var columnIndex = ( column != null ) ? column.VisiblePosition : -1;
 
-        // If we have an error during the EndEdit that prevent the PreviewMouseDown from occuring 
-        // (since we put e.Handled = true if an exception occurs), 
+        // If we have an error during the EndEdit that prevent the PreviewMouseDown from occuring  (since we put e.Handled = true if an exception occurs), 
         // the PreviewMouseUp will not occur, so it is safe to call UpdateSelection().
-        newPosition = new SelectionRangePoint( dataGridContext, item, itemIndex, columnIndex );
+        newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, itemIndex, columnIndex );
         rowIsBeingEdited = row.IsBeingEdited;
       }
+      else
+      {
+        return;
+      }
 
       if( newPosition != null )
       {
-        m_selectionChangerManager.UpdateSelection(
-          m_mouseDownSelectionRangePoint, newPosition, true, rowIsBeingEdited,
-          SelectionManager.UpdateSelectionSource.MouseUp );
+        m_selectionChangerManager.UpdateSelection( m_mouseDownSelectionRangePoint, newPosition, true, rowIsBeingEdited, SelectionManager.UpdateSelectionSource.MouseUp );
       }
     }
 
@@ -5533,7 +5868,7 @@ namespace Xceed.Wpf.DataGrid
       if( e.Handled || m_inhibitPreviewGotKeyboardFocus.IsSet )
         return;
 
-      DependencyObject newFocus = e.NewFocus as DependencyObject;
+      var newFocus = e.NewFocus as DependencyObject;
 
       if( this.NavigationBehavior == NavigationBehavior.None )
       {
@@ -5547,9 +5882,9 @@ namespace Xceed.Wpf.DataGrid
 
       if( ( newFocus == this ) || ( newFocus == this.ScrollViewer ) )
       {
-        DataGridContext currentDataGridContext = this.CurrentContext;
-        object internalCurrentItem = currentDataGridContext.InternalCurrentItem;
-        UIElement itemUIElement = null;
+        var currentDataGridContext = this.CurrentContext;
+        var internalCurrentItem = currentDataGridContext.InternalCurrentItem;
+        var itemUIElement = default( UIElement );
 
         if( ( internalCurrentItem == null ) && ( currentDataGridContext.Items.Count > 0 ) )
         {
@@ -5560,7 +5895,8 @@ namespace Xceed.Wpf.DataGrid
           {
             using( this.InhibitSetFocus() )
             {
-              currentDataGridContext.SetCurrent( internalCurrentItem, null, 0, currentDataGridContext.CurrentColumn, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.FocusChanged );
+              currentDataGridContext.SetCurrent( internalCurrentItem, null, 0, currentDataGridContext.CurrentColumn, false, false, this.SynchronizeSelectionWithCurrent,
+                                                 AutoScrollCurrentItemSourceTriggers.FocusChanged );
             }
           }
         }
@@ -5571,16 +5907,16 @@ namespace Xceed.Wpf.DataGrid
           itemUIElement = currentDataGridContext.GetContainerFromItem( internalCurrentItem ) as UIElement;
 
           //  Special case when the previous element with the focus is now collapsed, the focus must be moved to the ScrollViewer, so the grid is kept focusable. 
-          bool focusScrollViewer = ( itemUIElement == null );
+          var focusScrollViewer = ( itemUIElement == null );
           if( !focusScrollViewer )
           {
-            HeaderFooterItem headerFooterItem = itemUIElement as HeaderFooterItem;
+            var headerFooterItem = itemUIElement as HeaderFooterItem;
             if( headerFooterItem != null )
             {
               focusScrollViewer = headerFooterItem.Visibility == Visibility.Collapsed;
               if( !focusScrollViewer )
               {
-                UIElement container = headerFooterItem.Container as UIElement;
+                var container = headerFooterItem.Container as UIElement;
                 if( container != null )
                 {
                   focusScrollViewer = container.Visibility == Visibility.Collapsed;
@@ -5616,53 +5952,51 @@ namespace Xceed.Wpf.DataGrid
       }
 
       // If the focus was in a popup menu, we don't want to change the selection, so we consider the focus to be outside the grid in that situation.      
-      bool oldFocusWasInTheGrid = ( e.OldFocus != null ) && ( TreeHelper.IsDescendantOf( e.OldFocus as DependencyObject, this, false ) );
-      DataGridContext oldCurrentDataGridContext = this.CurrentContext;
+      var oldFocusWasInTheGrid = ( e.OldFocus != null ) && ( TreeHelper.IsDescendantOf( e.OldFocus as DependencyObject, this, false ) );
+      var oldCurrentDataGridContext = this.CurrentContext;
+      var oldRow = default( Row );
+      var oldPosition = default( SelectionRangePoint );
 
-      Row oldRow = null;
-      SelectionRangePoint oldPosition = null;
       if( oldCurrentDataGridContext != null )
       {
         oldRow = oldCurrentDataGridContext.CurrentRow;
         oldPosition = SelectionRangePoint.TryCreateFromCurrent( oldCurrentDataGridContext );
+        m_oldColumn = oldCurrentDataGridContext.CurrentCell != null ? new WeakReference( oldCurrentDataGridContext.CurrentCell.ParentColumn ) : m_oldColumn;
       }
 
-      FrameworkElement newContainer = CustomItemContainerGenerator.FindContainerFromChildOrRowSelectorOrSelf( this, newFocus );
-
-      DataGridContext newDataGridContext = ( newContainer == null ) ? null : DataGridControl.GetDataGridContext( newContainer );
-
-      Row newRow = Row.FromContainer( newContainer );
-      Cell newCell = newFocus as Cell;
+      var newContainer = this.GetLocalContainer( newFocus );
+      var newDataGridContext = ( newContainer == null ) ? null : DataGridControl.GetDataGridContext( newContainer );
+      var newRow = Row.FromContainer( newContainer );
+      var newCell = newFocus as Cell;
 
       if( ( newCell == null ) || ( newCell.ParentColumn.DataGridControl != this ) )
       {
         newCell = Cell.FindFromChild( this, newFocus );
       }
 
-      ColumnBase newColumn = ( newCell == null ) ? null : newCell.ParentColumn;
-      object item = ( newContainer == null ) ? null : newDataGridContext.GetItemFromContainer( newContainer );
-      bool containerChangedDuringEndEdit = false;
+      var newColumn = ( newCell == null ) ? null : newCell.ParentColumn;
+      var item = ( newContainer == null ) ? null : newDataGridContext.GetItemFromContainer( newContainer );
+      var containerChangedDuringEndEdit = false;
 
       // Prevent the focus to be moved during the EndEdit since we are changing focus at the moment
       using( this.InhibitSetFocus() )
       {
         if( ( oldRow != null ) && ( oldRow.IsBeingEdited ) )
         {
-          Cell oldCell = ( oldCurrentDataGridContext == null ) ? null : oldCurrentDataGridContext.CurrentCell;
+          var oldCell = ( oldCurrentDataGridContext == null ) ? null : oldCurrentDataGridContext.CurrentCell;
 
           if( oldRow != newRow )
           {
             try
             {
-              FrameworkElement previousNewContainer = newContainer;
+              var previousNewContainer = newContainer;
               oldRow.EndEdit();
 
-              // We must refetch the container for the current item in case EndEdit triggers a reset on the  CustomItemContainerGenerator
+              // We must refetch the container for the current item in case EndEdit triggers a reset on the CustomItemContainerGenerator
               // and remap this item to a container other than the one previously fetched
               this.UpdateLayout();
 
               newContainer = ( item == null ) ? null : newDataGridContext.GetContainerFromItem( item ) as FrameworkElement;
-
               newRow = Row.FromContainer( newContainer );
               newCell = ( newRow == null ) ? null : newRow.Cells[ newColumn ];
 
@@ -5673,7 +6007,7 @@ namespace Xceed.Wpf.DataGrid
               }
               else
               {
-                // If the newFocus is not in the the grid anymore, stop the focus.
+                // If the newFocus is not in the grid anymore, stop the focus.
                 if( DataGridControl.GetDataGridContext( newFocus ) == null )
                 {
                   e.Handled = true;
@@ -5717,16 +6051,15 @@ namespace Xceed.Wpf.DataGrid
 
         try
         {
-          Cell oldFocusedCell = e.OldFocus as Cell;
-          UIElement newFocusedElement = e.NewFocus as UIElement;
+          var oldFocusedCell = e.OldFocus as Cell;
+          var newFocusedElement = e.NewFocus as UIElement;
 
           // here we check if the oldFocus is the parent of the new focused element because the OnPreviewGotKeyboardFocus
           // is called twice if it's the case which give twice the focus and then endsup unselecting the element during the mouseUp 
           // because during the second updateSelection, the element is already contained then m_updateSelectionOnNextMouseUp set to true
-          bool isNewFocusParentTheOldFocusedCell = ( ( oldFocusedCell != null ) && ( newFocusedElement != null ) ) ?
-                                                     ( oldFocusedCell != Cell.FindFromChild( this, newFocusedElement ) ) : true;
-
-          int sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( newRow );
+          var isNewFocusParentTheOldFocusedCell = ( ( oldFocusedCell != null ) && ( newFocusedElement != null ) ) ?
+                                                    ( oldFocusedCell != Cell.FindFromChild( this, newFocusedElement ) ) : true;
+          var sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( newRow );
 
           // newCell != newFocus is in fact a way to test if newFocus is a child of the cell.
           if( ( newFocus != null ) && ( newCell != newFocus ) && ( !newCell.IsBeingEdited ) && ( newCell.IsCellEditorDisplayed ) )
@@ -5741,11 +6074,10 @@ namespace Xceed.Wpf.DataGrid
 
           if( isNewFocusParentTheOldFocusedCell )
           {
-            bool rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
+            var rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
 
             var newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, sourceDataItemIndex, newCell.ParentColumn.VisiblePosition );
-            m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid,
-                                                       rowIsBeingEditedAndCurrentRowNotChanged, null );
+            m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, null );
           }
         }
         catch( DataGridException )
@@ -5770,22 +6102,57 @@ namespace Xceed.Wpf.DataGrid
 
         try
         {
-          ColumnBase currentColumn = null;
+          var currentColumn = default( ColumnBase );
 
           //  The current column may need to be propagated, unless the focus is being moved to a GroupHeaderControl
-          if( ( this.NavigationBehavior == NavigationBehavior.CellOnly ) && !( item is GroupHeaderFooterItem ) )
+          // Special case for a row that is always set to NavigationBehavior.CellOnly (like FilterRow), as it needs a current column for the navigation to work propertly.
+          if( ( ( this.NavigationBehavior == NavigationBehavior.CellOnly ) || ( newRow.NavigationBehavior == NavigationBehavior.CellOnly ) )
+              && !( item is GroupHeaderFooterItem ) )
           {
-            currentColumn = newDataGridContext.CurrentColumn;
+            if( ( newDataGridContext != oldCurrentDataGridContext ) && this.AreDetailsFlatten )
+            {
+              currentColumn = newDataGridContext.GetMatchingColumn( oldCurrentDataGridContext, m_oldColumn.Target as ColumnBase );
+            }
+
+            if( currentColumn == null )
+            {
+              currentColumn = newDataGridContext.CurrentColumn;
+            }
 
             //if there is no current column,
             if( currentColumn == null )
             {
-              //then use the first visible column
-              ReadOnlyObservableCollection<ColumnBase> columns = newDataGridContext.VisibleColumns;
+              //Check what was the last currentColumn before navigating in Row mode, in the case it's navigating again towards a cell (as for the FilterRow for instance).
+              var oldColumn = m_oldColumn.Target as ColumnBase;
+              if( ( oldColumn != null ) && ( newDataGridContext == oldCurrentDataGridContext ) )
+              {
+                var fixedCellPanel = newRow.CellsHostPanel as FixedCellPanel;
+                if( fixedCellPanel != null )
+                {
+                  var cell = default( Cell );
+                  var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
+                  if( virtualizingCellCollection.TryGetBindedCell( oldColumn, out cell ) )
+                  {
+                    currentColumn = oldColumn;
+                  }
+                }
+              }
+            }
 
+            //If there is no last currentColumn, or it is not available for navigation.
+            if( currentColumn == null )
+            {
+              //Then use the first visible column
+              var columns = newDataGridContext.VisibleColumns;
               if( columns.Count > 0 )
               {
-                int firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( newDataGridContext, newRow );
+                //First try to find the first navigable column that is visible in the viewport.
+                var firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableInViewportColumnIndex( newDataGridContext, newRow );
+                if( firstFocusableColumn == -1 )
+                {
+                  //If none is found, find the first navigable one.  This will make the grid scroll if one is found, since it's currently out-of-view.
+                  firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( newDataGridContext, newRow );
+                }
                 if( firstFocusableColumn < 0 )
                   throw new DataGridException( "Trying to edit while no cell is focusable. ", this );
 
@@ -5823,13 +6190,11 @@ namespace Xceed.Wpf.DataGrid
             newDataGridContext.SetCurrent( item, newRow, sourceDataItemIndex, currentColumn, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
           }
 
-          int columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
-
-          bool rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
+          var columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
+          var rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
 
           var newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, sourceDataItemIndex, columnIndex );
-          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid,
-                                                     rowIsBeingEditedAndCurrentRowNotChanged, null );
+          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, null );
         }
         catch( DataGridException )
         {
@@ -5839,14 +6204,11 @@ namespace Xceed.Wpf.DataGrid
         return;
       }
 
-      if( newContainer != null )
+      if( newContainer is HeaderFooterItem )
       {
-        HeaderFooterItem headerFooterItem = newContainer as HeaderFooterItem;
-
-        if( headerFooterItem == null )
-          return;
+        var headerFooterItem = ( HeaderFooterItem )newContainer;
 
-        IDisposable inhibitSetFocus = null;
+        var inhibitSetFocus = default( IDisposable );
 
         if( !containerChangedDuringEndEdit )
         {
@@ -5856,15 +6218,15 @@ namespace Xceed.Wpf.DataGrid
         try
         {
           SelectionRangePoint newPosition;
-          ColumnBase currentColumn = newDataGridContext.CurrentColumn;
+
+          var currentColumn = newDataGridContext.CurrentColumn;
           newDataGridContext.SetCurrent( item, null, -1, currentColumn, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
 
-          int columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
+          var columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
 
           newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, -1, columnIndex );
 
-          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition,
-                                                     oldFocusWasInTheGrid, false, null );
+          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, false, null );
         }
         catch( DataGridException )
         {
@@ -5898,6 +6260,15 @@ namespace Xceed.Wpf.DataGrid
 
       if( e.Handled )
         return;
+
+      this.OnMouseLeftButtonUp_DragToSelect( e );
+    }
+
+    protected override void OnLostMouseCapture( MouseEventArgs e )
+    {
+      base.OnLostMouseCapture( e );
+
+      this.OnLostMouseCapture_DragToSelect( e );
     }
 
     protected override void OnMouseMove( MouseEventArgs e )
@@ -5906,11 +6277,15 @@ namespace Xceed.Wpf.DataGrid
 
       if( e.Handled )
         return;
+
+      this.OnMouseMove_DragToSelect( e );
     }
 
-    protected override AutomationPeer OnCreateAutomationPeer()
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
-      return new DataGridControlAutomationPeer( this );
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( e.Property.Name );
     }
 
     internal static object GetFixedItemFromContainer( DependencyObject container )
@@ -5975,6 +6350,9 @@ namespace Xceed.Wpf.DataGrid
 
     internal void ClearItemContainer( DependencyObject container, object item )
     {
+      // For performance reason, it is useless to clear the ContainerProperty. The value is set in DataGridControl.PrepareItemContainer and it contains the 
+      // container itself.  Clearing it here to set it back later is pointless.  Furthermore, setting and clearing the property cost more than usual since the
+      // DependencyProperty is inherited.  To determine if the container is in use, the DataGridControl.IsContainerPrepared attached property should be use instead.
       //DataGridControl.ClearContainer( container );
       DataGridControl.ClearIsContainerPrepared( container );
       this.ClearContainerForItemOverride( container, item );
@@ -5987,8 +6365,7 @@ namespace Xceed.Wpf.DataGrid
       if( container != null )
       {
 
-        // Set a local value for containers to ensure the 
-        // DefaultStyleKey is correctly applied on this container
+        // Set a local value for containers to ensure the DefaultStyleKey is correctly applied on this container
         container.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
       }
 
@@ -6093,34 +6470,15 @@ namespace Xceed.Wpf.DataGrid
       this.SetValue( ParentDataGridControlPropertyKey, null );
     }
 
-    internal void QueueDataGridContextPeerChlidrenRefresh( DataGridContext dataGridContext )
-    {
-      if( dataGridContext.Peer == null )
-        return;
-
-      if( m_dataGridContextToRefreshPeerChlidren == null )
-      {
-        m_dataGridContextToRefreshPeerChlidren = new HashSet<DataGridContext>();
-        m_dataGridContextToRefreshPeerChlidren.Add( dataGridContext );
-      }
-      else
-      {
-        if( !m_dataGridContextToRefreshPeerChlidren.Contains( dataGridContext ) )
-        {
-          m_dataGridContextToRefreshPeerChlidren.Add( dataGridContext );
-        }
-      }
-    }
-
     internal void SynchronizeForeignKeyConfigurations()
     {
-      ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations(
-        this.Columns.FieldNameToColumnDictionary,
-        this.ItemsSource,
-        this.DataGridContext.ItemsSourceFieldDescriptors,
-        this.AutoCreateForeignKeyConfigurations );
+      ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations( this.Columns,
+                                                                     this.ItemsSource,
+                                                                     m_itemsSourcePropertyDescriptions,
+                                                                     this.AutoCreateForeignKeyConfigurations );
     }
 
+
     private static bool IsRemoveAllowedForDeleteCommand( IList list )
     {
       // If the list has a fixed sized or if it's read only, we won't allow remove.
@@ -6189,6 +6547,7 @@ namespace Xceed.Wpf.DataGrid
       }
 
       collection.Clear();
+
     }
 
     private static void RefreshFixedHeaderFooter( DataGridControl dataGrid, Panel targetPanel, ObservableCollection<DataTemplate> collection )
@@ -6227,6 +6586,7 @@ namespace Xceed.Wpf.DataGrid
 
         targetPanel.Children.Add( control );
       }
+
     }
 
     private void ReapplyTemplate()
@@ -6265,6 +6625,37 @@ namespace Xceed.Wpf.DataGrid
       return rowIsBeingEditedAndCurrentRowNotChanged;
     }
 
+    private FrameworkElement GetLocalContainer( DependencyObject container )
+    {
+      if( container == null )
+        return null;
+
+      var candidate = DataGridControl.GetContainer( container );
+      while( candidate != null )
+      {
+        if( ( candidate is IDataGridItemContainer ) && ( candidate is FrameworkElement ) )
+        {
+          var dataGridContext = DataGridControl.GetDataGridContext( candidate );
+          if( dataGridContext == null )
+            break;
+
+          var dataGridControl = dataGridContext.DataGridControl;
+          if( dataGridControl == this )
+            return ( FrameworkElement )candidate;
+
+          candidate = dataGridControl;
+        }
+
+        var parent = TreeHelper.GetParent( candidate );
+        if( parent == null )
+          break;
+
+        candidate = DataGridControl.GetContainer( parent );
+      }
+
+      return null;
+    }
+
     private Size GetStartUpSize( Size constraint )
     {
       double width = this.Width;
@@ -6318,8 +6709,16 @@ namespace Xceed.Wpf.DataGrid
 
     protected virtual void OnNotifyPropertyChanged( PropertyChangedEventArgs e )
     {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, e );
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    private void OnPropertyChanged( string propertyName )
+    {
+      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( propertyName ) );
     }
 
     #endregion
@@ -6328,60 +6727,57 @@ namespace Xceed.Wpf.DataGrid
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      if( managerType == typeof( RootGroupChangedEventManager ) )
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        this.OnDataGridCollectionView_RootGroupChanged( sender, e );
-        return true;
+        var dataGridCollectionView = this.ItemsSource as DataGridCollectionViewBase;
+        var eventArgs = e as PropertyChangedEventArgs;
+
+        if( sender == dataGridCollectionView )
+        {
+          this.OnDataGridCollectionView_PropertyChanged( dataGridCollectionView, eventArgs );
+        }
       }
       else if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        this.OnDataGridDetailDescriptionsChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
+        this.OnDataGridDetailDescriptionsChanged( sender as DataGridDetailDescriptionCollection, ( NotifyCollectionChangedEventArgs )e );
       }
       else if( managerType == typeof( ProxyCollectionRefreshEventManager ) )
       {
-        this.OnDataGridCollectionView_ProxyCollectionRefresh( sender, e );
-        return true;
+        this.OnDataGridCollectionView_ProxyCollectionRefresh( sender as DataGridCollectionView, e );
       }
       else if( managerType == typeof( ProxyGroupDescriptionsChangedEventManager ) )
       {
-        this.OnDataGridCollectionView_ProxyGroupDescriptionsChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
+        this.OnDataGridCollectionView_ProxyGroupDescriptionsChanged( sender as DataGridCollectionView, ( NotifyCollectionChangedEventArgs )e );
       }
       else if( managerType == typeof( ProxySortDescriptionsChangedEventManager ) )
       {
-        this.OnDataGridCollectionView_ProxySortDescriptionsChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
-      }
-      else if( managerType == typeof( ProxyAutoFilterValuesChangedEventManager ) )
-      {
-        this.OnDataGridCollectionView_ProxyAutoFilterValuesChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
-      }
-      else if( managerType == typeof( ProxyApplyingFilterCriteriasEventManager ) )
-      {
-        this.OnDataGridCollectionView_ProxyApplyingFilterCriterias( sender, e );
-        return true;
+        this.OnDataGridCollectionView_ProxySortDescriptionsChanged( sender as DataGridCollectionView, ( NotifyCollectionChangedEventArgs )e );
       }
       else if( managerType == typeof( ConnectionStateChangedEventManager ) )
       {
-        this.OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( sender, e );
-        return true;
+        this.OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( sender as DataGridVirtualizingCollectionViewBase, e );
       }
       else if( managerType == typeof( ConnectionErrorChangedEventManager ) )
       {
-        this.OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( sender, e );
-        return true;
+        this.OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( sender as DataGridVirtualizingCollectionViewBase, e );
       }
       else if( managerType == typeof( FrameworkElementUnloadedEventManager ) )
       {
         this.UnhookToUnloaded();
         this.SaveDataGridContextState( this.DataGridContext, true, int.MaxValue );
         this.CleanUpAfterUnload();
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
@@ -6392,30 +6788,23 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return this.CreateDocumentPaginator();
+        return null;
       }
     }
 
-    protected virtual DocumentPaginator CreateDocumentPaginator()
-    {
-      return null;
-    }
-
     #endregion
 
-    #region Private Fields
-
-    private IDisposable m_columnsInitDisposable; // = null
     private IDisposable m_inhibitItemsCollectionChanged; // = null
 
-    private int m_beginInitCount; // = 0
-
     private Cursor m_oldCursor; // = null;
     private bool? m_oldForceCursor; // = null;
     private int m_waitCursorCount; // = 0;
 
     private FrameworkElement m_itemsHost; // = null
-    private CustomItemContainerGenerator m_customItemContainerGenerator; // = null
+    private readonly CustomItemContainerGenerator m_customItemContainerGenerator; // = null
+
+    private AutoScrollManager m_autoScrollManager;
+    private bool m_startDragSelection;
 
     private object m_currentItemInEdition; // = null
     private RowState m_currentRowInEditionState; // = null
@@ -6430,7 +6819,6 @@ namespace Xceed.Wpf.DataGrid
 
     private Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor> m_dataGridContextsStateDictionary;
     private SelectionManager m_selectionChangerManager;
-    private HashSet<DataGridContext> m_dataGridContextToRefreshPeerChlidren;
 
     private CommandBinding m_copyCommandBinding; // = null;
     private CommandBinding m_deleteCommandBinding; // = null;
@@ -6442,19 +6830,15 @@ namespace Xceed.Wpf.DataGrid
     private bool m_isFirstTimeLoaded = true;
 
     private WeakReference m_parentWindow;
+    private WeakReference m_oldColumn = new WeakReference( null );
 
     private BitVector32 m_flags = new BitVector32();
 
-    #endregion
-
-    #region DataGridControlFlags Nested Type
-
     [Flags]
     private enum DataGridControlFlags
     {
       SettingFocusOnCell = 1,
       IsSetCurrentInProgress = 2,
-      UsePrintView = 4,
       IsBoundToDataGridVirtualizingCollectionViewBase = 8,
       ViewPreservesContainerSize = 16,
       DebugSaveRestore = 32,
@@ -6462,8 +6846,5 @@ namespace Xceed.Wpf.DataGrid
       SelectedIndexPropertyNeedCoerce = 128,
       SelectedItemPropertyNeedCoerce = 256
     }
-
-    #endregion
   }
-
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
index 13017216..592fa340 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
@@ -15,8 +15,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using System.Runtime.Serialization;
 
 namespace Xceed.Wpf.DataGrid
@@ -66,41 +65,66 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    internal static void ThrowSystemException( string message, Type exceptionType, string source, string argument = "" )
+    internal static Exception Create<T>( string message, DataGridControl dataGridControl, string argument = "" )
     {
       Exception exception;
 
-      if( exceptionType == typeof( ArgumentException ) )
+      var exceptionType = typeof( T );
+
+      if( typeof( ArgumentException ) == exceptionType )
       {
         exception = new ArgumentException( message, argument );
       }
-      else if( exceptionType == typeof( ArgumentNullException ) )
+      else if( typeof( ArgumentNullException ) == exceptionType )
       {
         exception = new ArgumentNullException( message );
       }
-      else if( exceptionType == typeof( ArgumentOutOfRangeException ) )
+      else if( typeof( ArgumentOutOfRangeException ) == exceptionType )
       {
         exception = new ArgumentOutOfRangeException( argument, message );
       }
-      else if( exceptionType == typeof( IndexOutOfRangeException ) )
+      else if( typeof( IndexOutOfRangeException ) == exceptionType )
       {
         exception = new IndexOutOfRangeException( message );
       }
-      else if( exceptionType == typeof( InvalidOperationException ) )
+      else if( typeof( InvalidOperationException ) == exceptionType )
       {
         exception = new InvalidOperationException( message );
       }
-      else if( exceptionType == typeof( NotSupportedException ) )
+      else if( typeof( NotSupportedException ) == exceptionType )
       {
         exception = new NotSupportedException( message );
       }
+      else if( typeof( DataGridException ) == exceptionType )
+      {
+        return new DataGridException( message, dataGridControl );
+      }
+      else if( typeof( DataGridInternalException ) == exceptionType )
+      {
+        return new DataGridInternalException( message, dataGridControl );
+      }
       else
       {
         exception = new Exception( message );
       }
 
-      exception.Source = source;
-      throw exception;
+      if( dataGridControl != null )
+      {
+        var name = dataGridControl.GridUniqueName;
+        if( string.IsNullOrEmpty( name ) )
+        {
+          name = dataGridControl.Name;
+        }
+
+        if( !string.IsNullOrEmpty( name ) )
+        {
+          exception.Source = name;
+        }
+      }
+
+      Debug.Assert( exception != null );
+
+      return exception;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs
index 6d82fae6..a583c7ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs
@@ -23,8 +23,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal sealed class DataGridItemContainerManager
   {
-    #region Constructor
-
     internal DataGridItemContainerManager( IDataGridItemContainer owner )
     {
       if( owner == null )
@@ -36,6 +34,22 @@ namespace Xceed.Wpf.DataGrid
       m_owner = owner;
     }
 
+    #region CanBeRecycled Property
+
+    internal bool CanBeRecycled
+    {
+      get
+      {
+        if( m_preparedContainers.Any( item => !item.CanBeRecycled ) )
+          return false;
+
+        if( m_unpreparedContainers.Any( item => !item.CanBeRecycled ) )
+          return false;
+
+        return true;
+      }
+    }
+
     #endregion
 
     internal void Prepare( DataGridContext dataGridContext, object dataItem )
@@ -47,7 +61,7 @@ namespace Xceed.Wpf.DataGrid
       this.Update();
     }
 
-    internal void Clear()
+    internal void Clear( bool isRecyclingCandidate )
     {
       m_containersPrepared = false;
       m_dataGridContext = null;
@@ -55,7 +69,7 @@ namespace Xceed.Wpf.DataGrid
 
       try
       {
-        this.ClearContainers();
+        this.ClearContainers( isRecyclingCandidate );
       }
       finally
       {
@@ -64,13 +78,24 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    internal void CleanRecyclingCandidates()
+    {
+      var newContainers = m_owner.GetTemplatedChildDataGridItemContainers().ToList();
+
+      foreach( var container in newContainers )
+      {
+        container.IsRecyclingCandidate = false;
+        container.CleanRecyclingCandidate();
+      }
+    }
+
     internal void Update()
     {
       var newContainers = m_owner.GetTemplatedChildDataGridItemContainers().ToList();
 
       try
       {
-        this.ClearContainers( newContainers );
+        this.ClearContainers( newContainers, false );
       }
       finally
       {
@@ -107,27 +132,27 @@ namespace Xceed.Wpf.DataGrid
             fe.ApplyTemplate();
           }
         }
-        else
-        {
-          // When dealing with a row, make sure its cells are properly initialized with their corresponding columns.
-          row.SynchronizeCellsWithColumns( m_dataGridContext.DataGridControl, null, false );
-        }
 
         container.PrepareContainer( m_dataGridContext, m_dataItem );
       }
     }
 
-    private void ClearContainers()
+    private void ClearContainers( bool isRecyclingCandidate )
     {
-      this.ClearContainers( new List<IDataGridItemContainer>( 0 ) );
+      this.ClearContainers( new List<IDataGridItemContainer>( 0 ), isRecyclingCandidate );
     }
 
-    private void ClearContainers( ICollection<IDataGridItemContainer> keep )
+    private void ClearContainers( ICollection<IDataGridItemContainer> keep, bool isRecyclingCandidate )
     {
       foreach( var container in m_unpreparedContainers.Except( keep ).ToList() )
       {
         m_unpreparedContainers.Remove( container );
 
+        container.IsRecyclingCandidate = isRecyclingCandidate;
+
+        if( isRecyclingCandidate )
+          continue;
+
         var row = container as Row;
         if( row != null )
         {
@@ -139,12 +164,11 @@ namespace Xceed.Wpf.DataGrid
       {
         m_preparedContainers.Remove( container );
 
+        container.IsRecyclingCandidate = isRecyclingCandidate;
         container.ClearContainer();
       }
     }
 
-    #region Private Fields
-
     private readonly IDataGridItemContainer m_owner;
     private readonly ICollection<IDataGridItemContainer> m_unpreparedContainers = new HashSet<IDataGridItemContainer>();
     private readonly ICollection<IDataGridItemContainer> m_preparedContainers = new HashSet<IDataGridItemContainer>();
@@ -152,7 +176,5 @@ namespace Xceed.Wpf.DataGrid
     private DataGridContext m_dataGridContext;
     private object m_dataItem;
     private bool m_containersPrepared; //false
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
index 1d7ce855..40cd5805 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
@@ -23,14 +23,13 @@ using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Threading;
 using Xceed.Utils.Wpf;
 
 namespace Xceed.Wpf.DataGrid
 {
   public abstract class DataGridItemsHost : FrameworkElement, ICustomVirtualizingPanel
   {
-    #region Constructors
-
     static DataGridItemsHost()
     {
       DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
@@ -38,8 +37,6 @@ namespace Xceed.Wpf.DataGrid
         new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridControlChanged ) ) );
     }
 
-    #endregion
-
     #region ParentDataGridControl property
 
     protected DataGridControl ParentDataGridControl
@@ -85,15 +82,14 @@ namespace Xceed.Wpf.DataGrid
 
       m_generator.ItemsChanged += this.HandleGeneratorItemsChanged;
       m_generator.ContainersRemoved += this.HandleGeneratorContainersRemoved;
+      m_generator.RecyclingCandidatesCleaned += this.HandleGeneratorRecyclingCandidatesCleaned;
 
       m_generatorInitialized = true;
     }
 
     #endregion
 
-    #region CachedRootDataGridContext internal property
-
-    private DataGridContext m_cachedRootDataGridContext;
+    #region CachedRootDataGridContext Internal property
 
     internal DataGridContext CachedRootDataGridContext
     {
@@ -110,6 +106,18 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private DataGridContext m_cachedRootDataGridContext;
+
+    #endregion
+
+    #region DelayBringIntoView Internal Property
+
+    internal bool DelayBringIntoView
+    {
+      get;
+      private set;
+    }
+
     #endregion
 
     #region Children property
@@ -405,25 +413,43 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Protected Methods
-
     protected virtual IList<UIElement> CreateChildCollection()
     {
       return new ItemsHostUIElementCollection( this );
     }
 
-    protected abstract void OnItemsAdded( GeneratorPosition position, int index, int itemCount );
+    [Obsolete( "This OnItemsAdded method is obsolete and is no longer called." )]
+    protected virtual void OnItemsAdded( GeneratorPosition position, int index, int itemCount )
+    {
+    }
+
+    [Obsolete( "This OnItemsRemoved method is obsolete and is no longer called." )]
+    protected virtual void OnItemsRemoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
+    {
+    }
 
-    protected abstract void OnItemsMoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers );
+    [Obsolete( "The OnItemsMoved method is obsolete and is no longer called." )]
+    protected virtual void OnItemsMoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
+    {
+    }
 
-    protected abstract void OnItemsReplaced( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers );
+    [Obsolete( "The OnItemsReplaced method is obsolete and is no longer called." )]
+    protected virtual void OnItemsReplaced( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
+    {
+    }
+
+    protected abstract void OnItemsAdded();
 
-    protected abstract void OnItemsRemoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers );
+    protected abstract void OnItemsRemoved( IList<DependencyObject> affectedContainers );
 
     protected abstract void OnItemsReset();
 
     protected abstract void OnContainersRemoved( IList<DependencyObject> removedContainers );
 
+    protected virtual void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
+    {
+    }
+
     protected virtual void OnParentDataGridControlChanged( DataGridControl oldValue, DataGridControl newValue )
     {
       if( ( m_generator != null ) && ( newValue != null ) )
@@ -459,24 +485,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected void InvalidateAutomationPeerChildren()
-    {
-      DataGridContext dataGridContext = this.CachedRootDataGridContext;
-
-      if( ( dataGridContext == null ) || ( dataGridContext.Peer == null ) )
-        return;
-
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
 
-      if( dataGridControl == null )
-        return;
-
-      dataGridControl.QueueDataGridContextPeerChlidrenRefresh( dataGridContext );
-    }
-
-    #endregion
-
-    #region Internal Methods
 
     internal static bool ProcessMoveFocus( Key key )
     {
@@ -625,7 +634,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( ( ownerCell != null ) && ( ownerCell.ParentColumn == this.ParentDataGridControl.CurrentColumn ) )
         {
-          if( object.Equals( ownerCell.ParentRow.DataContext, this.ParentDataGridControl.CurrentItemInEdition ) )
+          if( object.Equals( ownerCell.ParentRow.GetEditingDataContext(), this.ParentDataGridControl.CurrentItemInEdition ) )
             return true;
         }
       }
@@ -633,9 +642,21 @@ namespace Xceed.Wpf.DataGrid
       return false;
     }
 
-    #endregion
+    internal bool CanRecycleContainer( DependencyObject container )
+    {
+      if( container == null )
+        return false;
+
+      var target = container as IDataGridItemContainer;
+      if( target != null )
+        return target.CanBeRecycled;
 
-    #region Private Methods
+      var element = container as UIElement;
+      if( ( element != null ) && ( element.IsKeyboardFocused || element.IsKeyboardFocusWithin ) )
+        return false;
+
+      return true;
+    }
 
     private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
@@ -656,11 +677,17 @@ namespace Xceed.Wpf.DataGrid
         // Clean up the previous generator that was used by the ItemsHost
         m_generator.ItemsChanged -= this.HandleGeneratorItemsChanged;
         m_generator.ContainersRemoved -= this.HandleGeneratorContainersRemoved;
+        m_generator.RecyclingCandidatesCleaned -= this.HandleGeneratorRecyclingCandidatesCleaned;
       }
       m_generatorInitialized = false;
       m_cachedRootDataGridContext = null;
     }
 
+    private void HandleGeneratorRecyclingCandidatesCleaned( object sender, RecyclingCandidatesCleanedEventArgs e )
+    {
+      this.OnRecyclingCandidatesCleaned( e.RecyclingCandidates );
+    }
+
     private void HandleGeneratorContainersRemoved( object sender, ContainersRemovedEventArgs e )
     {
       this.OnContainersRemoved( e.RemovedContainers );
@@ -668,41 +695,27 @@ namespace Xceed.Wpf.DataGrid
 
     private void HandleGeneratorItemsChanged( object sender, CustomGeneratorChangedEventArgs e )
     {
+      // We set this flag to delay any bring into view until a layout pass occured if there is one.
+      // We don't want the bring into view to occur on a container that may move around during the layout pass.
+      this.DelayBringIntoView = true;
+
       switch( e.Action )
       {
         case NotifyCollectionChangedAction.Add:
-          {
-            this.OnItemsAdded( e.Position, e.Index, e.ItemCount );
-            break;
-          }
-        case NotifyCollectionChangedAction.Move:
-          {
-            this.OnItemsMoved( e.Position, e.Index, e.OldPosition, e.OldIndex, e.ItemCount, e.ItemUICount, e.RemovedContainers );
-            break;
-          }
+          this.OnItemsAdded();
+          break;
+
         case NotifyCollectionChangedAction.Remove:
-          {
-            this.OnItemsRemoved( e.Position, e.Index, e.OldPosition, e.OldIndex, e.ItemCount, e.ItemUICount, e.RemovedContainers );
-            break;
-          }
-        case NotifyCollectionChangedAction.Replace:
-          {
-            this.OnItemsReplaced( e.Position, e.Index, e.OldPosition, e.OldIndex, e.ItemCount, e.ItemUICount, e.RemovedContainers );
-            break;
-          }
-        case NotifyCollectionChangedAction.Reset:
-          {
-            this.OnItemsReset();
-            break;
-          }
+          this.OnItemsRemoved( e.Containers );
+          break;
+
         default:
-          {
-            throw new System.ComponentModel.InvalidEnumArgumentException( "An unknown action was specified." );
-          }
+          this.OnItemsReset();
+          break;
       }
-    }
 
-    #endregion
+      this.Dispatcher.BeginInvoke( new Action( () => this.DelayBringIntoView = false ), DispatcherPriority.Loaded );
+    }
 
     #region ICustomVirtualizingPanel Members
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
index a08beaf4..b579a8fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
@@ -14,12 +14,13 @@
 
   ***********************************************************************************/
 
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -60,6 +61,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #region ItemCount Property
+
     public int ItemCount
     {
       get
@@ -91,6 +94,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
+    #region InternalCustomItemContainerGenerator Property
+
     private CustomItemContainerGenerator InternalCustomItemContainerGenerator
     {
       get
@@ -103,7 +110,7 @@ namespace Xceed.Wpf.DataGrid
 
         CustomItemContainerGenerator retval = null;
         ItemsControl control1 = ItemsControl.GetItemsOwner( this );
-        if((control1 != null) && (control1.IsGrouping == false ))
+        if( ( control1 != null ) && ( control1.IsGrouping == false ) )
         {
           retval = m_customGenerator;
         }
@@ -112,6 +119,8 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    #endregion
+
     #region ItemIndex Attached Property
 
     public static readonly DependencyProperty ItemIndexProperty =
@@ -129,6 +138,59 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion ItemIndex Attached Property
 
+    protected sealed override void OnItemsChanged( object sender, ItemsChangedEventArgs args )
+    {
+      //I don't want anybody to override this since we might be hooked to the CustomItemContainerGenerator
+      base.OnItemsChanged( sender, args );
+
+      //Ok, I only want to process this if i'm NOT hooked to the CustomItemContainerGenerator
+      if( this.InternalCustomItemContainerGenerator == null )
+      {
+        switch( args.Action )
+        {
+          //In case of a Reset, nothing to do since the Panel base class has cleared the internal children already!
+          case NotifyCollectionChangedAction.Reset:
+            break;
+
+          //If there was a removal (collapsing)
+          //or if there was a Move (edition of a Sorted field)
+          case NotifyCollectionChangedAction.Move:
+          case NotifyCollectionChangedAction.Remove:
+            //remove the concerned range
+            int index = args.OldPosition.Index;
+
+            Debug.Assert( index != -1 );
+
+            this.RemoveInternalChildRange( index, args.ItemCount );
+            break;
+
+          //if some items were added (expansion)
+          case NotifyCollectionChangedAction.Add:
+            //invalidate layout so that the items will be inserted in place!
+            this.InvalidateMeasure();
+            break;
+
+          case NotifyCollectionChangedAction.Replace:
+            Debug.Fail( "NotifyCollectionChangedAction.Replace" );
+            break;
+
+          default:
+            break;
+        }
+      }
+    }
+
+    protected override void OnClearChildren()
+    {
+      //Stop listening to the events of the System Generator if this one is not being used.
+      if( ( this.InternalCustomItemContainerGenerator == null ) && ( this.ItemContainerGenerator != null ) )
+      {
+        this.ItemContainerGenerator.RemoveAll();
+      }
+
+      base.OnClearChildren();
+    }
+
     private void InitializeDataGridVirtualizingPanel()
     {
       DataGridControl dataGridControl = ItemsControl.GetItemsOwner( this ) as DataGridControl;
@@ -143,7 +205,7 @@ namespace Xceed.Wpf.DataGrid
         {
           this.RemoveInternalChildRange( 0, this.InternalChildren.Count );
         }
-        ((IItemContainerGenerator)m_customGenerator).RemoveAll();
+        ( ( IItemContainerGenerator )m_customGenerator ).RemoveAll();
 
         m_customGenerator.ItemsChanged += OnCustomGeneratorItemsChanged;
 
@@ -158,39 +220,87 @@ namespace Xceed.Wpf.DataGrid
       {
         //In case of a Reset, nothing to do since the Panel base class has cleared the internal children already!
         case NotifyCollectionChangedAction.Reset:
-          if ( this.InternalChildren.Count > 0 )
-          {
-            this.RemoveInternalChildRange( 0, this.InternalChildren.Count );
-          }
-          else
           {
-            this.InvalidateMeasure();
+            if( this.InternalChildren.Count > 0 )
+            {
+              this.RemoveInternalChildRange( 0, this.InternalChildren.Count );
+            }
+            else
+            {
+              this.InvalidateMeasure();
+            }
           }
-
           break;
 
         //If there was a removal (collapsing)
         //or if there was a Move (edition of a Sorted field)
         case NotifyCollectionChangedAction.Move:
         case NotifyCollectionChangedAction.Remove:
-          //remove the concerned range
-          int index = e.OldPosition.Index;
-          if(e.OldPosition.Offset != 0)
           {
-            index++;
+            var containers = new HashSet<DependencyObject>( e.Containers ?? new DependencyObject[ 0 ] );
+
+            if( containers.Count > 0 )
+            {
+              var children = this.InternalChildren;
+              var from = -1;
+              var removeCount = 0;
+              var i = 0;
+
+              while( i < children.Count )
+              {
+                var container = children[ i ];
+
+                if( containers.Contains( container ) )
+                {
+                  containers.Remove( container );
+
+                  if( from < 0 )
+                  {
+                    from = i;
+                  }
+
+                  removeCount++;
+                  i++;
+                }
+                else if( removeCount > 0 )
+                {
+                  Debug.Assert( from >= 0 );
+                  this.RemoveInternalChildRange( from, removeCount );
+
+                  from = -1;
+                  removeCount = 0;
+                }
+                else
+                {
+                  i++;
+                }
+              }
+
+              if( removeCount > 0 )
+              {
+                Debug.Assert( from >= 0 );
+                this.RemoveInternalChildRange( from, removeCount );
+              }
+            }
+            else
+            {
+              this.InvalidateMeasure();
+            }
           }
-
-          this.RemoveInternalChildRange( index, e.ItemUICount );
           break;
 
         //if some items were added (expansion)
         case NotifyCollectionChangedAction.Add:
-          //invalidate layout so that the items will be inserted in place!
-          this.InvalidateMeasure();
+          {
+            //invalidate layout so that the items will be inserted in place!
+            this.InvalidateMeasure();
+          }
           break;
 
         case NotifyCollectionChangedAction.Replace:
-          Debug.Fail("NotifyCollectionChangedAction.Replace");
+          {
+            Debug.Fail( "NotifyCollectionChangedAction.Replace" );
+          }
           break;
 
         default:
@@ -198,60 +308,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected sealed override void OnItemsChanged( object sender, ItemsChangedEventArgs args )
-    {
-      //I don't want anybody to override this since we might be hooked to the CustomItemContainerGenerator
-      base.OnItemsChanged( sender, args );
-
-      //Ok, I only want to process this if i'm NOT hooked to the CustomItemContainerGenerator
-      if(this.InternalCustomItemContainerGenerator == null)
-      {
-        switch( args.Action )
-        {
-          //In case of a Reset, nothing to do since the Panel base class has cleared the internal children already!
-          case NotifyCollectionChangedAction.Reset:
-            break;
-
-          //If there was a removal (collapsing)
-          //or if there was a Move (edition of a Sorted field)
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Remove:
-            //remove the concerned range
-            int index = args.OldPosition.Index;
-
-            Debug.Assert( index != -1 );
-
-            this.RemoveInternalChildRange( index, args.ItemCount );
-            break;
-
-          //if some items were added (expansion)
-          case NotifyCollectionChangedAction.Add:
-            //invalidate layout so that the items will be inserted in place!
-            this.InvalidateMeasure();
-            break;
-
-          case NotifyCollectionChangedAction.Replace:
-            Debug.Fail("NotifyCollectionChangedAction.Replace");
-            break;
-
-          default:
-            break;
-        }
-      }
-    }
-
-    protected override void OnClearChildren()
-    {
-      //Stop listening to the events of the System Generator if this one is not being used.
-      if( ( this.InternalCustomItemContainerGenerator == null ) && ( this.ItemContainerGenerator != null ) )
-      {
-        this.ItemContainerGenerator.RemoveAll();
-      }
-
-      base.OnClearChildren();
-    }
-
-    private static void OnParentDataGridControlChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+    private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
       DataGridVirtualizingPanel panel = ( DataGridVirtualizingPanel )sender;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs
index 39dbed65..00179c25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs
@@ -21,8 +21,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal abstract class DataItemEventDescriptorBase : EventDescriptor
   {
-    #region Constructor
-
     protected DataItemEventDescriptorBase( DataItemTypeDescriptor owner, EventDescriptor parent )
       : base( parent )
     {
@@ -32,8 +30,6 @@ namespace Xceed.Wpf.DataGrid
       m_owner = owner;
     }
 
-    #endregion
-
     #region IsMulticast Property
 
     public override bool IsMulticast
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs
index 0da91534..e5afde0b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs
@@ -30,8 +30,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Constructor
-
     static DataItemEventDescriptorFactory()
     {
       s_reflectEventDescriptorType = Assembly.GetAssembly( typeof( EventDescriptor ) ).GetType( "System.ComponentModel.ReflectEventDescriptor" );
@@ -45,9 +43,7 @@ namespace Xceed.Wpf.DataGrid
       m_typeDescriptor = typeDescriptor;
     }
 
-    #endregion
-
-    internal DataItemEventDescriptorBase CreateEventDescriptor( EventDescriptor source )
+    internal DataItemEventDescriptor CreateEventDescriptor( EventDescriptor source )
     {
       if( !DataItemEventDescriptorFactory.IsReflected( source ) )
         return null;
@@ -154,10 +150,22 @@ namespace Xceed.Wpf.DataGrid
         {
           var d = ( Action<TSource, THandler> )Delegate.CreateDelegate( typeof( Action<TSource, THandler> ), methodInfo, false );
           if( d != null )
-            return ( source, handler ) => d.Invoke( ( TSource )source, ( THandler )handler );
+            return ( source, handler ) =>
+              {
+                if( !( source is TSource ) )
+                  return;
+
+                d.Invoke( ( TSource )source, ( THandler )handler );
+              };
         }
 
-        return ( source, handler ) => methodInfo.Invoke( source, new object[] { handler } );
+        return ( source, handler ) =>
+          {
+            if( !( source is TSource ) )
+              return;
+
+            methodInfo.Invoke( source, new object[] { handler } );
+          };
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs
new file mode 100644
index 00000000..430fab8d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs
@@ -0,0 +1,108 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal class DataItemIndexerDescriptor : DataItemPropertyDescriptorBase
+  {
+    internal DataItemIndexerDescriptor( DataItemTypeDescriptor owner, IndexerDescriptor parent )
+      : base( owner, parent, parent.GetValue, ( !parent.IsReadOnly ) ? parent.SetValue : default( Action<object, object> ), null )
+    {
+      m_descriptor = parent;
+    }
+
+    #region ComponentType Property
+
+    public sealed override Type ComponentType
+    {
+      get
+      {
+        return m_descriptor.ComponentType;
+      }
+    }
+
+    #endregion
+
+    #region PropertyType Property
+
+    public sealed override Type PropertyType
+    {
+      get
+      {
+        return m_descriptor.PropertyType;
+      }
+    }
+
+    #endregion
+
+    #region DisplayName Property
+
+    public override string DisplayName
+    {
+      get
+      {
+        return m_descriptor.DisplayName;
+      }
+    }
+
+    #endregion
+
+    #region IndexerParameters Internal Property
+
+    internal string IndexerParameters
+    {
+      get
+      {
+        return m_descriptor.IndexerParameters;
+      }
+    }
+
+    #endregion
+
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      return ( obj is DataItemIndexerDescriptor )
+          && ( base.Equals( obj ) );
+    }
+
+    protected override bool MustInhibitValueChanged( object component )
+    {
+      return false;
+    }
+
+    protected override bool IsValueChangedInhibited( object component )
+    {
+      return false;
+    }
+
+    protected override void InhibitValueChanged( object component )
+    {
+    }
+
+    protected override void ResetInhibitValueChanged( object component )
+    {
+    }
+
+    private readonly IndexerDescriptor m_descriptor;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs
index 6f2b2892..0c3c9dfb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs
@@ -30,8 +30,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Constructor
-
     protected DataItemPropertyDescriptorBase(
       DataItemTypeDescriptor owner,
       PropertyDescriptor parent,
@@ -52,8 +50,6 @@ namespace Xceed.Wpf.DataGrid
       m_resetter = resetter;
     }
 
-    #endregion
-
     #region IsReadOnly Property
 
     public sealed override bool IsReadOnly
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs
index 44d13ec0..db7b91b5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs
@@ -48,7 +48,7 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    internal DataItemPropertyDescriptorBase CreatePropertyDescriptor( PropertyDescriptor source )
+    internal DataItemPropertyDescriptor CreatePropertyDescriptor( PropertyDescriptor source )
     {
       if( !DataItemPropertyDescriptorFactory.IsReflected( source ) )
         return null;
@@ -86,6 +86,15 @@ namespace Xceed.Wpf.DataGrid
       return new DataItemPropertyDescriptor( m_typeDescriptor, source, componentType, propertyType, getter, setter, resetter );
     }
 
+    internal DataItemIndexerDescriptor CreateIndexerDescriptor( IndexerDescriptor source )
+    {
+      var propertyChangedEvent = this.GetPropertyChangedEvent( null );
+      if( propertyChangedEvent != null )
+        return new ValueChangeDataItemIndexerDescriptor( m_typeDescriptor, source, propertyChangedEvent );
+
+      return new DataItemIndexerDescriptor( m_typeDescriptor, source );
+    }
+
     private void InitializeEvents()
     {
       if( m_eventDescriptors != null )
@@ -111,6 +120,9 @@ namespace Xceed.Wpf.DataGrid
     {
       this.InitializeEvents();
 
+      if( string.IsNullOrEmpty( propertyName ) )
+        return null;
+
       var eventName = string.Format( CultureInfo.InvariantCulture, "{0}Changed", propertyName );
 
       return ( from ed in m_eventDescriptors.Cast<EventDescriptor>()
@@ -240,20 +252,35 @@ namespace Xceed.Wpf.DataGrid
           var d = ( ValueTypeGetter )Delegate.CreateDelegate( typeof( ValueTypeGetter ), methodInfo, false );
           if( d != null )
             return ( source ) =>
-              {
-                var s = ( TSource )source;
+            {
+              if( !( source is TSource ) )
+                return default( TProperty );
+
+              var s = ( TSource )source;
 
-                return d.Invoke( ref s );
-              };
+              return d.Invoke( ref s );
+            };
         }
         else
         {
           var d = ( Func<TSource, TProperty> )Delegate.CreateDelegate( typeof( Func<TSource, TProperty> ), methodInfo, false );
           if( d != null )
-            return ( source ) => d.Invoke( ( TSource )source );
+            return ( source ) =>
+            {
+              if( !( source is TSource ) )
+                return default( TProperty );
+
+              return d.Invoke( ( TSource )source );
+            };
         }
 
-        return ( source ) => methodInfo.Invoke( source, null );
+        return ( source ) =>
+        {
+          if( !( source is TSource ) )
+            return default( TProperty );
+
+          return methodInfo.Invoke( source, null );
+        };
       }
 
       public Action<object, object> CreateSetter( MethodInfo methodInfo )
@@ -267,10 +294,22 @@ namespace Xceed.Wpf.DataGrid
         {
           var d = ( Action<TSource, TProperty> )Delegate.CreateDelegate( typeof( Action<TSource, TProperty> ), methodInfo );
           if( d != null )
-            return ( source, value ) => d.Invoke( ( TSource )source, ( TProperty )value );
+            return ( source, value ) =>
+            {
+              if( !( source is TSource ) )
+                return;
+
+              d.Invoke( ( TSource )source, ( TProperty )value );
+            };
         }
 
-        return ( source, value ) => methodInfo.Invoke( source, new object[] { value } );
+        return ( source, value ) =>
+        {
+          if( !( source is TSource ) )
+            return;
+
+          methodInfo.Invoke( source, new object[] { value } );
+        };
       }
 
       public Action<object> CreateResetter( MethodInfo methodInfo )
@@ -283,10 +322,22 @@ namespace Xceed.Wpf.DataGrid
         {
           var d = ( Action<TSource> )Delegate.CreateDelegate( typeof( Action<TSource> ), methodInfo );
           if( d != null )
-            return ( source ) => d.Invoke( ( TSource )source );
+            return ( source ) =>
+            {
+              if( !( source is TSource ) )
+                return;
+
+              d.Invoke( ( TSource )source );
+            };
         }
 
-        return ( source ) => methodInfo.Invoke( source, null );
+        return ( source ) =>
+        {
+          if( !( source is TSource ) )
+            return;
+
+          methodInfo.Invoke( source, null );
+        };
       }
 
       private delegate TProperty ValueTypeGetter( ref TSource source );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs
index 1368e829..3937ae65 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs
@@ -19,7 +19,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
+using System.Reflection;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -57,7 +59,7 @@ namespace Xceed.Wpf.DataGrid
         return sourceEvents;
 
       var entry = this.GetEntry();
-      var replaceEvents = default( Dictionary<EventDescriptor, DataItemEventDescriptorBase> );
+      var replaceEvents = default( Dictionary<EventDescriptor, DataItemEventDescriptor> );
 
       lock( entry )
       {
@@ -65,7 +67,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( replaceEvents == null )
         {
-          replaceEvents = new Dictionary<EventDescriptor, DataItemEventDescriptorBase>();
+          replaceEvents = new Dictionary<EventDescriptor, DataItemEventDescriptor>();
           entry.Events = replaceEvents;
 
           var factory = new DataItemEventDescriptorFactory( this );
@@ -90,7 +92,7 @@ namespace Xceed.Wpf.DataGrid
       {
         var sourceEvent = sourceEvents[ i ];
 
-        DataItemEventDescriptorBase destinationEvent;
+        DataItemEventDescriptor destinationEvent;
         if( replaceEvents.TryGetValue( sourceEvent, out destinationEvent ) )
         {
           destinationEvents[ i ] = destinationEvent;
@@ -116,7 +118,7 @@ namespace Xceed.Wpf.DataGrid
         return sourceProperties;
 
       var entry = this.GetEntry();
-      var replaceProperties = default( Dictionary<PropertyDescriptor, DataItemPropertyDescriptorBase> );
+      var replaceProperties = default( Dictionary<PropertyDescriptor, DataItemPropertyDescriptor> );
 
       lock( entry )
       {
@@ -124,7 +126,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( replaceProperties == null )
         {
-          replaceProperties = new Dictionary<PropertyDescriptor, DataItemPropertyDescriptorBase>();
+          replaceProperties = new Dictionary<PropertyDescriptor, DataItemPropertyDescriptor>();
           entry.Properties = replaceProperties;
 
           var factory = new DataItemPropertyDescriptorFactory( this );
@@ -149,7 +151,7 @@ namespace Xceed.Wpf.DataGrid
       {
         var sourceProperty = sourceProperties[ i ];
 
-        DataItemPropertyDescriptorBase destinationProperty;
+        DataItemPropertyDescriptor destinationProperty;
         if( replaceProperties.TryGetValue( sourceProperty, out destinationProperty ) )
         {
           destinationProperties[ i ] = destinationProperty;
@@ -163,6 +165,70 @@ namespace Xceed.Wpf.DataGrid
       return new PropertyDescriptorCollection( destinationProperties );
     }
 
+    internal DataItemIndexerDescriptor GetIndexer( object[] indexValues )
+    {
+      if( ( indexValues == null ) || ( indexValues.Length <= 0 ) || ( m_targetType == null ) )
+        return null;
+
+      var entry = this.GetEntry();
+
+      lock( entry )
+      {
+        var indexers = entry.Indexers;
+        var descriptor = default( DataItemIndexerDescriptor );
+        var key = new IndexerKey( indexValues );
+
+        if( ( indexers != null ) && ( indexers.TryGetValue( key, out descriptor ) ) )
+          return descriptor;
+
+        var indexer = this.CreateIndexerDescriptor( indexValues );
+        if( indexer == null )
+          return null;
+
+        var factory = new DataItemPropertyDescriptorFactory( this );
+
+        descriptor = factory.CreateIndexerDescriptor( indexer );
+        if( descriptor == null )
+          return null;
+
+        if( indexers == null )
+        {
+          indexers = new Dictionary<IndexerKey, DataItemIndexerDescriptor>();
+          entry.Indexers = indexers;
+        }
+
+        indexers.Add( key, descriptor );
+
+        return descriptor;
+      }
+    }
+
+    private IndexerDescriptor CreateIndexerDescriptor( object[] indexValues )
+    {
+      if( ( indexValues == null ) || ( indexValues.Length <= 0 ) || ( m_targetType == null ) )
+        return null;
+
+      var best = default( IndexerChoice );
+
+      foreach( var propertyInfo in m_targetType.GetProperties() )
+      {
+        var candidate = IndexerChoice.GetMatch( propertyInfo, indexValues );
+        if( candidate == null )
+          continue;
+
+        if( ( best == null ) || ( candidate.CompareTo( best ) > 0 ) )
+        {
+          best = candidate;
+        }
+      }
+
+      // No matching indexer was found.
+      if( best == null )
+        return null;
+
+      return IndexerDescriptor.Create( best.Property, indexValues, best.Values );
+    }
+
     private Entry GetEntry()
     {
       if( m_entry == null )
@@ -203,6 +269,12 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private static bool IsNullableType( Type type )
+    {
+      return ( !type.IsValueType )
+          || ( type.IsGenericType && ( type.GetGenericTypeDefinition() == typeof( Nullable<> ) ) );
+    }
+
     #region Private Fields
 
     private readonly Type m_targetType;
@@ -236,13 +308,19 @@ namespace Xceed.Wpf.DataGrid
         private set;
       }
 
-      internal Dictionary<EventDescriptor, DataItemEventDescriptorBase> Events
+      internal Dictionary<EventDescriptor, DataItemEventDescriptor> Events
+      {
+        get;
+        set;
+      }
+
+      internal Dictionary<PropertyDescriptor, DataItemPropertyDescriptor> Properties
       {
         get;
         set;
       }
 
-      internal Dictionary<PropertyDescriptor, DataItemPropertyDescriptorBase> Properties
+      internal Dictionary<IndexerKey, DataItemIndexerDescriptor> Indexers
       {
         get;
         set;
@@ -250,5 +328,185 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    #region IndexerKey Private Class
+
+    private sealed class IndexerKey
+    {
+      internal IndexerKey( object[] parameters )
+      {
+        Debug.Assert( ( parameters != null ) && ( parameters.Length > 0 ) );
+
+        m_parameters = parameters;
+      }
+
+      public override int GetHashCode()
+      {
+        var count = Math.Min( m_parameters.Length, 3 );
+        var hashCode = 0;
+
+        for( int i = 0; i < count; i++ )
+        {
+          unchecked
+          {
+            hashCode *= 13;
+            hashCode += m_parameters[ i ].GetHashCode();
+          }
+        }
+
+        return hashCode;
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as IndexerKey;
+        if( target == null )
+          return false;
+
+        var targetParameters = target.m_parameters;
+        if( targetParameters.Length != m_parameters.Length )
+          return false;
+
+        for( int i = 0; i < m_parameters.Length; i++ )
+        {
+          if( !object.Equals( targetParameters[ i ], m_parameters[ i ] ) )
+            return false;
+        }
+
+        return true;
+      }
+
+      private readonly object[] m_parameters;
+    }
+
+    #endregion
+
+    #region IndexerChoice Private Class
+
+    private sealed class IndexerChoice
+    {
+      private IndexerChoice( PropertyInfo propertyInfo, object[] values, FitType[] fitTypes )
+      {
+        m_propertyInfo = propertyInfo;
+        m_values = values;
+        m_fitTypes = fitTypes;
+      }
+
+      internal PropertyInfo Property
+      {
+        get
+        {
+          return m_propertyInfo;
+        }
+      }
+
+      internal object[] Values
+      {
+        get
+        {
+          return m_values;
+        }
+      }
+
+      internal static IndexerChoice GetMatch( PropertyInfo propertyInfo, object[] parameterValues )
+      {
+        if( ( propertyInfo == null ) || ( parameterValues == null ) )
+          return null;
+
+        var parameters = propertyInfo.GetIndexParameters();
+        if( ( parameters == null ) || ( parameters.Length != parameterValues.Length ) )
+          return null;
+
+        var values = new object[ parameters.Length ];
+        var fitTypes = new FitType[ parameters.Length ];
+
+        for( int i = 0; i < parameters.Length; i++ )
+        {
+          var parameterType = parameters[ i ].ParameterType;
+          var parameterValue = parameterValues[ i ];
+          var parameterValueType = ( parameterValue != null ) ? parameterValue.GetType() : typeof( object );
+
+          if( parameterValue == null )
+          {
+            if( !DataItemTypeDescriptor.IsNullableType( parameterType ) )
+              return null;
+
+            fitTypes[ i ] = FitType.KeepAsType;
+          }
+          else if( !parameterType.IsAssignableFrom( parameterValueType ) )
+          {
+            var converter = TypeDescriptor.GetConverter( parameterType );
+            if( ( converter == null ) || !converter.CanConvertFrom( parameterValueType ) )
+              return null;
+
+            try
+            {
+              parameterValue = converter.ConvertFrom( null, CultureInfo.InvariantCulture, parameterValue );
+            }
+            catch
+            {
+              return null;
+            }
+
+            // An indexer that takes a parameter of any other type than string is considered a better candidate than
+            // an indexer that takes a parameter of type string.
+            fitTypes[ i ] = ( typeof( string ).IsAssignableFrom( parameterType ) ) ? FitType.ConvertToString : FitType.ConvertToType;
+          }
+          else
+          {
+            if( typeof( string ) == parameterType )
+            {
+              fitTypes[ i ] = FitType.KeepAsString;
+            }
+            else if( typeof( object ) == parameterType )
+            {
+              fitTypes[ i ] = FitType.KeepAsObject;
+            }
+            else
+            {
+              fitTypes[ i ] = FitType.KeepAsType;
+            }
+          }
+
+          values[ i ] = parameterValue;
+        }
+
+        return new IndexerChoice( propertyInfo, values, fitTypes );
+      }
+
+      internal int CompareTo( IndexerChoice comparand )
+      {
+        if( comparand == null )
+          throw new ArgumentNullException( "comparand" );
+
+        if( comparand.m_fitTypes.Length != m_fitTypes.Length )
+          throw new ArgumentException( "The indexer does not have the same number of parameters.", "comparand" );
+
+        for( int i = 0; i < m_fitTypes.Length; i++ )
+        {
+          var compare = m_fitTypes[ i ].CompareTo( comparand.m_fitTypes[ i ] );
+          if( compare != 0 )
+            return compare;
+        }
+
+        return 0;
+      }
+
+      private readonly PropertyInfo m_propertyInfo;
+      private readonly object[] m_values;
+      private readonly FitType[] m_fitTypes;
+
+      private enum FitType
+      {
+        None = 0,
+        ConvertToString,
+        KeepAsObject,
+        KeepAsString,
+        ConvertToType,
+        KeepAsType,
+      }
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
index 7446db0f..122eb7ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
@@ -19,7 +19,7 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Data;
+using System.Windows.Automation.Peers;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
@@ -29,8 +29,6 @@ namespace Xceed.Wpf.DataGrid
 {
   public class DataRow : Row, IEditableObject
   {
-    #region CONSTRUCTORS
-
     public DataRow()
     {
       this.CommandBindings.Add( new CommandBinding( DataGridCommands.ExpandDetails,
@@ -46,15 +44,8 @@ namespace Xceed.Wpf.DataGrid
                                                     new CanExecuteRoutedEventHandler( OnToggleDetailsCanExecute ) ) );
     }
 
-    #endregion CONSTRUCTORS
-
     private void OnExpandDetailsExecuted( object sender, ExecutedRoutedEventArgs e )
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-        dataGridContext.ExpandDetails( this.DataContext );
-      }
     }
 
     private void OnExpandDetailsCanExecute( object sender, CanExecuteRoutedEventArgs e )
@@ -73,11 +64,6 @@ namespace Xceed.Wpf.DataGrid
 
     private void OnCollapseDetailsExecuted( object sender, ExecutedRoutedEventArgs e )
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-        dataGridContext.CollapseDetails( this.DataContext );
-      }
     }
 
     private void OnCollapseDetailsCanExecute( object sender, CanExecuteRoutedEventArgs e )
@@ -99,7 +85,6 @@ namespace Xceed.Wpf.DataGrid
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
       if( ( dataGridContext != null ) && ( this.DataContext != null ) )
       {
-        dataGridContext.ToggleDetailExpansion( this.DataContext );
       }
     }
 
@@ -150,6 +135,55 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion TitleBarContent Private Property
 
+    #region ResortPending property
+
+    private bool ResortPending
+    {
+      get
+      {
+        return m_flags[ ( int )DataRowFlags.ResortPending ];
+      }
+      set
+      {
+        m_flags[ ( int )DataRowFlags.ResortPending ] = value;
+      }
+    }
+
+    #endregion
+
+    #region RegroupPending property
+
+    private bool RegroupPending
+    {
+      get
+      {
+        return m_flags[ ( int )DataRowFlags.RegroupPending ];
+      }
+      set
+      {
+        m_flags[ ( int )DataRowFlags.RegroupPending ] = value;
+      }
+    }
+
+    #endregion
+
+    #region RepositionPending property
+
+    private bool RepositionPending
+    {
+      get
+      {
+        return m_flags[ ( int )DataRowFlags.RepositionPending ];
+      }
+      set
+      {
+        m_flags[ ( int )DataRowFlags.RepositionPending ] = value;
+      }
+    }
+
+    #endregion
+
+
     protected override void OnMouseEnter( MouseEventArgs e )
     {
       base.OnMouseEnter( e );
@@ -184,8 +218,7 @@ namespace Xceed.Wpf.DataGrid
     {
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      // When TableflowViewItemsHost is used and an EmptyDataItem is detected
-      // We also want to avoid getting an animation when the container is sticky
+      // When TableflowViewItemsHost is used and an EmptyDataItem is detected.  We also want to avoid getting an animation when the container is sticky
       if( !( item is EmptyDataItem )
           && ( dataGridContext != null )
           && ( dataGridContext.DataGridControl.GetView() is TableflowView )
@@ -195,19 +228,16 @@ namespace Xceed.Wpf.DataGrid
         this.ApplyAnimationClock( Row.CellContentOpacityProperty, null );
         this.SetValue( Row.CellContentOpacityProperty, 0d );
 
-        // We set the DataContext to an EmptyDataItem to have the 
-        // real data item set later on with an opacity animation.
+        // We set the DataContext to an EmptyDataItem to have the real data item set later on with an opacity animation.
         this.DataContext = this.EmptyDataItem;
         this.UpdateUnboundDataItemContext();
 
-        Debug.Assert( m_affectDataContextOperation == null );
-
-        // Dispatch a call to SetDataContextDispatched that will update
-        // the DataContext of the Row and every CreatedCells to the
-        // DataItem the Row must display. We use a low priority to limit
-        // the impact on scrolling.
-        m_affectDataContextOperation = this.Dispatcher.BeginInvoke(
-          new Action<object>( this.SetDataContextDispatched ), DispatcherPriority.Background, item );
+        // Dispatch a call to SetDataContextDispatched that will update the DataContext of the Row and every CreatedCells to the
+        // DataItem the Row must display. We use a low priority to limit the impact on scrolling.
+        if( m_affectDataContextOperation == null )
+        {
+          m_affectDataContextOperation = this.Dispatcher.BeginInvoke( new Action<object>( this.SetDataContextDispatched ), DispatcherPriority.Background, item );
+        }
       }
       else
       {
@@ -221,16 +251,17 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void BeginEditCore()
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      DataGridCollectionViewBase dataGridCollectionViewBase =
-          ( dataGridContext == null ) ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
       if( dataGridCollectionViewBase != null )
       {
         // We do not want to call EditItem when the item is the one in the insertionrow
         if( dataGridCollectionViewBase.CurrentAddItem != this.DataContext )
+        {
           dataGridCollectionViewBase.EditItem( this.DataContext );
+        }
       }
       else
       {
@@ -238,7 +269,9 @@ namespace Xceed.Wpf.DataGrid
 
         // editableObject can be equal to this when the datarow is directly inserted as Item in the DataGridControl.
         if( ( editableObject != null ) && ( editableObject != this ) )
+        {
           editableObject.BeginEdit();
+        }
       }
 
       base.BeginEditCore();
@@ -246,19 +279,20 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void EndEditCore()
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
 
       base.EndEditCore();
 
-      DataGridCollectionViewBase dataGridCollectionViewBase =
-          ( dataGridContext == null ) ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
       try
       {
         if( dataGridCollectionViewBase != null )
         {
           if( dataGridCollectionViewBase.CurrentEditItem == this.DataContext )
+          {
             dataGridCollectionViewBase.CommitEdit();
+          }
         }
         else
         {
@@ -266,7 +300,9 @@ namespace Xceed.Wpf.DataGrid
 
           // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
           if( ( editableObject != null ) && ( editableObject != this ) )
+          {
             editableObject.EndEdit();
+          }
         }
       }
       catch( Exception exception )
@@ -283,16 +319,16 @@ namespace Xceed.Wpf.DataGrid
 
           // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
           if( ( editableObject != null ) && ( editableObject != this ) )
+          {
             editableObject.BeginEdit();
+          }
         }
 
-        // This method will set a validation error on the row and throw back a DataGridValidationException so that 
-        // the row stays in edition.
+        // This method will set a validation error on the row and throw back a DataGridValidationException so that  the row stays in edition.
         Row.SetRowValidationErrorOnException( this, exception );
       }
 
-      // Update the created cell's Content from the source in case the IEditableObject EndEdit implementation rectified
-      // some values.
+      // Update the created cell's Content from the source in case the IEditableObject EndEdit implementation rectified some values.
       this.UpdateCellsContentBindingTarget();
     }
 
@@ -324,16 +360,17 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void CancelEditCore()
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      DataGridCollectionViewBase dataGridCollectionViewBase =
-          ( dataGridContext == null ) ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
       if( dataGridCollectionViewBase != null )
       {
         // We do not want to call EditItem when the item is the one in the insertionrow
         if( dataGridCollectionViewBase.CurrentEditItem == this.DataContext )
+        {
           dataGridCollectionViewBase.CancelEdit();
+        }
       }
       else
       {
@@ -341,7 +378,9 @@ namespace Xceed.Wpf.DataGrid
 
         // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
         if( ( editableObject != null ) && ( editableObject != this ) )
+        {
           editableObject.CancelEdit();
+        }
       }
 
       base.CancelEditCore();
@@ -376,8 +415,7 @@ namespace Xceed.Wpf.DataGrid
       }
 
       // Ensure to stop the opacity animation if it is currently active
-      if( ( m_opacityAnimationClock != null )
-          && ( m_opacityAnimationClock.CurrentState != ClockState.Stopped ) )
+      if( ( m_opacityAnimationClock != null ) && ( m_opacityAnimationClock.CurrentState != ClockState.Stopped ) )
       {
         m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
         m_opacityAnimationClock.Controller.Stop();
@@ -393,6 +431,31 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    protected override void PartialClearContainer()
+    {
+      if( m_affectDataContextOperation != null )
+      {
+        m_affectDataContextOperation.Abort();
+        m_affectDataContextOperation = null;
+      }
+
+      // Ensure to stop the opacity animation if it is currently active
+      if( ( m_opacityAnimationClock != null ) && ( m_opacityAnimationClock.CurrentState != ClockState.Stopped ) )
+      {
+        m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
+        m_opacityAnimationClock.Controller.Stop();
+        m_opacityAnimationClock = null;
+      }
+
+      if( m_storedDataGridContext != null )
+      {
+        ( ( INotifyPropertyChanged )m_storedDataGridContext.Columns ).PropertyChanged -= new PropertyChangedEventHandler( Columns_PropertyChanged );
+        m_storedDataGridContext = null;
+      }
+
+      base.PartialClearContainer();
+    }
+
     protected override Cell CreateCell( ColumnBase column )
     {
       if( column == null )
@@ -406,16 +469,6 @@ namespace Xceed.Wpf.DataGrid
       return ( cell is DataCell );
     }
 
-    internal static IDisposable DeferCollectionViewRefresh( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      if( dataGridContext != null )
-        return dataGridContext.Items.DeferRefresh();
-
-      return null;
-    }
-
     private void EnsureResort( DataGridContext dataGridContext )
     {
       if( dataGridContext == null )
@@ -527,42 +580,35 @@ namespace Xceed.Wpf.DataGrid
     [EditorBrowsable( EditorBrowsableState.Never )]
     protected virtual void SetTitleBarContentBinding( DataGridContext dataGridContext )
     {
-      if( dataGridContext != null )
-      {
-        Xceed.Wpf.DataGrid.Views.ViewBase view = dataGridContext.DataGridControl.GetView();
-
-        if( ( view is TableView ) || ( view is TableflowView ) )
-          return;
-
-        Column headerColumn = dataGridContext.Columns.MainColumn as Column;
-
-        if( headerColumn != null )
-        {
-          BindingBase displayMemberBinding = headerColumn.GetDisplayMemberBinding();
+      if( dataGridContext == null )
+        return;
 
-          if( displayMemberBinding == null )
-          {
-            if( dataGridContext.ItemsSourceFieldDescriptors == null )
-              throw new InvalidOperationException( "An attempt was made to create a DisplayMemberBinding before the DataGridContext has been initialized." );
+      var view = dataGridContext.DataGridControl.GetView();
+      if( ( view is TableView ) || ( view is TableflowView ) )
+        return;
 
-            string name = headerColumn.FieldName;
-            ItemsSourceHelper.FieldDescriptor fieldDescriptor;
-            dataGridContext.ItemsSourceFieldDescriptors.TryGetValue( name, out fieldDescriptor );
+      var headerColumn = dataGridContext.Columns.MainColumn as Column;
+      if( headerColumn == null )
+        return;
 
-            displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding( this.DataContext is DataRow, name, fieldDescriptor, headerColumn, true, typeof( object ) );
+      var displayMemberBinding = headerColumn.GetDisplayMemberBinding();
+      if( displayMemberBinding == null )
+      {
+        var dataItem = this.DataContext;
+        var itemType = ( dataItem != null ) ? dataItem.GetType() : null;
 
-          }
+        displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding(
+                                 ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, headerColumn, itemType ) );
+      }
 
-          if( displayMemberBinding == null )
-          {
-            Debug.Assert( false, "displayMemberBinding is null." );
-            this.ClearValue( DataRow.TitleBarContentProperty );
-          }
-          else
-          {
-            this.SetBinding( DataRow.TitleBarContentProperty, displayMemberBinding );
-          }
-        }
+      if( displayMemberBinding == null )
+      {
+        Debug.Assert( false, "displayMemberBinding is null." );
+        this.ClearValue( DataRow.TitleBarContentProperty );
+      }
+      else
+      {
+        this.SetBinding( DataRow.TitleBarContentProperty, displayMemberBinding );
       }
     }
 
@@ -608,15 +654,12 @@ namespace Xceed.Wpf.DataGrid
     {
       object dataContext = this.DataContext;
       UnboundDataItem unboundDataItemContext = this.UnboundDataItemContext;
-      bool isNewContext;
 
       foreach( Cell cell in this.CreatedCells )
       {
-        Cell.AssignDataContext( cell, dataContext, unboundDataItemContext, cell.ParentColumn, out isNewContext );
+        Cell.AssignDataContext( cell, dataContext, unboundDataItemContext, cell.ParentColumn );
 
-        // We must refresh the Displayed template
-        // since ShouldDisplayEditor always return
-        // false when an EmptyDataItem is detected
+        // We must refresh the Displayed template since ShouldDisplayEditor always return false when an EmptyDataItem is detected
         cell.RefreshDisplayedTemplate();
       }
 
@@ -650,55 +693,11 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region PRIVATE PROPERTIES
-
-    private bool ResortPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.ResortPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.ResortPending ] = value;
-      }
-    }
-
-    private bool RegroupPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.RegroupPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.RegroupPending ] = value;
-      }
-    }
-
-    private bool RepositionPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.RepositionPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.RepositionPending ] = value;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE FIELDS
-
     private BitVector32 m_flags = new BitVector32();
 
     private DataGridContext m_storedDataGridContext; // = null
     private DispatcherOperation m_affectDataContextOperation; // = null;
 
-    #endregion PRIVATE FIELDS
-
     #region Flags Enum
 
     [Flags]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
index 60d6a1fd..4fe53870 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
@@ -23,293 +23,280 @@
                   xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
                   xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
                   xmlns:s="clr-namespace:System;assembly=mscorlib">
-   <FrameworkElement.Resources>
-
-      <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-
-      <ControlTemplate x:Key="scrollViewerTemplate"
-                       TargetType="{x:Type ScrollViewer}">
-         <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
-      </ControlTemplate>
-
-      <ControlTemplate x:Key="textBoxTemplate"
-                       TargetType="{x:Type TextBox}">
-         <ScrollViewer  x:Name="PART_ContentHost"
-                        Template="{StaticResource scrollViewerTemplate}" />
-      </ControlTemplate>
-
-      <DataTemplate x:Key="textBoxEditorTemplate">
-         <xctk:AutoSelectTextBox Text="{markup:CellEditorBinding}"
-                                    local:DataCell.IsCellFocusScope="True"
-                                    VerticalAlignment="Stretch"
-                                    Template="{StaticResource textBoxTemplate}"
-                                    Margin="-2,0,-2,0"
-                                    Background="Transparent"
+  <FrameworkElement.Resources>
+
+    <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+    <conv:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
+
+    <ControlTemplate x:Key="scrollViewerTemplate"
+                     TargetType="{x:Type ScrollViewer}">
+      <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="textBoxTemplate"
+                     TargetType="{x:Type TextBox}">
+      <ScrollViewer  x:Name="PART_ContentHost"
+                     Template="{StaticResource scrollViewerTemplate}" />
+    </ControlTemplate>
+
+    <DataTemplate x:Key="textBoxEditorTemplate">
+      <xctk:AutoSelectTextBox Text="{markup:CellEditorBinding}"
+                              local:DataCell.IsCellFocusScope="True"
+                              VerticalAlignment="Stretch"
+                              Template="{StaticResource textBoxTemplate}"
+                              Margin="-2,0,-2,0"
+                              Background="Transparent"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                              AutoSelectBehavior="OnFocus"
+                              AutoMoveFocus="True"
+                              AutomationProperties.AutomationId="TextBoxEditor" />
+    </DataTemplate>
+
+    <!--Also used by CellEditor.TextBoxEditor-->
+    <local:CellEditor x:Key="System.String"
+                      EditTemplate="{StaticResource textBoxEditorTemplate}">
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Int16">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Int16}">
+          <xctk:ShortUpDown Name="PART_CellEditorBoundControl"
+                            Value="{markup:CellEditorBinding}"
+                            local:DataCell.IsCellFocusScope="True"
+                            AllowSpin="False"
+                            ShowButtonSpinner="False"
+                            AutoMoveFocus="True"
+                            VerticalAlignment="Stretch"
+                            Margin="-2,0,-2,0"
+                            Background="Transparent"
+                            Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                            AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Int32">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Int32}">
+          <xctk:IntegerUpDown Name="PART_CellEditorBoundControl"
+                              Value="{markup:CellEditorBinding}"
+                              local:DataCell.IsCellFocusScope="True"
+                              AllowSpin="False"
+                              ShowButtonSpinner="False"
+                              AutoMoveFocus="True"
+                              VerticalAlignment="Stretch"
+                              Margin="-2,0,-2,0"
+                              Background="Transparent"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                              AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Int64">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Int64}">
+          <xctk:LongUpDown Name="PART_CellEditorBoundControl"
+                           Value="{markup:CellEditorBinding}"
+                           local:DataCell.IsCellFocusScope="True"
+                           AllowSpin="False"
+                           ShowButtonSpinner="False"
+                           AutoMoveFocus="True"
+                           VerticalAlignment="Stretch"
+                           Margin="-2,0,-2,0"
+                           Background="Transparent"
+                           Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                           AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Single">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Single}">
+          <xctk:SingleUpDown Name="PART_CellEditorBoundControl"
+                             Value="{markup:CellEditorBinding}"
+                             local:DataCell.IsCellFocusScope="True"
+                             AllowSpin="False"
+                             ShowButtonSpinner="False"
+                             AutoMoveFocus="True"
+                             VerticalAlignment="Stretch"
+                             Margin="-2,0,-2,0"
+                             Background="Transparent"
+                             Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                             AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Double">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Double}">
+          <xctk:DoubleUpDown Name="PART_CellEditorBoundControl"
+                             Value="{markup:CellEditorBinding}"
+                             local:DataCell.IsCellFocusScope="True"
+                             AllowSpin="False"
+                             ShowButtonSpinner="False"
+                             AutoMoveFocus="True"
+                             VerticalAlignment="Stretch"
+                             Margin="-2,0,-2,0"
+                             Background="Transparent"
+                             Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                             AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Decimal">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Decimal}">
+          <xctk:DecimalUpDown Name="PART_CellEditorBoundControl"
+                              Value="{markup:CellEditorBinding}"
+                              local:DataCell.IsCellFocusScope="True"
+                              AllowSpin="False"
+                              ShowButtonSpinner="False"
+                              AutoMoveFocus="True"
+                              VerticalAlignment="Stretch"
+                              Margin="-2,0,-2,0"
+                              Background="Transparent"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
+                              AutomationProperties.AutomationId="NumericTextBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <!--Also used by CellEditor.CheckBoxEditor-->
+    <local:CellEditor x:Key="System.Boolean">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:Boolean}">
+          <local:DataGridCheckBox IsChecked="{markup:CellEditorBinding}"
+                                  local:DataCell.IsCellFocusScope="True"
+                                  VerticalAlignment="Stretch"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent},  Path=(TextElement.Foreground)}"
+                                  AutomationProperties.AutomationId="CheckBoxEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:KeyActivationGesture Key="Space" />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <local:CellEditor x:Key="System.Xml.XmlElement"
+                      EditTemplate="{StaticResource textBoxEditorTemplate}">
+
+      <local:CellEditor.ActivationGestures>
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <!--Also used by CellEditor.DatePickerEditor-->
+    <local:CellEditor x:Key="System.DateTime">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate DataType="{x:Type s:DateTime}">
+          <local:DataGridDatePicker SelectedDate="{markup:CellEditorBinding}"
+                                    x:Name="PART_CellEditorBoundControl"
+                                    VerticalAlignment="Top"
                                     Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                    AutoSelectBehavior="OnFocus"
-                                    AutoMoveFocus="True"
-                                    AutomationProperties.AutomationId="TextBoxEditor" />
-      </DataTemplate>
-
-      <!--Also used by CellEditor.TextBoxEditor-->
-      <local:CellEditor x:Key="System.String"
-                        EditTemplate="{StaticResource textBoxEditorTemplate}">
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Int16">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Int16}">
-                    <local:ValidateInputWrapper>
-                        <xctk:ShortUpDown Name="PART_CellEditorBoundControl"
-                                          Value="{markup:CellEditorBinding}"
-                                          local:DataCell.IsCellFocusScope="True"
-                                          AllowSpin="False"
-                                          ShowButtonSpinner="False"
-                                          AutoMoveFocus="True"
-                                          VerticalAlignment="Stretch"
-                                          Margin="-2,0,-2,0"
-                                          Background="Transparent"
-                                          Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                          AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                    </local:ValidateInputWrapper>
-                </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Int32">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Int32}">
-                <local:ValidateInputWrapper>
-                    <xctk:IntegerUpDown Name="PART_CellEditorBoundControl"
-                                        Value="{markup:CellEditorBinding}"
-                                        local:DataCell.IsCellFocusScope="True"
-                                        AllowSpin="False"
-                                        ShowButtonSpinner="False"
-                                        AutoMoveFocus="True"
-                                        VerticalAlignment="Stretch"
-                                        Margin="-2,0,-2,0"
-                                        Background="Transparent"
-                                        Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                        AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Int64">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Int64}">
-                <local:ValidateInputWrapper>
-                    <xctk:LongUpDown Name="PART_CellEditorBoundControl"
-                                     Value="{markup:CellEditorBinding}"
-                                     local:DataCell.IsCellFocusScope="True"
-                                     AllowSpin="False"
-                                     ShowButtonSpinner="False"
-                                     AutoMoveFocus="True"
-                                     VerticalAlignment="Stretch"
-                                     Margin="-2,0,-2,0"
-                                     Background="Transparent"
-                                     Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                     AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Single">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Single}">
-                <local:ValidateInputWrapper>
-                    <xctk:SingleUpDown Name="PART_CellEditorBoundControl"
-                                    Value="{markup:CellEditorBinding}"
-                                    local:DataCell.IsCellFocusScope="True"
-                                    AllowSpin="False"
-                                    ShowButtonSpinner="False"
-                                    AutoMoveFocus="True"
-                                    VerticalAlignment="Stretch"
-                                    Margin="-2,0,-2,0"
-                                    Background="Transparent"
-                                    Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                    AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Double">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Double}">
-                <local:ValidateInputWrapper>
-                    <xctk:DoubleUpDown Name="PART_CellEditorBoundControl"
-                                       Value="{markup:CellEditorBinding}"
-                                       local:DataCell.IsCellFocusScope="True"
-                                       AllowSpin="False"
-                                       ShowButtonSpinner="False"
-                                       AutoMoveFocus="True"
-                                       VerticalAlignment="Stretch"
-                                       Margin="-2,0,-2,0"
-                                       Background="Transparent"
-                                       Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                       AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Decimal">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Decimal}">
-                <local:ValidateInputWrapper>
-                    <xctk:DecimalUpDown Name="PART_CellEditorBoundControl"
-                                        Value="{markup:CellEditorBinding}"
-                                        local:DataCell.IsCellFocusScope="True"
-                                        AllowSpin="False"
-                                        ShowButtonSpinner="False"
-                                        AutoMoveFocus="True"
-                                        VerticalAlignment="Stretch"
-                                        Margin="-2,0,-2,0"
-                                        Background="Transparent"
-                                        Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                        AutomationProperties.AutomationId="NumericTextBoxEditor" />
-                </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <!--Also used by CellEditor.CheckBoxEditor-->
-      <local:CellEditor x:Key="System.Boolean">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:Boolean}">
-               <local:DataGridCheckBox IsChecked="{markup:CellEditorBinding}"
-                               local:DataCell.IsCellFocusScope="True"
-                               VerticalAlignment="Stretch"
-                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent},  Path=(TextElement.Foreground)}"
-                               AutomationProperties.AutomationId="CheckBoxEditor" />
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:KeyActivationGesture Key="Space" />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <local:CellEditor x:Key="System.Xml.XmlElement"
-                        EditTemplate="{StaticResource textBoxEditorTemplate}">
-
-         <local:CellEditor.ActivationGestures>
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <!--Also used by CellEditor.DatePickerEditor-->
-      <local:CellEditor x:Key="System.DateTime">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate DataType="{x:Type s:DateTime}">
-               <local:ValidateInputWrapper>
-                  <local:DataGridDatePicker SelectedDate="{markup:CellEditorBinding}"
-                                            x:Name="PART_CellEditorBoundControl"
-                                            VerticalAlignment="Top"
-                                            Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                            AutomationProperties.AutomationId="DatePickerEditor" />
-               </local:ValidateInputWrapper>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:KeyActivationGesture SystemKey="Down"
-                                        Modifiers="Alt" />
-            <local:KeyActivationGesture SystemKey="Up"
-                                        Modifiers="Alt" />
-            <local:TextInputActivationGesture />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-      <!-- ForeignKey CellEditor -->
-      <local:CellEditor x:Key="foreignKeyCellEditor">
-         <local:CellEditor.EditTemplate>
-            <DataTemplate>
-               <ComboBox x:Name="fkComboBox"
-                         local:Cell.IsCellFocusScope="True"
-                         BorderThickness="0"
-                         ItemTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Mode=OneWay}"
-                         ItemContainerStyle="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Mode=OneWay}"
-                         ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemsSource, Mode=OneWay}"
-                         SelectedValuePath="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ValuePath, Mode=OneWay}"
-                         SelectedValue="{markup:CellEditorBinding}"
-                         AutomationProperties.AutomationId="ForeignKeyCellEditor" />
-
-               <!-- Only affect Selector if Template is null and DisplayMemberPath is null or empty -->
-               <DataTemplate.Triggers>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                                   Value="True" />
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplateSelector, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <MultiDataTrigger.Setters>
-                        <Setter TargetName="fkComboBox"
-                                Property="ItemTemplateSelector"
-                                Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplateSelector, Mode=OneWay}" />
-                     </MultiDataTrigger.Setters>
-                  </MultiDataTrigger>
-
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                                   Value="True" />
-                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplateSelector, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                                   Value="True" />
-                     </MultiDataTrigger.Conditions>
-                     <MultiDataTrigger.Setters>
-                        <Setter TargetName="fkComboBox"
-                                Property="DisplayMemberPath"
-                                Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.DisplayMemberPath, Mode=OneWay}" />
-                     </MultiDataTrigger.Setters>
-                  </MultiDataTrigger>
-
-                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                               Value="True">
-                     <Setter TargetName="fkComboBox"
-                             Property="ItemContainerStyleSelector"
-                             Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyleSelector, Mode=OneWay}" />
-                  </DataTrigger>
-               </DataTemplate.Triggers>
-            </DataTemplate>
-         </local:CellEditor.EditTemplate>
-         <local:CellEditor.ActivationGestures>
-            <local:KeyActivationGesture SystemKey="Down"
-                                        Modifiers="Alt" />
-
-            <local:KeyActivationGesture SystemKey="Up"
-                                        Modifiers="Alt" />
-
-            <local:KeyActivationGesture Key="F4" />
-
-            <local:KeyActivationGesture Key="Space" />
-         </local:CellEditor.ActivationGestures>
-      </local:CellEditor>
-
-   </FrameworkElement.Resources>
+                                    AutomationProperties.AutomationId="DatePickerEditor" />
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:KeyActivationGesture SystemKey="Down"
+                                    Modifiers="Alt" />
+        <local:KeyActivationGesture SystemKey="Up"
+                                    Modifiers="Alt" />
+        <local:TextInputActivationGesture />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+    <!-- ForeignKey CellEditor -->
+    <local:CellEditor x:Key="foreignKeyCellEditor">
+      <local:CellEditor.EditTemplate>
+        <DataTemplate>
+          <ComboBox x:Name="fkComboBox"
+                    local:Cell.IsCellFocusScope="True"
+                    BorderThickness="0"
+                    ItemContainerStyle="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Mode=OneWay}"
+                    ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemsSource, Mode=OneWay}"
+                    SelectedValuePath="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ValuePath, Mode=OneWay}"
+                    DisplayMemberPath="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.DisplayMemberPath, Mode=OneWay}"
+                    SelectedValue="{markup:CellEditorBinding}"
+                    AutomationProperties.AutomationId="ForeignKeyCellEditor" />
+
+          <!-- Only set ItemTemplate if DisplayMemberPath is null, and only set Selector if both DisplayMemberPath and CellContentTemplate are null-->
+          <DataTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding ElementName=fkComboBox, Path=DisplayMemberPath, Converter={StaticResource emptyStringToBooleanConverter}, Mode=OneWay}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <MultiDataTrigger.Setters>
+                <Setter TargetName="fkComboBox"
+                        Property="ItemTemplate"
+                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Mode=OneWay}" />
+              </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding ElementName=fkComboBox, Path=DisplayMemberPath, Converter={StaticResource emptyStringToBooleanConverter}, Mode=OneWay}"
+                           Value="True" />
+                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <MultiDataTrigger.Setters>
+                <Setter TargetName="fkComboBox"
+                        Property="ItemTemplateSelector"
+                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplateSelector, Mode=OneWay}" />
+              </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
+                         Value="True">
+              <Setter TargetName="fkComboBox"
+                      Property="ItemContainerStyleSelector"
+                      Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyleSelector, Mode=OneWay}" />
+            </DataTrigger>
+          </DataTemplate.Triggers>
+        </DataTemplate>
+      </local:CellEditor.EditTemplate>
+      <local:CellEditor.ActivationGestures>
+        <local:KeyActivationGesture SystemKey="Down"
+                                    Modifiers="Alt" />
+
+        <local:KeyActivationGesture SystemKey="Up"
+                                    Modifiers="Alt" />
+
+        <local:KeyActivationGesture Key="F4" />
+
+        <local:KeyActivationGesture Key="Space" />
+      </local:CellEditor.ActivationGestures>
+    </local:CellEditor>
+
+  </FrameworkElement.Resources>
 
 </FrameworkElement>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
index d81c5150..dfe27fa9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
@@ -15,39 +15,47 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using System.Windows;
-using System.Collections;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal partial class DefaultCellEditorSelector : FrameworkElement
   {
-    static DefaultCellEditorSelector()
-    {
-      Instance = new DefaultCellEditorSelector();
-    }
+    #region Static Fields
+
+    private static DefaultCellEditorSelector s_instance = default( DefaultCellEditorSelector );
+    private static readonly List<WeakReference> s_instances = new List<WeakReference>( 1 );
+
+    #endregion
 
     private DefaultCellEditorSelector()
     {
       this.InitializeComponent();
     }
 
-    private static readonly DefaultCellEditorSelector Instance;
+    #region ForeignKeyCellEditor Public Static Property
 
-    #region TextBoxEditor Public Static Property
+    public static CellEditor ForeignKeyCellEditor
+    {
+      get
+      {
+        return DefaultCellEditorSelector.GetCellEditor( "foreignKeyCellEditor" );
+      }
+    }
 
-    public static CellEditor TextBoxEditorCache;
+    #endregion
+
+    #region TextBoxEditor Public Static Property
 
     public static CellEditor TextBoxEditor
     {
       get
       {
-        if( TextBoxEditorCache == null )
-          TextBoxEditorCache = DefaultCellEditorSelector.SelectCellEditor( typeof( string ) );
-
-        return TextBoxEditorCache;
+        return DefaultCellEditorSelector.SelectCellEditor( typeof( string ) );
       }
     }
 
@@ -55,16 +63,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region CheckBoxEditor Public Static Property
 
-    public static CellEditor CheckBoxEditorCache;
-
     public static CellEditor CheckBoxEditor
     {
       get
       {
-        if( CheckBoxEditorCache == null )
-          CheckBoxEditorCache = DefaultCellEditorSelector.SelectCellEditor( typeof( bool ) );
-
-        return CheckBoxEditorCache;
+        return DefaultCellEditorSelector.SelectCellEditor( typeof( bool ) );
       }
     }
 
@@ -72,122 +75,155 @@ namespace Xceed.Wpf.DataGrid
 
     #region DateTimeEditor Public Static Editor
 
-    public static CellEditor DateTimeEditorCache;
-
     public static CellEditor DateTimeEditor
     {
       get
       {
-        if( DateTimeEditorCache == null )
-          DateTimeEditorCache = DefaultCellEditorSelector.SelectCellEditor( typeof( DateTime ) );
-
-        return DateTimeEditorCache;
+        return DefaultCellEditorSelector.SelectCellEditor( typeof( DateTime ) );
       }
     }
 
     #endregion
 
-    #region ForeignKeyCellEditor Public Static Property
+    public static CellEditor SelectCellEditor( Type dataType )
+    {
+      if( dataType == null )
+        return null;
 
-    private static CellEditor ForeignKeyEditorCache;
+      if( dataType.IsGenericType && ( dataType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
+      {
+        dataType = Nullable.GetUnderlyingType( dataType );
+      }
 
-    public static CellEditor ForeignKeyCellEditor
+      var editor = default( CellEditor );
+      if( DefaultCellEditorSelector.TryGetCellEditor( dataType.FullName, out editor ) )
+        return editor;
+
+      return null;
+    }
+
+    private static DataTemplate GetDataTemplate( object key )
     {
-      get
-      {
-        if( ForeignKeyEditorCache == null )
-        {
-          ForeignKeyEditorCache = DefaultCellEditorSelector.ThreadSafeFindResource( "foreignKeyCellEditor" ) as CellEditor;
-          ForeignKeyEditorCache.EditTemplate.Seal();
-        }
+      var resource = default( DataTemplate );
+      if( !DefaultCellEditorSelector.TryGetDataTemplate( key, out resource ) )
+        throw new KeyNotFoundException( "Resource not found" );
 
-        return ForeignKeyEditorCache;
-      }
+      return resource;
     }
 
-    #endregion
+    private static bool TryGetDataTemplate( object key, out DataTemplate value )
+    {
+      var resource = default( object );
+      if( !DefaultCellEditorSelector.TryGetResource( key, out resource ) )
+      {
+        value = default( DataTemplate );
+        return false;
+      }
+      else
+      {
+        value = DefaultCellEditorSelector.TrySeal( resource as DataTemplate );
+        return ( value != null );
+      }
+    }
 
-    #region LinqCellEditor Public Static Editor
+    private static CellEditor GetCellEditor( object key )
+    {
+      var resource = default( CellEditor );
+      if( !DefaultCellEditorSelector.TryGetCellEditor( key, out resource ) )
+        throw new KeyNotFoundException( "Resource not found" );
 
-    private static CellEditor LinqCellEditorCache;
+      return resource;
+    }
 
-    public static CellEditor LinqCellEditor
+    private static bool TryGetCellEditor( object key, out CellEditor value )
     {
-      get
+      var resource = default( object );
+      if( !DefaultCellEditorSelector.TryGetResource( key, out resource ) )
       {
-        if( LinqCellEditorCache == null )
-        {
-          LinqCellEditorCache = DefaultCellEditorSelector.ThreadSafeFindResource( "linqCellEditor" ) as CellEditor;
-          LinqCellEditorCache.EditTemplate.Seal();
-        }
-
-        return LinqCellEditorCache;
+        value = default( CellEditor );
+        return false;
+      }
+      else
+      {
+        value = DefaultCellEditorSelector.TryFreeze( resource as CellEditor );
+        return ( value != null );
       }
     }
 
-    #endregion
-
-    public static CellEditor SelectCellEditor( Type dataType )
+    private static bool TryGetResource( object key, out object value )
     {
-      CellEditor cellEditor = null;
+      value = null;
+
+      var dispatcher = Dispatcher.CurrentDispatcher;
+      if( dispatcher == null )
+        return false;
+
+      var target = default( DefaultCellEditorSelector );
 
-      if( dataType != null )
+      lock( ( ( ICollection )s_instances ).SyncRoot )
       {
-        if( ( dataType.IsGenericType ) && ( dataType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
-          dataType = Nullable.GetUnderlyingType( dataType );
+        for( int i = s_instances.Count - 1; i >= 0; i-- )
+        {
+          var instance = s_instances[ i ].Target as DefaultCellEditorSelector;
+
+          if( instance == null )
+          {
+            s_instances.RemoveAt( i );
+          }
+          else if( instance.Dispatcher == dispatcher )
+          {
+            target = instance;
+
+            // We could exit the loop but we don't because we want to clean up the list
+            // and keep it small.  We don't want it to become large with lots of empty
+            // WeakReference.
+            //break;
+          }
+        }
 
-        cellEditor = DefaultCellEditorSelector.ThreadSafeTryFindResource( dataType.FullName ) as CellEditor;
+        if( target == null )
+        {
+          target = new DefaultCellEditorSelector();
+          s_instances.Add( new WeakReference( target ) );
+        }
 
-        if( cellEditor != null )
-          DefaultCellEditorSelector.ThreadSafeTryFreezeEditor( cellEditor );
+        // We keep a strong reference on the target instance to prevent that instance
+        // from being garbage collected.  We assume that we will need that instance
+        // again for other calls.  We don't want to have to create a new instance to
+        // query for a single resource.
+        s_instance = target;
       }
 
-      return cellEditor;
-    }
-
-    private static object ThreadSafeTryFindResource( string key )
-    {
-      Func<string, object> func = ( resourceKey => DefaultCellEditorSelector.Instance.TryFindResource( resourceKey ) );
+      Debug.Assert( target != null );
 
-      if( DefaultCellEditorSelector.Instance.CheckAccess() )
-        return func( key );
+      value = target.TryFindResource( key );
 
-      return DefaultCellEditorSelector.Instance.Dispatcher.Invoke( func, key );
+      return ( value != null );
     }
 
-    private static object ThreadSafeFindResource( string key )
+    private static DataTemplate TrySeal( DataTemplate template )
     {
-      Func<string, object> func = ( resourceKey => DefaultCellEditorSelector.Instance.FindResource( resourceKey ) );
-
-      if( DefaultCellEditorSelector.Instance.CheckAccess() )
-        return func( key );
+      if( ( template != null ) && !template.IsSealed )
+      {
+        template.Seal();
+      }
 
-      return DefaultCellEditorSelector.Instance.Dispatcher.Invoke( func, key );
+      return template;
     }
 
-    private static void ThreadSafeTryFreezeEditor( CellEditor cellEditor )
+    private static CellEditor TryFreeze( CellEditor editor )
     {
-      if( cellEditor == null )
-        throw new ArgumentNullException( "cellEditor" );
-
-      if( DefaultCellEditorSelector.Instance.CheckAccess() )
+      if( ( editor != null ) && !editor.IsFrozen )
       {
-        if( cellEditor.IsFrozen )
-          return;
-
-        if( ( cellEditor.EditTemplate != null ) && ( !cellEditor.EditTemplate.IsSealed ) )
-          cellEditor.EditTemplate.Seal();
-
-        System.Diagnostics.Debug.Assert( cellEditor.CanFreeze );
+        DefaultCellEditorSelector.TrySeal( editor.EditTemplate );
 
-        if( cellEditor.CanFreeze )
-          cellEditor.Freeze();
-      }
-      else
-      {
-        DefaultCellEditorSelector.Instance.Dispatcher.Invoke(
-          new Action<CellEditor>( DefaultCellEditorSelector.ThreadSafeTryFreezeEditor ), cellEditor );
+        if( editor.CanFreeze )
+        {
+          editor.Freeze();
+        }
       }
+
+      return editor;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
index 3b752375..7701f8f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
@@ -275,8 +275,6 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       m_defaultHeadersFootersAdded = true;
-
-      DetailConfiguration.AddDefaultHeadersFooters( this.Headers, false );
     }
 
     private bool m_defaultHeadersFootersAdded = false;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
index 0d73e4da..86423d25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
@@ -21,17 +21,26 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
 using Xceed.Wpf.DataGrid.Markup;
+using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal sealed class DetailConfiguration : DependencyObject, IWeakEventListener, ISupportInitialize, INotifyPropertyChanged
   {
+    #region Static Fields
+
+    internal static readonly string DataGridControlPropertyName = PropertyHelper.GetPropertyName( ( DetailConfiguration d ) => d.DataGridControl );
+    internal static readonly string DetailDescriptionPropertyName = PropertyHelper.GetPropertyName( ( DetailConfiguration d ) => d.DetailDescription );
+
+    #endregion
+
     static DetailConfiguration()
     {
       DetailConfiguration.DetailConfigurationsProperty = DetailConfiguration.DetailConfigurationsPropertyKey.DependencyProperty;
@@ -46,24 +55,26 @@ namespace Xceed.Wpf.DataGrid
 
     public DetailConfiguration()
     {
-      var columns = new ColumnCollection( this.DataGridControl, this );
+      var columns = new ColumnCollection( null, this );
 
-      this.SetColumns( columns );
-      this.Columns.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnColumnsCollectionChanged );
-      VisibilityChangedEventManager.AddListener( this.Columns, this );
+      m_columnManager = new ColumnHierarchyManager( columns );
 
-      this.SetVisibleColumns( new ReadOnlyColumnCollection() );
+      this.SetColumns( columns );
+      this.SetVisibleColumns( m_columnManager.VisibleColumns );
 
-      m_columnsByVisiblePosition = new HashedLinkedList<ColumnBase>();
       m_columnSynchronizationManager = new ColumnSynchronizationManager( this );
+      m_columnManagerRowConfiguration = new ColumnManagerRowConfiguration();
 
       this.SetHeaders( new ObservableCollection<DataTemplate>() );
       this.SetFooters( new ObservableCollection<DataTemplate>() );
 
       this.SetGroupLevelDescriptions( new GroupLevelDescriptionCollection() );
-      this.SetDetailConfigurations( new DetailConfigurationCollection( this.DataGridControl, this ) );
+      this.SetDetailConfigurations( new DetailConfigurationCollection( null, this ) );
+
+      columns.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnColumnsCollectionChanged );
       CollectionChangedEventManager.AddListener( this.DetailConfigurations, this );
 
+      this.BeginInit();
     }
 
     private static void BuildDefaultTemplates()
@@ -141,7 +152,7 @@ namespace Xceed.Wpf.DataGrid
     private static DataTemplate DefaultColumnManagerRowTemplate;
     private static DataTemplate DefaultGroupByControlTemplate;
 
-    internal static void AddDefaultHeadersFooters( ObservableCollection<DataTemplate> headersCollection, bool areDetailsFlatten )
+    internal static void AddDefaultHeadersFooters( ObservableCollection<DataTemplate> headersCollection, int mergedHeadersCount, bool areDetailsFlatten )
     {
       if( !areDetailsFlatten )
       {
@@ -150,57 +161,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal static void SynchronizeDetailConfigurations(
-      DataGridDetailDescriptionCollection dataGridDetailDescriptionCollection,
-      DetailConfigurationCollection detailConfigurationCollection,
-      bool autoCreateDetailConfigurations,
-      bool autoCreateForeignKeyConfigurations,
-      bool autoRemoveUnassociated )
-    {
-      HashSet<DetailConfiguration> detailConfigWithAssociation = new HashSet<DetailConfiguration>();
-
-      foreach( DataGridDetailDescription detailDescription in dataGridDetailDescriptionCollection )
-      {
-        DetailConfiguration detailConfig = detailConfigurationCollection[ detailDescription.RelationName ];
-
-        if( detailConfig == null )
-        {
-          if( autoCreateDetailConfigurations )
-          {
-            detailConfig = new DetailConfiguration();
-
-            detailConfig.SetIsAutoCreated( true );
-            detailConfig.RelationName = detailDescription.RelationName;
-            detailConfig.AutoCreateForeignKeyConfigurations = autoCreateForeignKeyConfigurations;
-            detailConfig.AutoRemoveColumnsAndDetailConfigurations = autoRemoveUnassociated;
-            detailConfigurationCollection.Add( detailConfig );
-          }
-        }
-
-        if( detailConfig != null )
-        {
-          detailConfigWithAssociation.Add( detailConfig );
-          detailConfig.SynchronizeWithDetailDescription( detailDescription );
-        }
-      }
-
-      for( int i = detailConfigurationCollection.Count - 1; i >= 0; i-- )
-      {
-        DetailConfiguration detailConfig = detailConfigurationCollection[ i ];
-
-        if( !detailConfigWithAssociation.Contains( detailConfig ) )
-        {
-          detailConfig.DetachFromDetailDescription();
-
-          if( ( autoRemoveUnassociated ) && ( detailConfig.IsAutoCreated ) )
-          {
-            DetailConfiguration.CleanupDetailConfigurations( detailConfig.DetailConfigurations, autoRemoveUnassociated );
-            detailConfigurationCollection.RemoveAt( i );
-          }
-        }
-      }
-    }
-
     internal static void SynchronizeAddedConfigurations( IList addedDetailConfigs, DataGridDetailDescriptionCollection detailDescriptions )
     {
       foreach( DetailConfiguration detailConfig in addedDetailConfigs )
@@ -300,44 +260,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion AutoCreateColumns Property
 
-    #region AutoCreateDetailConfigurations Property
-
-    public static readonly DependencyProperty AutoCreateDetailConfigurationsProperty =
-      DataGridControl.AutoCreateDetailConfigurationsProperty.AddOwner( typeof( DetailConfiguration ), new FrameworkPropertyMetadata( true ) );
-
-    public bool AutoCreateDetailConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.AutoCreateDetailConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.AutoCreateDetailConfigurationsProperty, value );
-      }
-    }
-
-    #endregion AutoCreateColumns Property
-
-    #region AutoRemoveColumnsAndDetailConfigurations Property
-
-    public static readonly DependencyProperty AutoRemoveColumnsAndDetailConfigurationsProperty =
-      DataGridControl.AutoRemoveColumnsAndDetailConfigurationsProperty.AddOwner( typeof( DetailConfiguration ) );
-
-    public bool AutoRemoveColumnsAndDetailConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AutoRemoveColumnsAndDetailConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoRemoveColumnsAndDetailConfigurationsProperty, value );
-      }
-    }
-
-    #endregion AutoRemoveColumnsAndDetailConfigurations Property
-
     #region Columns Read-Only Property
 
     internal static readonly DependencyPropertyKey ColumnsPropertyKey =
@@ -776,6 +698,16 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region ForeignKeysUpdatedOnAutoCreate Property
+
+    internal bool ForeignKeysUpdatedOnAutoCreate
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
     #region CurrentColumn Property
 
     internal ColumnBase CurrentColumn
@@ -808,29 +740,23 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return m_columnsByVisiblePosition;
+        return m_columnManager.ColumnsByVisiblePosition;
       }
     }
 
-    private HashedLinkedList<ColumnBase> m_columnsByVisiblePosition;
-
     #endregion
 
-    #region ItemsSourceFieldDescriptors Property
+    #region ItemsSourcePropertyDescriptions Internal Property
 
-    internal Dictionary<string, ItemsSourceHelper.FieldDescriptor> ItemsSourceFieldDescriptors
+    internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
     {
       get
       {
-        return m_itemsSourceFieldDescriptors;
-      }
-      set
-      {
-        m_itemsSourceFieldDescriptors = value;
+        return m_itemsSourcePropertyDescriptions;
       }
     }
 
-    private Dictionary<string, ItemsSourceHelper.FieldDescriptor> m_itemsSourceFieldDescriptors; // = null
+    private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions = new PropertyDescriptionRouteDictionary();
 
     #endregion
 
@@ -907,30 +833,87 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        var collection = this.ContainingCollection;
-        if( collection != null )
-          return collection.DataGridControl;
-
-        return null;
+        return m_dataGridControl;
       }
       private set
       {
-        if( this.Columns != null )
+        if( value == m_dataGridControl )
+          return;
+
+        var oldDataGridControl = m_dataGridControl;
+
+        if( m_dataGridControl != null )
+        {
+          ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
+        }
+
+        m_dataGridControl = value;
+
+        if( m_dataGridControl != null )
         {
-          this.Columns.DataGridControl = value;
+          ViewChangedEventManager.AddListener( m_dataGridControl, this );
         }
 
-        if( this.DetailConfigurations != null )
+        if( value != null )
         {
-          this.DetailConfigurations.DataGridControl = value;
+          m_columnManager.Initialize( value );
+          m_columnManager.SetFixedColumnCount( TableView.GetFixedColumnCount( this ) );
+        }
+        else
+        {
+          m_columnManager.Clear();
         }
 
-        m_fieldNameMap.SetSource( value, this.DetailDescription );
+        var detailConfigurations = this.DetailConfigurations;
+        if( detailConfigurations != null )
+        {
+          detailConfigurations.DataGridControl = value;
+        }
+
+        this.InitializeItemPropertyMap( this.DataGridControl, this.DetailDescription );
+        this.OnPropertyChanged( DetailConfiguration.DataGridControlPropertyName );
 
-        this.OnPropertyChanged( "DataGridControl" );
+        if( m_dataGridControl == null )
+        {
+          this.BeginInit();
+        }
+        else if( oldDataGridControl == null )
+        {
+          this.EndInit();
+        }
       }
     }
 
+    private DataGridControl m_dataGridControl;
+
+    #endregion
+
+    #region DataGridContext Property
+
+    internal DataGridContext DataGridContext
+    {
+      get
+      {
+        return m_dataGridContexts.FirstOrDefault();
+      }
+    }
+
+    internal void AddDataGridContext( DataGridContext dataGridContext )
+    {
+      Debug.Assert( dataGridContext != null );
+
+      m_dataGridContexts.Add( dataGridContext );
+    }
+
+    internal void RemoveDataGridContext( DataGridContext dataGridContext )
+    {
+      var oldCount = m_dataGridContexts.Count;
+      m_dataGridContexts.Remove( dataGridContext );
+      var newCount = m_dataGridContexts.Count;
+    }
+
+    private readonly ICollection<DataGridContext> m_dataGridContexts = new HashSet<DataGridContext>();
+
     #endregion
 
     #region ParentDetailConfiguration Internal Property
@@ -948,58 +931,59 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region IsAutoCreated Internal Property
+    #region ColumnManagerRowConfiguration Internal Property
 
-    internal bool IsAutoCreated
+    internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
     {
       get
       {
-        return m_isAutoCreated;
+        return m_columnManagerRowConfiguration;
       }
     }
 
-    internal void SetIsAutoCreated( bool newValue )
-    {
-      m_isAutoCreated = newValue;
-    }
-
-    private bool m_isAutoCreated = false;
+    private readonly ColumnManagerRowConfiguration m_columnManagerRowConfiguration;
 
     #endregion
 
-    #region IsAttachedToDetailDescription Internal Read-Only Property
+    #region IsAutoCreated Internal Property
 
-    internal bool IsAttachedToDetailDescription
+    internal bool IsAutoCreated
     {
       get
       {
-        return m_isAttachedToDetailDescription;
+        return m_isAutoCreated;
       }
       private set
       {
-        if( value == m_isAttachedToDetailDescription )
-          return;
-
-        m_isAttachedToDetailDescription = value;
-        this.OnPropertyChanged( "IsAttachedToDetailDescription" );
+        m_isAutoCreated = value;
       }
     }
 
-    private bool m_isAttachedToDetailDescription; //false
+    private bool m_isAutoCreated = false;
+
+    #endregion
+
+    #region IsCreatedFromSelector Property
+
+    private bool IsCreatedFromSelector
+    {
+      get;
+      set;
+    }
 
     #endregion
 
     #region ItemPropertyMap Internal Property
 
-    internal FieldNameMap ItemPropertyMap
+    internal DataGridItemPropertyMap ItemPropertyMap
     {
       get
       {
-        return m_fieldNameMap;
+        return m_itemPropertyMap;
       }
     }
 
-    private readonly FieldNameMapProxy m_fieldNameMap = new FieldNameMapProxy();
+    private readonly DataGridItemPropertyMap m_itemPropertyMap = new DataGridItemPropertyMap();
 
     #endregion
 
@@ -1045,18 +1029,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region RecyclingManager Internal Read-Only property
-
-    internal RecyclingManager RecyclingManager
-    {
-      get
-      {
-        return m_recyclingManager;
-      }
-    }
-
-    #endregion
-
     #region IsDeleteCommandEnabled Property
 
     public static readonly DependencyProperty IsDeleteCommandEnabledProperty = DependencyProperty.Register(
@@ -1084,23 +1056,21 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion IsDeleteCommandEnabled Property
 
-    #region DetailDescription Private Property
+    #region DetailDescription Internal Property
 
-    private DataGridDetailDescription DetailDescription
+    internal DataGridDetailDescription DetailDescription
     {
       get
       {
         return m_detailDescription;
       }
-      set
+      private set
       {
         if( value == m_detailDescription )
           return;
 
         m_detailDescription = value;
-        this.OnPropertyChanged( "DetailDescription" );
-
-        this.IsAttachedToDetailDescription = ( value != null );
+        this.OnPropertyChanged( DetailConfiguration.DetailDescriptionPropertyName );
       }
     }
 
@@ -1121,6 +1091,9 @@ namespace Xceed.Wpf.DataGrid
         if( value == m_containingCollection )
           return;
 
+        if( ( m_containingCollection != null ) && ( value != null ) )
+          throw new InvalidOperationException( "The DetailConfiguration is already contained in another DetailConfigurationCollection." );
+
         if( m_containingCollection != null )
         {
           ( ( INotifyPropertyChanged )m_containingCollection ).PropertyChanged -= new PropertyChangedEventHandler( this.OnContainingCollectionPropertyChanged );
@@ -1173,22 +1146,39 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region IsSettingFixedColumnCount Property
+    #region ColumnManager Internal Property
 
-    internal bool IsSettingFixedColumnCount
+    internal ColumnHierarchyManager ColumnManager
     {
-      get;
-      set;
+      get
+      {
+        return m_columnManager;
+      }
     }
 
+    private readonly ColumnHierarchyManager m_columnManager;
+
     #endregion
 
-    #region Events
+    public IDisposable DeferColumnsUpdate()
+    {
+      return ColumnHierarchyManagerHelper.DeferColumnsUpdate( this );
+    }
 
-    internal event EventHandler<RequestingDelayBringIntoViewAndFocusCurrentEventArgs> RequestingDelayBringIntoViewAndFocusCurrent;
-    internal event EventHandler FixedColumnCountChanged;
+    public bool MoveColumnBefore( ColumnBase current, ColumnBase next )
+    {
+      return ColumnHierarchyManagerHelper.MoveColumnBefore( this, current, next );
+    }
 
-    #endregion
+    public bool MoveColumnAfter( ColumnBase current, ColumnBase previous )
+    {
+      return ColumnHierarchyManagerHelper.MoveColumnAfter( this, current, previous );
+    }
+
+    public bool MoveColumnUnder( ColumnBase current, ColumnBase parent )
+    {
+      return ColumnHierarchyManagerHelper.MoveColumnUnder( this, current, parent );
+    }
 
     protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
@@ -1196,11 +1186,14 @@ namespace Xceed.Wpf.DataGrid
 
       if( e.Property == DetailConfiguration.GroupConfigurationSelectorProperty )
       {
-        if( this.GroupConfigurationSelectorChanged != null )
+        var handler = this.GroupConfigurationSelectorChanged;
+        if( handler != null )
         {
-          this.GroupConfigurationSelectorChanged( this, EventArgs.Empty );
+          handler.Invoke( this, EventArgs.Empty );
         }
       }
+
+      this.OnPropertyChanged( e.Property.Name );
     }
 
     internal void AddDefaultHeadersFooters()
@@ -1210,7 +1203,7 @@ namespace Xceed.Wpf.DataGrid
 
       m_defaultHeadersFootersAdded = true;
 
-      DetailConfiguration.AddDefaultHeadersFooters( this.Headers, this.DataGridControl.AreDetailsFlatten );
+      DetailConfiguration.AddDefaultHeadersFooters( this.Headers, 0, this.DataGridControl.AreDetailsFlatten );
     }
 
     internal void SynchronizeForeignKeyConfigurations()
@@ -1220,7 +1213,7 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-        this.Columns.FieldNameToColumnDictionary,
+        this.Columns,
         detailDescription.ItemProperties,
         this.AutoCreateForeignKeyConfigurations );
     }
@@ -1238,103 +1231,91 @@ namespace Xceed.Wpf.DataGrid
       this.ContainingCollection = null;
     }
 
-    internal void RaiseFixedColumnCountChanged( FixedColumnCountInfoEventArgs infoEventArgs )
+    private void SynchronizeWithDetailDescription( DataGridDetailDescription detailDescription )
     {
-      this.IsSettingFixedColumnCount = true;
+      if( detailDescription == this.DetailDescription )
+        return;
 
-      if( this.FixedColumnCountChanged != null )
-      {
-        this.FixedColumnCountChanged( this, infoEventArgs );
-      }
-    }
+      this.DetachFromDetailDescription( false );
 
-    private void SynchronizeWithDetailDescription( DataGridDetailDescription detailDescription )
-    {
-      if( detailDescription != this.DetailDescription )
-      {
-        this.DetachFromDetailDescription();
+      m_shouldCreateColumns = true;
+      this.DetailDescription = detailDescription;
 
-        m_shouldCreateColumns = true;
-        this.DetailDescription = detailDescription;
+      DataGridSortDescriptionCollection dataGridSortDescriptionCollection;
+      ObservableCollection<GroupDescription> groupDescriptionCollection;
 
-        DataGridSortDescriptionCollection dataGridSortDescriptionCollection;
-        ObservableCollection<GroupDescription> groupDescriptionCollection;
+      if( detailDescription != null )
+      {
+        groupDescriptionCollection = detailDescription.GroupDescriptions;
 
-        if( detailDescription != null )
-        {
-          groupDescriptionCollection = detailDescription.GroupDescriptions;
+        //register to the collectionchanged of the DataGridDetailDescription collection of the detailDescription matching this one.
+        dataGridSortDescriptionCollection = detailDescription.DataGridSortDescriptions;
 
-          //register to the collectionchanged of the DataGridDetailDescription collection of the detailDescription matching this one.
-          dataGridSortDescriptionCollection = detailDescription.DataGridSortDescriptions;
+        this.RegisterItemProperties( detailDescription.ItemProperties );
 
-          CollectionChangedEventManager.AddListener( detailDescription.ItemProperties, this );
-          CollectionChangedEventManager.AddListener( detailDescription.DetailDescriptions, this );
-        }
-        else
-        {
-          groupDescriptionCollection = new GroupDescriptionCollection();
-          dataGridSortDescriptionCollection = new DataGridSortDescriptionCollection();
-        }
+        CollectionChangedEventManager.AddListener( detailDescription.DetailDescriptions, this );
+      }
+      else
+      {
+        groupDescriptionCollection = new GroupDescriptionCollection();
+        dataGridSortDescriptionCollection = new DataGridSortDescriptionCollection();
+      }
 
-        m_groupDescriptions = groupDescriptionCollection;
-        m_sortDescriptions = dataGridSortDescriptionCollection;
-        m_sortDescriptionsSyncContext = null; //clear it, if it was ever set!
-        m_fieldNameMap.SetSource( this.DataGridControl, detailDescription );
+      m_groupDescriptions = groupDescriptionCollection;
+      m_sortDescriptions = dataGridSortDescriptionCollection;
+      m_sortDescriptionsSyncContext = null; //clear it, if it was ever set!
 
-        //This update is required since there might be some columns in the Columns collection after the XAML parsing of the DetailConfiguration
-        this.UpdateColumnSortOrder();
+      this.InitializeItemPropertyMap( this.DataGridControl, detailDescription );
 
-        //This update is required since we want the GroupLevelDescriptions to be created if DetailConfiguration in XAML
-        //contains GroupDescriptions
-        DataGridContext.UpdateGroupLevelDescriptions( this.GroupLevelDescriptions, new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ), this.GroupDescriptions, this.Columns );
+      //This update is required since there might be some columns in the columns collection after the XAML parsing of the DetailConfiguration
+      this.UpdateColumnSortOrder();
 
-        CollectionChangedEventManager.AddListener( m_sortDescriptions, this );
-        CollectionChangedEventManager.AddListener( m_groupDescriptions, this );
+      //This update is required since we want the GroupLevelDescriptions to be created if DetailConfiguration in XAML
+      //contains GroupDescriptions
+      DataGridContext.UpdateGroupLevelDescriptions( this.GroupLevelDescriptions,
+                                                    new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ),
+                                                    this.GroupDescriptions,
+                                                    this.Columns );
 
-        if( detailDescription != null )
+      CollectionChangedEventManager.AddListener( m_sortDescriptions, this );
+      CollectionChangedEventManager.AddListener( m_groupDescriptions, this );
+
+      if( detailDescription != null )
+      {
+        if( this.ReadLocalValue( DetailConfiguration.TitleProperty ) == DependencyProperty.UnsetValue )
         {
-          if( this.ReadLocalValue( DetailConfiguration.TitleProperty ) == DependencyProperty.UnsetValue )
+          if( detailDescription.Title == null )
           {
-            if( detailDescription.Title == null )
-            {
-              this.Title = detailDescription.RelationName;
-            }
-            else
-            {
-              this.Title = detailDescription.Title;
-            }
+            this.Title = detailDescription.RelationName;
           }
-
-          if( ( this.ReadLocalValue( DetailConfiguration.TitleTemplateProperty ) == DependencyProperty.UnsetValue )
-            && ( detailDescription.TitleTemplate != null ) )
+          else
           {
-            this.TitleTemplate = detailDescription.TitleTemplate;
+            this.Title = detailDescription.Title;
           }
+        }
 
-          DetailConfiguration.SynchronizeDetailConfigurations(
-            detailDescription.DetailDescriptions,
-            this.DetailConfigurations,
-            this.AutoCreateDetailConfigurations,
-            this.AutoCreateForeignKeyConfigurations,
-            this.AutoRemoveColumnsAndDetailConfigurations );
+        if( ( this.ReadLocalValue( DetailConfiguration.TitleTemplateProperty ) == DependencyProperty.UnsetValue )
+          && ( detailDescription.TitleTemplate != null ) )
+        {
+          this.TitleTemplate = detailDescription.TitleTemplate;
         }
       }
 
-      if( detailDescription != null )
-      {
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-          this.Columns.FieldNameToColumnDictionary,
-          detailDescription.ItemProperties,
-          this.AutoCreateForeignKeyConfigurations );
-      }
+      this.UpdateColumns();
     }
 
     private void DetachFromDetailDescription()
+    {
+      this.DetachFromDetailDescription( true );
+    }
+
+    private void DetachFromDetailDescription( bool synchronizeColumns )
     {
       var detailDescription = this.DetailDescription;
       if( detailDescription != null )
       {
-        CollectionChangedEventManager.RemoveListener( detailDescription.ItemProperties, this );
+        this.UnregisterItemProperties( detailDescription.ItemProperties );
+
         CollectionChangedEventManager.RemoveListener( detailDescription.DetailDescriptions, this );
       }
 
@@ -1350,10 +1331,115 @@ namespace Xceed.Wpf.DataGrid
 
       m_sortDescriptions = null;
       m_groupDescriptions = null;
-      m_fieldNameMap.SetSource( this.DataGridControl, null );
+      m_itemsSourcePropertyDescriptions.Clear();
+
+      this.InitializeItemPropertyMap( this.DataGridControl, null );
       this.DetailDescription = null;
 
-      m_recyclingManager.Clear();
+      if( synchronizeColumns )
+      {
+        m_columnSynchronizationManager.Refresh();
+      }
+    }
+
+    private void InitializeItemPropertyMap( DataGridControl dataGridControl, DataGridDetailDescription detailDescription )
+    {
+      using( m_itemPropertyMap.DeferMappingChanged() )
+      {
+        if( ( dataGridControl == null ) || ( detailDescription == null ) || !dataGridControl.AreDetailsFlatten )
+        {
+          m_itemPropertyMap.MasterItemProperties = null;
+          m_itemPropertyMap.DetailItemProperties = null;
+        }
+        else
+        {
+          var collectionView = dataGridControl.Items.SourceCollection as DataGridCollectionViewBase;
+          if( collectionView != null )
+          {
+            m_itemPropertyMap.MasterItemProperties = collectionView.ItemProperties;
+            m_itemPropertyMap.DetailItemProperties = detailDescription.ItemProperties;
+          }
+          else
+          {
+            m_itemPropertyMap.MasterItemProperties = null;
+            m_itemPropertyMap.DetailItemProperties = null;
+          }
+        }
+      }
+    }
+
+    private void UpdateColumns()
+    {
+      var detailDescription = this.DetailDescription;
+      var dataGridControl = this.DataGridControl;
+      var dataGridContext = this.DataGridContext;
+
+      if( ( detailDescription != null ) && ( dataGridControl != null ) && ( dataGridContext != null ) )
+      {
+        ItemsSourceHelper.ResetPropertyDescriptions( m_itemsSourcePropertyDescriptions, m_itemPropertyMap, dataGridControl, dataGridContext.Items );
+
+        if( this.AutoCreateColumns )
+        {
+          ItemsSourceHelper.UpdateColumnsFromPropertyDescriptions( m_columnManager, dataGridControl.DefaultCellEditors, m_itemsSourcePropertyDescriptions, this.AutoCreateForeignKeyConfigurations );
+        }
+      }
+      else
+      {
+        m_itemsSourcePropertyDescriptions.Clear();
+      }
+
+      if( detailDescription != null )
+      {
+        // Ensure to update ForeignKeyDescriptions and ForeignKeyConfigurations when ItemProperties change on DetailDescription.
+        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
+          this.Columns,
+          detailDescription.ItemProperties,
+          this.AutoCreateForeignKeyConfigurations );
+      }
+    }
+
+    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      CollectionChangedEventManager.AddListener( itemProperties, this );
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.RegisterItemProperty( itemProperty );
+      }
+    }
+
+    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
+    {
+      if( itemProperties == null )
+        return;
+
+      foreach( var itemProperty in itemProperties )
+      {
+        this.UnregisterItemProperty( itemProperty );
+      }
+
+      CollectionChangedEventManager.RemoveListener( itemProperties, this );
+    }
+
+    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      PropertyChangedEventManager.AddListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
+      this.RegisterItemProperties( itemProperty.ItemPropertiesInternal );
+    }
+
+    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return;
+
+      this.UnregisterItemProperties( itemProperty.ItemPropertiesInternal );
+      PropertyChangedEventManager.RemoveListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
     }
 
     private void UpdateColumnSortOrder()
@@ -1385,77 +1471,129 @@ namespace Xceed.Wpf.DataGrid
       this.RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.ColumnsCollectionChanged );
       this.UpdateColumnSortOrder();
 
-      //Then call the method that will update the VisibleColumns
-      DataGridContext.HandleColumnsCollectionChanged( e, this.Columns, this.VisibleColumns as ReadOnlyColumnCollection, this.ColumnsByVisiblePosition );
-
       var detailDescription = this.DetailDescription;
       if( detailDescription != null )
       {
         switch( e.Action )
         {
+          case NotifyCollectionChangedAction.Add:
+          case NotifyCollectionChangedAction.Replace:
           case NotifyCollectionChangedAction.Reset:
             {
               ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-                this.Columns.FieldNameToColumnDictionary,
+                this.Columns,
                 detailDescription.ItemProperties,
                 this.AutoCreateForeignKeyConfigurations );
-
-              break;
             }
+            break;
 
-          case NotifyCollectionChangedAction.Add:
-          case NotifyCollectionChangedAction.Replace:
-            {
-              IList newItems = e.NewItems;
-              int count = newItems.Count;
-              Dictionary<string, ColumnBase> newColumns = new Dictionary<string, ColumnBase>( count );
+          default:
+            break;
+        }
+      }
+    }
 
-              for( int i = 0; i < count; i++ )
-              {
-                ColumnBase column = newItems[ i ] as ColumnBase;
-                newColumns.Add( column.FieldName, column );
-              }
+    private void OnItemPropertiesCollectionChanged( DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e )
+    {
+      var detailDescription = this.DetailDescription;
+      if( detailDescription == null )
+        return;
 
-              ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-                newColumns,
-                detailDescription.ItemProperties,
-                this.AutoCreateForeignKeyConfigurations );
+      var rootCollection = ItemsSourceHelper.GetRootCollection( collection );
+      if( rootCollection == null )
+        return;
 
-              break;
-            }
+      if( rootCollection == detailDescription.ItemProperties )
+      {
+        if( e.Action == NotifyCollectionChangedAction.Reset )
+          throw new NotSupportedException();
+
+        if( e.Action == NotifyCollectionChangedAction.Move )
+          return;
+
+        if( e.OldItems != null )
+        {
+          foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
+          {
+            this.UnregisterItemProperty( itemProperty );
+          }
+        }
+
+        if( e.NewItems != null )
+        {
+          foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
+          {
+            this.RegisterItemProperty( itemProperty );
+          }
+        }
+
+        this.UpdateColumns();
+      }
+      else
+      {
+        Debug.Fail( "The collection is not linked to the detail configuration's item properties." );
+        this.UnregisterItemProperties( collection );
+      }
+    }
+
+    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
+    {
+      var detailDescription = this.DetailDescription;
+      if( detailDescription == null )
+        return;
+
+      var rootCollection = ItemsSourceHelper.GetRootCollection( itemProperty );
+      if( rootCollection == null )
+        return;
+
+      if( rootCollection != detailDescription.ItemProperties )
+      {
+        Debug.Fail( "The collection is not linked to the detail configuration's item properties." );
+        this.UnregisterItemProperty( itemProperty );
+        return;
+      }
+
+      if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
+      {
+        var itemProperties = itemProperty.ItemPropertiesInternal;
+        if( itemProperties != null )
+        {
+          this.UnregisterItemProperties( itemProperties );
+          this.RegisterItemProperties( itemProperties );
+          this.UpdateColumns();
         }
       }
     }
 
     private void HandleCurrentColumnRemove( NotifyCollectionChangedEventArgs e )
     {
-      bool removeCurrentColumn = false;
-      ColumnBase currentColumn = this.CurrentColumn;
+      var currentColumn = this.CurrentColumn;
+      if( currentColumn == null )
+        return;
+
+      var removeCurrentColumn = false;
 
       if( e.Action == NotifyCollectionChangedAction.Reset )
       {
-        //Reset means that collection was cleared.
-        removeCurrentColumn = true;
+        removeCurrentColumn = !this.Columns.Contains( currentColumn );
       }
-      else if( ( e.Action == NotifyCollectionChangedAction.Remove ) && ( e.OldItems.Contains( currentColumn ) == true ) )
+      else if( ( e.Action == NotifyCollectionChangedAction.Remove ) && ( e.OldItems.Contains( currentColumn ) ) )
       {
         //Remove of at least the current column
         removeCurrentColumn = true;
       }
-      else if( ( e.Action == NotifyCollectionChangedAction.Replace ) && ( e.OldItems.Contains( currentColumn ) == true )
-        && ( e.NewItems.Contains( currentColumn ) == false ) )
+      else if( ( e.Action == NotifyCollectionChangedAction.Replace ) && ( e.OldItems.Contains( currentColumn ) ) && ( !e.NewItems.Contains( currentColumn ) ) )
       {
         //Replace in which at least the current column was "replaced" by another (current column not present in new items )
         removeCurrentColumn = true;
       }
 
       //If we computed that current columns should be cleared
-      if( removeCurrentColumn == true )
+      if( removeCurrentColumn )
       {
         //reset current column.
         this.CurrentColumn = DataGridContext.GetClosestColumn( currentColumn, this.ColumnsByVisiblePosition );
       }
-
     }
 
     private void OnDetailConfigurationsChanged( object sender, NotifyCollectionChangedEventArgs e )
@@ -1479,79 +1617,61 @@ namespace Xceed.Wpf.DataGrid
 
     private void RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers trigger )
     {
-      var handler = this.RequestingDelayBringIntoViewAndFocusCurrent;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new RequestingDelayBringIntoViewAndFocusCurrentEventArgs( trigger ) );
     }
 
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       //check if the event comes from a INotifyCollectionChanged collection
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
-        NotifyCollectionChangedEventArgs ncce = ( NotifyCollectionChangedEventArgs )e;
+        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
 
         if( sender is DetailConfigurationCollection )
         {
-          this.OnDetailConfigurationsChanged( sender, ncce );
-          return true;
+          this.OnDetailConfigurationsChanged( sender, eventArgs );
         }
         else if( sender is SortDescriptionCollection )
         {
-          this.SortDescriptions_CollectionChanged( sender, ncce );
-          return true;
+          this.SortDescriptions_CollectionChanged( sender, eventArgs );
         }
         else if( sender is ObservableCollection<GroupDescription> )
         {
-          this.GroupDescriptions_CollectionChanged( sender, ncce );
-          return true;
+          this.GroupDescriptions_CollectionChanged( sender, eventArgs );
         }
         else if( sender is DataGridDetailDescriptionCollection )
         {
-          var detailDescription = this.DetailDescription;
-          if( detailDescription != null )
-          {
-            DetailConfiguration.SynchronizeDetailConfigurations(
-              detailDescription.DetailDescriptions,
-              this.DetailConfigurations,
-              this.AutoCreateDetailConfigurations,
-              this.AutoCreateForeignKeyConfigurations,
-              this.AutoRemoveColumnsAndDetailConfigurations );
-          }
-
-          return true;
         }
         else if( sender is DataGridItemPropertyCollection )
         {
-          // Ensure to update ForeignKeyDescriptions and ForeignKeyConfigurations
-          // when ItemProperties change on DetailDescription
-          var detailDescription = this.DetailDescription;
-          if( detailDescription != null )
-          {
-            ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-              this.Columns.FieldNameToColumnDictionary,
-              detailDescription.ItemProperties,
-              this.AutoCreateForeignKeyConfigurations );
-          }
-          return true;
+          this.OnItemPropertiesCollectionChanged( ( DataGridItemPropertyCollection )sender, eventArgs );
         }
       }
-      else if( managerType == typeof( VisibilityChangedEventManager ) )
+      else if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        var wrappedEventArgs = ( ColumnCollection.WrappedEventEventArgs )e;
-
-        DataGridContext.UpdateVisibleColumns(
-          this.Columns, this.VisibleColumns as ReadOnlyColumnCollection, this.ColumnsByVisiblePosition,
-          new object[] { wrappedEventArgs.WrappedSender }, wrappedEventArgs.WrappedEventArgs as ColumnVisiblePositionChangedEventArgs );
+        var eventArgs = ( PropertyChangedEventArgs )e;
 
-        return true;
+        if( sender is DataGridItemPropertyBase )
+        {
+          this.OnItemPropertyPropertyChanged( ( DataGridItemPropertyBase )sender, eventArgs );
+        }
+      }
+      else if( managerType == typeof( ViewChangedEventManager ) )
+      {
+        this.InitializeItemPropertyMap( this.DataGridControl, this.DetailDescription );
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
@@ -1560,31 +1680,35 @@ namespace Xceed.Wpf.DataGrid
 
     public void BeginInit()
     {
-      m_beginInitCount++;
+      m_initCount++;
+      if( m_initCount != 1 )
+        return;
 
-      //It is determined at construction of the DetailConfiguration if it is synchronized with its parent, therefore, I can assume it is set appropriatly here
-      if( m_columnsInitDisposable == null )
-      {
-        m_columnsInitDisposable = this.Columns.DeferColumnAdditionMessages();
-      }
+      Debug.Assert( m_deferColumnsLayoutUpdate == null );
+      m_deferColumnsLayoutUpdate = m_columnManager.DeferUpdate();
+
+      m_deferColumnsNotifications = this.Columns.DeferNotifications();
     }
 
     public void EndInit()
     {
-      if( m_beginInitCount > 0 )
-        m_beginInitCount--;
+      m_initCount--;
+      if( m_initCount != 0 )
+        return;
 
-      if( m_beginInitCount == 0 )
-      {
-        if( m_columnsInitDisposable != null )
-        {
-          m_columnsInitDisposable.Dispose();
-          m_columnsInitDisposable = null;
-        }
-      }
+      var columnsNotificationsDisposable = m_deferColumnsNotifications;
+      m_deferColumnsNotifications = null;
+      columnsNotificationsDisposable.Dispose();
+
+      Debug.Assert( m_deferColumnsLayoutUpdate != null );
+      var columnsUpdateDisposable = m_deferColumnsLayoutUpdate;
+      m_deferColumnsLayoutUpdate = null;
+      columnsUpdateDisposable.Dispose();
     }
 
-    private int m_beginInitCount = 0;
+    private int m_initCount = 0;
+    private IDisposable m_deferColumnsLayoutUpdate; //null
+    private IDisposable m_deferColumnsNotifications; //null
 
     #endregion
 
@@ -1594,20 +1718,18 @@ namespace Xceed.Wpf.DataGrid
 
     private void OnPropertyChanged( string propertyName )
     {
-      if( this.PropertyChanged != null )
-      {
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-      }
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
     }
 
     #endregion
 
     private bool m_shouldCreateColumns = true;
-    private IDisposable m_columnsInitDisposable; // = null
     private bool m_defaultHeadersFootersAdded; // = false
 
-    private readonly RecyclingManager m_recyclingManager = new RecyclingManager();
-
     private sealed class DetailConfigurationUpdateColumnSortCommand : UpdateColumnSortCommand
     {
       private static void ThrowIfDetailsNotFlatten( DetailConfiguration detailConfiguration )
@@ -1758,7 +1880,7 @@ namespace Xceed.Wpf.DataGrid
         if( !synchronizationContext.Own )
           return;
 
-        if( !detailConfiguration.IsAttachedToDetailDescription )
+        if( detailConfiguration.DetailDescription == null )
           return;
 
         var dataGridControl = detailConfiguration.DataGridControl;
@@ -1775,28 +1897,29 @@ namespace Xceed.Wpf.DataGrid
 
         using( this.DeferResortHelper( detailConfiguration ) )
         {
-          this.SynchronizeDetailSortDescriptions( masterSortDescriptions, detailSortDescriptions, detailConfiguration.ItemPropertyMap );
+          this.SynchronizeDetailSortDescriptions( masterSortDescriptions, detailSortDescriptions, detailConfiguration );
         }
       }
 
-      private void SynchronizeDetailSortDescriptions( SortDescriptionCollection masterSortDescriptions, SortDescriptionCollection detailSortDescriptions,
-                                                      FieldNameMap itemPropertyMap )
+      private void SynchronizeDetailSortDescriptions( SortDescriptionCollection masterSortDescriptions, SortDescriptionCollection detailSortDescriptions, DetailConfiguration detailConfiguration )
       {
         ColumnSortCommand.ThrowIfNull( masterSortDescriptions, "masterSortDescriptions" );
         ColumnSortCommand.ThrowIfNull( detailSortDescriptions, "detailSortDescriptions" );
+
+        var itemPropertyMap = detailConfiguration.ItemPropertyMap;
         ColumnSortCommand.ThrowIfNull( itemPropertyMap, "itemPropertyMap" );
 
-        int masterSortDescriptionsCount = masterSortDescriptions.Count;
+        var masterSortDescriptionsCount = masterSortDescriptions.Count;
         if( masterSortDescriptionsCount > 0 )
         {
-          int insertionIndex = 0;
+          var insertionIndex = 0;
 
           for( int i = 0; i < masterSortDescriptionsCount; i++ )
           {
             var sortDescription = masterSortDescriptions[ i ];
+            var detailPropertyName = default( string );
 
-            string detailPropertyName;
-            if( !itemPropertyMap.TryGetItemPropertyName( sortDescription.PropertyName, out detailPropertyName ) )
+            if( !DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, sortDescription.PropertyName, out detailPropertyName ) )
               continue;
 
             var detailDirection = sortDescription.Direction;
@@ -1872,16 +1995,22 @@ namespace Xceed.Wpf.DataGrid
       protected override string GetColumnName( ColumnBase column )
       {
         var detailConfiguration = this.DetailConfiguration;
-        if( detailConfiguration == null )
+        if( ( detailConfiguration == null ) || ( column == null ) )
           return null;
 
-        var fieldNameMap = detailConfiguration.ItemPropertyMap;
-        string fieldName;
-
-        if( !fieldNameMap.TryGetItemPropertyName( column, out fieldName ) )
-          return null;
+        var itemPropertyMap = detailConfiguration.ItemPropertyMap;
+        if( ( itemPropertyMap != null ) && itemPropertyMap.IsMapping )
+        {
+          string fieldName;
+          if( DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, column.FieldName, out fieldName ) )
+            return fieldName;
+        }
+        else
+        {
+          return column.FieldName;
+        }
 
-        return fieldName;
+        return null;
       }
 
       protected override GroupDescription GetGroupDescription( ColumnBase column )
@@ -1937,99 +2066,5 @@ namespace Xceed.Wpf.DataGrid
         }
       }
     }
-
-    private sealed class FieldNameMapProxy : FieldNameMap, INotifyCollectionChanged
-    {
-      #region Source Private Property
-
-      private FieldNameMap Source
-      {
-        get
-        {
-          return m_source;
-        }
-        set
-        {
-          if( value == m_source )
-            return;
-
-          var oldSource = m_source as INotifyCollectionChanged;
-          if( oldSource != null )
-          {
-            oldSource.CollectionChanged -= new NotifyCollectionChangedEventHandler( this.OnSourceCollectionChanged );
-          }
-
-          m_source = value;
-
-          var newSource = m_source as INotifyCollectionChanged;
-          if( newSource != null )
-          {
-            newSource.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnSourceCollectionChanged );
-          }
-
-          this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-        }
-      }
-
-      private FieldNameMap m_source;
-
-      #endregion
-
-      protected override bool TryGetSource( string targetName, out string sourceName )
-      {
-        var source = this.Source;
-        if( source != null )
-          return source.TryGetItemPropertyName( targetName, out sourceName );
-
-        return base.TryGetSource( targetName, out sourceName );
-      }
-
-      protected override bool TryGetTarget( string sourceName, out string targetName )
-      {
-        var source = this.Source;
-        if( source != null )
-          return source.TryGetColumnFieldName( sourceName, out targetName );
-
-        return base.TryGetTarget( sourceName, out targetName );
-      }
-
-      internal void SetSource( DataGridControl dataGridControl, DataGridDetailDescription detailDescription )
-      {
-        if( ( dataGridControl == null ) || ( detailDescription == null ) || ( !dataGridControl.AreDetailsFlatten ) )
-        {
-          this.Source = null;
-        }
-        else
-        {
-          var map = this.Source as ItemPropertyNameMap;
-          var itemProperties = detailDescription.ItemProperties;
-
-          if( ( map == null ) || ( map.ItemProperties != detailDescription.ItemProperties ) )
-          {
-            this.Source = new ItemPropertyNameMap( itemProperties );
-          }
-        }
-      }
-
-      private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-      {
-        this.RaiseCollectionChanged( e );
-      }
-
-      #region INotifyCollectionChanged Members
-
-      public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-      private void RaiseCollectionChanged( NotifyCollectionChangedEventArgs e )
-      {
-        var handler = this.CollectionChanged;
-        if( handler == null )
-          return;
-
-        handler.Invoke( this, e );
-      }
-
-      #endregion
-    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
index b3cf167b..22632842 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
@@ -23,8 +23,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal class DetailConfigurationCollection : ObservableCollection<DetailConfiguration>, IWeakEventListener
   {
-    #region CONSTRUCTORS
-
     internal DetailConfigurationCollection( DataGridControl dataGridControl, DetailConfiguration parentDetailConfiguration )
       : base()
     {
@@ -32,7 +30,38 @@ namespace Xceed.Wpf.DataGrid
       this.ParentDetailConfiguration = parentDetailConfiguration;
     }
 
-    #endregion CONSTRUCTORS
+    #region DataGridControl Property
+
+    internal DataGridControl DataGridControl
+    {
+      get
+      {
+        return m_dataGridControl;
+      }
+      set
+      {
+        if( m_dataGridControl == value )
+          return;
+
+        m_dataGridControl = value;
+
+        this.OnPropertyChanged( new PropertyChangedEventArgs( "DataGridControl" ) );
+      }
+    }
+
+    private DataGridControl m_dataGridControl;
+
+    #endregion
+
+    #region ParentDetailConfiguration Property
+
+    internal DetailConfiguration ParentDetailConfiguration
+    {
+      get;
+      set;
+    }
+
+    #endregion
 
     public DetailConfiguration this[ string relationName ]
     {
@@ -107,6 +136,11 @@ namespace Xceed.Wpf.DataGrid
     internal event EventHandler DetailVisibilityChanged;
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
       if( managerType == typeof( DetailVisibilityChangedEventManager ) )
       {
@@ -121,38 +155,5 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
-
-    #region DataGridControl Property
-
-    internal DataGridControl DataGridControl
-    {
-      get
-      {
-        return m_dataGridControl;
-      }
-      set
-      {
-        if( m_dataGridControl == value )
-          return;
-
-        m_dataGridControl = value;
-
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "DataGridControl" ) );
-      }
-    }
-
-    private DataGridControl m_dataGridControl;
-
-    #endregion
-
-    #region ParentDetailConfiguration Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get;
-      set;
-    }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs
new file mode 100644
index 00000000..fca7f661
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs
@@ -0,0 +1,26 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid
+{
+  public abstract class DetailConfigurationSelector
+  {
+    internal virtual DetailConfiguration SelectDetailConfiguration( string relationName, DataGridDetailDescription dataGridDetailDescription )
+    {
+      return null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs
new file mode 100644
index 00000000..1e48c1d8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs
@@ -0,0 +1,68 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Diagnostics;
+using System.Threading;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal static class DataGridControlTraceSources
+  {
+    #region CollectionViewSource Property
+
+    internal static DataGridTraceSource CollectionViewSource
+    {
+      get
+      {
+        return DataGridControlTraceSources.DataGridTraceSource;
+      }
+    }
+
+    #endregion
+
+    #region ItemContainerGeneratorSource Property
+
+    internal static DataGridTraceSource ItemContainerGeneratorSource
+    {
+      get
+      {
+        return DataGridControlTraceSources.DataGridTraceSource;
+      }
+    }
+
+    #endregion
+
+    #region DataSource Private Property
+
+    private static DataGridTraceSource DataGridTraceSource
+    {
+      get
+      {
+        if( s_traceSource == null )
+        {
+          var source = new DataGridTraceSource( new TraceSource( "Xceed.Wpf.DataGrid" ) );
+          Interlocked.CompareExchange<DataGridTraceSource>( ref s_traceSource, source, null );
+        }
+
+        return s_traceSource;
+      }
+    }
+
+    private static DataGridTraceSource s_traceSource; //null
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs
new file mode 100644
index 00000000..ffff83e2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs
@@ -0,0 +1,86 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal class DataGridTraceArg<T> : DataGridTraceArg
+  {
+    internal DataGridTraceArg( T value )
+    {
+      m_value = value;
+    }
+
+    protected override string FormatOutput( CultureInfo culture )
+    {
+      if( object.ReferenceEquals( m_value, null ) )
+        return "<null>";
+
+      var formattable = m_value as IFormattable;
+      if( formattable != null )
+        return formattable.ToString( null, culture );
+
+      var valueType = m_value.GetType();
+      if( valueType.IsGenericType && ( valueType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
+      {
+        valueType = Nullable.GetUnderlyingType( valueType );
+      }
+
+      if( valueType.IsEnum )
+        return m_value.ToString();
+
+      if( valueType.IsPrimitive || ( typeof( string ) == valueType ) )
+        return string.Format( culture, "{0}", m_value );
+
+      var hashCode = m_value.GetHashCode();
+      var name = default( string );
+
+      if( m_value is DataGridControl )
+      {
+        var dataGridControl = m_value as DataGridControl;
+
+        name = dataGridControl.GridUniqueName;
+
+        if( string.IsNullOrEmpty( name ) )
+        {
+          name = dataGridControl.Name;
+        }
+      }
+      else if( m_value is FrameworkElement )
+      {
+        var fe = m_value as FrameworkElement;
+
+        name = fe.Name;
+      }
+      else if( m_value is FrameworkContentElement )
+      {
+        var fce = m_value as FrameworkContentElement;
+
+        name = fce.Name;
+      }
+
+      if( !string.IsNullOrEmpty( name ) )
+        return string.Format( culture, "('{2}' -> {0}, <{1}>)", hashCode, valueType, name );
+
+      return string.Format( culture, "({0}, <{1}>)", hashCode, valueType );
+    }
+
+    private readonly T m_value;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs
new file mode 100644
index 00000000..328b0853
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs
@@ -0,0 +1,34 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Globalization;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal abstract class DataGridTraceArg
+  {
+    protected abstract string FormatOutput( CultureInfo culture );
+
+    public sealed override string ToString()
+    {
+      var output = this.FormatOutput( CultureInfo.InvariantCulture );
+      if( string.IsNullOrEmpty( output ) )
+        return string.Empty;
+
+      return output;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs
new file mode 100644
index 00000000..0297d39f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs
@@ -0,0 +1,145 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Globalization;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal static class DataGridTraceArgs
+  {
+    internal static DataGridTraceArg Action<T>( T value )
+    {
+      return new TraceArg<T>( "Action", value );
+    }
+
+    internal static DataGridTraceArg DataSource<T>( T value )
+    {
+      return new TraceArg<T>( "DataSource", value );
+    }
+
+    internal static DataGridTraceArg DataGridControl<T>( T value )
+    {
+      return new TraceArg<T>( "DataGridControl", value );
+    }
+
+    internal static DataGridTraceArg Generator<T>( T value )
+    {
+      return new TraceArg<T>( "ItemContainerGenerator", value );
+    }
+
+    internal static DataGridTraceArg Count<T>( T value )
+    {
+      return new TraceArg<T>( "Count", value );
+    }
+
+    internal static DataGridTraceArg ItemCount<T>( T value )
+    {
+      return new TraceArg<T>( "ItemCount", value );
+    }
+
+    internal static DataGridTraceArg Container<T>( T value )
+    {
+      return new TraceArg<T>( "Container", value );
+    }
+
+    internal static DataGridTraceArg Group<T>( T value )
+    {
+      return new TraceArg<T>( "Group", value );
+    }
+
+    internal static DataGridTraceArg Index<T>( T value )
+    {
+      return new TraceArg<T>( "Index", value );
+    }
+
+    internal static DataGridTraceArg GeneratorIndex<T>( T value )
+    {
+      return new TraceArg<T>( "GIndex", value );
+    }
+
+    internal static DataGridTraceArg From<T>( T value )
+    {
+      return new TraceArg<T>( "From", value );
+    }
+
+    internal static DataGridTraceArg To<T>( T value )
+    {
+      return new TraceArg<T>( "To", value );
+    }
+
+    internal static DataGridTraceArg Item<T>( T value )
+    {
+      return new TraceArg<T>( "Item", value );
+    }
+
+    internal static DataGridTraceArg Node<T>( T value )
+    {
+      return new TraceArg<T>( "Node", value );
+    }
+
+    internal static DataGridTraceArg NextNode<T>( T value )
+    {
+      return new TraceArg<T>( "NNode", value );
+    }
+
+    internal static DataGridTraceArg PreviousNode<T>( T value )
+    {
+      return new TraceArg<T>( "PNode", value );
+    }
+
+    internal static DataGridTraceArg LastNode<T>( T value )
+    {
+      return new TraceArg<T>( "LNode", value );
+    }
+
+    internal static DataGridTraceArg Value<T>( T value )
+    {
+      return new TraceArg<T>( "Value", value );
+    }
+
+    #region TraceArg Private Class
+
+    private sealed class TraceArg<T> : DataGridTraceArg<T>
+    {
+      internal TraceArg( string label, T value )
+        : base( value )
+      {
+        m_label = label;
+      }
+
+      protected sealed override string FormatOutput( CultureInfo culture )
+      {
+        var label = m_label;
+        var value = base.FormatOutput( culture );
+
+        if( string.IsNullOrEmpty( label ) )
+          return value;
+
+        if( value == null )
+          return string.Format( "{0}: <null>", label );
+
+        if( value.Length == 0 )
+          return string.Format( "{0}: ''", label );
+
+        return string.Format( "{0}: {1}", label, value );
+      }
+
+      private readonly string m_label;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs
new file mode 100644
index 00000000..3fd28a1e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs
@@ -0,0 +1,80 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal enum DataGridTraceEventId
+  {
+    CustomItemContainerGenerator_ApplyGroupChanges = 0,
+    CustomItemContainerGenerator_CleanupGenerator,
+    CustomItemContainerGenerator_CloseDetailsForItem,
+    CustomItemContainerGenerator_CollapseDetails,
+    CustomItemContainerGenerator_CollapseGroup,
+    CustomItemContainerGenerator_ContainerFromIndex,
+    CustomItemContainerGenerator_ContainerFromItem,
+    CustomItemContainerGenerator_CreateDetailsForItem,
+    CustomItemContainerGenerator_CreateDetailsHelper,
+    CustomItemContainerGenerator_EnsureNodeTreeCreated,
+    CustomItemContainerGenerator_ExpandDetails,
+    CustomItemContainerGenerator_ExpandGroup,
+    CustomItemContainerGenerator_FindIndexForItem,
+    CustomItemContainerGenerator_GenerateNextLocalContainer,
+    CustomItemContainerGenerator_GenerateStickyFootersForDetail,
+    CustomItemContainerGenerator_GenerateStickyHeadersForDetail,
+    CustomItemContainerGenerator_GenPosArraysRemoveAt,
+    CustomItemContainerGenerator_GetGroupFromItem,
+    CustomItemContainerGenerator_GetGroupIndex,
+    CustomItemContainerGenerator_GetRealizedContainerForIndex,
+    CustomItemContainerGenerator_GetRealizedIndexForContainer,
+    CustomItemContainerGenerator_HandleDetailReset,
+    CustomItemContainerGenerator_HandleGlobalItemsReset,
+    CustomItemContainerGenerator_HandleHeadersFootersAddition,
+    CustomItemContainerGenerator_HandleHeadersFootersRemoveMoveReplace,
+    CustomItemContainerGenerator_HandleItemAddition,
+    CustomItemContainerGenerator_HandleItemReset,
+    CustomItemContainerGenerator_HandleSameLevelGroupAddition,
+    CustomItemContainerGenerator_HandleSameLevelGroupMove,
+    CustomItemContainerGenerator_HandleSameLevelGroupRemove,
+    CustomItemContainerGenerator_HandleSameLevelGroupReset,
+    CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext,
+    CustomItemContainerGenerator_IItemContainerGenerator_Remove,
+    CustomItemContainerGenerator_IndexFromItem,
+    CustomItemContainerGenerator_IsGroupExpanded,
+    CustomItemContainerGenerator_ItemFromContainer,
+    CustomItemContainerGenerator_ItemFromIndex,
+    CustomItemContainerGenerator_MoveGeneratorBackward,
+    CustomItemContainerGenerator_MoveGeneratorForward,
+    CustomItemContainerGenerator_OnDetailConfigurationsChanged,
+    CustomItemContainerGenerator_OnDetailGeneratorContentChanged,
+    CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged,
+    CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged,
+    CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged,
+    CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged,
+    CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged,
+    CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging,
+    CustomItemContainerGenerator_OnGroupsChanged,
+    CustomItemContainerGenerator_OnItemsChanged,
+    CustomItemContainerGenerator_ProcessGroupRemoval,
+    CustomItemContainerGenerator_RemapFloatingDetails,
+    CustomItemContainerGenerator_SetupInitialItemsNodes,
+    CustomItemContainerGenerator_ToggleDetails,
+    CustomItemContainerGenerator_ToggleGroupExpansion,
+    CustomItemContainerGenerator_UpdateFooters,
+    CustomItemContainerGenerator_UpdateGenPosToIndexList,
+    CustomItemContainerGenerator_UpdateHeaders,
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs
new file mode 100644
index 00000000..a1d04d9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs
@@ -0,0 +1,71 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal static class DataGridTraceMessages
+  {
+    internal const string CannotCollapseDetail = "Cannot collapse the detail.";
+    internal const string CannotExpandDetail = "Cannot expand the detail.";
+    internal const string CannotProcessOnReset = "Cannot process while resetting.";
+    internal const string CannotRemapDetails = "Cannot remap details when deferred.";
+    internal const string CollapsedItemAdded = "Item(s) added under a collapsed node.";
+    internal const string CollapsingDetail = "Collapsing a detail.";
+    internal const string ContainerAdded = "The container was added.";
+    internal const string ContainerFound = "The container was found.";
+    internal const string ContainerGenerated = "A container was generated.";
+    internal const string ContainerIsInDetail = "The container is located in a detail.";
+    internal const string ContainerNotFound = "The container was not found.";
+    internal const string ContainerRemoved = "The container was removed.";
+    internal const string DetailAlreadyCollapsed = "The detail is already collapsed.";
+    internal const string DetailAlreadyExpanded = "The detail is already expanded.";
+    internal const string DetailExpanded = "The detail was expanded.";
+    internal const string DetailCollapsed = "The detail was collapsed.";
+    internal const string DetailExpected = "Detail expected.";
+    internal const string DetailIsFloating = "The detail is floating.";
+    internal const string DetailNodeAdded = "Detail node(s) added.";
+    internal const string DetailNodeNotFound = "The detail node was not found.";
+    internal const string DetailNotFound = "The detail was not found.";
+    internal const string DetailNotSupported = "Details are not supported.";
+    internal const string EmptyTree = "There is no node.";
+    internal const string GroupFound = "The group was found.";
+    internal const string GroupNodeAdded = "Group node(s) added.";
+    internal const string GroupNodeRemoved = "Group node(s) removed.";
+    internal const string GroupNotFound = "The group was not found.";
+    internal const string InhibiterAlreadySet = "An inhibiter is already set.";
+    internal const string IndexFound = "The index was found.";
+    internal const string IndexUpdated = "The index was updated.";
+    internal const string ItemAdded = "Item(s) added.";
+    internal const string ItemFound = "The item was found.";
+    internal const string ItemNotBelongingToGenerator = "The item does not belong to the generator.";
+    internal const string ItemNotBelongingToNode = "The item does not belong to the node.";
+    internal const string ItemNotFound = "The item was not found.";
+    internal const string ItemNotFoundOrCollapsed = "The item was not found or is under a collapsed node.";
+    internal const string NewStartNode = "New start node.";
+    internal const string NewTreeCreated = "New tree node created.";
+    internal const string NodeFound = "The node was found.";
+    internal const string NodeIsCollapsed = "The node is collapsed.";
+    internal const string NodeIsNotTheCurrentNode = "Node is not the current one.";
+    internal const string RemapDetailNodes = "Remap details nodes.";
+    internal const string RemapZombieDetail = "Master item not found for detail.";
+    internal const string UnexpectedNode = "Unexpected node.";
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs
new file mode 100644
index 00000000..647f3c32
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs
@@ -0,0 +1,201 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace Xceed.Wpf.DataGrid.Diagnostics
+{
+  internal class DataGridTraceSource
+  {
+    #region Static Fields
+
+    internal readonly IDisposable NoTrace = new EmptyDisposable();
+
+    #endregion
+
+    internal DataGridTraceSource( TraceSource traceSource )
+    {
+      if( traceSource == null )
+        throw new ArgumentNullException( "traceSource" );
+
+      m_traceSource = traceSource;
+    }
+
+    internal bool ShouldTrace( TraceEventType eventType )
+    {
+#if TRACE
+      var listeners = m_traceSource.Listeners;
+      if( ( listeners == null ) || ( listeners.Count <= 0 ) )
+        return false;
+
+      var sourceSwitch = m_traceSource.Switch;
+
+      return ( sourceSwitch != null )
+          && ( sourceSwitch.ShouldTrace( eventType ) );
+#else
+      return false;
+#endif
+    }
+
+    internal bool ShouldTraceBlock()
+    {
+      return ( this.ShouldTrace( TraceEventType.Start ) )
+          || ( this.ShouldTrace( TraceEventType.Stop ) );
+    }
+
+    internal IDisposable TraceBlock( DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
+    {
+      if( this.ShouldTrace( TraceEventType.Start ) )
+      {
+        this.TraceEventCore( TraceEventType.Start, eventId, message, args );
+      }
+
+      if( this.ShouldTrace( TraceEventType.Stop ) )
+        return new TraceBlockEndDisposable( this, eventId, message, args );
+
+      return this.NoTrace;
+    }
+
+    [Conditional( "TRACE" )]
+    internal void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
+    {
+      if( !this.ShouldTrace( eventType ) )
+        return;
+
+      this.TraceEventCore( eventType, eventId, message, args );
+    }
+
+    private void TraceEventCore( TraceEventType eventType, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
+    {
+      var format = DataGridTraceSource.Format( args );
+
+      if( string.IsNullOrEmpty( message ) )
+      {
+        if( string.IsNullOrEmpty( format ) )
+        {
+          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, null );
+        }
+        else
+        {
+          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, format );
+        }
+      }
+      else
+      {
+        if( string.IsNullOrEmpty( format ) )
+        {
+          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, message );
+        }
+        else
+        {
+          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, message + " | " + format );
+        }
+      }
+    }
+
+    private static void TraceEvent( TraceSource source, TraceEventType eventType, int eventId, string message )
+    {
+      if( string.IsNullOrEmpty( message ) )
+      {
+        source.TraceEvent( eventType, eventId );
+      }
+      else
+      {
+        source.TraceEvent( eventType, eventId, message );
+      }
+
+      if( Debugger.IsAttached )
+      {
+        source.Flush();
+      }
+    }
+
+    private static string Format( IEnumerable<DataGridTraceArg> args )
+    {
+      if( ( args == null ) || !args.Any() )
+        return null;
+
+      var sb = new StringBuilder( 128 );
+
+      foreach( var arg in args )
+      {
+        var value = arg.ToString();
+
+        if( string.IsNullOrEmpty( value ) )
+          continue;
+
+        if( sb.Length > 0 )
+        {
+          sb.Append( "; " );
+        }
+
+        sb.Append( value );
+      }
+
+      return sb.ToString();
+    }
+
+    private readonly TraceSource m_traceSource;
+
+    #region TraceBlockEndDisposable Private Class
+
+    private sealed class TraceBlockEndDisposable : IDisposable
+    {
+      internal TraceBlockEndDisposable( DataGridTraceSource owner, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
+      {
+        if( owner == null )
+          throw new ArgumentNullException( "owner" );
+
+        m_owner = owner;
+        m_eventId = eventId;
+        m_message = message;
+        m_args = args;
+      }
+
+      void IDisposable.Dispose()
+      {
+        var owner = Interlocked.Exchange( ref m_owner, null );
+        if( owner == null )
+          return;
+
+        owner.TraceEventCore( TraceEventType.Stop, m_eventId, m_message, m_args );
+      }
+
+      private DataGridTraceSource m_owner;
+      private readonly DataGridTraceEventId m_eventId;
+      private readonly string m_message;
+      private readonly IEnumerable<DataGridTraceArg> m_args;
+    }
+
+    #endregion
+
+    #region EmptyDisposable Private Class
+
+    private sealed class EmptyDisposable : IDisposable
+    {
+      void IDisposable.Dispose()
+      {
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
index f5b8a937..a4707270 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
@@ -23,37 +23,27 @@ using Xceed.Wpf.DataGrid.Views;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class DropMarkAdorner : Adorner
+  internal sealed class DropMarkAdorner : Adorner
   {
     // A null value for the pen parameter means that the adorner will not show any visual cue.
-    public DropMarkAdorner( UIElement adornedElement, Pen pen, DropMarkOrientation orientation )
+    internal DropMarkAdorner( UIElement adornedElement, Pen pen, DropMarkOrientation orientation )
       : base( adornedElement )
     {
       Debug.Assert( orientation != DropMarkOrientation.Default, "A DropMarkAdorner without a specific orientation should virtually never happen. The only known way to do this would be to have a grid element not hosted in a DataGridControl. The DropMarkAdorner should react well to this nonetheless." );
       m_pen = pen;
       m_orientation = orientation;
+      m_render = ( pen != null );
 
       this.IsHitTestVisible = false;
     }
 
-    public DropMarkAlignment Alignment
-    {
-      get
-      {
-        return m_alignment;
-      }
-    }
-
-    // This Property does not use the Alignment paradigm. It allows to manually set the position of the drop mark.
     #region HorizontalPosition Property
 
     public static readonly DependencyProperty HorizontalPositionProperty = DependencyProperty.Register(
       "HorizontalPosition",
       typeof( double ),
       typeof( DropMarkAdorner ),
-      new FrameworkPropertyMetadata(
-        0d,
-        new PropertyChangedCallback( DropMarkAdorner.OnHorizontalPositionChanged ) ) );
+      new FrameworkPropertyMetadata( 0d, new PropertyChangedCallback( DropMarkAdorner.OnHorizontalPositionChanged ) ) );
 
     public double HorizontalPosition
     {
@@ -69,164 +59,140 @@ namespace Xceed.Wpf.DataGrid
 
     private static void OnHorizontalPositionChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      DropMarkAdorner adorner = sender as DropMarkAdorner;
-
-      if( adorner == null )
+      var self = sender as DropMarkAdorner;
+      if( self == null )
         return;
 
-      adorner.UpdatePosition();
+      self.Update();
     }
 
     #endregion
 
-    public void ForceAlignment( DropMarkAlignment alignment )
-    {
-      m_alignment = alignment;
-    }
+    #region Alignment Property
 
-    public void UpdateAlignment( Point mousePosition )
+    internal DropMarkAlignment Alignment
     {
-      DropMarkAlignment alignment = DropMarkAlignment.Near;
-
-      if( m_orientation == DropMarkOrientation.Horizontal )
+      get
       {
-        // A horizontal drop mark is either displayed at the top or at the bottom of the AdornedElement.
-        Rect hitTestRect = new Rect( 0d, 0d, this.AdornedElement.RenderSize.Width, this.AdornedElement.RenderSize.Height / 2 );
-
-        if( hitTestRect.Contains( mousePosition ) )
-        {
-          alignment = DropMarkAlignment.Near;
-        }
-        else
-        {
-          alignment = DropMarkAlignment.Far;
-        }
+        return m_alignment;
       }
-      else
+      set
       {
-        // A vertical drop mark is either displayed at the left or at the right of the AdornedElement.
-        Rect hitTestRect = new Rect( 0d, 0d, this.AdornedElement.RenderSize.Width / 2, this.AdornedElement.RenderSize.Height );
-
-        if( hitTestRect.Contains( mousePosition ) )
-        {
-          alignment = DropMarkAlignment.Near;
-        }
-        else
-        {
-          alignment = DropMarkAlignment.Far;
-        }
-      }
+        if( value == m_alignment )
+          return;
 
-      if( alignment != m_alignment )
-      {
-        m_alignment = alignment;
-        this.UpdatePosition();
+        m_alignment = value;
+
+        this.Update();
       }
     }
 
-    protected override Size MeasureOverride( Size constraint )
-    {
-      this.AdornedElement.Measure( constraint );
+    private DropMarkAlignment m_alignment = DropMarkAlignment.ExplicitPosition;
+
+    #endregion
 
-      Size size = Size.Empty;
+    #region AdornerLayout Private Property
 
-      if( m_pen != null )
+    private AdornerLayer AdornerLayer
+    {
+      get
       {
-        switch( m_orientation )
-        {
-          case DropMarkOrientation.Default:
-          case DropMarkOrientation.Vertical:
-            size = new Size( m_pen.Thickness, this.AdornedElement.RenderSize.Height );
-            break;
-          case DropMarkOrientation.Horizontal:
-            size = new Size( this.AdornedElement.RenderSize.Width, m_pen.Thickness );
-            break;
-        }
+        return ( this.Parent as AdornerLayer );
       }
-
-      return size;
     }
 
-    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
+    #endregion
+
+    protected override void OnRender( DrawingContext drawingContext )
     {
-      double offsetX = this.HorizontalPosition;
-      double offsetY = 0d;
+      base.OnRender( drawingContext );
 
-      if( m_pen != null )
+      if( !m_render || ( m_pen == null ) )
+        return;
+
+      var renderSize = this.AdornedElement.RenderSize;
+
+      Point startPoint = new Point( this.HorizontalPosition, 0d );
+      Point endPoint;
+
+      switch( m_orientation )
       {
-        switch( m_orientation )
-        {
-          case DropMarkOrientation.Default:
-          case DropMarkOrientation.Vertical:
-            offsetX -= m_pen.Thickness / 2;
-            break;
-          case DropMarkOrientation.Horizontal:
-            offsetY -= m_pen.Thickness / 2;
-            break;
-        }
-
-        if( m_alignment == DropMarkAlignment.Far )
-        {
-          if( m_orientation == DropMarkOrientation.Vertical )
+        case DropMarkOrientation.Default:
+        case DropMarkOrientation.Vertical:
           {
-            // A "far" vertical drop mark is displayed at the right
-            offsetX += this.AdornedElement.RenderSize.Width;
+            if( m_alignment == DropMarkAlignment.Far )
+            {
+              startPoint.X += renderSize.Width;
+            }
+
+            endPoint = new Point( startPoint.X, renderSize.Height );
           }
-          else
+          break;
+        case DropMarkOrientation.Horizontal:
           {
-            // A "far" horizontal drop mark is displayed at the bottom
-            offsetY += this.AdornedElement.RenderSize.Height;
+            if( m_alignment == DropMarkAlignment.Far )
+            {
+              startPoint.Y += renderSize.Height;
+            }
+
+            endPoint = new Point( renderSize.Width, startPoint.Y );
           }
-        }
+          break;
+        default:
+          return;
       }
 
-      GeneralTransformGroup transformGroup = new GeneralTransformGroup();
+      drawingContext.DrawLine( m_pen, startPoint, endPoint );
+    }
 
-      transformGroup.Children.Add( base.GetDesiredTransform( transform ) );
-      transformGroup.Children.Add( new TranslateTransform( offsetX, offsetY ) );
+    internal void UpdateAlignment( RelativePoint mousePosition )
+    {
+      var relativePosition = mousePosition.GetPoint( this.AdornedElement );
+      var elementSize = this.AdornedElement.RenderSize;
 
-      return transformGroup;
+      if( m_orientation == DropMarkOrientation.Horizontal )
+      {
+        this.Alignment = ( relativePosition.Y < elementSize.Height / 2d ) ? DropMarkAlignment.Near : DropMarkAlignment.Far;
+      }
+      else
+      {
+        this.Alignment = ( relativePosition.X < elementSize.Width / 2d ) ? DropMarkAlignment.Near : DropMarkAlignment.Far;
+      }
     }
 
-    protected override void OnRender( DrawingContext drawingContext )
+    private void Update()
     {
-      if( m_pen != null )
-      {
-        Size renderSize = this.RenderSize;
-        Point startPoint = new Point();
-        Point endPoint = new Point();
-
-        switch( m_orientation )
-        {
-          case DropMarkOrientation.Default:
-          case DropMarkOrientation.Vertical:
-            startPoint = new Point( renderSize.Width / 2, 0d );
-            endPoint = new Point( startPoint.X, renderSize.Height );
-            break;
-          case DropMarkOrientation.Horizontal:
-            startPoint = new Point( 0d, renderSize.Height / 2 );
-            endPoint = new Point( renderSize.Width, startPoint.Y );
-            break;
-        }
+      if( !m_render )
+        return;
 
-        drawingContext.DrawLine( m_pen, startPoint, endPoint );
-      }
+      if( !this.InvalidateAdornerLayer() )
+        return;
 
-      base.OnRender( drawingContext );
+      m_render = false;
+      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
     }
 
-    private void UpdatePosition()
+    private bool InvalidateAdornerLayer()
     {
-      AdornerLayer adornerLayer = this.Parent as AdornerLayer;
+      var adornerLayer = this.AdornerLayer;
+      if( adornerLayer == null )
+        return false;
 
-      if( adornerLayer != null )
-      {
-        adornerLayer.Update( this.AdornedElement );
-      }
+      adornerLayer.Update( this.AdornedElement );
+      return true;
     }
 
-    private DropMarkAlignment m_alignment = DropMarkAlignment.ExplicitPosition;
-    private Pen m_pen;
-    private DropMarkOrientation m_orientation;
+    private void OnLayoutUpdated( object sender, EventArgs e )
+    {
+      m_render = true;
+
+      this.LayoutUpdated -= new EventHandler( this.OnLayoutUpdated );
+      this.InvalidateVisual();
+      this.InvalidateAdornerLayer();
+    }
+
+    private readonly DropMarkOrientation m_orientation;
+    private readonly Pen m_pen;
+    private bool m_render;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs
new file mode 100644
index 00000000..13a6e738
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs
@@ -0,0 +1,201 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Xceed.Wpf.DataGrid.Export
+{
+  // Class used to format data into the CF_HTML Clipbard Format
+  // http://msdn.microsoft.com/en-us/library/aa767917(VS.85).aspx
+  internal sealed class CF_HtmlStream : Stream
+  {
+    public CF_HtmlStream( Stream innerStream )
+    {
+      if( innerStream == null )
+        throw new ArgumentNullException( "innerStream" );
+
+      if( innerStream.CanWrite == false )
+        throw new InvalidOperationException( "An attempt was made to use a non-writable stream." );
+
+      if( innerStream.CanSeek == false )
+        throw new InvalidOperationException( "An attempt was made to use a non-seekable stream." );
+
+      m_innerStream = innerStream;
+
+      StringBuilder headerStringBuilder = new StringBuilder();
+      headerStringBuilder.Append( "Version:1.0" );
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "StartHTML:-1" ); // This is optional according to MSDN documentation
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "EndHTML:-1" ); // This is optional according to MSDN documentation
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "StartFragment:0000000109" ); // Always 109 bytes from start of Version to the end of <!--StartFragment--> tag
+      headerStringBuilder.Append( Environment.NewLine );
+
+      // Get the offset of the EndFragment: tag to be able to modify the 10 digits
+      m_endFragmentOffset = headerStringBuilder.ToString().Length;
+
+      Debug.Assert( m_endFragmentOffset == 65 );
+
+      headerStringBuilder.Append( "EndFragment:0000000000" ); // We write 0000000000 and we will update this field when the Stream is closed
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "<!--StartFragment-->" );
+
+      string headerString = headerStringBuilder.ToString();
+
+      byte[] tempBuffer = Encoding.UTF8.GetBytes( headerString );
+
+      m_headerBytesLength = headerStringBuilder.Length;
+
+      Debug.Assert( m_headerBytesLength == tempBuffer.Length );
+      Debug.Assert( tempBuffer.Length == 109 );
+
+      m_innerStream.Write( tempBuffer, 0, m_headerBytesLength );
+      m_HtmlContentByteCount = 0;
+    }
+
+    public override bool CanRead
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    public override bool CanSeek
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    public override bool CanWrite
+    {
+      get
+      {
+        return true;
+      }
+    }
+
+    public override long Length
+    {
+      get
+      {
+        return m_headerBytesLength + m_HtmlContentByteCount + s_footerBytes.Length;
+      }
+    }
+
+    public override long Position
+    {
+      get
+      {
+        throw new NotSupportedException();
+      }
+      set
+      {
+        throw new NotSupportedException();
+      }
+    }
+
+    public override void Close()
+    {
+      // Already closed, nothing to do
+      if( m_closed )
+        return;
+
+      // Update the value of EndFragment field in the header
+      string endFragmentOffset = ( m_HtmlContentByteCount + m_headerBytesLength ).ToString( "0000000000", CultureInfo.InvariantCulture );
+
+      m_innerStream.Seek( m_endFragmentOffset, SeekOrigin.Begin );
+
+      byte[] tempBuffer = Encoding.UTF8.GetBytes( "EndFragment:" + endFragmentOffset );
+      Debug.Assert( tempBuffer.Length == 22 );
+      m_innerStream.Write( tempBuffer, 0, tempBuffer.Length );
+
+      // Append the final end line and EndFragment tag
+      m_innerStream.Seek( 0, SeekOrigin.End );
+      m_innerStream.Write( s_footerBytes, 0, s_footerBytes.Length );
+      m_innerStream.Flush();
+
+      m_closed = true;
+    }
+
+    protected override void Dispose( bool disposing )
+    {
+      this.Close();
+    }
+
+    public override void Flush()
+    {
+      m_innerStream.Flush();
+    }
+
+    public override int Read( byte[] buffer, int offset, int count )
+    {
+      throw new NotSupportedException();
+    }
+
+    public override int ReadByte()
+    {
+      throw new NotSupportedException();
+    }
+
+    public override long Seek( long offset, SeekOrigin origin )
+    {
+      throw new NotSupportedException();
+    }
+
+    public override void SetLength( long value )
+    {
+      throw new NotSupportedException();
+    }
+
+    public override void WriteByte( byte value )
+    {
+      this.CheckIfClosed();
+      m_HtmlContentByteCount++;
+      m_innerStream.WriteByte( value );
+    }
+
+    public override void Write( byte[] buffer, int offset, int count )
+    {
+      this.CheckIfClosed();
+      m_HtmlContentByteCount += count;
+      m_innerStream.Write( buffer, offset, count );
+    }
+
+    private void CheckIfClosed()
+    {
+      if( m_closed )
+        throw new InvalidOperationException( "An attempt was made to access a closed stream." );
+    }
+
+    private bool m_closed; // = false;
+    private int m_endFragmentOffset; // = 0;
+    private int m_headerBytesLength; // = 0;
+    private long m_HtmlContentByteCount; // = 0;
+    private Stream m_innerStream; // = null;
+
+    private static byte[] s_footerBytes = Encoding.UTF8.GetBytes( Environment.NewLine + "<!--EndFragment-->" );
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
index e34bab80..0603d1b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
@@ -15,11 +15,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Globalization;
 using System.Windows;
 
 namespace Xceed.Wpf.DataGrid.Export
@@ -209,7 +207,7 @@ namespace Xceed.Wpf.DataGrid.Export
         this.UpdateExporterIndentation( detailLevel );
 
         // Get master indexes that have mapped expanded details
-        List<int> indexesToMasterItemList = dataGridContext.CustomItemContainerGenerator.GetMasterIndexexWithExpandedDetails();
+        List<int> indexesToMasterItemList = dataGridContext.CustomItemContainerGenerator.GetMasterIndexesWithExpandedDetails();
 
         // Get the index of the next detail to export in case
         // it is expanded before the first selected index of the
@@ -290,28 +288,24 @@ namespace Xceed.Wpf.DataGrid.Export
         }
       }
 
-      private void ExportDataItemCore( DataGridContext dataGridContext, ClipboardExporterBase clipboardExporter, int itemIndex, object item, int[] exportedVisiblePositions,
-                                       ColumnBase[] columnsByVisiblePosition )
+      private void ExportDataItemCore( DataGridContext dataGridContext, ClipboardExporterBase clipboardExporter, int itemIndex, object item,
+                                       int[] exportedVisiblePositions, ColumnBase[] columnsByVisiblePosition )
       {
-        DataGridCollectionViewBase dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+        var dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
 
         clipboardExporter.StartDataItem( dataGridContext, item );
 
         // Ensure the count does not exceeds the columns count
-        int exportedVisiblePositionsCount = exportedVisiblePositions.Length;
+        var exportedVisiblePositionsCount = exportedVisiblePositions.Length;
         exportedVisiblePositionsCount = Math.Min( exportedVisiblePositionsCount, columnsByVisiblePosition.Length );
 
-        HashSet<int> intersectedIndexes = this.GetIntersectedRangesForIndex( dataGridContext, itemIndex, exportedVisiblePositions, exportedVisiblePositionsCount );
-
-        object fieldValue = null;
-        Column column = null;
+        var intersectedIndexes = this.GetIntersectedRangesForIndex( dataGridContext, itemIndex, exportedVisiblePositions, exportedVisiblePositionsCount );
 
         for( int i = 0; i < exportedVisiblePositionsCount; i++ )
         {
-          // Reset field value
-          fieldValue = null;
-
-          int visiblePosition = exportedVisiblePositions[ i ];
+          var fieldValue = default( object );
+          var column = default( Column );
+          var visiblePosition = exportedVisiblePositions[ i ];
 
           // Export null if not intersected by a SelectionRange
           if( intersectedIndexes.Contains( visiblePosition ) )
@@ -322,29 +316,25 @@ namespace Xceed.Wpf.DataGrid.Export
             if( column == null )
               continue;
 
-            // Use DataGridCollectionView directly since the DataGridItemProperty uses PropertyDescriptor which increase
-            // the read of the field value
-            DataGridItemPropertyBase dataGridItemProperty = null;
+            // Use DataGridCollectionView directly since the DataGridItemProperty uses PropertyDescriptor which increase the read of the field value
+            var dataGridItemProperty = default( DataGridItemPropertyBase );
 
-            // Try to get a DataGridItemProperty matching the column FieldName
-            // and get the value from it
+            // Try to get a DataGridItemProperty matching the column FieldName and get the value from it
             if( dataGridCollectionViewBase != null )
             {
-              dataGridItemProperty = dataGridCollectionViewBase.ItemProperties[ column.FieldName ];
+              dataGridItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( dataGridCollectionViewBase.ItemProperties, column.FieldName );
 
               if( dataGridItemProperty != null )
               {
-                fieldValue = dataGridItemProperty.GetValue( item );
+                fieldValue = ItemsSourceHelper.GetValueFromItemProperty( dataGridItemProperty, item );
               }
             }
 
             // If none was found, create a BindingPathValueExtractor from this column
             if( ( dataGridCollectionViewBase == null ) || ( dataGridItemProperty == null ) )
             {
-              // We don't have a DataGridCollectionView, use a BindingPathValueExtractor
-              // to create a binding to help us get the value for the Column in the 
-              // data item
-              BindingPathValueExtractor extractorForRead = null;
+              // We don't have a DataGridCollectionView, use a BindingPathValueExtractor to create a binding to help us get the value for the Column in the data item
+              var extractorForRead = default( BindingPathValueExtractor );
 
               if( m_columnToBindingPathExtractor.TryGetValue( column, out extractorForRead ) == false )
               {
@@ -359,19 +349,27 @@ namespace Xceed.Wpf.DataGrid.Export
           if( fieldValue != null )
           {
             //Verify if the value should be converted to the displayed value for exporting.
-            ForeignKeyConfiguration foreignKeyConfiguration = column.ForeignKeyConfiguration;
-
+            var foreignKeyConfiguration = column.ForeignKeyConfiguration;
             if( foreignKeyConfiguration != null && foreignKeyConfiguration.UseDisplayedValueWhenExporting )
             {
               fieldValue = foreignKeyConfiguration.GetDisplayMemberValue( fieldValue );
             }
-            else if( column.DisplayedValueConverter != null )
+            else
             {
-              fieldValue = column.DisplayedValueConverter.Convert( fieldValue, typeof( object ), column.DisplayedValueConverterParameter, column.GetCulture( column.DisplayedValueConverterCulture ) );
-            }
-            else if( !string.IsNullOrEmpty( column.CellContentStringFormat ) )
-            {
-              fieldValue = string.Format( column.GetCulture(), column.CellContentStringFormat, fieldValue );
+              var valueConverter = column.DisplayedValueConverter;
+              if( valueConverter != null )
+              {
+                fieldValue = valueConverter.Convert( fieldValue, typeof( object ), column.DisplayedValueConverterParameter,
+                                                     column.GetCulture( column.DisplayedValueConverterCulture ) );
+              }
+              else
+              {
+                var valueFormat = column.CellContentStringFormat;
+                if( !string.IsNullOrEmpty( valueFormat ) )
+                {
+                  fieldValue = string.Format( column.GetCulture(), valueFormat, fieldValue );
+                }
+              }
             }
           }
 
@@ -482,7 +480,6 @@ namespace Xceed.Wpf.DataGrid.Export
       private void ExportDataItem( DataGridContext dataGridContext, int itemIndex, object item, int detailLevel, int[] exportedVisiblePositions,
                                    ColumnBase[] columnsByVisiblePosition )
       {
-        Debug.WriteLine( string.Format( "ExportDataItem for detail level {0}, itemIndex {1}", detailLevel, itemIndex ) );
 
         foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
         {
@@ -503,7 +500,6 @@ namespace Xceed.Wpf.DataGrid.Export
         if( m_lastExportedHeaderDetailLevel == detailLevel )
           return;
 
-        Debug.WriteLine( string.Format( "ExportHeaders for detail level {0}", detailLevel ) );
 
         foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
         {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs
new file mode 100644
index 00000000..f8529bf1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs
@@ -0,0 +1,217 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.IO;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid.Export
+{
+  public class HtmlClipboardExporter : ClipboardExporterBase
+  {
+    #region PUBLIC CONSTRUCTORS
+
+    public HtmlClipboardExporter()
+      : base()
+    {
+      this.IncludeColumnHeaders = true;
+      this.FormatSettings = new HtmlFormatSettings();
+      m_indentationString = string.Empty;
+
+      // We keep a reference to the innerStream to return it when clipboard export is finished
+      m_memoryStream = new MemoryStream();
+      m_baseStream = new CF_HtmlStream( m_memoryStream );
+    }
+
+    #endregion
+
+    #region PUBLIC PROPERTIES
+
+    public HtmlFormatSettings FormatSettings
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region PROTECTED OVERRIDES
+
+    protected override object ClipboardData
+    {
+      get
+      {
+        // Return the innerStream of the CF_HtmlStream which contains the CF_HTML formatted data
+        return m_memoryStream;
+      }
+    }
+
+    protected override void Indent()
+    {
+      string startDelimiter = this.FormatSettings.FieldStartDelimiter;
+      string endDelimiter = this.FormatSettings.FieldEndDelimiter;
+
+      if( startDelimiter == null )
+        startDelimiter = string.Empty;
+
+      if( endDelimiter == null )
+        endDelimiter = string.Empty;
+
+      // By default, we suppose indentation as an empty field
+      m_indentationString += startDelimiter + endDelimiter;
+    }
+
+    protected override void Unindent()
+    {
+      string startDelimiter = this.FormatSettings.FieldStartDelimiter;
+      string endDelimiter = this.FormatSettings.FieldEndDelimiter;
+
+      if( startDelimiter == null )
+        startDelimiter = string.Empty;
+
+      if( endDelimiter == null )
+        endDelimiter = string.Empty;
+
+      if( m_indentationString == null )
+      {
+        Debug.Fail( "Indentation must at least be string.empty when unindenting." );
+
+        // We initalize the indentation string and return
+        m_indentationString = string.Empty;
+      }
+      else
+      {
+        int emptyFieldLength = startDelimiter.Length + endDelimiter.Length;
+        int indentationLength = m_indentationString.Length;
+
+        // If there are less characters in indentationString than in the empty field, just set indentation
+        // as string.empty
+        if( indentationLength < emptyFieldLength )
+        {
+          m_indentationString = string.Empty;
+        }
+        else
+        {
+          m_indentationString = m_indentationString.Substring( 0, indentationLength - emptyFieldLength );
+        }
+      }
+    }
+
+    protected override void ResetExporter()
+    {
+      m_tempBuffer = null;
+      m_indentationString = string.Empty;
+
+      // We must NOT close or dispose the previous MemoryStream since we pass this
+      // instance to the Clipboard directly and it becomes responsible of 
+      // closing/disposing it
+      m_memoryStream = new MemoryStream();
+      m_baseStream = new CF_HtmlStream( m_memoryStream );
+    }
+
+    protected override void StartExporter( string dataFormat )
+    {
+      this.WriteToBaseStream( this.FormatSettings.ExporterStartDelimiter );
+    }
+
+    protected override void EndExporter( string dataFormat )
+    {
+      this.WriteToBaseStream( this.FormatSettings.ExporterEndDelimiter );
+
+      // Force the header to be updated with length of HTML data and add the footer
+      m_baseStream.Close();
+    }
+
+    protected override void StartHeader( DataGridContext dataGridContext )
+    {
+      this.WriteToBaseStream( this.FormatSettings.HeaderDataStartDelimiter );
+
+      if( string.IsNullOrEmpty( m_indentationString ) == false )
+      {
+        this.WriteToBaseStream( m_indentationString );
+      }
+    }
+
+    protected override void StartHeaderField( DataGridContext dataGridContext, Column column )
+    {
+      this.WriteToBaseStream( this.FormatSettings.HeaderFieldStartDelimiter );
+
+      object columnHeader = ( ( this.UseFieldNamesInHeader ) || ( column.Title == null ) ) ? column.FieldName : column.Title;
+
+      string fieldValueString = FormatHelper.FormatHtmlFieldData( null, columnHeader, this.FormatSettings );
+
+      this.WriteToBaseStream( fieldValueString );
+      this.WriteToBaseStream( this.FormatSettings.HeaderFieldEndDelimiter );
+    }
+
+    protected override void EndHeader( DataGridContext dataGridContext )
+    {
+      this.WriteToBaseStream( this.FormatSettings.HeaderDataEndDelimiter );
+    }
+
+    protected override void StartDataItem( DataGridContext dataGridContext, object dataItem )
+    {
+      this.WriteToBaseStream( this.FormatSettings.DataStartDelimiter );
+
+      if( string.IsNullOrEmpty( m_indentationString ) == false )
+      {
+        this.WriteToBaseStream( m_indentationString );
+      }
+    }
+
+    protected override void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
+    {
+      this.WriteToBaseStream( this.FormatSettings.FieldStartDelimiter );
+      string fieldValueString = FormatHelper.FormatHtmlFieldData( null, fieldValue, this.FormatSettings );
+      this.WriteToBaseStream( fieldValueString );
+      this.WriteToBaseStream( this.FormatSettings.FieldEndDelimiter );
+    }
+
+    protected override void EndDataItem( DataGridContext dataGridContext, object dataItem )
+    {
+      this.WriteToBaseStream( this.FormatSettings.DataEndDelimiter );
+    }
+
+    #endregion
+
+    #region PRIVATE METHODS
+
+    private void WriteToBaseStream( string value )
+    {
+      if( string.IsNullOrEmpty( value ) )
+        return;
+
+      m_tempBuffer = Encoding.UTF8.GetBytes( value );
+
+      m_baseStream.Write( m_tempBuffer, 0, m_tempBuffer.Length );
+    }
+
+    #endregion
+
+    #region PRIVATE FIELDS
+
+    private string m_indentationString; // = null;
+    private MemoryStream m_memoryStream; // = null;
+    private CF_HtmlStream m_baseStream; // = null;
+    private byte[] m_tempBuffer; // = null;
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs
new file mode 100644
index 00000000..59bb495f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs
@@ -0,0 +1,106 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid.Export
+{
+  public class HtmlFormatSettings : FormatSettingsBase
+  {
+    public HtmlFormatSettings()
+    {
+      this.ExporterStartDelimiter = "<TABLE>";
+      this.ExporterEndDelimiter = "</TABLE>";
+
+      this.HeaderFieldStartDelimiter = "<TH>";
+      this.HeaderFieldEndDelimiter = "</TH>";
+      this.HeaderDataStartDelimiter = "<TR>";
+      this.HeaderDataEndDelimiter = "</TR>";
+
+      this.FieldStartDelimiter = "<TD>";
+      this.FieldEndDelimiter = "</TD>";
+      this.DataStartDelimiter = "<TR>";
+      this.DataEndDelimiter = "</TR>";
+    }
+
+    #region PUBLIC PROPERTIES
+
+    public string ExporterStartDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string ExporterEndDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string HeaderFieldStartDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string HeaderFieldEndDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string HeaderDataStartDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string HeaderDataEndDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string FieldStartDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string FieldEndDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string DataStartDelimiter
+    {
+      get;
+      set;
+    }
+
+    public string DataEndDelimiter
+    {
+      get;
+      set;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs
new file mode 100644
index 00000000..534d6db8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs
@@ -0,0 +1,338 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid.Export
+{
+  public class UnicodeCsvClipboardExporter : ClipboardExporterBase
+  {
+    public UnicodeCsvClipboardExporter()
+    {
+      this.IncludeColumnHeaders = true;
+      this.FormatSettings = new CsvFormatSettings();
+      m_indentationString = string.Empty;
+      m_baseStream = new ToStringMemoryStream();
+    }
+
+    #region PUBLIC PROPERTIES
+
+    public CsvFormatSettings FormatSettings
+    {
+      get;
+      private set;
+    }
+
+    #endregion
+
+    #region PROTECTED OVERRIDES
+
+    protected override object ClipboardData
+    {
+      get
+      {
+        return m_baseStream;
+      }
+    }
+
+    protected override void Indent()
+    {
+      char separator = this.FormatSettings.Separator;
+      m_indentationString += separator;
+    }
+
+    protected override void Unindent()
+    {
+      char separator = this.FormatSettings.Separator;
+
+      if( m_indentationString == null )
+      {
+        Debug.Fail( "Indentation must at least be string.empty when unindenting." );
+        m_indentationString = string.Empty;
+      }
+      else
+      {
+        int separatorLength = 1;
+        int indentationLength = m_indentationString.Length;
+
+        // If there are less characters in indentationString than in the empty field, just set indentation
+        // as string.empty
+        if( indentationLength < separatorLength )
+        {
+          m_indentationString = string.Empty;
+        }
+        else
+        {
+          m_indentationString = m_indentationString.Substring( 0, indentationLength - separatorLength );
+        }
+      }
+    }
+
+    protected override void ResetExporter()
+    {
+      m_baseStream = new ToStringMemoryStream();
+      m_indentationString = string.Empty;
+    }
+
+    protected override void StartHeader( DataGridContext dataGridContext )
+    {
+      if( string.IsNullOrEmpty( m_indentationString ) == false )
+        this.WriteToBaseStream( m_indentationString );
+
+      // The next StartDataItemField will be considered as first column
+      m_isFirstColumn = true;
+    }
+
+    protected override void StartHeaderField( DataGridContext dataGridContext, Column column )
+    {
+      // We always insert the separator before the value except for the first item
+      if( !m_isFirstColumn )
+      {
+        this.WriteToBaseStream( this.FormatSettings.Separator );
+      }
+      else
+      {
+        m_isFirstColumn = false;
+      }
+
+      object columnHeader = ( ( this.UseFieldNamesInHeader ) || ( column.Title == null ) ) ? column.FieldName : column.Title;
+      string fieldValueString = UnicodeCsvClipboardExporter.FormatCsvData( null, columnHeader, this.FormatSettings );
+
+      this.WriteToBaseStream( fieldValueString );
+    }
+
+    protected override void EndHeader( DataGridContext dataGridContext )
+    {
+      this.WriteToBaseStream( this.FormatSettings.NewLine );
+    }
+
+    protected override void StartDataItem( DataGridContext dataGridContext, object dataItem )
+    {
+      if( string.IsNullOrEmpty( m_indentationString ) == false )
+        this.WriteToBaseStream( m_indentationString );
+
+      // The next StartDataItemField will be considered as first column
+      m_isFirstColumn = true;
+    }
+
+    protected override void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
+    {
+      // We always insert the separator before the value except for the first item
+      if( !m_isFirstColumn )
+      {
+        this.WriteToBaseStream( this.FormatSettings.Separator );
+      }
+      else
+      {
+        m_isFirstColumn = false;
+      }
+
+      string fieldValueString = UnicodeCsvClipboardExporter.FormatCsvData( null, fieldValue, this.FormatSettings );
+
+      this.WriteToBaseStream( fieldValueString );
+    }
+
+    protected override void EndDataItem( DataGridContext dataGridContext, object dataItem )
+    {
+      this.WriteToBaseStream( this.FormatSettings.NewLine );
+    }
+
+    #endregion
+
+    #region PRIVATE METHODS
+
+    private void WriteToBaseStream( char value )
+    {
+      byte[] tempBuffer = Encoding.Unicode.GetBytes( new char[] { value } );
+      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
+    }
+
+    private void WriteToBaseStream( string value )
+    {
+      if( string.IsNullOrEmpty( value ) )
+        return;
+
+      byte[] tempBuffer = Encoding.Unicode.GetBytes( value );
+      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
+    }
+
+    #endregion
+
+    #region Private Static Methods
+
+    private static string FormatCsvData( Type dataType, object dataValue, CsvFormatSettings formatSettings )
+    {
+      string outputString = null;
+      bool checkWhitespace = true;
+
+      if( ( dataValue != null ) && ( !Convert.IsDBNull( dataValue ) ) && ( !( dataValue is Array ) ) )
+      {
+        if( dataType == null )
+          dataType = dataValue.GetType();
+
+        if( dataType == typeof( string ) )
+        {
+          if( formatSettings.TextQualifier == '\0' )
+          {
+            outputString = ( string )dataValue;
+          }
+          else
+          {
+            outputString = formatSettings.TextQualifier + ( string )dataValue + formatSettings.TextQualifier;
+          }
+
+          checkWhitespace = false;
+        }
+        else if( dataType == typeof( DateTime ) )
+        {
+          if( !string.IsNullOrEmpty( formatSettings.DateTimeFormat ) )
+          {
+            if( formatSettings.Culture == null )
+            {
+              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, CultureInfo.InvariantCulture );
+            }
+            else
+            {
+              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, formatSettings.Culture );
+            }
+          }
+        }
+        else if( ( dataType == typeof( double ) ) ||
+                 ( dataType == typeof( decimal ) ) ||
+                 ( dataType == typeof( float ) ) ||
+                 ( dataType == typeof( int ) ) ||
+                 ( dataType == typeof( double ) ) ||
+                 ( dataType == typeof( decimal ) ) ||
+                 ( dataType == typeof( float ) ) ||
+                 ( dataType == typeof( short ) ) ||
+                 ( dataType == typeof( Single ) ) ||
+                 ( dataType == typeof( UInt16 ) ) ||
+                 ( dataType == typeof( UInt32 ) ) ||
+                 ( dataType == typeof( UInt64 ) ) ||
+                 ( dataType == typeof( Int16 ) ) ||
+                 ( dataType == typeof( Int64 ) ) )
+        {
+          string format = formatSettings.NumericFormat;
+
+          if( ( ( dataType == typeof( double ) ) ||
+                ( dataType == typeof( decimal ) ) ||
+                ( dataType == typeof( float ) ) ) &&
+              ( !string.IsNullOrEmpty( formatSettings.FloatingPointFormat ) ) )
+            format = formatSettings.FloatingPointFormat;
+
+          if( !string.IsNullOrEmpty( format ) )
+          {
+            if( formatSettings.Culture == null )
+            {
+              outputString = string.Format( CultureInfo.InvariantCulture, "{0:" + format + "}", dataValue );
+            }
+            else
+            {
+              outputString = string.Format( formatSettings.Culture, "{0:" + format + "}", dataValue );
+            }
+          }
+        }
+
+        if( outputString == null )
+        {
+          if( formatSettings.Culture == null )
+          {
+            outputString = string.Format( CultureInfo.InvariantCulture, "{0}", dataValue );
+          }
+          else
+          {
+            outputString = string.Format( formatSettings.Culture, "{0}", dataValue );
+          }
+        }
+
+        // For dates and numbers, as a rule, we never use the TextQualifier. However, the
+        // specified format can introduce whitespaces. To better support this case, we add
+        // the TextQualifier if needed.
+        if( ( checkWhitespace ) && ( formatSettings.TextQualifier != '\0' ) )
+        {
+          bool useTextQualifier = false;
+
+          // If the output string contains the character used to separate the fields, we
+          // don't bother checking for whitespace. TextQualifier will be used.
+          if( outputString.IndexOf( formatSettings.Separator ) < 0 )
+          {
+            for( int i = 0; i < outputString.Length; i++ )
+            {
+              if( char.IsWhiteSpace( outputString, i ) )
+              {
+                useTextQualifier = true;
+                break;
+              }
+            }
+          }
+          else
+          {
+            useTextQualifier = true;
+          }
+
+          if( useTextQualifier )
+            outputString = formatSettings.TextQualifier + outputString + formatSettings.TextQualifier;
+        }
+      }
+
+      return outputString;
+    }
+
+    #endregion
+
+    #region PRIVATE FIELDS
+
+    private string m_indentationString; // = null;
+    private MemoryStream m_baseStream; // = null;
+    private bool m_isFirstColumn; // = false;
+
+    #endregion
+
+    #region ToStringMemoryStream Private Class
+
+    // This class is used to force the ToString of the
+    // MemoryStream to return the content of the Stream
+    // instead of the name of the Type. 
+    private class ToStringMemoryStream : MemoryStream
+    {
+      public override string ToString()
+      {
+        if( this.Length == 0 )
+        {
+          return string.Empty;
+        }
+        else
+        {
+          try
+          {
+            return Encoding.Unicode.GetString( this.ToArray() );
+          }
+          catch( Exception )
+          {
+            return base.ToString();
+          }
+        }
+      }
+    }
+
+    #endregion
+  }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
index 65ee071e..a8cfe398 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
@@ -147,6 +147,120 @@ namespace Xceed.Wpf.DataGrid.Export
       return outputString;
     }
 
+    public static string FormatHtmlFieldData( Type dataType, object dataValue, HtmlFormatSettings formatSettings )
+    {
+      string outputString = null;
+
+      if( ( dataValue != null ) && ( !Convert.IsDBNull( dataValue ) ) && ( !( dataValue is Array ) ) )
+      {
+        if( dataType == null )
+          dataType = dataValue.GetType();
+
+        if( dataType == typeof( string ) )
+        {
+          outputString = ( string )dataValue;
+        }
+        else if( dataType == typeof( DateTime ) )
+        {
+          if( !string.IsNullOrEmpty( formatSettings.DateTimeFormat ) )
+          {
+            if( formatSettings.Culture == null )
+            {
+              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, CultureInfo.InvariantCulture );
+            }
+            else
+            {
+              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, formatSettings.Culture );
+            }
+          }
+        }
+        else if( ( dataType == typeof( double ) ) ||
+                 ( dataType == typeof( decimal ) ) ||
+                 ( dataType == typeof( float ) ) ||
+                 ( dataType == typeof( int ) ) ||
+                 ( dataType == typeof( double ) ) ||
+                 ( dataType == typeof( decimal ) ) ||
+                 ( dataType == typeof( float ) ) ||
+                 ( dataType == typeof( short ) ) ||
+                 ( dataType == typeof( Single ) ) ||
+                 ( dataType == typeof( UInt16 ) ) ||
+                 ( dataType == typeof( UInt32 ) ) ||
+                 ( dataType == typeof( UInt64 ) ) ||
+                 ( dataType == typeof( Int16 ) ) ||
+                 ( dataType == typeof( Int64 ) ) )
+        {
+          string format = formatSettings.NumericFormat;
+
+          if( ( ( dataType == typeof( double ) ) ||
+                ( dataType == typeof( decimal ) ) ||
+                ( dataType == typeof( float ) ) ) &&
+              ( !string.IsNullOrEmpty( formatSettings.FloatingPointFormat ) ) )
+            format = formatSettings.FloatingPointFormat;
+
+          if( !string.IsNullOrEmpty( format ) )
+          {
+            if( formatSettings.Culture == null )
+            {
+              outputString = string.Format( CultureInfo.InvariantCulture, "{0:" + format + "}", dataValue );
+            }
+            else
+            {
+              outputString = string.Format( formatSettings.Culture, "{0:" + format + "}", dataValue );
+            }
+          }
+        }
+
+        if( outputString == null )
+        {
+          if( formatSettings.Culture == null )
+          {
+            outputString = string.Format( CultureInfo.InvariantCulture, "{0}", dataValue );
+          }
+          else
+          {
+            outputString = string.Format( formatSettings.Culture, "{0}", dataValue );
+          }
+        }
+      }
+
+      return FormatHelper.FormatPlainTextAsHtml( outputString );
+    }
+
+    public static void FormatHtmlData( StringBuilder htmlDataStringBuilder )
+    {
+      string htmlDataString = htmlDataStringBuilder.ToString();
+
+      StringBuilder headerStringBuilder = new StringBuilder();
+      headerStringBuilder.Append( "Version:1.0" );
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "StartHTML:-1" ); // This is optional according to MSDN documentation
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "EndHTML:-1" ); // This is optional according to MSDN documentation
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "StartFragment:0000000109" ); // Always 109 bytes from start of Version to the end of <!--StartFragment--> tag
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "EndFragment:{0}" ); // need + 7 to "emulate" the 10 digits ( "{x}" is already 3 of the 10 chars )
+      headerStringBuilder.Append( Environment.NewLine );
+      headerStringBuilder.Append( "<!--StartFragment-->" );
+
+      // We assure the StartFramgment offset is correct
+      string headerString = headerStringBuilder.ToString();
+      int startFragmentByteCounts = headerString.Length + 7; //  +7 chars as mentionned above
+      Debug.Assert( startFragmentByteCounts == 109 );
+
+      // Compute the EndFragment offset => header size + html data size + final end line (after data) length (\r\n)
+      int endFragmentByteCounts = startFragmentByteCounts + htmlDataString.Length + Environment.NewLine.Length;
+      string endFragmentOffset = endFragmentByteCounts.ToString( "0000000000", CultureInfo.InvariantCulture );
+      headerString = string.Format( CultureInfo.InvariantCulture, headerString, endFragmentOffset );
+
+      // Insert header at the beginning of the htmlDataStringBuilder
+      htmlDataStringBuilder.Insert( 0, headerString );
+
+      // Append the final end line and EndFragment tag
+      htmlDataStringBuilder.Append( Environment.NewLine );
+      htmlDataStringBuilder.Append( "<!--EndFragment-->" );
+    }
+
     public static string FormatPlainTextAsHtml( string plainText )
     {
       StringBuilder htmlStringBuilder = new StringBuilder();
@@ -166,7 +280,7 @@ namespace Xceed.Wpf.DataGrid.Export
             case '\r':
               break;
 
-            case ' ':
+            case '\u00A0':
               htmlStringBuilder.Append( "&nbsp;" );
               break;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameMap.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameMap.cs
deleted file mode 100644
index 8e6109ab..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameMap.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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class FieldNameMap
-  {
-    public bool TryGetColumnFieldName( string name, out string columnName )
-    {
-      return this.TryGetTarget( name, out columnName );
-    }
-
-    public bool TryGetColumnFieldName( ColumnBase column, out string columnName )
-    {
-      if( column != null )
-        return this.TryGetTarget( column.FieldName, out columnName );
-
-      columnName = null;
-
-      return false;
-    }
-
-    public bool TryGetColumnFieldName( SortDescription sortDescription, out string columnName )
-    {
-      return this.TryGetTarget( sortDescription.PropertyName, out columnName );
-    }
-
-    public bool TryGetItemPropertyName( string name, out string itemPropertyName )
-    {
-      return this.TryGetSource( name, out itemPropertyName );
-    }
-
-    public bool TryGetItemPropertyName( ColumnBase column, out string itemPropertyName )
-    {
-      if( column != null )
-        return this.TryGetSource( column.FieldName, out itemPropertyName );
-
-      itemPropertyName = null;
-
-      return false;
-    }
-
-    public bool TryGetItemPropertyName( SortDescription sortDescription, out string itemPropertyName )
-    {
-      return this.TryGetSource( sortDescription.PropertyName, out itemPropertyName );
-    }
-
-    protected virtual bool TryGetSource( string targetName, out string sourceName )
-    {
-      sourceName = targetName;
-
-      return !string.IsNullOrEmpty( targetName );
-    }
-
-    protected virtual bool TryGetTarget( string sourceName, out string targetName )
-    {
-      targetName = sourceName;
-
-      return !string.IsNullOrEmpty( sourceName );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs
deleted file mode 100644
index 1e7e6c11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq.Expressions;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "@ AND @", FilterOperatorPrecedence.AndOperator, FilterTokenPriority.AndOperator )]
-  [DebuggerDisplay( "AND( {FirstFilterCriterion}, {SecondFilterCriterion} )" )]
-  public class AndFilterCriterion : FilterCriterion
-  {
-    public AndFilterCriterion()
-    {
-    }
-
-    public AndFilterCriterion( FilterCriterion firstFilterCriterion, FilterCriterion secondFilterCriterion )
-    {
-      this.FirstFilterCriterion = firstFilterCriterion;
-      this.SecondFilterCriterion = secondFilterCriterion;
-    }
-
-    #region FirstFilterCriterion Property
-
-    public FilterCriterion FirstFilterCriterion
-    {
-      get
-      {
-        return m_firstFilterCriterion;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "FirstFilterCriterion" );
-
-        if( value != m_firstFilterCriterion )
-        {
-          if( m_firstFilterCriterion != null )
-            m_firstFilterCriterion.PropertyChanged -= new PropertyChangedEventHandler( FirstFilterCriterion_PropertyChanged );
-
-          m_firstFilterCriterion = value;
-          m_firstFilterCriterion.PropertyChanged += new PropertyChangedEventHandler( FirstFilterCriterion_PropertyChanged );
-          this.RaisePropertyChanged( "FirstFilterCriterion" );
-        }
-      }
-    }
-
-    private void FirstFilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaisePropertyChanged( "FirstFilterCriterion" );
-    }
-
-    private FilterCriterion m_firstFilterCriterion; // = null;
-
-    #endregion FirstFilterCriterion Property
-
-    #region SecondFilterCriterion Property
-
-    public FilterCriterion SecondFilterCriterion
-    {
-      get
-      {
-        return m_secondFilterCriterion;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "SecondFilterCriterion" );
-
-        if( value != m_secondFilterCriterion )
-        {
-          if( m_secondFilterCriterion != null )
-            m_secondFilterCriterion.PropertyChanged -= new PropertyChangedEventHandler( SecondFilterCriterion_PropertyChanged );
-
-          m_secondFilterCriterion = value;
-          m_secondFilterCriterion.PropertyChanged += new PropertyChangedEventHandler( SecondFilterCriterion_PropertyChanged );
-          this.RaisePropertyChanged( "SecondFilterCriterion" );
-        }
-      }
-    }
-
-    private void SecondFilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaisePropertyChanged( "SecondFilterCriterion" );
-    }
-
-    private FilterCriterion m_secondFilterCriterion; // = null;
-
-    #endregion SecondFilterCriterion Property
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      if( ( this.FirstFilterCriterion == null ) || ( this.SecondFilterCriterion == null ) )
-        return "";
-
-      StringBuilder stringBuilder = new StringBuilder( this.FirstFilterCriterion.ToExpression( culture ) );
-      stringBuilder.Append( " AND " );
-      stringBuilder.Append( this.SecondFilterCriterion.ToExpression( culture ) );
-
-      return stringBuilder.ToString();
-    }
-
-    public override Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      Expression firstFilterLINQExpression = ( m_firstFilterCriterion == null ) ? null : m_firstFilterCriterion.ToLinqExpression( queryable, parameterExpression, propertyName );
-      Expression secondFilterLINQExpression = ( m_secondFilterCriterion == null ) ? null : m_secondFilterCriterion.ToLinqExpression( queryable, parameterExpression, propertyName );
-
-      if( ( firstFilterLINQExpression != null ) && ( secondFilterLINQExpression != null ) )
-        return Expression.And( firstFilterLINQExpression, secondFilterLINQExpression );
-
-      if( firstFilterLINQExpression != null )
-        return firstFilterLINQExpression;
-
-      // Will return null if both criterion or resulting LINQ expressions are null;
-      return secondFilterLINQExpression;
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( ( m_firstFilterCriterion == null ) || ( m_secondFilterCriterion == null ) )
-        return false;
-
-      return m_firstFilterCriterion.IsMatch( value ) && m_secondFilterCriterion.IsMatch( value );
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !base.Equals( obj ) )
-        return false;
-
-      AndFilterCriterion criterion = ( AndFilterCriterion )obj;
-
-      return object.Equals( this.FirstFilterCriterion, criterion.FirstFilterCriterion )
-        && object.Equals( this.SecondFilterCriterion, criterion.SecondFilterCriterion );
-    }
-
-    public override int GetHashCode()
-    {
-      int hash = base.GetHashCode();
-
-      if( this.FirstFilterCriterion != null )
-        hash ^= this.FirstFilterCriterion.GetHashCode();
-
-      if( this.SecondFilterCriterion != null )
-        hash ^= this.SecondFilterCriterion.GetHashCode();
-
-      return hash;
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder( "AND( " );
-      stringBuilder.Append( this.FirstFilterCriterion.ToString() );
-      stringBuilder.Append( ", " );
-      stringBuilder.Append( this.SecondFilterCriterion.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-
-    protected internal override void InitializeFrom( object[] parameters, Type defaultComparisonFilterCriterionType )
-    {
-      Debug.Assert( parameters.Length == 2, "Should have been caught earlier during BuildCriterion." );
-
-      if( parameters.Length != 2 )
-        throw new DataGridInternalException( "Missing operand for the AND operator." );
-
-      this.FirstFilterCriterion = FilterParser.ProduceCriterion( parameters[ 0 ], defaultComparisonFilterCriterionType );
-      this.SecondFilterCriterion = FilterParser.ProduceCriterion( parameters[ 1 ], defaultComparisonFilterCriterionType );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs
deleted file mode 100644
index dc479eea..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq.Expressions;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "Contains( {Value} )" )]
-  public class ContainsFilterCriterion : RelationalFilterCriterion
-  {
-    public ContainsFilterCriterion()
-      : base()
-    {
-    }
-
-    public ContainsFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-
-      return strValue ?? "";
-    }
-
-    public override Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      string queriedValue = this.Value as string;
-
-      if( queriedValue == null )
-        queriedValue = string.Empty;
-
-      return queryable.CreateContainsExpression( parameterExpression, propertyName, queriedValue );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( value == null )
-        return false;
-
-      if( this.Value == null )
-        return true;
-
-      string searchedValue = this.Value.ToString().ToLower();
-
-      if( searchedValue.Length == 0 )
-        return true;
-
-      string strValue = value.ToString().ToLower();
-
-      return strValue.Contains( searchedValue );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder( "Contains( " );
-      stringBuilder.Append( ( this.Value == null ) ? "" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs
deleted file mode 100644
index e85fb828..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.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;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [ AttributeUsage( AttributeTargets.Class, Inherited = true, AllowMultiple = false ) ]
-  internal sealed class CriterionDescriptorAttribute : Attribute
-  {
-    public CriterionDescriptorAttribute( string pattern, FilterOperatorPrecedence operatorPrecedence, FilterTokenPriority parserPriority )
-    {
-      m_pattern = pattern;
-      m_operatorPrecedence = operatorPrecedence;
-      m_parserPriority = parserPriority;
-    }
-
-    public string Pattern
-    {
-      get
-      {
-        return m_pattern;
-      }
-    }
-
-    public FilterOperatorPrecedence OperatorPrecedence
-    {
-      get
-      {
-        return m_operatorPrecedence;
-      }
-    }
-
-    public FilterTokenPriority ParserPriority
-    {
-      get
-      {
-        return m_parserPriority;
-      }
-    }
-
-    private readonly string m_pattern;
-    private readonly FilterOperatorPrecedence m_operatorPrecedence;
-    private readonly FilterTokenPriority m_parserPriority;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs
deleted file mode 100644
index 02a6fafb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.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.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Windows;
-using System.Linq;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "<>@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "DifferentThan( {Value} )" )]
-  public class DifferentThanFilterCriterion : RelationalFilterCriterion
-  {
-    public DifferentThanFilterCriterion()
-      : base()
-    {
-    }
-
-    public DifferentThanFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : "<>" + strValue;
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateDifferentThanExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      return ( this.Compare( value ) != CompareResult.EqualsTo );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "DifferentThan( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs
deleted file mode 100644
index d8675daa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "*@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "EndsWith( {Value} )" )]
-  public class EndsWithFilterCriterion : RelationalFilterCriterion
-  {
-    public EndsWithFilterCriterion()
-      : base()
-    {
-    }
-
-    public EndsWithFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-
-      return ( strValue == null ) ? "" : "*" + strValue;
-    }
-
-    public override Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      string queriedValue = this.Value as string;
-
-      if( queriedValue == null )
-        queriedValue = string.Empty;
-      else
-        queriedValue = queriedValue.Remove( queriedValue.IndexOf( '*' ) );
-
-      return queryable.CreateEndsWithExpression( parameterExpression, propertyName, queriedValue );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( value == null )
-        return false;
-
-      if( this.Value == null )
-        return true;
-
-      string searchedValue = this.Value.ToString().ToLower();
-
-      if( searchedValue.Length == 0 )
-        return true;
-
-      string strValue = value.ToString().ToLower();
-      return strValue.EndsWith( searchedValue, true, CultureInfo.CurrentCulture );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder( "EndsWith( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs
deleted file mode 100644
index bc109faa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "=@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "EqualTo( {Value} )" )]
-  public class EqualToFilterCriterion : RelationalFilterCriterion
-  {
-    public EqualToFilterCriterion()
-      : base()
-    {
-    }
-
-    public EqualToFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : "=" + strValue;
-    }
-
-    public override Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateEqualExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      return ( this.Compare( value ) == CompareResult.EqualsTo );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "EqualTo( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs
deleted file mode 100644
index ceeec6cd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.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.ComponentModel;
-using System.Globalization;
-using System.Linq.Expressions;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "", FilterOperatorPrecedence.Default, FilterTokenPriority.Default )]
-  public abstract class FilterCriterion : INotifyPropertyChanged
-  {
-#if DEBUG
-    [Obsolete( "This method exists for the general public. Consider using the overload receiving the culture." )]
-#endif
-    public static FilterCriterion Parse( string expression, Type targetDataType )
-    {
-      return FilterCriterion.Parse( expression, targetDataType, null );
-    }
-
-    public static FilterCriterion Parse( string expression, Type targetDataType, CultureInfo culture )
-    {
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      if( targetDataType == null )
-        throw new ArgumentNullException( "targetDataType" );
-
-      return FilterParser.Parse( expression, targetDataType, culture );
-    }
-
-#if DEBUG
-    [Obsolete( "This method exists for the general public. Consider using the overload receiving the culture." )]
-#endif
-    public static bool TryParse( string expression, Type targetDataType, out FilterCriterion filterCriterion )
-    {
-      return FilterCriterion.TryParse( expression, targetDataType, null, out filterCriterion );
-    }
-
-    public static bool TryParse( string expression, Type targetDataType, CultureInfo culture, out FilterCriterion filterCriterion )
-    {
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      if( targetDataType == null )
-        throw new ArgumentNullException( "targetDataType" );
-
-      filterCriterion = FilterParser.TryParse( expression, targetDataType, culture );
-
-      return ( filterCriterion != null ) || ( FilterParser.LastError.Length == 0 );
-    }
-
-    public abstract bool IsMatch( object value );
-
-    public abstract string ToExpression( CultureInfo culture );
-
-    public abstract Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName );
-
-    public override bool Equals( object obj )
-    {
-      FilterCriterion filterCriterion = obj as FilterCriterion;
-
-      if( filterCriterion == null )
-        return false;
-
-      return this.GetType() == filterCriterion.GetType();
-    }
-
-    public override int GetHashCode()
-    {
-      return this.GetType().GetHashCode();
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      return "#" + this.GetType().Name + "#";
-    }
-#endif
-
-    protected internal abstract void InitializeFrom( object[] parameters, Type defaultComparisonFilterCriterionType );
-
-    #region INotifyPropertyChanged Implementation
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected void RaisePropertyChanged( string name )
-    {
-      if( this.PropertyChanged != null )
-      {
-        this.PropertyChanged( this, new PropertyChangedEventArgs( name ) );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterExpressionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterExpressionHelper.cs
deleted file mode 100644
index ca593616..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterExpressionHelper.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  internal class FilterExpressionHelper
-  {
-    #region LastValue Property
-
-    internal static long LastValue
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region IsConsecutive Property
-
-    internal static bool IsConsecutive
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region GreaterThanAdded Property
-
-    internal static bool GreaterThanAdded
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    internal static string BuildExpressionFromIntValue( string expression, long currentValue )
-    {
-      //If we have an int value, let's try to find ranges of values, in oreder to build a more efficent expression than having all values separated by an OR criterion.
-      if( currentValue - 1 < FilterExpressionHelper.LastValue )
-      {
-        expression = currentValue.ToString();
-      }
-      else if( currentValue - 1 > FilterExpressionHelper.LastValue )
-      {
-        if( FilterExpressionHelper.IsConsecutive )
-        {
-          expression += " AND <" + ( FilterExpressionHelper.LastValue + 1 ).ToString() + " OR " + currentValue.ToString();
-          FilterExpressionHelper.IsConsecutive = false;
-        }
-        else
-        {
-          expression += " OR " + currentValue.ToString();
-        }
-        FilterExpressionHelper.GreaterThanAdded = false;
-      }
-      else if( currentValue - 1 == FilterExpressionHelper.LastValue )
-      {
-        if( !FilterExpressionHelper.GreaterThanAdded )
-        {
-          expression = expression.Remove( expression.IndexOf( FilterExpressionHelper.LastValue.ToString() ) );
-          expression += ">" + ( FilterExpressionHelper.LastValue - 1 ).ToString();
-          FilterExpressionHelper.GreaterThanAdded = true;
-        }
-        FilterExpressionHelper.IsConsecutive = true;
-      }
-
-      FilterExpressionHelper.LastValue = currentValue;
-
-      return expression;
-    }
-
-    internal static bool GetIsIntValuePathType( Type valuePathDataType )
-    {
-      return valuePathDataType == typeof( sbyte ) ||
-             valuePathDataType == typeof( byte ) ||
-             valuePathDataType == typeof( short ) ||
-             valuePathDataType == typeof( ushort ) ||
-             valuePathDataType == typeof( int ) ||
-             valuePathDataType == typeof( uint ) ||
-             valuePathDataType == typeof( long ) ||
-             valuePathDataType == typeof( ulong );
-    }
-  }
-
-  internal class EmptyCriterionObject
-  {
-    internal EmptyCriterionObject()
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs
deleted file mode 100644
index 7d7530e8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.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.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( ">@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "GreaterThan( {Value} )" )]
-  public class GreaterThanFilterCriterion : RelationalFilterCriterion
-  {
-    public GreaterThanFilterCriterion()
-      : base()
-    {
-    }
-
-    public GreaterThanFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : ">" + strValue;
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateGreaterThanExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      return ( this.Compare( value ) == CompareResult.GreaterThan );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "GreaterThan( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs
deleted file mode 100644
index db1b70a6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( ">=@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "GreaterThanOrEqualTo( {Value} )" )]
-  public class GreaterThanOrEqualToFilterCriterion : RelationalFilterCriterion
-  {
-    public GreaterThanOrEqualToFilterCriterion()
-      : base()
-    {
-    }
-
-    public GreaterThanOrEqualToFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : ">=" + strValue;
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateGreaterThanOrEqualExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      CompareResult result = this.Compare( value );
-      return ( result == CompareResult.EqualsTo ) || ( result == CompareResult.GreaterThan );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "GreaterThanOrEqualTo( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs
deleted file mode 100644
index 3888f67f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.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.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "<@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "LessThan( {Value} )" )]
-  public class LessThanFilterCriterion : RelationalFilterCriterion
-  {
-    public LessThanFilterCriterion()
-      : base()
-    {
-    }
-
-    public LessThanFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : "<" + strValue;
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateLesserThanExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      return ( this.Compare( value ) == CompareResult.LessThan );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "LessThan( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs
deleted file mode 100644
index 62e26ddd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "<=@", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "LessThanOrEqualTo( {Value} )" )]
-  public class LessThanOrEqualToFilterCriterion : RelationalFilterCriterion
-  {
-    public LessThanOrEqualToFilterCriterion()
-      : base()
-    {
-    }
-
-    public LessThanOrEqualToFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-      return ( strValue == null ) ? "" : "<=" + strValue;
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      return queryable.CreateLesserThanOrEqualExpression( parameterExpression, propertyName, this.Value );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      CompareResult result = this.Compare( value );
-      return ( result == CompareResult.EqualsTo ) || ( result == CompareResult.LessThan );
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "LessThanOrEqualTo( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs
deleted file mode 100644
index 74836636..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows.Markup;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [ContentProperty( "FilterCriterion" )]
-  [CriterionDescriptor( "NOT @", FilterOperatorPrecedence.NotOperator, FilterTokenPriority.NotOperator )]
-  [DebuggerDisplay( "NOT( {FilterCriterion} )" )]
-  public class NotFilterCriterion : FilterCriterion
-  {
-    public NotFilterCriterion()
-    {
-    }
-
-    public NotFilterCriterion( FilterCriterion filterCriterion )
-    {
-      this.FilterCriterion = filterCriterion;
-    }
-
-    #region FilterCriterion Property
-
-    public FilterCriterion FilterCriterion
-    {
-      get
-      {
-        return m_filterCriterion;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "FilterCriterion" );
-
-        if( value != m_filterCriterion )
-        {
-          if( m_filterCriterion != null )
-            m_filterCriterion.PropertyChanged -= new PropertyChangedEventHandler( FilterCriterion_PropertyChanged );
-
-          m_filterCriterion = value;
-          m_filterCriterion.PropertyChanged += new PropertyChangedEventHandler( FilterCriterion_PropertyChanged );
-          this.RaisePropertyChanged( "FilterCriterion" );
-        }
-      }
-    }
-
-    private void FilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaisePropertyChanged( "FilterCriterion" );
-    }
-
-    private FilterCriterion m_filterCriterion; // = null;
-
-    #endregion FilterCriterion Property
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      if( this.FilterCriterion == null )
-        return "";
-
-      return "NOT " + this.FilterCriterion.ToExpression( culture );
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      if( m_filterCriterion == null )
-        return null;
-
-      Expression expressionToReverse = m_filterCriterion.ToLinqExpression( queryable, parameterExpression, propertyName );
-
-      if( expressionToReverse == null )
-        return null;
-
-      return Expression.Not( expressionToReverse );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( m_filterCriterion == null )
-        return false;
-
-      return !m_filterCriterion.IsMatch( value );
-    }
-
-    protected internal override void InitializeFrom( object[] parameters, Type defaultComparisonFilterCriterionType )
-    {
-      if( parameters.Length != 1 )
-        throw new DataGridException( string.Format( FilterParser.MissingRightOperandErrorText, this.GetType().Name ) );
-
-      this.FilterCriterion = FilterParser.ProduceCriterion( parameters[ 0 ], defaultComparisonFilterCriterionType );
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !base.Equals( obj ) )
-        return false;
-
-      NotFilterCriterion criterion = ( NotFilterCriterion )obj;
-
-      return object.Equals( this.FilterCriterion, criterion.FilterCriterion );
-    }
-
-    public override int GetHashCode()
-    {
-      int hash = base.GetHashCode();
-
-      if( this.FilterCriterion != null )
-        hash ^= this.FilterCriterion.GetHashCode();
-
-      return hash;
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder( "NOT( " );
-      stringBuilder.Append( ( this.FilterCriterion == null ) ? "#NULL#" : this.FilterCriterion.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs
deleted file mode 100644
index 34523662..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Windows;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "@ OR @", FilterOperatorPrecedence.OrOperator, FilterTokenPriority.OrOperator )]
-  [DebuggerDisplay( "OR( {FirstFilterCriterion}, {SecondFilterCriterion} )" )]
-  public class OrFilterCriterion : FilterCriterion
-  {
-    public OrFilterCriterion()
-    {
-    }
-
-    public OrFilterCriterion( FilterCriterion firstFilterCriterion, FilterCriterion secondFilterCriterion )
-    {
-      this.FirstFilterCriterion = firstFilterCriterion;
-      this.SecondFilterCriterion = secondFilterCriterion;
-    }
-
-    #region FirstFilterCriterion Property
-
-    public FilterCriterion FirstFilterCriterion
-    {
-      get
-      {
-        return m_firstFilterCriterion;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "FirstFilterCriterion" );
-
-        if( value != m_firstFilterCriterion )
-        {
-          if( m_firstFilterCriterion != null )
-            m_firstFilterCriterion.PropertyChanged -= new PropertyChangedEventHandler( FirstFilterCriterion_PropertyChanged );
-
-          m_firstFilterCriterion = value;
-          m_firstFilterCriterion.PropertyChanged += new PropertyChangedEventHandler( FirstFilterCriterion_PropertyChanged );
-          this.RaisePropertyChanged( "FirstFilterCriterion" );
-        }
-      }
-    }
-
-    private void FirstFilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaisePropertyChanged( "FirstFilterCriterion" );
-    }
-
-    private FilterCriterion m_firstFilterCriterion; // = null;
-
-    #endregion FirstFilterCriterion Property
-
-    #region SecondFilterCriterion Property
-
-    public FilterCriterion SecondFilterCriterion
-    {
-      get
-      {
-        return m_secondFilterCriterion;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "SecondFilterCriterion" );
-
-        if( value != m_secondFilterCriterion )
-        {
-          if( m_secondFilterCriterion != null )
-            m_secondFilterCriterion.PropertyChanged -= new PropertyChangedEventHandler( SecondFilterCriterion_PropertyChanged );
-
-          m_secondFilterCriterion = value;
-          m_secondFilterCriterion.PropertyChanged += new PropertyChangedEventHandler( SecondFilterCriterion_PropertyChanged );
-          this.RaisePropertyChanged( "SecondFilterCriterion" );
-        }
-      }
-    }
-
-    private void SecondFilterCriterion_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.RaisePropertyChanged( "SecondFilterCriterion" );
-    }
-
-    private FilterCriterion m_secondFilterCriterion; // = null;
-
-    #endregion SecondFilterCriterion Property
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      if( ( this.FirstFilterCriterion == null ) || ( this.SecondFilterCriterion == null ) )
-        return "";
-
-      StringBuilder builder = new StringBuilder( this.FirstFilterCriterion.ToExpression( culture ) );
-      builder.Append( " OR " );
-      builder.Append( this.SecondFilterCriterion.ToExpression( culture ) );
-
-      return builder.ToString();
-    }
-
-    public override System.Linq.Expressions.Expression ToLinqExpression( System.Linq.IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      System.Linq.Expressions.Expression firstFilterLINQExpression =
-        ( m_firstFilterCriterion == null ) ? null : m_firstFilterCriterion.ToLinqExpression( queryable, parameterExpression, propertyName );
-
-      System.Linq.Expressions.Expression secondFilterLINQExpression =
-        ( m_secondFilterCriterion == null ) ? null : m_secondFilterCriterion.ToLinqExpression( queryable, parameterExpression, propertyName );
-
-      if( ( firstFilterLINQExpression != null ) && ( secondFilterLINQExpression != null ) )
-        return System.Linq.Expressions.Expression.Or( firstFilterLINQExpression, secondFilterLINQExpression );
-
-      if( firstFilterLINQExpression != null )
-        return firstFilterLINQExpression;
-
-      // Will return null if both criterion or resulting LINQ expressions are null;
-      return secondFilterLINQExpression;
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( ( m_firstFilterCriterion == null ) || ( m_secondFilterCriterion == null ) )
-        return false;
-
-      return m_firstFilterCriterion.IsMatch( value ) || m_secondFilterCriterion.IsMatch( value );
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !base.Equals( obj ) )
-        return false;
-
-      OrFilterCriterion criterion = ( OrFilterCriterion )obj;
-
-      return object.Equals( this.FirstFilterCriterion, criterion.FirstFilterCriterion )
-        && object.Equals( this.SecondFilterCriterion, criterion.SecondFilterCriterion );
-    }
-
-    public override int GetHashCode()
-    {
-      int hash = base.GetHashCode();
-
-      if( this.FirstFilterCriterion != null )
-        hash ^= this.FirstFilterCriterion.GetHashCode();
-
-      if( this.SecondFilterCriterion != null )
-        hash ^= this.SecondFilterCriterion.GetHashCode();
-
-      return hash;
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder stringBuilder = new StringBuilder( "OR( " );
-      stringBuilder.Append( this.FirstFilterCriterion.ToString() );
-      stringBuilder.Append( ", " );
-      stringBuilder.Append( this.SecondFilterCriterion.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-
-    protected internal override void InitializeFrom( object[] parameters, Type defaultComparisonFilterCriterionType )
-    {
-      Debug.Assert( parameters.Length == 2, "Should have been caught earlier during BuildCriterion." );
-
-      if( parameters.Length != 2 )
-        throw new DataGridInternalException( "Missing operand for the OR operator." );
-
-      this.FirstFilterCriterion = FilterParser.ProduceCriterion( parameters[ 0 ], defaultComparisonFilterCriterionType );
-      this.SecondFilterCriterion = FilterParser.ProduceCriterion( parameters[ 1 ], defaultComparisonFilterCriterionType );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs
deleted file mode 100644
index 094f2859..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [ContentProperty( "Value" )]
-  public abstract class RelationalFilterCriterion : FilterCriterion
-  {
-    public RelationalFilterCriterion()
-    {
-    }
-
-    public RelationalFilterCriterion( object value )
-    {
-      this.Value = value;
-    }
-
-    #region Value Property
-
-    public object Value
-    {
-      get
-      {
-        return m_value;
-      }
-
-      set
-      {
-        if( value != m_value )
-        {
-          m_value = value;
-          m_comparableValue = value as IComparable;
-          this.RaisePropertyChanged( "Value" );
-        }
-      }
-    }
-
-    protected IComparable ComparableValue
-    {
-      get
-      {
-        return m_comparableValue;
-      }
-    }
-
-    private object m_value;
-    private IComparable m_comparableValue;
-
-    #endregion
-
-    public override bool Equals( object obj )
-    {
-      if( !base.Equals( obj ) )
-        return false;
-
-      RelationalFilterCriterion criterion = ( RelationalFilterCriterion )obj;
-
-      return object.Equals( this.Value, criterion.Value );
-    }
-
-    public override int GetHashCode()
-    {
-      int hash = base.GetHashCode();
-
-      if( this.Value != null )
-        hash ^= this.Value.GetHashCode();
-
-      return hash;
-    }
-
-    // Can return null.
-    protected string GetValueForExpression( CultureInfo culture )
-    {
-      string strValue = this.Value as string;
-
-      if( ( this.Value == null ) || ( this.Value == DBNull.Value ) )
-      {
-        strValue = "NULL";
-      }
-      else if( strValue == null )
-      {
-        Type dataType = this.Value.GetType();
-
-        if( dataType == typeof( DateTime ) )
-        {
-          DateTime dateValue = ( DateTime )this.Value;
-
-          // ISO 8601 format
-          if( ( dateValue.Hour > 0 )
-            || ( dateValue.Minute > 0 )
-            || ( dateValue.Second > 0 )
-            || ( dateValue.Millisecond > 0 ) )
-          {
-            strValue = ( ( DateTime )this.Value ).ToString( "yyyy-MM-ddTHH:mm:ss.FFFFFFF" );
-          }
-          else
-          {
-            strValue = ( ( DateTime )this.Value ).ToString( "yyyy-MM-dd" );
-          }
-        }
-        else
-        {
-          try
-          {
-            if( culture == null )
-            {
-              strValue = Convert.ToString( this.Value );
-            }
-            else
-            {
-              strValue = Convert.ToString( this.Value, culture );
-            }
-          }
-          catch( OverflowException )
-          {
-          }
-          catch( FormatException )
-          {
-          }
-        }
-      }
-
-      if( strValue != null )
-      {
-        int index = strValue.Length - 1;
-
-        if( strValue == "" )
-          strValue = "\"\"";
-
-        while( index >= 0 )
-        {
-          if( strValue[ index ] == '"' )
-          {
-            strValue = strValue.Insert( index, "\"" );
-          }
-
-          index--;
-        }
-
-        if( strValue.Contains( " " ) )
-        {
-          strValue = "\"" + strValue + "\"";
-        }
-      }
-
-      return strValue;
-    }
-
-    protected internal override void InitializeFrom( object[] parameters, Type defaultComparisonFilterCriterionType )
-    {
-      if( parameters.Length != 1 )
-        throw new DataGridException( string.Format( FilterParser.MissingRightOperandErrorText, this.GetType().Name ) );
-
-      Debug.Assert( !( parameters[ 0 ] is FilterCriterion ), "Should have been caught earlier during BuildCriterion." );
-
-      if( parameters[ 0 ] is FilterCriterion )
-        throw new DataGridInternalException( "Comparison with the result of a filter criterion is not allowed." );
-
-      this.Value = parameters[ 0 ];
-    }
-
-    /// <summary>
-    /// Compare the specified value (left value) with the Value property (right value).
-    /// For instance, this method will return LessThan if value &lt; this.Value.
-    /// </summary>
-    internal CompareResult Compare( object value )
-    {
-      object value2 = this.Value;
-
-      if( ( value == null ) || ( value == DBNull.Value ) || ( value as string == string.Empty ) )
-      {
-        if( ( value2 == null ) || ( value2 == DBNull.Value ) || ( ( value2 as string ) == string.Empty ) )
-        {
-          return CompareResult.EqualsTo;
-        }
-        else
-        {
-          return CompareResult.LessThan;
-        }
-      }
-      else
-      {
-        if( ( value2 == null ) || ( value2 == DBNull.Value ) )
-        {
-          return CompareResult.GreaterThan;
-        }
-        else if( m_comparableValue == null )
-        {
-          return object.Equals( value, value2 ) ? CompareResult.EqualsTo : CompareResult.DifferentThan;
-        }
-        else
-        {
-          int i = m_comparableValue.CompareTo( value );
-
-          if( i < 0 )
-          {
-            // value2 is less than value1: value is greater than.
-            return CompareResult.GreaterThan;
-          }
-          else if( i == 0 )
-          {
-            return CompareResult.EqualsTo;
-          }
-          else
-          {
-            // value2 is greater than value1: value is less than.
-            return CompareResult.LessThan;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs
deleted file mode 100644
index 4ebc046f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.FilterCriteria
-{
-  [CriterionDescriptor( "@*", FilterOperatorPrecedence.RelationalOperator, FilterTokenPriority.RelationalOperator )]
-  [DebuggerDisplay( "StartsWith( {Value} )" )]
-  public class StartsWithFilterCriterion : RelationalFilterCriterion
-  {
-    public StartsWithFilterCriterion()
-      : base()
-    {
-    }
-
-    public StartsWithFilterCriterion( object value )
-      : base( value )
-    {
-    }
-
-    public override string ToExpression( CultureInfo culture )
-    {
-      string strValue = this.GetValueForExpression( culture );
-
-      return ( strValue == null ) ? "" : strValue + "*";
-    }
-
-    public override Expression ToLinqExpression( IQueryable queryable, ParameterExpression parameterExpression, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( parameterExpression == null )
-        throw new ArgumentNullException( "parameterExpression" );
-
-      if( String.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "PropertyName must not be empty.", "propertyName" );
-      }
-
-      string queriedValue = this.Value as string;
-
-
-      if( queriedValue == null )
-        queriedValue = string.Empty;
-      else
-        queriedValue = queriedValue.Remove( queriedValue.LastIndexOf( '*' ) );
-
-      return queryable.CreateStartsWithExpression( parameterExpression, propertyName, queriedValue );
-    }
-
-    public override bool IsMatch( object value )
-    {
-      if( value == null )
-        return false;
-
-      if( this.Value == null )
-        return true;
-
-      string searchedValue = this.Value.ToString().ToLower();
-
-      if( searchedValue.Length == 0 )
-        return true;
-
-      string strValue = value.ToString().ToLower();
-      return strValue.StartsWith( searchedValue, true, CultureInfo.CurrentCulture );
-    }
-#if DEBUG
-    public override string ToString()
-    {
-      System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder( "StartsWith( " );
-      stringBuilder.Append( ( this.Value == null ) ? "#NULL#" : this.Value.ToString() );
-      stringBuilder.Append( " )" );
-
-      return stringBuilder.ToString();
-    }
-#endif
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs
deleted file mode 100644
index 3ded1d98..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs
+++ /dev/null
@@ -1,812 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using Xceed.Wpf.DataGrid.FilterCriteria;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static partial class FilterParser
-  {
-    static FilterParser()
-    {
-      RegisteredFilterCriterionTypes.Add( typeof( AndFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( ContainsFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( DifferentThanFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( EqualToFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( GreaterThanOrEqualToFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( GreaterThanFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( LessThanOrEqualToFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( LessThanFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( NotFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( OrFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( EndsWithFilterCriterion ) );
-      RegisteredFilterCriterionTypes.Add( typeof( StartsWithFilterCriterion ) );
-
-    }
-
-    public static string LastError
-    {
-      get
-      {
-        return FilterParser.LastErrorString;
-      }
-
-      set
-      {
-        // Always keep the error message that triggered the error state for this session.
-        if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( FilterParser.LastErrorString ) )
-          FilterParser.LastErrorString = value;
-      }
-    }
-
-    public static FilterCriterion ProduceCriterion( object parameterValue, Type defaultComparisonFilterCriterionType )
-    {
-      if( parameterValue is FilterCriterion )
-      {
-        return ( FilterCriterion )parameterValue;
-      }
-      else
-      {
-        if( !typeof( RelationalFilterCriterion ).IsAssignableFrom( defaultComparisonFilterCriterionType ) )
-          throw new DataGridInternalException( "The default FilterCriterion type should derived from RelationalFilterCriterion." );
-
-        return Activator.CreateInstance( defaultComparisonFilterCriterionType, parameterValue ) as RelationalFilterCriterion;
-      }
-    }
-
-    // If culture is null, CurrentThread.CurrentCulture will be used when necessary.
-    public static FilterCriterion Parse( string expression, Type dataType, CultureInfo culture )
-    {
-      List<Token> tokens = FilterParser.GetTokens( expression, dataType );
-      return FilterParser.BuildCriterion( tokens, dataType, FilterParser.GetDefaultCriterionType( dataType ), culture );
-    }
-
-    public static FilterCriterion TryParse( string expression, Type dataType, CultureInfo culture )
-    {
-      FilterCriterion filterCriterion = null;
-      FilterParser.LastError = null;
-
-      try
-      {
-        filterCriterion = FilterParser.Parse( expression, dataType, culture );
-      }
-      catch( Exception ex )
-      {
-        FilterParser.LastError = ex.Message;
-      }
-
-      return filterCriterion;
-    }
-
-    private static List<Token> GetTokens( string expression, Type dataType )
-    {
-      List<Token> tokens = new List<Token>();
-      FilterParser.LastError = null;
-
-      FilterParser.PrepareExpressionTokens( expression, tokens );
-      FilterParser.Tokenize( tokens, dataType, FilterParser.GetDefaultCriterionType( dataType ) );
-      FilterParser.TrimTokens( tokens );
-
-      return tokens;
-    }
-
-    private static void TrimTokens( List<Token> tokens )
-    {
-      RawToken rawToken;
-
-      for( int index = tokens.Count - 1; index >= 0; index-- )
-      {
-        rawToken = tokens[ index ] as RawToken;
-
-        if( rawToken != null )
-        {
-          rawToken.Value = rawToken.Value.Trim();
-
-          if( rawToken.Value.Length == 0 )
-            tokens.RemoveAt( index );
-        }
-      }
-    }
-
-    private static void FillPrecedenceList( List<int> precedences )
-    {
-      foreach( Type type in FilterParser.RegisteredFilterCriterionTypes )
-      {
-        CriterionDescriptorAttribute attribute = ( CriterionDescriptorAttribute )type.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), true )[ 0 ];
-
-        if( !precedences.Contains( ( int )attribute.OperatorPrecedence ) )
-          precedences.Add( ( int )attribute.OperatorPrecedence );
-      }
-
-      precedences.Sort();
-    }
-
-    private static void FillParserPriorityList( List<int> parserPriorities )
-    {
-      foreach( Type type in FilterParser.RegisteredFilterCriterionTypes )
-      {
-        CriterionDescriptorAttribute attribute = ( CriterionDescriptorAttribute )type.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), true )[ 0 ];
-
-        if( !parserPriorities.Contains( ( int )attribute.ParserPriority ) )
-        {
-          parserPriorities.Add( ( int )attribute.ParserPriority );
-        }
-      }
-
-      parserPriorities.Sort();
-    }
-
-    /// <summary>
-    /// Transforms the specified expression into one or more preliminary Tokens (RawToken
-    /// or AtomicStringToken).
-    /// </summary>
-    private static void PrepareExpressionTokens( string expression, List<Token> tokens )
-    {
-      // Start index in the expression when we exclude all added tokens so far. This
-      // value is only updated after closing an atomic string token.
-      int stringStartIndex = 0;
-      // count the number of double quotes simplified 
-      int quotesCounter = 0;
-      // Index of the first found " starting from the current position (0 for the first).
-      int quoteIndex = 0;
-      // Index of the first non " character after a found ".
-      int quotesEnd = 0;
-      // Index of the first character after the opening ".
-      int quotesStart = 0;
-      bool quoteOpened = false;
-
-      expression = expression.Trim();
-      quoteIndex = expression.IndexOf( '"' );
-
-      while( quoteIndex >= 0 )
-      {
-        quotesEnd = quoteIndex + 1;
-
-        // Find the first non " character starting from the index found.
-        while( quotesEnd < expression.Length )
-        {
-          if( expression[ quotesEnd ] != '"' )
-            break;
-
-          quotesEnd++;
-        }
-
-        if( ( ( ( quotesEnd - quoteIndex > 1 ) && ( quoteOpened ) ) ) )
-        {
-          // Transform the " couples to a single ".
-          StringBuilder temp = new StringBuilder( expression.Substring( 0, quoteIndex ) );
-
-          for( int i = 0; i < ( quotesEnd - quoteIndex ) / 2; i++ )
-          {
-            temp.Append( '"' );
-            quotesCounter++;
-          }
-          temp.Append( expression.Substring( quotesEnd ) );
-
-          // Manually add the excess " when we're handling an odd number of " (can only 
-          // happen when forming an AtomicString). The quotesCounter indicates where the
-          // last quotes have to be added (in case of (Starts/Ends)With, the quotes were misplaced).
-          if( ( quotesEnd - quoteIndex ) % 2 != 0 )
-          {
-            temp.Insert( quotesEnd - quotesCounter - 1, "\"" );
-            quotesCounter = 0;
-          }
-          expression = temp.ToString();
-
-          // Continue looking from the first character after the last " couple.
-          quoteIndex = quoteIndex + ( quotesEnd - quoteIndex ) / 2;
-        }
-
-        else
-        {
-          if( quoteOpened )
-          {
-            tokens.Add( new AtomicStringToken( expression.Substring( quotesStart, quoteIndex - quotesStart ) ) );
-            stringStartIndex = quoteIndex + 1;
-          }
-          else
-          {
-            if( quoteIndex > stringStartIndex )
-              tokens.Add( new RawToken( expression.Substring( stringStartIndex, quoteIndex - stringStartIndex ) ) );
-
-            quotesStart = quoteIndex + 1;
-          }
-
-          quoteOpened = !quoteOpened;
-          quoteIndex++;
-        }
-
-        quoteIndex = expression.IndexOf( '"', quoteIndex );
-      }
-
-      if( quoteOpened )
-        throw new DataGridException( FilterParser.MissingClosingQuotesErrorText );
-
-      if( ( stringStartIndex > 0 ) && ( stringStartIndex < expression.Length ) )
-      {
-        if( stringStartIndex < expression.Length )
-          tokens.Add( new RawToken( expression.Substring( stringStartIndex ) ) );
-      }
-
-      if( tokens.Count == 0 )
-      {
-        tokens.Add( new RawToken( expression ) );
-      }
-    }
-
-    private static void Tokenize( List<Token> tokens, Type dataType, Type defaultCriterionType )
-    {
-      if( !typeof( FilterCriterion ).IsAssignableFrom( defaultCriterionType ) )
-        throw new DataGridInternalException( "The default criterion type should be derived from the FilterCriterion class." );
-
-      List<int> parserPriorities = new List<int>();
-      FilterParser.FillParserPriorityList( parserPriorities );
-
-      FilterParser.Tokenize( parserPriorities, tokens );
-
-      if( ( tokens.Count == 1 ) && ( tokens[ 0 ] is ValueToken ) )
-      {
-        if( defaultCriterionType == typeof( ContainsFilterCriterion ) )
-        {
-          // ContainsFilterCriterion has no keyword associated; it won't be handled when 
-          // building the criterion. Initialize it with the Value already in it.
-          FilterCriterionToken containsToken = new FilterCriterionToken( ( FilterCriterion )Activator.CreateInstance( defaultCriterionType, ( ( ValueToken )tokens[ 0 ] ).Value ) );
-          tokens.Clear();
-          tokens.Add( containsToken );
-        }
-        else
-        {
-          // Insert the default token previous to the value.
-          FilterCriterionToken defaultToken = new FilterCriterionToken( ( FilterCriterion )Activator.CreateInstance( defaultCriterionType ) );
-          tokens.Insert( 0, defaultToken );
-        }
-      }
-    }
-
-    private static void Tokenize( List<int> parserPriorities, List<Token> tokens )
-    {
-      for( int index = 0; index < parserPriorities.Count; index++ )
-      {
-        int curParserPriority = parserPriorities[ index ];
-        bool tokenAdded = false;
-
-        do
-        {
-          tokenAdded = false;
-
-          for( int tokenIndex = 0; tokenIndex < tokens.Count; tokenIndex++ )
-          {
-            RawToken rawToken = tokens[ tokenIndex ] as RawToken;
-            Token precedentToken = ( tokenIndex > 0 ) ? tokens[ tokenIndex - 1 ] : null;
-            if( rawToken != null )
-            {
-              FilterCriterionToken filterToken;
-              int startIndex;
-              int length;
-
-
-              if( FilterParser.ExtractFirstCriterion( precedentToken, rawToken, curParserPriority, out filterToken, out startIndex, out length ) )
-              {
-                tokens.RemoveAt( tokenIndex );
-
-                if( startIndex > 0 )
-                {
-                  tokens.Insert( tokenIndex, new RawToken( rawToken.Value.Substring( 0, startIndex ) ) );
-                  tokenIndex++;
-                }
-
-                tokens.Insert( tokenIndex, filterToken );
-                tokenIndex++;
-
-                if( startIndex + length < rawToken.Value.Length )
-                  tokens.Insert( tokenIndex, new RawToken( rawToken.Value.Substring( startIndex + length ) ) );
-
-                tokenAdded = true;
-                break;
-              }
-            }
-          }
-        }
-        while( tokenAdded );
-      }
-    }
-
-    private static bool ExtractFirstCriterion( Token precedentToken, RawToken rawToken, int parserPriority, out FilterCriterionToken filterToken, out int startIndex, out int length )
-    {
-      //RawToken rawToken = rawTokens[ tokenIndex ] as RawToken;
-      Type foundCriterionType = null;
-      filterToken = null;
-      startIndex = int.MaxValue;
-      length = 0;
-
-      foreach( Type type in FilterParser.RegisteredFilterCriterionTypes )
-      {
-        CriterionDescriptorAttribute attribute = ( CriterionDescriptorAttribute )type.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), true )[ 0 ];
-
-        if( ( int )attribute.ParserPriority == parserPriority )
-        {
-          if( !string.IsNullOrEmpty( attribute.Pattern ) )
-          {
-            string separator = attribute.Pattern.Replace( "@", "" );
-            int foundIndex = -1;
-
-            if( attribute.Pattern.StartsWith( "@" ) )
-            {
-              // The keyword can be anywhere in the token (there can be characters 
-              // before the token).
-              foundIndex = rawToken.Value.IndexOf( separator );
-            }
-            //else if( ( rawTokens[ tokenIndex + 1 ] as AtomicStringToken ) != null )
-            //{
-
-            //}
-            else
-            {
-              // The keyword must be the first non whitespace character.
-              if( rawToken.Value.TrimStart( null ).StartsWith( separator ) )
-              {
-                foundIndex = rawToken.Value.IndexOf( separator );
-              }
-            }
-
-            if( ( foundIndex >= 0 ) &&
-                ( ( foundIndex < startIndex ) ||
-                  ( ( foundIndex == startIndex ) && ( separator.Length > length ) ) ) )
-            {
-              if( type == typeof( EndsWithFilterCriterion ) && ( precedentToken as AtomicStringToken ) != null )
-                foundCriterionType = typeof( StartsWithFilterCriterion );
-              else
-                foundCriterionType = type;
-              startIndex = foundIndex;
-              length = separator.Length;
-            }
-          }
-          else
-          {
-            if( type != typeof( ContainsFilterCriterion ) )
-              throw new DataGridInternalException( "Missing pattern in attribute: " + type.Name );
-          }
-        }
-      }
-
-      if( foundCriterionType != null )
-        filterToken = new FilterCriterionToken( ( FilterCriterion )Activator.CreateInstance( foundCriterionType ) );
-
-      return ( filterToken != null );
-    }
-
-    private static FilterCriterion BuildCriterion( List<Token> tokens, Type dataType, Type defaultCriterionType, CultureInfo culture )
-    {
-      FilterCriterion filterCriterion = null;
-      ReferenceList<FilterCriterion> initializedCriteria = new ReferenceList<FilterCriterion>();
-      List<int> precedences = new List<int>();
-      FilterParser.FillPrecedenceList( precedences );
-
-      for( int index = 0; index < precedences.Count; index++ )
-      {
-        int curOperatorPrecedence = precedences[ index ];
-
-        foreach( Type type in FilterParser.RegisteredFilterCriterionTypes )
-        {
-          CriterionDescriptorAttribute attribute = ( CriterionDescriptorAttribute )type.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), true )[ 0 ];
-
-          if( ( int )attribute.OperatorPrecedence == curOperatorPrecedence )
-          {
-            if( !string.IsNullOrEmpty( attribute.Pattern ) )
-            {
-              bool tokenConsumed;
-
-              do
-              {
-                tokenConsumed = false;
-
-                for( int i = 0; i < tokens.Count; i++ )
-                {
-                  FilterCriterionToken filterToken = tokens[ i ] as FilterCriterionToken;
-
-                  if( ( filterToken != null ) && ( filterToken.FilterCriterion.GetType() == type ) && ( !initializedCriteria.Contains( filterToken.FilterCriterion ) ) )
-                  {
-                    List<object> parameters = new List<object>();
-
-                    if( attribute.Pattern.StartsWith( "@" ) )
-                    {
-                      if( i <= 0 )
-                        throw new DataGridException( string.Format( FilterParser.MissingLeftOperandErrorText, type.Name ) );
-
-                      if( tokens[ i - 1 ] is ValueToken )
-                      {
-                        FilterParser.AddValueToParameters( parameters, ( ValueToken )tokens[ i - 1 ], dataType, culture );
-                      }
-                      else
-                      {
-                        parameters.Add( ( ( FilterCriterionToken )tokens[ i - 1 ] ).FilterCriterion );
-                      }
-
-                      tokens.RemoveAt( i - 1 );
-                      i--;
-                    }
-
-                    if( attribute.Pattern.EndsWith( "@" ) )
-                    {
-                      if( i + 1 >= tokens.Count )
-                        throw new DataGridException( string.Format( FilterParser.MissingRightOperandErrorText, type.Name ) );
-
-                      if( tokens[ i + 1 ] is ValueToken )
-                      {
-                        FilterParser.AddValueToParameters( parameters, ( ValueToken )tokens[ i + 1 ], dataType, culture );
-                      }
-                      else
-                      {
-                        parameters.Add( ( ( FilterCriterionToken )tokens[ i + 1 ] ).FilterCriterion );
-                      }
-
-                      tokens.RemoveAt( i + 1 );
-                      i--;
-                    }
-
-                    filterToken.FilterCriterion.InitializeFrom( parameters.ToArray(), defaultCriterionType );
-                    initializedCriteria.Add( filterToken.FilterCriterion );
-                    tokenConsumed = true;
-                    break;
-                  }
-                }
-              }
-              while( tokenConsumed );
-            }
-            else
-            {
-              if( type != typeof( ContainsFilterCriterion ) )
-                throw new DataGridInternalException( "Missing pattern in attribute: " + type.Name );
-            }
-          }
-        }
-      }
-
-      if( ( tokens.Count == 1 ) && ( tokens[ 0 ] is FilterCriterionToken ) )
-      {
-        filterCriterion = ( ( FilterCriterionToken )tokens[ 0 ] ).FilterCriterion;
-      }
-      else
-      {
-        throw new DataGridException( FilterParser.InvalidExpressionErrorText );
-      }
-
-      return filterCriterion;
-    }
-
-    private static void AddValueToParameters( List<object> parameters, ValueToken token, Type dataType, CultureInfo culture )
-    {
-      if( token.Value == "NULL" )
-      {
-        parameters.Add( null );
-      }
-      else if( dataType == typeof( string ) )
-      {
-        parameters.Add( token.Value );
-      }
-      else if( dataType == typeof( Guid ) )
-      {
-        System.ComponentModel.GuidConverter converter = new System.ComponentModel.GuidConverter();
-
-        parameters.Add( converter.ConvertFrom( token.Value ) );
-      }
-      else if( ( dataType == typeof( byte ) )
-            || ( dataType == typeof( short ) )
-            || ( dataType == typeof( bool ) )
-            || ( dataType == typeof( int ) )
-            || ( dataType == typeof( long ) )
-            || ( dataType == typeof( float ) )
-            || ( dataType == typeof( double ) )
-            || ( dataType == typeof( decimal ) )
-            || ( dataType == typeof( sbyte ) )
-            || ( dataType == typeof( ushort ) )
-            || ( dataType == typeof( uint ) )
-            || ( dataType == typeof( ulong ) ) )
-      {
-        try
-        {
-          parameters.Add( Convert.ChangeType( token.Value, dataType, culture ) );
-        }
-        catch( OverflowException )
-        {
-          throw new DataGridException( FilterParser.NumberOverflowErrorText );
-        }
-        catch( FormatException )
-        {
-          throw new DataGridException( FilterParser.InvalidNumberFormatErrorText );
-        }
-      }
-      else if( dataType == typeof( char ) )
-      {
-        if( token.Value.Length == 1 )
-        {
-          parameters.Add( token.Value[ 0 ] );
-        }
-        else
-        {
-          throw new DataGridException( string.Format( FilterParser.InvalidCharValueErrorText, token.Value ) );
-        }
-      }
-      else if( dataType == typeof( DateTime ) )
-      {
-        DateTime dateTime;
-
-        try
-        {
-          if( culture == null )
-          {
-            dateTime = DateTime.Parse( token.Value );
-          }
-          else
-          {
-            dateTime = DateTime.Parse( token.Value, culture );
-          }
-        }
-        catch( FormatException )
-        {
-          throw new DataGridException( string.Format( FilterParser.InvalidDateTimeValueErrorText, token.Value ) );
-        }
-
-        parameters.Add( dateTime );
-      }
-    }
-
-    private static Type GetDefaultCriterionType( Type dataType )
-    {
-      return dataType == typeof( string ) ? typeof( ContainsFilterCriterion ) : typeof( EqualToFilterCriterion );
-    }
-
-    private static CriterionTypeCollection RegisteredFilterCriterionTypes = new CriterionTypeCollection();
-    private static string LastErrorString = null;
-    internal static string MissingClosingQuotesErrorText = "Missing closing quotes.";
-    internal static string MissingRightOperandErrorText = "Missing right operand for filter {0}.";
-    internal static string MissingLeftOperandErrorText = "Missing left operand for filter {0}.";
-    internal static string InvalidExpressionErrorText = "The expression cannot be resolved. Are you missing a logical operator?";
-    internal static string InvalidCharValueErrorText = "{0} is not a valid character value.";
-    internal static string InvalidDateTimeValueErrorText = "Invalid date/time value. It is recommended to use the following format: yyyy-MM-ddTHH:mm:ss.fff.";
-    internal static string InvalidNumberFormatErrorText = "Invalid number format.";
-    internal static string InvalidEnumValueErrorText = "Invalid enum value.";
-    internal static string NumberOverflowErrorText = "Number value is out of range.";
-
-    #region CriterionTypeCollection Nested Type
-
-    private class CriterionTypeCollection : Collection<Type>
-    {
-      protected override void InsertItem( int index, Type item )
-      {
-        if( !typeof( FilterCriterion ).IsAssignableFrom( item ) )
-          throw new ArgumentException( "Must be derived from FilterCriterion.", "item" );
-
-        if( item.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), false ).Length == 0 )
-          throw new ArgumentException( "Must have the CriterionDescriptor attribute.", "item" );
-
-        base.InsertItem( index, item );
-      }
-
-      protected override void SetItem( int index, Type item )
-      {
-        if( !typeof( FilterCriterion ).IsAssignableFrom( item ) )
-          throw new ArgumentException( "Must be derived from FilterCriterion.", "item" );
-
-        if( item.GetCustomAttributes( typeof( CriterionDescriptorAttribute ), false ).Length == 0 )
-          throw new ArgumentException( "Must have the CriterionDescriptor attribute.", "item" );
-
-        base.SetItem( index, item );
-      }
-    }
-
-    #endregion CriterionTypeCollection Nested Type
-
-    #region Token Nested Type
-
-    private abstract class Token
-    {
-    }
-
-    #endregion
-
-    #region ValueToken Nested Type
-
-    private abstract class ValueToken : Token
-    {
-      public ValueToken()
-      {
-      }
-
-      public ValueToken( string value )
-      {
-        this.Value = value;
-      }
-
-      public string Value
-      {
-        get;
-        set;
-      }
-    }
-
-    #endregion
-
-    #region RawToken Nested Type
-
-    /// <summary>
-    /// A token containing still unprocessed complete or partial expression or an actual
-    /// value that is not between "".
-    /// </summary>
-    private class RawToken : ValueToken
-    {
-      public RawToken()
-      {
-      }
-
-      public RawToken( string value )
-        : base( value )
-      {
-      }
-    }
-
-    #endregion
-
-    #region AtomicStringToken
-
-    /// <summary>
-    /// A token containing a value that will not be processed by the parser because it
-    /// was between "".
-    /// </summary>
-    private class AtomicStringToken : ValueToken
-    {
-      public AtomicStringToken()
-      {
-      }
-
-      public AtomicStringToken( string value )
-        : base( value )
-      {
-      }
-    }
-
-    #endregion
-
-    #region FilterCriterionToken Nested Type
-
-    private class FilterCriterionToken : Token
-    {
-      public FilterCriterionToken()
-      {
-      }
-
-      public FilterCriterionToken( FilterCriterion filterCriterion )
-      {
-        this.FilterCriterion = filterCriterion;
-      }
-
-      public FilterCriterion FilterCriterion
-      {
-        get;
-        set;
-      }
-    }
-
-    #endregion
-
-    #region ReferenceList Nested Type
-
-    // This list will prevent the same object of being added twice.
-    // To compare objects (in IndexOf, Add, Remove and Contains), it will use the ReferenceEquals() method.
-    // Naturally, this class won't behave properly with ValueType because of boxing.
-    private class ReferenceList<T> : ICollection<T>
-    {
-      public int IndexOf( T item )
-      {
-        int foundIndex = -1;
-
-        for( int i = 0; i < m_internalList.Count; i++ )
-        {
-          if( object.ReferenceEquals( item, m_internalList[ i ] ) )
-          {
-            foundIndex = i;
-            break;
-          }
-        }
-
-        return foundIndex;
-      }
-
-      #region ICollection<T> Members
-
-      public void Add( T item )
-      {
-        if( this.Contains( item ) )
-          throw new InvalidOperationException( "An attempt was made to add an item that is already contained in the list." );
-
-        m_internalList.Add( item );
-      }
-
-      public void Clear()
-      {
-        m_internalList.Clear();
-      }
-
-      public bool Contains( T item )
-      {
-        return ( this.IndexOf( item ) > -1 );
-      }
-
-      public void CopyTo( T[] array, int arrayIndex )
-      {
-        m_internalList.CopyTo( array, arrayIndex );
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_internalList.Count;
-        }
-      }
-
-      public bool IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      public bool Remove( T item )
-      {
-        int index = this.IndexOf( item );
-
-        if( index > -1 )
-        {
-          m_internalList.RemoveAt( index );
-        }
-
-        return ( index > -1 );
-      }
-
-      #endregion
-
-      #region IEnumerable<T> Members
-
-      public IEnumerator<T> GetEnumerator()
-      {
-        return m_internalList.GetEnumerator();
-      }
-
-      #endregion
-
-      #region IEnumerable Members
-
-      System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-      {
-        return m_internalList.GetEnumerator();
-      }
-
-      #endregion
-
-      private List<T> m_internalList = new List<T>();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs
deleted file mode 100644
index e4116f0e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#if DEBUG
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Windows;
-using System.Windows.Markup;
-using System.Windows.Controls;
-using System.Xml;
-
-using Xceed.Wpf.DataGrid.FilterCriteria;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class FilterParserTestWindow : Window
-  {
-    public FilterParserTestWindow()
-    {
-      string mainGridXaml =
-@"<Grid xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
-        xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-        xmlns:s=""clr-namespace:System;assembly=mscorlib""
-        Margin=""5"">
-    <Grid.Resources>
-      <Style TargetType=""Button"">
-        <Setter Property=""MinWidth"" Value=""100"" />
-      </Style>
-    </Grid.Resources>
-
-    <Grid.RowDefinitions>
-      <RowDefinition Height=""Auto"" />
-      <RowDefinition Height=""Auto"" />
-      <RowDefinition Height=""*"" />
-      <RowDefinition Height=""3*"" />
-      <RowDefinition Height=""Auto"" />
-    </Grid.RowDefinitions>
-
-    <TextBlock MaxWidth=""400""
-               HorizontalAlignment=""Left""
-               TextWrapping=""Wrap""
-               Margin=""0,0,0,5""
-               Grid.Row=""0"">
-Here, you can test various expression that will be parsed. 
-The result of the parsing will be shown in the second TextBox.
-Don't forget to check the Output Window for errors that could have occured during the
-automated tests. Untested expressions by the automated tests should be added when found.
-    </TextBlock>
-
-    <StackPanel Margin=""0,5,0,0""
-                Orientation=""Horizontal""
-                Grid.Row=""1"">
-      <TextBlock Text=""Data type: ""
-                 VerticalAlignment=""Center"" />
-
-      <ComboBox x:Name=""dataTypeComboBox""
-                Width=""150""
-                SelectedValuePath=""Content""
-                SelectedIndex=""0"">
-        <ListBoxItem Content=""{x:Type s:String}""/>
-        <ListBoxItem Content=""{x:Type s:Char}""/>
-        <ListBoxItem Content=""{x:Type s:DateTime}""/>
-        <ListBoxItem Content=""{x:Type s:Byte}""/>
-        <ListBoxItem Content=""{x:Type s:Boolean}""/>
-        <ListBoxItem Content=""{x:Type s:Int16}""/>
-        <ListBoxItem Content=""{x:Type s:Int32}""/>
-        <ListBoxItem Content=""{x:Type s:Int64}""/>
-        <ListBoxItem Content=""{x:Type s:Single}""/>
-        <ListBoxItem Content=""{x:Type s:Double}""/>
-        <ListBoxItem Content=""{x:Type s:Decimal}""/>
-        <ListBoxItem Content=""{x:Type s:SByte}""/>
-        <ListBoxItem Content=""{x:Type s:UInt16}""/>
-        <ListBoxItem Content=""{x:Type s:UInt32}""/>
-        <ListBoxItem Content=""{x:Type s:UInt64}""/>
-      </ComboBox>
-
-      <TextBlock Text=""Culture (blank for current): ""
-                 Margin=""10,0,0,0""
-                 VerticalAlignment=""Center"" />
-
-      <ComboBox x:Name=""cultureComboBox""
-                IsEditable=""True""
-                Width=""100"">
-        <s:String>Invariant</s:String>
-        <s:String>fr-FR</s:String>
-        <s:String>en-US</s:String>
-      </ComboBox>
-    </StackPanel>
-
-    <TextBox x:Name=""expressionTextBox""
-             TextWrapping=""Wrap""
-             Grid.Row=""2"" />
-
-    <TextBox x:Name=""resultTextBox""
-             TextWrapping=""Wrap""
-             IsReadOnly=""True""
-             Foreground=""Gray""
-             VerticalScrollBarVisibility=""Visible""
-             Grid.Row=""3"" />
-
-    <Grid Margin=""0,5,0,0""
-          Grid.Row=""4"">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width=""Auto"" />
-        <ColumnDefinition Width=""Auto"" />
-        <ColumnDefinition />
-        <ColumnDefinition Width=""Auto"" />
-      </Grid.ColumnDefinitions>
-
-      <Button x:Name=""parseButton""
-              Content=""Parse""
-              IsDefault=""True""
-              Grid.Column=""0"" />
-
-      <Button x:Name=""runUnitTestsButton""
-              Content=""Run Unit Tests""
-              Margin=""5,0,0,0""
-              Grid.Column=""1"" />
-
-      <Button x:Name=""closeButton""
-              Content=""Close""
-              IsCancel=""True""
-              Margin=""0,0,10,0""
-              Grid.Column=""3"" />
-    </Grid>
-  </Grid>";
-
-      this.Title = "Expression Parser Test Window";
-      this.Width = 600;
-      this.Height = 400;
-      this.MinHeight = 224;
-      this.MinWidth = 467;
-      this.ResizeMode = ResizeMode.CanResizeWithGrip;
-
-      StringReader strReader = new StringReader( mainGridXaml );
-      XmlTextReader xmlReader = new XmlTextReader( strReader );
-      this.Content = XamlReader.Load( xmlReader ) as UIElement;
-
-      Button button = ( ( Grid )this.Content ).FindName( "closeButton" ) as Button;
-
-      if( button != null )
-        button.Click += new RoutedEventHandler( this.closeButton_Click );
-
-      m_parseButton = ( ( Grid )this.Content ).FindName( "parseButton" ) as Button;
-      m_parseButton.Click += new RoutedEventHandler( this.parseButton_Click );
-
-      m_runUnitTestsButton = ( ( Grid )this.Content ).FindName( "runUnitTestsButton" ) as Button;
-      m_runUnitTestsButton.Click += new RoutedEventHandler( this.runUnitTestsButton_Click );
-
-      m_dataTypeComboBox = ( ( Grid )this.Content ).FindName( "dataTypeComboBox" ) as ComboBox;
-      m_cultureComboBox = ( ( Grid )this.Content ).FindName( "cultureComboBox" ) as ComboBox;
-      m_expressionTextBox = ( ( Grid )this.Content ).FindName( "expressionTextBox" ) as TextBox;
-      m_resultTextBox = ( ( Grid )this.Content ).FindName( "resultTextBox" ) as TextBox;
-    }
-
-    private void parseButton_Click( object sender, RoutedEventArgs e )
-    {
-      CultureInfo culture = null;
-      string invalidCultureErrorText = null;
-      string cultureName = m_cultureComboBox.Text;
-
-      if( !string.IsNullOrEmpty( cultureName ) )
-      {
-        try
-        {
-          if( cultureName.ToLower() == "invariant" )
-          {
-            culture = CultureInfo.InvariantCulture;
-          }
-          else
-          {
-            culture = CultureInfo.GetCultureInfo( cultureName );
-          }
-        }
-        catch( Exception ex )
-        {
-          invalidCultureErrorText = cultureName + " is an invalid culture : " + ex.Message;
-        }
-      }
-
-      FilterCriterion criterion = FilterParser.TryParse( m_expressionTextBox.Text, m_dataTypeComboBox.SelectedValue as Type, culture );
-
-      if( criterion == null )
-      {
-        m_resultTextBox.Text = "Error while parsing" + Environment.NewLine + 
-          FilterParser.LastError;
-      }
-      else
-      {
-        m_resultTextBox.Text = criterion.ToString() + Environment.NewLine + 
-          Environment.NewLine + 
-          "Normalized expression:" + Environment.NewLine +
-          criterion.ToExpression( culture );
-      }
-
-      if( !string.IsNullOrEmpty( invalidCultureErrorText ) )
-      {
-        m_resultTextBox.Text += Environment.NewLine + Environment.NewLine + invalidCultureErrorText;
-      }
-    }
-
-    private void runUnitTestsButton_Click( object sender, RoutedEventArgs e )
-    {
-      m_runUnitTestsButton.IsEnabled = false;
-      m_parseButton.IsEnabled = false;
-      m_resultTextBox.Text = "";
-
-      ThreadedUnitTester unitTester = new ThreadedUnitTester( new Action( this.UnitTestsCompletedCallback ), new Action<string>( this.LogMessageCallback ) );
-      Thread unitTestThread = new Thread( new ThreadStart( unitTester.RunTests ) );
-
-      unitTestThread.Start();
-    }
-
-    private void UnitTestsCompletedCallback()
-    {
-      this.LogMessageCallback( "Unit tests completed." );
-
-      this.Dispatcher.BeginInvoke( new Action( delegate
-      {
-        m_runUnitTestsButton.IsEnabled = true;
-        m_parseButton.IsEnabled = true;
-      } ) );
-    }
-
-    private void LogMessageCallback( string message )
-    {
-      this.Dispatcher.BeginInvoke( new Action( delegate
-      {
-        m_resultTextBox.Text += message + Environment.NewLine;
-        m_resultTextBox.ScrollToEnd();
-      } ) );
-    }
-
-    private void closeButton_Click( object sender, RoutedEventArgs e )
-    {
-      this.Close();
-    }
-
-    private TextBox m_expressionTextBox;
-    private TextBox m_resultTextBox;
-    private ComboBox m_dataTypeComboBox;
-    private ComboBox m_cultureComboBox;
-    private Button m_parseButton;
-    private Button m_runUnitTestsButton;
-
-    #region ThreadedUnitTester Nested Type
-
-    private class ThreadedUnitTester
-    {
-      public ThreadedUnitTester( Action testCompletedCallback, Action<string> logMessageCallback )
-      {
-        if( testCompletedCallback == null )
-          throw new ArgumentNullException( "testCompletedCallback" );
-
-        if( logMessageCallback == null )
-          throw new ArgumentNullException( "logMessageCallback" );
-
-        m_testCompletedCallback = testCompletedCallback;
-        m_logMessageCallback = logMessageCallback;
-      }
-
-      public void RunTests()
-      {
-        if( FilterParser.LogMessageCallback != null )
-          throw new InvalidOperationException( "Unit tests already running." );
-
-        try
-        {
-          FilterParser.LogMessageCallback = m_logMessageCallback;
-          FilterParser.TestQuoteParser();
-          FilterParser.TestCriterionBuilder();
-
-          if( m_testCompletedCallback != null )
-            m_testCompletedCallback();
-        }
-        finally
-        {
-          FilterParser.LogMessageCallback = null;
-        }
-      }
-
-      private Action m_testCompletedCallback = null;
-      private Action<string> m_logMessageCallback = null;
-    }
-
-    #endregion ThreadedUnitTester Nested Type
-  }
-}
-
-#endif
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs
deleted file mode 100644
index 9baf9635..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs
+++ /dev/null
@@ -1,1462 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#if DEBUG
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-
-using Xceed.Wpf.DataGrid.FilterCriteria;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static partial class FilterParser
-  {
-    internal static Action<string> LogMessageCallback
-    {
-      get
-      {
-        return s_logMessageCallback;
-      }
-
-      set
-      {
-        if( ( ( value == null ) && ( s_logMessageCallback != null ) ) ||
-            ( ( value != null ) && ( s_logMessageCallback == null ) ) )
-        {
-          s_logMessageCallback = value;
-        }
-        else
-        {
-          throw new InvalidOperationException( "Unit test already running." );
-        }
-      }
-    }
-
-    internal static void TestQuoteParser()
-    {
-      FilterParser.LogMessageCallback( "Testing quote parser..." );
-
-      FilterParser.CheckQuoteParserResult( "", new RawToken( "" ) );
-      FilterParser.CheckQuoteParserResult( "test", new RawToken( "test" ) );
-      FilterParser.CheckQuoteParserResult( "test test", new RawToken( "test test" ) );
-      FilterParser.CheckQuoteParserResult( "\"test\"", new AtomicStringToken( "test" ) );
-      FilterParser.CheckQuoteParserResult( "L'idéal du calme \"est dans\" un \"chat assis\"",
-        new RawToken( "L'idéal du calme " ),
-        new AtomicStringToken( "est dans" ),
-        new RawToken( " un " ),
-        new AtomicStringToken( "chat assis" ) );
-
-
-      FilterParser.CheckQuoteParserResult( "\"\"\"L'idéal du calme est dans un chat assis\"\"\"",
-        new AtomicStringToken( "\"L'idéal du calme est dans un chat assis\"" ) );
-
-
-      FilterParser.CheckQuoteParserResult( "L'idéal du calme \"est dans\" un \"\"\"chat assis\"",
-        new RawToken( "L'idéal du calme " ),
-        new AtomicStringToken( "est dans" ),
-        new RawToken( " un " ),
-        new AtomicStringToken( "\"chat assis" ) );
-
-      FilterParser.CheckQuoteParserResult( "L'idéal du calme \"est dans\" un \"\"\"chat assis\"\"\"",
-        new RawToken( "L'idéal du calme " ),
-        new AtomicStringToken( "est dans" ),
-        new RawToken( " un " ),
-        new AtomicStringToken( "\"chat assis\"" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"", new AtomicStringToken( "" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"\"\"\"\"", new AtomicStringToken( "\"\"" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"\"\"\"\"\"\"", new AtomicStringToken( "\"\"\"" ) );
-      FilterParser.CheckQuoteParserResult( "\" \"\"\"\" \"", new AtomicStringToken( " \"\" " ) );
-      FilterParser.CheckQuoteParserResult( "\"\"\"", FilterParser.MissingClosingQuotesErrorText );
-      FilterParser.CheckQuoteParserResult( "\"\"L'idéal du calme est dans un chat assis\"\"", new AtomicStringToken( "" ),
-      new RawToken( "L'idéal du calme est dans un chat assis" ), new AtomicStringToken( "" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"L'idéal du calme est dans un chat assis", new AtomicStringToken( "" ),
-        new RawToken( "L'idéal du calme est dans un chat assis" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"\"L'idéal du calme est dans un chat assis\"", new AtomicStringToken( "\"L'idéal du calme est dans un chat assis" ) );
-      FilterParser.CheckQuoteParserResult( "\"\"\"\"L'idéal du calme est dans un chat assis\"", FilterParser.MissingClosingQuotesErrorText );
-
-    }
-
-    internal static void TestCriterionBuilder()
-    {
-      FilterParser.TestCriterionBuilderString();
-      FilterParser.TestCriterionBuilderChar();
-      FilterParser.TestCriterionBuilderDateTime();
-      FilterParser.TestCriterionBuilderNumber();
-    }
-
-    private static void TestCriterionBuilderString()
-    {
-      Type type = typeof( string );
-      FilterParser.LogMessageCallback( "Testing string filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        new ContainsFilterCriterion( "" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=\"\"", type, null,
-        new EqualToFilterCriterion( "" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*\"\"", type, null, new EndsWithFilterCriterion( "" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"\"*", type, null, new StartsWithFilterCriterion( "" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*\"Test\"", type, null, new EndsWithFilterCriterion( "Test" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "Test", type, null,
-        new ContainsFilterCriterion( "Test" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "Not Test", type, null,
-        new ContainsFilterCriterion( "Not Test" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT", type, null,
-        new ContainsFilterCriterion( "NOT" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT ", type, null,
-        new ContainsFilterCriterion( "NOT" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "AND ", type, null,
-        new ContainsFilterCriterion( "AND" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "   AND    ", type, null,
-        new ContainsFilterCriterion( "AND" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "OR OR OR OR", type, null,
-        new OrFilterCriterion(
-          new ContainsFilterCriterion( "OR" ),
-          new ContainsFilterCriterion( "OR OR" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT OR NOT", type, null,
-        new OrFilterCriterion(
-          new ContainsFilterCriterion( "NOT" ),
-          new ContainsFilterCriterion( "NOT" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT Test", type, null,
-        new NotFilterCriterion( new ContainsFilterCriterion( "Test" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<10 OR >50", type, null,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( "10" ),
-          new GreaterThanFilterCriterion( "50" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=fou AND <gra", type, null,
-        new AndFilterCriterion(
-          new GreaterThanOrEqualToFilterCriterion( "fou" ),
-          new LessThanFilterCriterion( "gra" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT =10", type, null,
-        new NotFilterCriterion(
-          new EqualToFilterCriterion( "10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "AND AND >10 ", type, null,
-        new AndFilterCriterion(
-          new ContainsFilterCriterion( "AND" ),
-          new GreaterThanFilterCriterion( "10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "OR AND 10 ", type, null,
-        new AndFilterCriterion(
-          new ContainsFilterCriterion( "OR" ),
-          new ContainsFilterCriterion( "10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "AND OR =10 ", type, null,
-        new OrFilterCriterion(
-          new ContainsFilterCriterion( "AND" ),
-          new EqualToFilterCriterion( "10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"=10 AND 10 OR 10\"", type, null,
-        new ContainsFilterCriterion( "=10 AND 10 OR 10" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=\"10 AND 10 OR 10\"", type, null,
-        new EqualToFilterCriterion( "10 AND 10 OR 10" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=10   AND   \"10 OR 10\"", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( "10" ),
-          new ContainsFilterCriterion( "10 OR 10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*\"Test\" AND \"\"\"Test2\"*", type, null, new AndFilterCriterion( new EndsWithFilterCriterion( "Test" ), new StartsWithFilterCriterion( "\"Test2" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*\"Test\" AND \"Test\"\"2\"\"\"*", type, null, new AndFilterCriterion( new EndsWithFilterCriterion( "Test" ), new StartsWithFilterCriterion( "Test\"2\"" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*Test AND \"Test\"\"2\"\"\"*", type, null, new AndFilterCriterion( new EndsWithFilterCriterion( "Test" ), new StartsWithFilterCriterion( "Test\"2\"" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*\" Test\" AND \"Test\"\"2\"\"\"*", type, null, new AndFilterCriterion( new EndsWithFilterCriterion( " Test" ), new StartsWithFilterCriterion( "Test\"2\"" ) ) );
-      FilterParser.CheckCriterionBuilderResult( "=10 AND \"10   OR 10\"", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( "10" ),
-          new ContainsFilterCriterion( "10   OR 10" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new ContainsFilterCriterion( "NULL" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new ContainsFilterCriterion( "NULL" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=Null", type, null,
-        new EqualToFilterCriterion( "Null" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"=10 AND <5 OR NOT >2\"", type, null,
-        new ContainsFilterCriterion( "=10 AND <5 OR NOT >2" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=NULL OR =5", type, null, 
-        new OrFilterCriterion( 
-          new EqualToFilterCriterion( null ), 
-          new EqualToFilterCriterion( "5" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "  =10   AND   >5  OR 15  ", type, null,
-        new OrFilterCriterion(
-          new AndFilterCriterion(
-            new EqualToFilterCriterion( "10" ),
-            new GreaterThanFilterCriterion( "5" ) ),
-          new ContainsFilterCriterion( "15" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=NOT 10", type, null,
-        new EqualToFilterCriterion( "NOT 10" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "10 =20", type, null,
-        new ContainsFilterCriterion( "10 =20" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<ab >cd", type, null,
-        new LessThanFilterCriterion( "ab >cd" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "= chat", type, null,
-        new EqualToFilterCriterion( "chat" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "= chat   OR =chien  ", type, null,
-        new OrFilterCriterion(
-          new EqualToFilterCriterion( "chat" ),
-          new EqualToFilterCriterion( "chien" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=chat  chien   OR =lion", type, null,
-        new OrFilterCriterion(
-          new EqualToFilterCriterion( "chat  chien" ),
-          new EqualToFilterCriterion( "lion" ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "=chat =chien", type, null,
-        new EqualToFilterCriterion( "chat =chien" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "*chien", type, null, new EndsWithFilterCriterion( "chien" ) );
-      FilterParser.CheckCriterionBuilderResult( "*chien OR chat*", type, null, new OrFilterCriterion( new EndsWithFilterCriterion( "chien" ), new StartsWithFilterCriterion( "chat" ) ) );
-      FilterParser.CheckCriterionBuilderResult( "*\"chien\" OR \"chat\"*", type, null, new OrFilterCriterion( new EndsWithFilterCriterion( "chien" ), new StartsWithFilterCriterion( "chat" ) ) );
-      FilterParser.CheckCriterionBuilderResult( "\"*chien\" OR \"chat\"*", type, null, new OrFilterCriterion( new ContainsFilterCriterion( "*chien" ), new StartsWithFilterCriterion( "chat" ) ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "=10   \"AND 10 OR 10\"", type, null,
-        FilterParser.InvalidExpressionErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Johann  \"Sebastian Bach\"", type, null,
-        FilterParser.InvalidExpressionErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "  \"Johann Sebastian\"    Bach  ", type, null,
-        FilterParser.InvalidExpressionErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "\"University Southern\" \"North Dakota\"", type, null,
-        FilterParser.InvalidExpressionErrorText );
-
-
-    }
-
-    private static void TestCriterionBuilderChar()
-    {
-      Type type = typeof( char );
-      FilterParser.LogMessageCallback( "Testing char filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "a", type, null,
-        new EqualToFilterCriterion( 'a' ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\" \"", type, null,
-        new EqualToFilterCriterion( ' ' ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\u03a0", type, null,
-        new EqualToFilterCriterion( '\u03a0' ) ); // Pi
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( " ", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "abc", type, null,
-        string.Format( FilterParser.InvalidCharValueErrorText, "abc" ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\u03a0\u03a0", type, null,
-        string.Format( FilterParser.InvalidCharValueErrorText, "\u03a0\u03a0" ) );// PiPi
-
-      FilterParser.CheckCriterionBuilderResult( "=Null", type, null,
-        string.Format( FilterParser.InvalidCharValueErrorText, "Null" ) );
-    }
-
-    private static void TestCriterionBuilderDateTime()
-    {
-      Type type = typeof( DateTime );
-      FilterParser.LogMessageCallback( "Testing DateTime filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0001-01-01", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( DateTime.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0104-02-29", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 104, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0204-02-29", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 204, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "02-29-0304", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 304, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "2.29.0400", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 400, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0504-02-29T00:00", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 504, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0604-02-29T00:00:00", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 604, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0704-02-29T00:00:00.000", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 704, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0800-02-29T23:59:59.999", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 800, 2, 29, 23, 59, 59, 999 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"02-29-904 23:59:59.999\"", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 904, 2, 29, 23, 59, 59, 999 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"29.2.1004 23:59:59.999\"", type, IsIsCulture,
-        new EqualToFilterCriterion( new DateTime( 1004, 2, 29, 23, 59, 59, 999 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29-Feb-1104", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 1104, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "February/29/1200", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 1200, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29-février-1304", type, FrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1304, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29.Ebrel.1404", type, BrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1404, 4, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29-02-1504", type, FrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1504, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "février-29-1600", type, FrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1600, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29-february-1704", type, FrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1704, 2, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "29.april.1804", type, BrFrCulture,
-        new EqualToFilterCriterion( new DateTime( 1804, 4, 29 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "02-29-1904 23:59:59.999", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( new DateTime( 1904, 2, 29, 23, 59, 59, 999 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "02-29-1904 23:59:59.999 OR 02-29-1908 23:59:59.999", type, CultureInfo.InvariantCulture,
-        new OrFilterCriterion(
-          new EqualToFilterCriterion( new DateTime( 1904, 2, 29, 23, 59, 59, 999 ) ),
-          new EqualToFilterCriterion( new DateTime( 1908, 2, 29, 23, 59, 59, 999 ) ) ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "`0100-02-29", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0200-01-29T10", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0300-01-29T24:00", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0400-01-29T23:60", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0500-01-29T23:59:60", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "01-avril-0600", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "01/avril/0700", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "01.avril.0904", type, BrFrCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "01-15-1004", type, FrFrCulture,
-        FilterParser.InvalidDateTimeValueErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "=Null", type, null,
-        FilterParser.InvalidDateTimeValueErrorText );
-    }
-
-    private static void TestCriterionBuilderNumber()
-    {
-      FilterParser.TestCriterionBuilderByte();
-      FilterParser.TestCriterionBuilderInt16();
-      FilterParser.TestCriterionBuilderInt32();
-      FilterParser.TestCriterionBuilderInt64();
-      FilterParser.TestCriterionBuilderSingle();
-      FilterParser.TestCriterionBuilderDouble();
-      FilterParser.TestCriterionBuilderDecimal();
-      FilterParser.TestCriterionBuilderSByte();
-      FilterParser.TestCriterionBuilderUInt16();
-      FilterParser.TestCriterionBuilderUInt32();
-      FilterParser.TestCriterionBuilderUInt64();
-    }
-
-    #region Number test methods
-
-    private static void TestCriterionBuilderByte()
-    {
-      Type type = typeof( byte );
-      FilterParser.LogMessageCallback( "Testing byte filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( byte.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "255", type, null,
-        new EqualToFilterCriterion( byte.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=0", type, null,
-        new GreaterThanOrEqualToFilterCriterion( byte.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<255", type, null,
-        new LessThanFilterCriterion( byte.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "  0   OR  255  ", type, null,
-        new OrFilterCriterion(
-          new EqualToFilterCriterion( ( byte )0 ),
-          new EqualToFilterCriterion( byte.MaxValue ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "256", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<=256", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 3", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 AND 300", type, null,
-        FilterParser.NumberOverflowErrorText );
-    }
-
-    private static void TestCriterionBuilderInt16()
-    {
-      Type type = typeof( short );
-      FilterParser.LogMessageCallback( "Testing Int16 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( ( short )0 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-32768", type, null,
-        new EqualToFilterCriterion( short.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "32767", type, null,
-        new EqualToFilterCriterion( short.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-32768", type, null,
-        new GreaterThanOrEqualToFilterCriterion( short.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>32767", type, null,
-        new DifferentThanFilterCriterion( short.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-309 AND 4555", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( ( short )-309 ),
-          new EqualToFilterCriterion( ( short )4555 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 AND >000", type, null,
-        new AndFilterCriterion(
-          new LessThanFilterCriterion( ( short )0 ),
-          new GreaterThanFilterCriterion( ( short )0 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-32769", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "32768", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<>-32769", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<=32768", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10,000", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 000", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "139 AND 40000", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderInt32()
-    {
-      Type type = typeof( int );
-      FilterParser.LogMessageCallback( "Testing Int32 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( 0 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-2147483648", type, null,
-        new EqualToFilterCriterion( int.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "2147483647", type, null,
-        new EqualToFilterCriterion( int.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-2147483648", type, null,
-        new GreaterThanOrEqualToFilterCriterion( int.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<2147483647", type, null,
-        new LessThanFilterCriterion( int.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-564654 AND 71207", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( -564654 ),
-          new EqualToFilterCriterion( 71207 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >00000000000000000", type, null,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( 0 ),
-          new GreaterThanFilterCriterion( 0 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-2147483649", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "2147483648", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-2147483649", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<2147483648", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "483 648 457", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "483,648,457", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "30 AND 21474836480", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderInt64()
-    {
-      Type type = typeof( long );
-      FilterParser.LogMessageCallback( "Testing Int64 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( 0L ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-9223372036854775808", type, null,
-        new EqualToFilterCriterion( long.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "9223372036854775807", type, null,
-        new EqualToFilterCriterion( long.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-9223372036854775808", type, null,
-        new GreaterThanOrEqualToFilterCriterion( long.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<9223372036854775807", type, null,
-        new LessThanFilterCriterion( long.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-4199873364 AND 127915466", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( -4199873364L ),
-          new EqualToFilterCriterion( 127915466L ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >00000000000000000", type, null,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( 0L ),
-          new GreaterThanFilterCriterion( 0L ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-9223372036854775809", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "9223372036854775808", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-9223372036854775809", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<9223372036854775808", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "223 372 036 854 775 807", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "223,372,036,854,775,807", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 AND 92233720368547758080", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderSingle()
-    {
-      Type type = typeof( float );
-      FilterParser.LogMessageCallback( "Testing Single filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( 0F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1E-45", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 1E-45F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-1E-45", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( -1E-45F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "3E38 ", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 3E38F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-3E38 ", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( -3E38F ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-3829.5000", type, CultureInfo.InvariantCulture,
-        new GreaterThanOrEqualToFilterCriterion( -3829.5F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11,687.145", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( 11687.145F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<1687,145", type, FrFrCulture,
-        new LessThanFilterCriterion( 1687.145F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>\"11 687,145\"", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687,145", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<92   233,75", type, FrFrCulture,
-        new LessThanFilterCriterion( 92233.75F ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">11 687,145 AND < 12 384,55", type, FrFrCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145F ),
-          new LessThanFilterCriterion( 12384.55F ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 AND 3.10", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( 0F ),
-          new EqualToFilterCriterion( 3.1F ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( " >  11,687.145  AND <  12,384.55", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145F ),
-          new LessThanFilterCriterion( 12384.55F ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >000000,00000000000", type, FrFrCulture,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( 0F ),
-          new GreaterThanFilterCriterion( 0F ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">-Infini", type, FrFrCulture,
-        new GreaterThanFilterCriterion( float.NegativeInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>-Infinity", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( float.NegativeInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<+Infini", type, FrFrCulture,
-        new LessThanFilterCriterion( float.PositiveInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT =Infinity", type, CultureInfo.InvariantCulture,
-        new NotFilterCriterion(
-          new EqualToFilterCriterion( float.PositiveInfinity ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"Non Numérique\"", type, FrFrCulture,
-        new EqualToFilterCriterion( float.NaN ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>NaN", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( float.NaN ) );
-
-      // Seems like a bug in the framework number parser. Everything too small will 
-      // convert to 0. There doesn't seem to be a limit in the smallness.
-      FilterParser.CheckCriterionBuilderResult( "-1E-46", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 0F ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<92 233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 5989 92,233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 3.10", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "14.545,1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-\"92 233,72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<\"92 233.72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "4E38", type, CultureInfo.InvariantCulture,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderDouble()
-    {
-      Type type = typeof( double );
-      FilterParser.LogMessageCallback( "Testing Double filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( 0D ) );
-
-      FilterParser.CheckCriterionBuilderResult( "5E-324", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 5E-324 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-5E-324", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( -5E-324 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1E308 ", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 1E308 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-1E308 ", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( -1E308 ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-3829.5000", type, CultureInfo.InvariantCulture,
-        new GreaterThanOrEqualToFilterCriterion( -3829.5 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11,687.145", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( 11687.145 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<1687,145", type, FrFrCulture,
-        new LessThanFilterCriterion( 1687.145 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>\"11 687,145\"", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687,145", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.0 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<92   233,75", type, FrFrCulture,
-        new LessThanFilterCriterion( 92233.75 ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">11 687,145 AND < 12 384,55", type, FrFrCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145 ),
-          new LessThanFilterCriterion( 12384.55 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 AND 3.10", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( 0D ),
-          new EqualToFilterCriterion( 3.1 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( " >  11,687.145  AND <  12,384.55", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145 ),
-          new LessThanFilterCriterion( 12384.55 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >000000,00000000000", type, FrFrCulture,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( 0D ),
-          new GreaterThanFilterCriterion( 0D ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">-Infini", type, FrFrCulture,
-        new GreaterThanFilterCriterion( double.NegativeInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>-Infinity", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( double.NegativeInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<+Infini", type, FrFrCulture,
-        new LessThanFilterCriterion( double.PositiveInfinity ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NOT =Infinity", type, CultureInfo.InvariantCulture,
-        new NotFilterCriterion(
-          new EqualToFilterCriterion( double.PositiveInfinity ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"Non Numérique\"", type, FrFrCulture,
-        new EqualToFilterCriterion( double.NaN ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>NaN", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( double.NaN ) );
-
-      // Seems like a bug in the framework number parser. Everything too small will 
-      // convert to 0. There doesn't seem to be a limit in the smallness.
-      FilterParser.CheckCriterionBuilderResult( "2E-325", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( 0D ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<\"92 233.72\"", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<92 233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 5989 92,233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 3.10", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "14.545,1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-\"92 233,72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<\"92 233.72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "2E308", type, CultureInfo.InvariantCulture,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderDecimal()
-    {
-      Type type = typeof( decimal );
-      FilterParser.LogMessageCallback( "Testing Decimal filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( 0M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-79228162514264337593543950335", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( decimal.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "79228162514264337593543950335 ", type, CultureInfo.InvariantCulture,
-        new EqualToFilterCriterion( decimal.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-3829.5000", type, CultureInfo.InvariantCulture,
-        new GreaterThanOrEqualToFilterCriterion( -3829.5M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11,687.145", type, CultureInfo.InvariantCulture,
-        new DifferentThanFilterCriterion( 11687.145M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<1687,145", type, FrFrCulture,
-        new LessThanFilterCriterion( 1687.145M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>\"11 687,145\"", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687,145", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687.145M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>11 687", type, FrFrCulture,
-        new DifferentThanFilterCriterion( 11687M ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<92   233,75", type, FrFrCulture,
-        new LessThanFilterCriterion( 92233.75M ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">11 687,145 AND < 12 384,55", type, FrFrCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145M ),
-          new LessThanFilterCriterion( 12384.55M ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 AND 3.10", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( 0M ),
-          new EqualToFilterCriterion( 3.1M ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( " >  11,687.145  AND <  12,384.55", type, CultureInfo.InvariantCulture,
-        new AndFilterCriterion(
-          new GreaterThanFilterCriterion( 11687.145M ),
-          new LessThanFilterCriterion( 12384.55M ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >000000,00000000000", type, FrFrCulture,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( 0M ),
-          new GreaterThanFilterCriterion( 0M ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<\"92 233.72\"", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<92 233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 5989 92,233.72", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "0.0 3.10", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "14.545,1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-\"92 233,72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<\"92 233.72\"", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-79228162514264337593543950336", type, CultureInfo.InvariantCulture,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "79228162514264337593543950336", type, CultureInfo.InvariantCulture,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderSByte()
-    {
-      Type type = typeof( sbyte );
-      FilterParser.LogMessageCallback( "Testing SByte filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( ( sbyte )0 ) );
-
-      FilterParser.CheckCriterionBuilderResult( "-128", type, null,
-        new EqualToFilterCriterion( sbyte.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "127", type, null,
-        new EqualToFilterCriterion( sbyte.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=-128", type, null,
-        new GreaterThanOrEqualToFilterCriterion( sbyte.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<127", type, null,
-        new LessThanFilterCriterion( sbyte.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "10 AND 20", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( ( sbyte )10 ),
-          new EqualToFilterCriterion( ( sbyte )20 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "  0   OR  127  ", type, null,
-        new OrFilterCriterion(
-          new EqualToFilterCriterion( ( sbyte )0 ),
-          new EqualToFilterCriterion( sbyte.MaxValue ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-129", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "128", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-129", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<=128", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 3", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 340", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderUInt16()
-    {
-      Type type = typeof( ushort );
-      FilterParser.LogMessageCallback( "Testing UInt16 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( ushort.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "65535", type, null,
-        new EqualToFilterCriterion( ushort.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=0", type, null,
-        new GreaterThanOrEqualToFilterCriterion( ushort.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<>65535", type, null,
-        new DifferentThanFilterCriterion( ushort.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "309 AND 4555", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( ( ushort )309 ),
-          new EqualToFilterCriterion( ( ushort )4555 ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 AND >000", type, null,
-        new AndFilterCriterion(
-          new LessThanFilterCriterion( ushort.MinValue ),
-          new GreaterThanFilterCriterion( ushort.MinValue ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "65536", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<>-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<=65536", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10,000", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "10 000", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "139 AND 66000", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderUInt32()
-    {
-      Type type = typeof( uint );
-      FilterParser.LogMessageCallback( "Testing UInt32 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( uint.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "4294967295", type, null,
-        new EqualToFilterCriterion( uint.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=0", type, null,
-        new GreaterThanOrEqualToFilterCriterion( uint.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<4294967295", type, null,
-        new LessThanFilterCriterion( uint.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1 AND 71207", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( 1U ),
-          new EqualToFilterCriterion( 71207U ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >00000000000000000", type, null,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( uint.MinValue ),
-          new GreaterThanFilterCriterion( uint.MinValue ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "4294967296", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<4294967296", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "42 949 672", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<42,949,672", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 AND 5989 AND 429496729345", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 5989 42949", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    private static void TestCriterionBuilderUInt64()
-    {
-      Type type = typeof( ulong );
-      FilterParser.LogMessageCallback( "Testing UInt64 filter criteria..." );
-
-      // Valid expressions
-      FilterParser.CheckCriterionBuilderResult( "0", type, null,
-        new EqualToFilterCriterion( ulong.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "18446744073709551615", type, null,
-        new EqualToFilterCriterion( ulong.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( ">=0", type, null,
-        new GreaterThanOrEqualToFilterCriterion( ulong.MinValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<18446744073709551615", type, null,
-        new LessThanFilterCriterion( ulong.MaxValue ) );
-
-      FilterParser.CheckCriterionBuilderResult( "54 AND 127915466", type, null,
-        new AndFilterCriterion(
-          new EqualToFilterCriterion( 54UL ),
-          new EqualToFilterCriterion( 127915466UL ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "<0 OR >00000000000000000", type, null,
-        new OrFilterCriterion(
-          new LessThanFilterCriterion( ulong.MinValue ),
-          new GreaterThanFilterCriterion( ulong.MinValue ) ) );
-
-      FilterParser.CheckCriterionBuilderResult( "NULL", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      FilterParser.CheckCriterionBuilderResult( "\"NULL\"", type, null,
-        new EqualToFilterCriterion( null ) );
-
-      // Invalid expressions
-      FilterParser.CheckCriterionBuilderResult( "", type, null,
-        string.Format( FilterParser.MissingRightOperandErrorText, typeof( EqualToFilterCriterion ).Name ) );
-
-      FilterParser.CheckCriterionBuilderResult( "1.1", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "1,1", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "18446744073709551616", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( ">-1", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "<18446744073709551616", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "26681 AND 5989 AND 1844674407370955161455", type, null,
-        FilterParser.NumberOverflowErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "446 744 073 709 551", type, FrFrCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "446,744,073,709,551", type, CultureInfo.InvariantCulture,
-        FilterParser.InvalidNumberFormatErrorText );
-
-      FilterParser.CheckCriterionBuilderResult( "Null", type, null,
-        FilterParser.InvalidNumberFormatErrorText );
-    }
-
-    #endregion Number test methods
-
-    private static void CheckQuoteParserResult( string expression, params object[] expectedTokens )
-    {
-      List<Token> tokens = new List<Token>();
-
-      string error = null;
-
-      try
-      {
-        FilterParser.PrepareExpressionTokens( expression, tokens );
-      }
-      catch( Exception ex )
-      {
-        error = ex.Message;
-      }
-
-      if( error == null )
-      {
-        if( tokens.Count != expectedTokens.Length )
-          FilterParser.LogMessageCallback( "#ERROR# Token count mismatch for expression: " + expression );
-
-        if( tokens.Count == expectedTokens.Length )
-        {
-          for( int index = 0; index < expectedTokens.Length; index++ )
-          {
-            ValueToken expectedToken = expectedTokens[ index ] as ValueToken;
-
-            if( expectedToken == null )
-            {
-              FilterParser.LogMessageCallback( "#ERROR# Missing expected Token in expression: " + expression );
-            }
-            else
-            {
-              Token resultToken = tokens[ index ];
-
-              if( expectedToken.GetType() == resultToken.GetType() )
-              {
-                if( ( ( ValueToken )expectedToken ).Value != ( ( ValueToken )resultToken ).Value )
-                  FilterParser.LogMessageCallback( "#ERROR# Value mismatch for Token in expression: " + expression );
-              }
-              else
-              {
-                FilterParser.LogMessageCallback( "#ERROR# Missing expected Token in expression: " + expression );
-              }
-            }
-          }
-        }
-      }
-      else
-      {
-        if( ( expectedTokens.Length == 1 ) && ( expectedTokens[ 0 ] is string ) )
-        {
-          if( ( string )expectedTokens[ 0 ] != error )
-          {
-            FilterParser.LogMessageCallback( "#ERROR# Expected <" + ( string )expectedTokens[ 0 ] + "> Got <" + error + "> Expression: " + expression );
-          }
-        }
-        else
-        {
-          FilterParser.LogMessageCallback( "#ERROR# " + error + " Expression: " + expression );
-        }
-      }
-    }
-
-    private static void CheckCriterionBuilderResult( string expression, Type dataType, CultureInfo culture, object expectedResult )
-    {
-      FilterCriterion resultFilterCriterion = FilterParser.TryParse( expression, dataType, culture );
-
-      if( resultFilterCriterion == null )
-      {
-        if( expectedResult is string )
-        {
-          if( ( string )expectedResult != FilterParser.LastError )
-          {
-            FilterParser.LogMessageCallback( "#ERROR# Expected <" + ( string )expectedResult + "> Got <" + FilterParser.LastError + "> Expression: " + expression );
-          }
-        }
-        else
-        {
-          FilterParser.LogMessageCallback( "#ERROR# " + FilterParser.LastError + " Expression: " + expression );
-        }
-      }
-      else
-      {
-        if( !string.IsNullOrEmpty( FilterParser.LastError ) )
-          FilterParser.LogMessageCallback( "#ERROR# Parse succeeded but an error was set: " + FilterParser.LastError );
-
-        if( expectedResult is FilterCriterion )
-        {
-          if( !resultFilterCriterion.Equals( expectedResult ) )
-            FilterParser.LogMessageCallback( "#ERROR# Result mismatch for expression: " + expression + 
-            ". Expected <" + ( ( FilterCriterion )expectedResult ).ToString() + "> Got <" + resultFilterCriterion.ToString() + ">" );
-        }
-        else
-        {
-          FilterParser.LogMessageCallback( "#ERROR# Unexpected valid expression: " + expression );
-        }
-      }
-    }
-
-    // As standard, use culture that has little chance of being modified by the 
-    // developper's regional settings. This allow the use of the default settings
-    // without having to manually force any standard value.
-    private static CultureInfo FrFrCulture = CultureInfo.GetCultureInfo( "fr-FR" ); // France
-    private static CultureInfo IsIsCulture = CultureInfo.GetCultureInfo( "is-IS" ); // Islande
-    private static CultureInfo BrFrCulture = CultureInfo.GetCultureInfo( "br-FR" ); // Breton
-    private static Action<string> s_logMessageCallback = null;
-  }
-}
-
-#endif
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs
new file mode 100644
index 00000000..a2138730
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs
@@ -0,0 +1,329 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Media.TextFormatting;
+using Xceed.Utils.Collections;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class FrameworkElementExtensions
+  {
+    #region Static Fields
+
+    private static readonly WeakDictionary<TextProperties, double> s_fontHeight = new WeakDictionary<TextProperties, double>();
+
+    #endregion
+
+    internal static object CoerceMinHeight( this FrameworkElement source, Thickness padding, object value )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      var newValue = ( double )value;
+      var minHeight = FrameworkElementExtensions.GetFontHeight( source ) + padding.Top + padding.Bottom;
+
+      if( newValue >= minHeight )
+        return value;
+
+      if( minHeight != source.MinHeight )
+        return minHeight;
+
+      return DependencyProperty.UnsetValue;
+    }
+
+    internal static double GetFontHeight( this FrameworkElement source )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      var textProperties = new TextProperties(
+                             TextOptions.GetTextFormattingMode( source ),
+                             TextElement.GetFontFamily( source ),
+                             TextElement.GetFontStyle( source ),
+                             TextElement.GetFontWeight( source ),
+                             TextElement.GetFontStretch( source ),
+                             TextElement.GetFontSize( source ) );
+
+      lock( ( ( ICollection )s_fontHeight ).SyncRoot )
+      {
+        double fontHeight;
+
+        if( !s_fontHeight.TryGetValue( textProperties, out fontHeight ) )
+        {
+          var formatter = TextFormatter.Create( textProperties.FormattingMode );
+          var typeface = new Typeface( textProperties.FontFamily, textProperties.FontStyle, textProperties.FontWeight, textProperties.FontStretch );
+          var textSource = new EmptyTextSource();
+          var textRunProperties = new EmptyTextRunProperties( typeface, textProperties.FontSize );
+          var textParagraphProperties = new EmptyTextParagraphProperties( textRunProperties );
+          var textLine = formatter.FormatLine( textSource, 0, 0d, textParagraphProperties, null );
+
+          fontHeight = textLine.Height;
+          s_fontHeight.Add( textProperties, fontHeight );
+        }
+
+        return fontHeight;
+      }
+    }
+
+    #region EmptyTextSource Private Class
+
+    private sealed class EmptyTextSource : TextSource
+    {
+      public override TextSpan<CultureSpecificCharacterBufferRange> GetPrecedingText( int textSourceCharacterIndexLimit )
+      {
+        return new TextSpan<CultureSpecificCharacterBufferRange>( 0, null );
+      }
+
+      public override int GetTextEffectCharacterIndexFromTextSourceCharacterIndex( int textSourceCharacterIndex )
+      {
+        return -1;
+      }
+
+      public override TextRun GetTextRun( int textSourceCharacterIndex )
+      {
+        return new TextEndOfParagraph( 1 );
+      }
+    }
+
+    #endregion
+
+    #region EmptyTextParagraphProperties Private Class
+
+    private sealed class EmptyTextParagraphProperties : TextParagraphProperties
+    {
+      internal EmptyTextParagraphProperties( TextRunProperties defaultTextRunProperties )
+      {
+        m_defaultTextRunProperties = defaultTextRunProperties;
+      }
+
+      public override TextRunProperties DefaultTextRunProperties
+      {
+        get
+        {
+          return m_defaultTextRunProperties;
+        }
+      }
+
+      public override bool FirstLineInParagraph
+      {
+        get
+        {
+          return true;
+        }
+      }
+
+      public override FlowDirection FlowDirection
+      {
+        get
+        {
+          return FlowDirection.LeftToRight;
+        }
+      }
+
+      public override double Indent
+      {
+        get
+        {
+          return 0d;
+        }
+      }
+
+      public override double LineHeight
+      {
+        get
+        {
+          return 0d;
+        }
+      }
+
+      public override TextAlignment TextAlignment
+      {
+        get
+        {
+          return TextAlignment.Left;
+        }
+      }
+
+      public override TextMarkerProperties TextMarkerProperties
+      {
+        get
+        {
+          return null;
+        }
+      }
+
+      public override TextWrapping TextWrapping
+      {
+        get
+        {
+          return TextWrapping.NoWrap;
+        }
+      }
+
+      private readonly TextRunProperties m_defaultTextRunProperties;
+    }
+
+    #endregion
+
+    #region EmptyTextRunProperties Private Class
+
+    private sealed class EmptyTextRunProperties : TextRunProperties
+    {
+      internal EmptyTextRunProperties( Typeface typeface, double fontSize )
+      {
+        m_typeface = typeface;
+        m_fontSize = fontSize;
+      }
+
+      public override Brush BackgroundBrush
+      {
+        get
+        {
+          return Brushes.Transparent;
+        }
+      }
+
+      public override CultureInfo CultureInfo
+      {
+        get
+        {
+          return CultureInfo.InvariantCulture;
+        }
+      }
+
+      public override double FontHintingEmSize
+      {
+        get
+        {
+          return m_fontSize;
+        }
+      }
+
+      public override double FontRenderingEmSize
+      {
+        get
+        {
+          return m_fontSize;
+        }
+      }
+
+      public override Brush ForegroundBrush
+      {
+        get
+        {
+          return Brushes.Transparent;
+        }
+      }
+
+      public override TextDecorationCollection TextDecorations
+      {
+        get
+        {
+          return null;
+        }
+      }
+
+      public override TextEffectCollection TextEffects
+      {
+        get
+        {
+          return null;
+        }
+      }
+
+      public override Typeface Typeface
+      {
+        get
+        {
+          return m_typeface;
+        }
+      }
+
+      private readonly Typeface m_typeface;
+      private readonly double m_fontSize;
+    }
+
+    #endregion
+
+    #region TextProperties Private Class
+
+    private sealed class TextProperties : IEquatable<TextProperties>
+    {
+      internal TextProperties( TextFormattingMode formattingMode, FontFamily fontFamily, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch, double fontSize )
+      {
+        this.FormattingMode = formattingMode;
+        this.FontFamily = fontFamily;
+        this.FontStyle = fontStyle;
+        this.FontWeight = fontWeight;
+        this.FontStretch = fontStretch;
+        this.FontSize = fontSize;
+      }
+
+      public override int GetHashCode()
+      {
+        unchecked
+        {
+          var hashCode = this.FontSize.GetHashCode();
+
+          if( this.FontFamily != null )
+          {
+            hashCode = hashCode * 13 + this.FontFamily.GetHashCode();
+          }
+
+          hashCode = hashCode * 13 + this.FontStyle.GetHashCode();
+          hashCode = hashCode * 13 + this.FontWeight.GetHashCode();
+          hashCode = hashCode * 13 + this.FontStretch.GetHashCode();
+          hashCode = hashCode * 13 + this.FormattingMode.GetHashCode();
+
+          return hashCode;
+        }
+      }
+
+      public override bool Equals( object obj )
+      {
+        return this.Equals( obj as TextProperties );
+      }
+
+      public bool Equals( TextProperties obj )
+      {
+        if( object.ReferenceEquals( obj, null ) )
+          return false;
+
+        return object.Equals( obj.FontSize, this.FontSize )
+            && object.Equals( obj.FontFamily, this.FontFamily )
+            && object.Equals( obj.FontStyle, this.FontStyle )
+            && object.Equals( obj.FontWeight, this.FontWeight )
+            && object.Equals( obj.FontStretch, this.FontStretch )
+            && object.Equals( obj.FormattingMode, this.FormattingMode );
+      }
+
+      internal readonly TextFormattingMode FormattingMode;
+      internal readonly FontFamily FontFamily;
+      internal readonly FontStyle FontStyle;
+      internal readonly FontWeight FontWeight;
+      internal readonly FontStretch FontStretch;
+      internal readonly double FontSize;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs
deleted file mode 100644
index 9820d4c8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Threading;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class FrameworkElementUnloadedEventManager : WeakEventManager
-  {
-    private FrameworkElementUnloadedEventManager()
-    {
-    }
-
-    public static void AddListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      FrameworkElement frameworkElement = source as FrameworkElement;
-
-      if( frameworkElement != null )
-        frameworkElement.Unloaded += this.FrameworkElement_Unloaded;
-    }
-
-    protected override void StopListening( object source )
-    {
-      FrameworkElement frameworkElement = source as FrameworkElement;
-
-      if( frameworkElement != null )
-      {
-        if( frameworkElement.Dispatcher.Thread == Thread.CurrentThread )
-        {
-          frameworkElement.Unloaded -= this.FrameworkElement_Unloaded;
-        }
-        else
-        {
-          System.Windows.Threading.Dispatcher dispatcher = frameworkElement.Dispatcher;
-          Debug.Assert( ( dispatcher != null ) && ( !dispatcher.HasShutdownStarted ) && ( !dispatcher.HasShutdownFinished ) );
-
-          if( dispatcher != null )
-          {
-            dispatcher.Invoke( new Action( 
-              delegate
-              {
-                frameworkElement.Unloaded -= this.FrameworkElement_Unloaded;
-              } ), null );
-          }
-        }
-      }
-    }
-
-    private static FrameworkElementUnloadedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( FrameworkElementUnloadedEventManager );
-
-        FrameworkElementUnloadedEventManager currentManager =
-          ( FrameworkElementUnloadedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new FrameworkElementUnloadedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void FrameworkElement_Unloaded( object sender, RoutedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
index 9faa51bc..520278e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
@@ -19,31 +19,31 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Globalization;
+using System.Linq;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Automation;
 using Xceed.Wpf.DataGrid.Utils;
-using System.Linq;
 
 namespace Xceed.Wpf.DataGrid
 {
-  public class Group : IGroupLevelDescription, INotifyPropertyChanged
+  public sealed class Group : IGroupLevelDescription, INotifyPropertyChanged, IWeakEventListener
   {
     #region Static Fields
 
-    private static readonly string IsExpandedPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.IsExpanded );
-    private static readonly string ItemCountPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ItemCount );
-    private static readonly string GroupByPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.GroupBy );
-    private static readonly string TitlePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.Title );
-    private static readonly string TitleTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplate );
-    private static readonly string TitleTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplateSelector );
-    private static readonly string ValueTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplate );
-    private static readonly string ValueTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplateSelector );
-    private static readonly string ValueStringFormatPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormat );
-    private static readonly string ValueStringFormatCulturePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormatCulture );
+    internal static readonly string IsExpandedPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.IsExpanded );
+    internal static readonly string ItemCountPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ItemCount );
+    internal static readonly string GroupByPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.GroupBy );
+    internal static readonly string TitlePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.Title );
+    internal static readonly string TitleTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplate );
+    internal static readonly string TitleTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplateSelector );
+    internal static readonly string ValueTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplate );
+    internal static readonly string ValueTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplateSelector );
+    internal static readonly string ValueStringFormatPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormat );
+    internal static readonly string ValueStringFormatCulturePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormatCulture );
 
     #endregion
 
@@ -630,11 +630,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    internal DataGridGroupAutomationPeer CreateAutomationPeer()
-    {
-      return new DataGridGroupAutomationPeer( this );
-    }
-
     internal void ClearGroup()
     {
       m_groupDescription = null;
@@ -704,5 +699,19 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
+
+    #region IWeakEventListener Members
+
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return false;
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
index 161e7bdb..b6f28807 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
@@ -318,95 +318,43 @@ namespace Xceed.Wpf.DataGrid
         panel.RegisterParentDataGridContext( dataGridContext );
     }
 
-    private void ShowFarDropMark()
-    {
-      if( m_dropMarkAdorner == null )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        DataGridControl grid = ( dataGridContext != null )
-          ? dataGridContext.DataGridControl
-          : null;
-
-        Pen pen = Xceed.Wpf.DataGrid.Views.UIViewBase.GetDropMarkPen( this );
-
-        if( ( pen == null ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-          pen = uiViewBase.DefaultDropMarkPen;
-        }
-
-        DropMarkOrientation orientation = UIViewBase.GetDropMarkOrientation( this );
-
-        if( ( orientation == DropMarkOrientation.Default ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-
-          orientation = uiViewBase.DefaultDropMarkOrientation;
-        }
-
-        m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
-
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Add( m_dropMarkAdorner );
-      }
-
-      // We Only want the drop mark to be displayed at the end of the HierarchicalGroupByControlNode
-      m_dropMarkAdorner.ForceAlignment( DropMarkAlignment.Far );
-    }
-
-    private void HideDropMark()
-    {
-      if( m_dropMarkAdorner != null )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Remove( m_dropMarkAdorner );
-
-        m_dropMarkAdorner = null;
-      }
-    }
-
     #region IDropTarget Members
 
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
-      bool isAlreadyGroupedBy = false;
-
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
+      var isAlreadyGroupedBy = false;
+      var cell = draggedElement as ColumnManagerCell;
 
       if( cell != null )
       {
         isAlreadyGroupedBy = GroupingHelper.IsAlreadyGroupedBy( cell );
-        ColumnBase parentColumn = cell.ParentColumn;
 
+        var parentColumn = cell.ParentColumn;
         if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
           return false;
       }
 
-      DataGridContext sourceDetailContext = DataGridControl.GetDataGridContext( this );
+      var sourceDetailContext = DataGridControl.GetDataGridContext( this );
       Debug.Assert( sourceDetailContext != null );
-      DetailConfiguration sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
+      var sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
 
-      DataGridContext draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
-      Debug.Assert( draggedDetailContext != null );
-      DetailConfiguration draggedDetailConfig = ( draggedDetailContext != null ) ? draggedDetailContext.SourceDetailConfiguration : null;
+      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
+      Debug.Assert( draggedElementContext != null );
+      var draggedDetailConfig = ( draggedElementContext != null ) ? draggedElementContext.SourceDetailConfiguration : null;
 
 
-      bool canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
-        ( sourceDetailContext != null ) &&
-        ( draggedDetailContext != null ) &&
-        ( sourceDetailContext.GroupLevelDescriptions == draggedDetailContext.GroupLevelDescriptions ) &&
-        ( this.IsGroupingModificationAllowed ) &&
-        ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
-        ( !isAlreadyGroupedBy );
+      var canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
+                    ( sourceDetailContext != null ) &&
+                    ( draggedElementContext != null ) &&
+                    ( sourceDetailContext.GroupLevelDescriptions == draggedElementContext.GroupLevelDescriptions ) &&
+                    ( this.IsGroupingModificationAllowed ) &&
+                    ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
+                    ( !isAlreadyGroupedBy );
 
       if( canDrop && ( cell != null ) )
-        canDrop = GroupingHelper.ValidateMaxGroupDescriptions( draggedDetailContext );
+      {
+        canDrop = GroupingHelper.ValidateMaxGroupDescriptions( draggedElementContext );
+      }
 
       return canDrop;
     }
@@ -415,95 +363,66 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
+      var cell = draggedElement as ColumnManagerCell;
       if( cell == null )
         return;
 
-      DataGridContext draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
-
-      int lastIndex = draggedDetailContext.GroupLevelDescriptions.Count - 1;
-      if( lastIndex > -1 )
-      {
-        GroupByItem groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
+      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
+      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
+      if( lastIndex < 0 )
+        return;
 
-        Debug.Assert( groupByItem != null );
-        if( groupByItem == null )
-          throw new DataGridInternalException( "groupByItem is null." );
+      var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
+      if( groupByItem == null )
+        throw new DataGridInternalException( "groupByItem is null." );
 
-        groupByItem.ShowDropMark( mousePosition );
-      }
+      groupByItem.ShowDropMark( mousePosition );
     }
 
     void IDropTarget.DragLeave( UIElement draggedElement )
     {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
+      var cell = draggedElement as ColumnManagerCell;
       if( cell == null )
         return;
 
-      DataGridContext draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
-
-      int lastIndex = draggedDetailContext.GroupLevelDescriptions.Count - 1;
-      if( lastIndex > -1 )
-      {
-        GroupByItem groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
+      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
+      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
+      if( lastIndex < 0 )
+        return;
 
-        Debug.Assert( groupByItem != null );
-        if( groupByItem == null )
-          throw new DataGridInternalException( "groupByItem is null." );
+      var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
+      if( groupByItem == null )
+        throw new DataGridInternalException( "groupByItem is null." );
 
-        groupByItem.HideDropMark();
-      }
-      else
-      {
-        this.HideDropMark();
-      }
+      groupByItem.HideDropMark();
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
+      var cell = draggedElement as ColumnManagerCell;
       if( cell == null )
         return;
 
-      DataGridContext draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
+      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
+      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
 
-      int lastIndex = draggedDetailContext.GroupLevelDescriptions.Count - 1;
-      if( lastIndex > -1 )
+      if( lastIndex >= 0 )
       {
-        GroupByItem groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
-
-        Debug.Assert( groupByItem != null );
+        var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
         if( groupByItem == null )
           throw new DataGridInternalException( "groupByItem is null." );
 
         groupByItem.HideDropMark();
       }
-      else
-      {
-        this.HideDropMark();
-      }
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl parentGrid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      GroupingHelper.AppendNewGroupFromColumnManagerCell( cell, parentGrid );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
 
+      GroupingHelper.AppendNewGroupFromColumnManagerCell( cell, dataGridControl );
     }
 
     #endregion
-
-    #region PRIVATE FIELDS
-
-    private DropMarkAdorner m_dropMarkAdorner;
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
index 18c7dc59..6bb2ba89 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
@@ -120,26 +120,26 @@ namespace Xceed.Wpf.DataGrid
 
     private void InitSortDirection()
     {
-      DataGridContext gridContext = DataGridControl.GetDataGridContext( this );
-      GroupLevelDescription groupInfo = this.Content as GroupLevelDescription;
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( dataGridContext == null )
+        return;
 
-      Debug.Assert( ( gridContext != null ) && ( groupInfo != null ) || ( DesignerProperties.GetIsInDesignMode( this ) ) );
-      if( ( gridContext != null ) && ( groupInfo != null ) )
-      {
-        ColumnBase column = gridContext.Columns[ groupInfo.FieldName ];
+      var groupInfo = this.Content as GroupLevelDescription;
+      if( groupInfo == null )
+        return;
 
-        if( column != null )
-        {
-          Binding sortBinding = new Binding();
-          sortBinding.Path = new PropertyPath( ColumnBase.SortDirectionProperty );
-          sortBinding.Mode = BindingMode.OneWay;
-          sortBinding.NotifyOnSourceUpdated = true;
-          sortBinding.Source = column;
-          sortBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-
-          BindingOperations.SetBinding( this, GroupByItem.SortDirectionInternalProperty, sortBinding );
-        }
-      }
+      var column = dataGridContext.Columns[ groupInfo.FieldName ];
+      if( column == null )
+        return;
+
+      var sortBinding = new Binding();
+      sortBinding.Path = new PropertyPath( ColumnBase.SortDirectionProperty );
+      sortBinding.Mode = BindingMode.OneWay;
+      sortBinding.NotifyOnSourceUpdated = true;
+      sortBinding.Source = column;
+      sortBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
+
+      BindingOperations.SetBinding( this, GroupByItem.SortDirectionInternalProperty, sortBinding );
     }
 
     private GroupByControl GetParentGroupByControl()
@@ -278,7 +278,7 @@ namespace Xceed.Wpf.DataGrid
              : UIViewBase.DefaultGroupDraggedOutsideCursor;
           }
 
-          m_dragSourceManager.ProcessMouseLeftButtonDown( e );
+          m_dragSourceManager.DragStart( e );
         }
 
         e.Handled = true;
@@ -292,7 +292,9 @@ namespace Xceed.Wpf.DataGrid
       if( ( this.IsMouseCaptured ) && ( e.LeftButton == MouseButtonState.Pressed ) )
       {
         if( m_dragSourceManager != null )
-          m_dragSourceManager.ProcessMouseMove( e );
+        {
+          m_dragSourceManager.DragMove( e );
+        }
       }
 
       base.OnMouseMove( e );
@@ -304,10 +306,14 @@ namespace Xceed.Wpf.DataGrid
       bool isPressed = this.IsPressed;
 
       if( m_dragSourceManager != null )
-        m_dragSourceManager.ProcessMouseLeftButtonUp( e );
+      {
+        m_dragSourceManager.Drop( e );
+      }
 
       if( isMouseCaptured )
       {
+        this.ReleaseMouseCapture();
+
         bool click = isPressed;
 
         if( click )
@@ -351,44 +357,48 @@ namespace Xceed.Wpf.DataGrid
     protected override void OnLostMouseCapture( MouseEventArgs e )
     {
       if( m_dragSourceManager != null )
-        m_dragSourceManager.ProcessLostMouseCapture( e );
+      {
+        m_dragSourceManager.DragCancel( e );
+      }
 
       base.OnLostMouseCapture( e );
     }
 
-    internal void ShowDropMark( Point mousePosition )
+    internal void ShowDropMark( RelativePoint mousePosition )
     {
       if( m_dropMarkAdorner == null )
       {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
+        var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
+        var pen = UIViewBase.GetDropMarkPen( this );
 
-        DataGridControl grid = ( dataGridContext != null )
-          ? dataGridContext.DataGridControl
-          : null;
-
-        Pen pen = UIViewBase.GetDropMarkPen( this );
-
-        if( ( pen == null ) && ( grid != null ) )
+        if( ( pen == null ) && ( dataGridControl != null ) )
         {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-          pen = uiViewBase.DefaultDropMarkPen;
+          var uiViewBase = dataGridControl.GetView() as UIViewBase;
+          if( uiViewBase != null )
+          {
+            pen = uiViewBase.DefaultDropMarkPen;
+          }
         }
 
-        DropMarkOrientation orientation = UIViewBase.GetDropMarkOrientation( this );
+        var orientation = UIViewBase.GetDropMarkOrientation( this );
 
-        if( ( orientation == DropMarkOrientation.Default ) && ( grid != null ) )
+        if( ( orientation == DropMarkOrientation.Default ) && ( dataGridControl != null ) )
         {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-
-          orientation = uiViewBase.DefaultDropMarkOrientation;
+          var uiViewBase = dataGridControl.GetView() as UIViewBase;
+          if( uiViewBase != null )
+          {
+            orientation = uiViewBase.DefaultDropMarkOrientation;
+          }
         }
 
         m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
 
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
+        var adornerLayer = AdornerLayer.GetAdornerLayer( this );
         if( adornerLayer != null )
+        {
           adornerLayer.Add( m_dropMarkAdorner );
+        }
       }
 
       m_dropMarkAdorner.UpdateAlignment( mousePosition );
@@ -396,62 +406,65 @@ namespace Xceed.Wpf.DataGrid
 
     internal void HideDropMark()
     {
-      if( m_dropMarkAdorner != null )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Remove( m_dropMarkAdorner );
+      if( m_dropMarkAdorner == null )
+        return;
 
-        m_dropMarkAdorner = null;
+      var adornerLayer = AdornerLayer.GetAdornerLayer( this );
+      if( adornerLayer != null )
+      {
+        adornerLayer.Remove( m_dropMarkAdorner );
       }
+
+      m_dropMarkAdorner = null;
     }
 
     #endregion Drag & Drop Manager
 
     #region IDropTarget Members
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
-      bool allowGroupingModification = true;
-      GroupByControl parentGBC = this.GetParentGroupByControl();
+      var allowGroupingModification = true;
+      var parentGBC = this.GetParentGroupByControl();
 
       if( parentGBC != null )
+      {
         allowGroupingModification = parentGBC.IsGroupingModificationAllowed;
+      }
 
       // We don't accept any ColumnManagerCell from Details
-      DataGridContext context = DataGridControl.GetDataGridContext( draggedElement );
-
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      bool isAlreadyGroupedBy = false;
+      var context = DataGridControl.GetDataGridContext( draggedElement );
+      var cell = draggedElement as ColumnManagerCell;
+      var isAlreadyGroupedBy = false;
 
       if( cell != null )
       {
         isAlreadyGroupedBy = GroupingHelper.IsAlreadyGroupedBy( cell );
-        ColumnBase parentColumn = cell.ParentColumn;
 
+        var parentColumn = cell.ParentColumn;
         if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
           return false;
       }
 
-      DataGridContext sourceDetailContext = DataGridControl.GetDataGridContext( this );
+      var sourceDetailContext = DataGridControl.GetDataGridContext( this );
       Debug.Assert( sourceDetailContext != null );
-      DetailConfiguration sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
+      var sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
 
-      DataGridContext draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
+      var draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
       Debug.Assert( draggedDetailContext != null );
-      DetailConfiguration draggedDetailConfig = ( draggedDetailContext != null ) ? draggedDetailContext.SourceDetailConfiguration : null;
+      var draggedDetailConfig = ( draggedDetailContext != null ) ? draggedDetailContext.SourceDetailConfiguration : null;
 
 
-      bool canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
-        ( allowGroupingModification ) &&
-        ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
-        ( draggedElement != this ) &&
-        ( isAlreadyGroupedBy == false );
+      var canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
+                    ( allowGroupingModification ) &&
+                    ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
+                    ( draggedElement != this ) &&
+                    ( isAlreadyGroupedBy == false );
 
       if( canDrop && ( cell != null ) )
+      {
         canDrop = GroupingHelper.ValidateMaxGroupDescriptions( draggedDetailContext );
+      }
 
       return canDrop;
     }
@@ -460,7 +473,7 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
       this.ShowDropMark( mousePosition );
     }
@@ -470,44 +483,39 @@ namespace Xceed.Wpf.DataGrid
       this.HideDropMark();
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
-      if( m_dropMarkAdorner != null )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( m_dropMarkAdorner == null )
+        return;
 
-        Debug.Assert( dataGridContext != null );
-        if( dataGridContext != null )
-        {
-          GroupLevelDescription draggedOverGroupLevelDescription = this.Content as GroupLevelDescription;
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( dataGridContext == null )
+        return;
 
-          Debug.Assert( draggedOverGroupLevelDescription != null );
-          if( draggedOverGroupLevelDescription != null )
-          {
-            DropMarkAlignment alignment = m_dropMarkAdorner.Alignment;
+      var draggedOverGroupLevelDescription = this.Content as GroupLevelDescription;
+      if( draggedOverGroupLevelDescription == null )
+        return;
 
-            this.HideDropMark();
+      var alignment = m_dropMarkAdorner.Alignment;
 
-            ColumnManagerCell draggedCell = draggedElement as ColumnManagerCell;
+      this.HideDropMark();
 
-            if( draggedCell != null )
-            {
-              GroupingHelper.AddNewGroupFromColumnManagerCell( draggedCell, draggedOverGroupLevelDescription, alignment, dataGridContext.DataGridControl );
-            }
-            else
-            {
-              GroupByItem draggedGroupBy = draggedElement as GroupByItem;
+      var draggedCell = draggedElement as ColumnManagerCell;
+      if( draggedCell != null )
+      {
+        GroupingHelper.AddNewGroupFromColumnManagerCell( draggedCell, draggedOverGroupLevelDescription, alignment, dataGridContext.DataGridControl );
+      }
+      else
+      {
+        var draggedGroupBy = draggedElement as GroupByItem;
 
-              Debug.Assert( draggedGroupBy != null );
+        Debug.Assert( draggedGroupBy != null );
 
-              if( draggedGroupBy != null )
-              {
-                GroupLevelDescription draggedGroupLevelDescription = draggedGroupBy.Content as GroupLevelDescription;
+        if( draggedGroupBy != null )
+        {
+          var draggedGroupLevelDescription = draggedGroupBy.Content as GroupLevelDescription;
 
-                GroupingHelper.MoveGroupDescription( dataGridContext.Columns, dataGridContext.Items.GroupDescriptions, draggedOverGroupLevelDescription, alignment, draggedGroupLevelDescription, dataGridContext.DataGridControl );
-              }
-            }
-          }
+          GroupingHelper.MoveGroupDescription( dataGridContext.Columns, dataGridContext.Items.GroupDescriptions, draggedOverGroupLevelDescription, alignment, draggedGroupLevelDescription, dataGridContext.DataGridControl );
         }
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
index 321c288b..775b5718 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
@@ -14,9 +14,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 using System.Windows.Data;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
index fb5221ad..a432d768 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
@@ -14,22 +14,26 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
-using System.Linq;
 using System.Windows;
 using System.Windows.Automation.Peers;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using Xceed.Utils.Wpf;
+using Xceed.Wpf.DataGrid.Utils;
 
 namespace Xceed.Wpf.DataGrid
 {
   public class GroupHeaderControl : ContentControl, INotifyPropertyChanged, IDataGridItemContainer
   {
-    #region Constructors
+    #region Static Fields
+
+    internal static readonly string GroupPropertyName = PropertyHelper.GetPropertyName( ( GroupHeaderControl g ) => g.Group );
+
+    #endregion
 
     static GroupHeaderControl()
     {
@@ -59,8 +63,6 @@ namespace Xceed.Wpf.DataGrid
       m_itemContainerManager = new DataGridItemContainerManager( this );
     }
 
-    #endregion
-
     #region Group Internal Attached Property
 
     internal static readonly DependencyProperty GroupProperty = DependencyProperty.RegisterAttached(
@@ -95,7 +97,7 @@ namespace Xceed.Wpf.DataGrid
       this.Content = m_group;
       GroupHeaderControl.SetGroup( this, group );
 
-      this.RaisePropertyChanged( "Group" );
+      this.RaisePropertyChanged( GroupHeaderControl.GroupPropertyName );
     }
 
     private Group m_group;
@@ -174,7 +176,20 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion InactiveSelectionForeground Property
 
-    #region Public Overrides Methods
+    #region CanBeRecycled Protected Property
+
+    protected virtual bool CanBeRecycled
+    {
+      get
+      {
+        if( this.IsKeyboardFocused || this.IsKeyboardFocusWithin )
+          return false;
+
+        return m_itemContainerManager.CanBeRecycled;
+      }
+    }
+
+    #endregion
 
     public override void OnApplyTemplate()
     {
@@ -183,13 +198,11 @@ namespace Xceed.Wpf.DataGrid
       m_itemContainerManager.Update();
     }
 
-    #endregion
-
-    #region Protected Overrides Methods
 
-    protected override System.Windows.Automation.Peers.AutomationPeer OnCreateAutomationPeer()
+    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
     {
-      return new FrameworkElementAutomationPeer( this );
+      base.OnPreviewMouseLeftButtonUp( e );
+      return;
     }
 
     protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
@@ -222,12 +235,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion
-
-    #region Protected Methods
-
     protected virtual void PrepareContainer( DataGridContext dataGridContext, object item )
     {
+      m_isRecyclingCandidate = false;
+
       if( m_isContainerPrepared )
         Debug.Fail( "A GroupHeaderControl can't be prepared twice, it must be cleaned before PrepareContainer is called again" );
 
@@ -252,7 +263,7 @@ namespace Xceed.Wpf.DataGrid
 
     protected virtual void ClearContainer()
     {
-      m_itemContainerManager.Clear();
+      m_itemContainerManager.Clear( m_isRecyclingCandidate );
       m_isContainerPrepared = false;
     }
 
@@ -264,16 +275,19 @@ namespace Xceed.Wpf.DataGrid
     protected internal virtual bool ShouldHandleSelectionEvent( InputEventArgs eventArgs )
     {
       var targetChild = eventArgs.OriginalSource as DependencyObject;
-      // If the event is comming from a control inside the header, ignore the event
-      // since it is not for selection purposes that the user targeted this control. 
-      // This handle the expand collapse butto, and the GroupNavigationControl
-      return TreeHelper.FindParent<Control>( targetChild, true, null, this ) == null;
-    }
 
+      // If the event is comming from a specific control inside the header (GroupNavigationControl or Collapsed button),
+      // ignore the event since it is not for selection purposes that the user targeted this control. 
+      var collapsedButtonParent = TreeHelper.FindParent<ToggleButton>( targetChild, true, null, this );
+      if( collapsedButtonParent != null )
+        return false;
 
-    #endregion
+      var groupNavigationControlParent = TreeHelper.FindParent<GroupNavigationControl>( targetChild, true, null, this );
+      if( groupNavigationControlParent != null )
+        return false;
 
-    #region Private Static Methods
+      return true;
+    }
 
     private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
@@ -286,10 +300,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion
-
-    #region Private Methods
-
     private void OnExpandCanExecute( object sender, CanExecuteRoutedEventArgs e )
     {
       e.CanExecute = false;
@@ -370,15 +380,6 @@ namespace Xceed.Wpf.DataGrid
       return ( groupCommandTarget != null ) ? groupCommandTarget : this.Group;
     }
 
-    #endregion
-
-    #region Private Fields
-
-    private readonly DataGridItemContainerManager m_itemContainerManager;
-    private bool m_isContainerPrepared;
-
-    #endregion
-
     #region INotifyPropertyChanged Members
 
     public event PropertyChangedEventHandler PropertyChanged;
@@ -396,6 +397,26 @@ namespace Xceed.Wpf.DataGrid
 
     #region IDataGridItemContainer Members
 
+    bool IDataGridItemContainer.CanBeRecycled
+    {
+      get
+      {
+        return this.CanBeRecycled;
+      }
+    }
+
+    bool IDataGridItemContainer.IsRecyclingCandidate
+    {
+      get
+      {
+        return m_isRecyclingCandidate;
+      }
+      set
+      {
+        m_isRecyclingCandidate = value;
+      }
+    }
+
     void IDataGridItemContainer.PrepareContainer( DataGridContext dataGridContext, object item )
     {
       this.PrepareContainer( dataGridContext, item );
@@ -406,6 +427,15 @@ namespace Xceed.Wpf.DataGrid
       this.ClearContainer();
     }
 
+    void IDataGridItemContainer.CleanRecyclingCandidate()
+    {
+      m_itemContainerManager.CleanRecyclingCandidates();
+    }
+
     #endregion
+
+    private readonly DataGridItemContainerManager m_itemContainerManager;
+    private bool m_isContainerPrepared;
+    private bool m_isRecyclingCandidate;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
index 6604487b..31629031 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
@@ -444,7 +444,6 @@ namespace Xceed.Wpf.DataGrid
       if( managerType == typeof( CollectionChangedEventManager ) )
       {
         this.InvalidateMeasure();
-        return true;
       }
       else if( managerType == typeof( PropertyChangedEventManager ) )
       {
@@ -453,11 +452,13 @@ namespace Xceed.Wpf.DataGrid
         {
           this.InvalidateMeasure();
         }
-
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
@@ -471,7 +472,7 @@ namespace Xceed.Wpf.DataGrid
           return value;
 
         // When groupLevelConfig.GroupLevelIndicatorStyle is null, try to find an implicit style
-        // for the GroupLevelIndicator in the resource.
+        // for the GroupLevelIndicator in the resources.
         var gli = ( GroupLevelIndicator )parameter;
         var style = gli.TryFindResource( gli.GetType() );
         if( style != null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
index bb842858..3fdc5132 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
@@ -229,6 +229,23 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region CanBeRecycled Protected Property
+
+    protected virtual bool CanBeRecycled
+    {
+      get
+      {
+        if( this.IsKeyboardFocused
+          || this.IsKeyboardFocusWithin
+          || this.IsBeingEdited )
+          return false;
+
+        return m_itemContainerManager.CanBeRecycled;
+      }
+    }
+
+    #endregion
+
     #region VisualRootElementType Property
 
     internal Type VisualRootElementType
@@ -289,10 +306,6 @@ namespace Xceed.Wpf.DataGrid
       return this.GetVisualChild( 0 );
     }
 
-    protected override AutomationPeer OnCreateAutomationPeer()
-    {
-      return new FrameworkElementAutomationPeer( this );
-    }
 
     protected void PrepareContainer( DataGridContext dataGridContext, object item )
     {
@@ -304,12 +317,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( !this.IsLoaded )
       {
-        if( dataGridContext.DataGridControl.IsPrinting )
-        {
-          this.ApplyTemplate();
-          this.PrepareContainerWorker();
-        }
-        else if( dataGridContext.DataGridControl.ItemsHost.IsAncestorOf( this ) )
+        if( dataGridContext.DataGridControl.ItemsHost.IsAncestorOf( this ) )
         {
           this.ApplyTemplate();
           this.PrepareContainerWorker();
@@ -331,15 +339,17 @@ namespace Xceed.Wpf.DataGrid
 
     protected void ClearContainer()
     {
-      // Ensure we removed the HeaderFooterItem_Loaded event handler if
-      // it was not yet loaded
-      if( m_loadedHandler != null )
+      if( !m_isRecyclingCandidate )
       {
-        this.Loaded -= m_loadedHandler;
-        m_loadedHandler = null;
+        // Ensure we removed the HeaderFooterItem_Loaded event handler if it was not yet loaded
+        if( m_loadedHandler != null )
+        {
+          this.Loaded -= m_loadedHandler;
+          m_loadedHandler = null;
+        }
       }
 
-      m_itemContainerManager.Clear();
+      m_itemContainerManager.Clear( m_isRecyclingCandidate );
     }
 
     protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
@@ -379,17 +389,40 @@ namespace Xceed.Wpf.DataGrid
 
     private void PrepareContainerWorker()
     {
+      m_isRecyclingCandidate = false;
+
       var rootContainer = this.AsVisual();
 
       this.SetContainer( rootContainer );
 
       m_itemContainerManager.Prepare( m_initializingDataGridContext, m_initializingDataItem );
+
       m_initializingDataGridContext = null;
       m_initializingDataItem = null;
     }
 
     #region IDataGridItemContainer Members
 
+    bool IDataGridItemContainer.CanBeRecycled
+    {
+      get
+      {
+        return this.CanBeRecycled;
+      }
+    }
+
+    bool IDataGridItemContainer.IsRecyclingCandidate
+    {
+      get
+      {
+        return m_isRecyclingCandidate;
+      }
+      set
+      {
+        m_isRecyclingCandidate = value;
+      }
+    }
+
     void IDataGridItemContainer.PrepareContainer( DataGridContext dataGridContext, object item )
     {
       this.PrepareContainer( dataGridContext, item );
@@ -400,17 +433,17 @@ namespace Xceed.Wpf.DataGrid
       this.ClearContainer();
     }
 
-    #endregion
+    void IDataGridItemContainer.CleanRecyclingCandidate()
+    {
+      m_itemContainerManager.CleanRecyclingCandidates();
+    }
 
-    #region Private Fields
+    #endregion
 
     private readonly DataGridItemContainerManager m_itemContainerManager;
-
     private DataGridContext m_initializingDataGridContext; // = null
     private object m_initializingDataItem; // = null
-
     private RoutedEventHandler m_loadedHandler;
-
-    #endregion
+    private bool m_isRecyclingCandidate;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
index fdc4d981..2304dcba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
@@ -493,7 +493,7 @@ namespace Xceed.Wpf.DataGrid
     #region IDropTarget Members
 
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
       bool canDrop = this.AllowGroupingModification;
 
@@ -559,7 +559,7 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = draggedElement as ColumnManagerCell;
 
@@ -615,7 +615,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = draggedElement as ColumnManagerCell;
 
@@ -646,18 +646,20 @@ namespace Xceed.Wpf.DataGrid
 
     public event PropertyChangedEventHandler PropertyChanged;
 
-    private void OnNotifyPropertyChanged( string propertyName )
+    private void OnPropertyChanged( string propertyName )
     {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
     }
 
     internal void UpdateHasGroups()
     {
-      this.OnNotifyPropertyChanged( "HasGroups" );
+      this.OnPropertyChanged( "HasGroups" );
     }
 
     #endregion
-
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
index 0164decb..5963ef4a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
@@ -498,7 +498,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal void ShowFarDropMark( ColumnManagerCell cell, Point mousePosition )
+    internal void ShowFarDropMark( ColumnManagerCell cell, RelativePoint mousePosition )
     {
       Debug.Assert( cell != null );
       if( cell == null )
@@ -542,7 +542,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal void ShowFarDropMark( Point mousePosition )
+    internal void ShowFarDropMark( RelativePoint mousePosition )
     {
       int itemsCount = this.Items.Count;
       if( itemsCount < 1 )
@@ -577,11 +577,13 @@ namespace Xceed.Wpf.DataGrid
           AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
 
           if( adornerLayer != null )
+          {
             adornerLayer.Add( m_dropMarkAdorner );
-
+          }
         }
+
         // We Only want the drop mark to be displayed at the end of the HierarchicalGroupByControlNode
-        m_dropMarkAdorner.ForceAlignment( DropMarkAlignment.Far );
+        m_dropMarkAdorner.Alignment = DropMarkAlignment.Far;
       }
       else
       {
@@ -594,8 +596,10 @@ namespace Xceed.Wpf.DataGrid
         Debug.Assert( groupLevelDescription != null );
 
         // Show Far DropMark only if not already grouped
-        if( this.Items.Contains( groupLevelDescription ) == false )
+        if( !this.Items.Contains( groupLevelDescription ) )
+        {
           hierarchicalGroupByItem.ShowFarDropMark( mousePosition );
+        }
       }
     }
 
@@ -677,7 +681,7 @@ namespace Xceed.Wpf.DataGrid
 
     #region IDropTarget Members
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = null;
       HierarchicalGroupByItem hierarchicalGroupByItem = null;
@@ -758,7 +762,7 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = draggedElement as ColumnManagerCell;
 
@@ -863,7 +867,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = draggedElement as ColumnManagerCell;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
index a3a5ee4e..e28af749 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
@@ -339,7 +339,7 @@ namespace Xceed.Wpf.DataGrid
              : UIViewBase.DefaultGroupDraggedOutsideCursor;
           }
 
-          m_dragSourceManager.ProcessMouseLeftButtonDown( e );
+          m_dragSourceManager.DragStart( e );
         }
 
         e.Handled = true;
@@ -353,7 +353,9 @@ namespace Xceed.Wpf.DataGrid
       if( ( this.IsMouseCaptured ) && ( e.LeftButton == MouseButtonState.Pressed ) )
       {
         if( m_dragSourceManager != null )
-          m_dragSourceManager.ProcessMouseMove( e );
+        {
+          m_dragSourceManager.DragMove( e );
+        }
       }
 
       base.OnMouseMove( e );
@@ -365,10 +367,14 @@ namespace Xceed.Wpf.DataGrid
       bool isPressed = this.IsPressed;
 
       if( m_dragSourceManager != null )
-        m_dragSourceManager.ProcessMouseLeftButtonUp( e );
+      {
+        m_dragSourceManager.Drop( e );
+      }
 
       if( isMouseCaptured )
       {
+        this.ReleaseMouseCapture();
+
         bool click = isPressed;
 
         if( click )
@@ -423,22 +429,24 @@ namespace Xceed.Wpf.DataGrid
     protected override void OnLostMouseCapture( MouseEventArgs e )
     {
       if( m_dragSourceManager != null )
-        m_dragSourceManager.ProcessLostMouseCapture( e );
+      {
+        m_dragSourceManager.DragCancel( e );
+      }
 
       base.OnLostMouseCapture( e );
     }
 
-    internal void ShowFarDropMark( Point mousePosition )
+    internal void ShowFarDropMark( RelativePoint mousePosition )
     {
       this.ShowDropMark( mousePosition, DropMarkAlignment.Far, true );
     }
 
-    private void ShowDropMark( Point mousePosition )
+    private void ShowDropMark( RelativePoint mousePosition )
     {
       this.ShowDropMark( mousePosition, DropMarkAlignment.Far, false );
     }
 
-    private void ShowDropMark( Point mousePosition, DropMarkAlignment defaultAlignment, bool forceDefaultAlignment )
+    private void ShowDropMark( RelativePoint mousePosition, DropMarkAlignment defaultAlignment, bool forceDefaultAlignment )
     {
       if( m_dropMarkAdorner == null )
       {
@@ -475,7 +483,7 @@ namespace Xceed.Wpf.DataGrid
 
       if( forceDefaultAlignment )
       {
-        m_dropMarkAdorner.ForceAlignment( defaultAlignment );
+        m_dropMarkAdorner.Alignment = defaultAlignment;
       }
       else
       {
@@ -619,7 +627,7 @@ namespace Xceed.Wpf.DataGrid
 
     #region IDropTarget Members
 
-    bool IDropTarget.CanDropElement( UIElement draggedElement )
+    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
     {
       bool canDrop = true;
 
@@ -703,7 +711,7 @@ namespace Xceed.Wpf.DataGrid
     {
     }
 
-    void IDropTarget.DragOver( UIElement draggedElement, Point mousePosition )
+    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell cell = draggedElement as ColumnManagerCell;
 
@@ -855,7 +863,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    void IDropTarget.Drop( UIElement draggedElement )
+    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
     {
       ColumnManagerCell draggedColumnManagerCell = draggedElement as ColumnManagerCell;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
index 0eb35768..fa5f40a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
@@ -15,8 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -28,15 +26,15 @@ namespace Xceed.Wpf.DataGrid
     static HierarchicalGroupLevelIndicatorPane()
     {
       // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( HierarchicalGroupLevelIndicatorPane ) ) ) );
+      FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( HierarchicalGroupLevelIndicatorPane ) ) ) );
 
-      FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( false ) );
+      UIElement.FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( false ) );
 
       DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridControlChanged ) ) );
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits, new PropertyChangedCallback( OnDataGridContextChanged ) ) );
+      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnDataGridContextChanged ) ) );
     }
 
-    #region GroupLevelIndicatorPaneHost Read-Only Property
+    #region GroupLevelIndicatorPaneHost Private Property
 
     private Panel GroupLevelIndicatorPaneHost
     {
@@ -45,7 +43,7 @@ namespace Xceed.Wpf.DataGrid
         //if there is no local storage for the host panel, try to retrieve and store the value
         if( m_storedGroupLevelIndicatorPaneHost == null )
         {
-          m_storedGroupLevelIndicatorPaneHost = this.RetrieveGroupLevelIndicatorPaneHostPanel();
+          m_storedGroupLevelIndicatorPaneHost = this.GetTemplateChild( "PART_GroupLevelIndicatorHost" ) as Panel;
         }
 
         return m_storedGroupLevelIndicatorPaneHost;
@@ -54,7 +52,7 @@ namespace Xceed.Wpf.DataGrid
 
     private Panel m_storedGroupLevelIndicatorPaneHost = null;
 
-    #endregion GroupLevelIndicatorPaneHost Read-Only Property
+    #endregion
 
     #region GroupLevelIndicatorPaneNeedsRefresh Private Property
 
@@ -62,18 +60,18 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        Panel panel = this.GroupLevelIndicatorPaneHost;
+        var panel = this.GroupLevelIndicatorPaneHost;
         if( panel == null )
           return false;
 
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
         if( dataGridContext == null )
           return false;
 
         //skip the "current" DataGridContext
         dataGridContext = dataGridContext.ParentDataGridContext;
 
-        int expectedIndicatorsCount = 0;
+        var expectedIndicatorsCount = 0;
         for( ; dataGridContext != null; dataGridContext = dataGridContext.ParentDataGridContext )
         {
           //a group indicator and a detail indicator should exist per level
@@ -96,107 +94,106 @@ namespace Xceed.Wpf.DataGrid
 
     internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
     {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupLevelIndicatorPane ) );
+      var newThemeKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupLevelIndicatorPane ) );
+      if( object.Equals( this.DefaultStyleKey, newThemeKey ) )
+        return;
+
+      this.DefaultStyleKey = newThemeKey;
     }
 
     protected override Size MeasureOverride( Size availableSize )
     {
-      Panel panel = this.GroupLevelIndicatorPaneHost;
+      var panel = this.GroupLevelIndicatorPaneHost;
+      if( panel == null )
+        return base.MeasureOverride( availableSize );
 
-      if( panel != null )
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( ( dataGridContext == null ) || !this.GroupLevelIndicatorPaneNeedsRefresh )
+        return base.MeasureOverride( availableSize );
+
+      //clear all the panel's children!
+      panel.Children.Clear();
+
+      var previousContext = dataGridContext;
+      var runningDataGridContext = dataGridContext.ParentDataGridContext;
+
+      while( runningDataGridContext != null )
       {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+        //create a GroupLevelIndicator to create indentation between the GLIPs
+        FrameworkElement newGroupMargin = new DetailIndicator();
+        newGroupMargin.DataContext = dataGridContext;
+
+        object bindingSource = dataGridContext.GetDefaultDetailConfigurationForContext();
+        if( bindingSource == null )
+        {
+          bindingSource = dataGridContext.SourceDetailConfiguration;
+        }
+
+        //Bind the GroupLevelIndicator`s style to the running DataGridContext`s GroupLevelIndicatorStyle.
+        var groupLevelIndicatorStyleBinding = new Binding();
+        groupLevelIndicatorStyleBinding.Path = new PropertyPath( DetailConfiguration.DetailIndicatorStyleProperty );
+        groupLevelIndicatorStyleBinding.Source = bindingSource;
+        newGroupMargin.SetBinding( StyleProperty, groupLevelIndicatorStyleBinding );
 
-        if( dataGridContext != null )
+        //insert the Spacer GroupLevelIndicator in the panel
+        panel.Children.Insert( 0, newGroupMargin );
+
+        if( !runningDataGridContext.AreDetailsFlatten )
         {
-          if( this.GroupLevelIndicatorPaneNeedsRefresh )
-          {
-            //clear all the panel's children!
-            panel.Children.Clear();
-
-            DataGridContext previousContext = dataGridContext;
-            DataGridContext runningDataGridContext = dataGridContext.ParentDataGridContext;
-
-            while( runningDataGridContext != null )
-            {
-              //create a GroupLevelIndicator to create indentation between the GLIPs
-              FrameworkElement newGroupMargin = null;
-              newGroupMargin = new DetailIndicator();
-              newGroupMargin.DataContext = dataGridContext;
-
-              object bindingSource = dataGridContext.GetDefaultDetailConfigurationForContext();
-              if( bindingSource == null )
-                bindingSource = dataGridContext.SourceDetailConfiguration;
-
-              //Bind the GroupLevelIndicator`s style to the running DataGridContext`s GroupLevelIndicatorStyle.
-              Binding groupLevelIndicatorStyleBinding = new Binding();
-              groupLevelIndicatorStyleBinding.Path = new PropertyPath( DetailConfiguration.DetailIndicatorStyleProperty );
-              groupLevelIndicatorStyleBinding.Source = bindingSource;
-              newGroupMargin.SetBinding( StyleProperty, groupLevelIndicatorStyleBinding );
-
-              //insert the Spacer GroupLevelIndicator in the panel
-              panel.Children.Insert( 0, newGroupMargin );
-
-              if( !runningDataGridContext.AreDetailsFlatten )
-              {
-                //then create the GLIP for the running DataGridContext
-                GroupLevelIndicatorPane newSubGLIP = new GroupLevelIndicatorPane();
-                DataGridControl.SetDataGridContext( newSubGLIP, runningDataGridContext );
-                newSubGLIP.SetIsLeaf( false );
-                GroupLevelIndicatorPane.SetGroupLevel( newSubGLIP, -1 );
-
-                //and insert it in the panel.
-                panel.Children.Insert( 0, newSubGLIP );
-              }
-
-              previousContext = runningDataGridContext;
-              runningDataGridContext = runningDataGridContext.ParentDataGridContext;
-            } //end of the loop to cycle through the parent contexts.
-          } // end if GroupLevelIndicatorPaneNeedsRefresh
-        } // end if dataGridContext != null
-      } //end if panel is not null
+          //then create the GLIP for the running DataGridContext
+          var newSubGLIP = new GroupLevelIndicatorPane();
+          DataGridControl.SetDataGridContext( newSubGLIP, runningDataGridContext );
+          newSubGLIP.SetIsLeaf( false );
+          GroupLevelIndicatorPane.SetGroupLevel( newSubGLIP, -1 );
+
+          //and insert it in the panel.
+          panel.Children.Insert( 0, newSubGLIP );
+        }
+
+        previousContext = runningDataGridContext;
+        runningDataGridContext = runningDataGridContext.ParentDataGridContext;
+      }
 
       return base.MeasureOverride( availableSize );
     }
 
     private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      HierarchicalGroupLevelIndicatorPane self = ( HierarchicalGroupLevelIndicatorPane )sender;
-      DataGridControl grid = e.OldValue as DataGridControl;
+      var self = sender as HierarchicalGroupLevelIndicatorPane;
+      if( self == null )
+        return;
 
-      //unsubsribe from the old DataGridControl (the GLIP was disconnected)
-      if( grid != null )
+      var dataGridControl = e.OldValue as DataGridControl;
+      if( dataGridControl != null )
       {
-        DetailsChangedEventManager.RemoveListener( grid, self );
+        DetailsChangedEventManager.RemoveListener( dataGridControl, self );
       }
 
-      grid = e.NewValue as DataGridControl;
+      dataGridControl = e.NewValue as DataGridControl;
 
       //register to the parent grid control's Items Collection GroupDescriptions Changed event
-      if( grid != null )
+      if( dataGridControl != null )
       {
-        self.PrepareDefaultStyleKey( grid.GetView() );
+        self.PrepareDefaultStyleKey( dataGridControl.GetView() );
 
-        DetailsChangedEventManager.AddListener( grid, self );
+        DetailsChangedEventManager.AddListener( dataGridControl, self );
         self.InvalidateMeasure();
       }
     }
 
     private static void OnDataGridContextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      HierarchicalGroupLevelIndicatorPane self = ( HierarchicalGroupLevelIndicatorPane )sender;
-      Panel panel = self.GroupLevelIndicatorPaneHost;
+      var self = sender as HierarchicalGroupLevelIndicatorPane;
+      if( self == null )
+        return;
 
+      var panel = self.GroupLevelIndicatorPaneHost;
       if( panel != null )
       {
         panel.Children.Clear();
       }
-    }
 
-    private Panel RetrieveGroupLevelIndicatorPaneHostPanel()
-    {
-      //get the template part
-      return this.GetTemplateChild( "PART_GroupLevelIndicatorHost" ) as Panel;
+      self.InvalidateMeasure();
     }
 
     #region IWeakEventListener Members
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
index ea0e6b64..16607809 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
@@ -14,13 +14,24 @@
 
   ***********************************************************************************/
 
-using System;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal interface IDataGridItemContainer
   {
+    bool CanBeRecycled
+    {
+      get;
+    }
+
+    bool IsRecyclingCandidate
+    {
+      get;
+      set;
+    }
+
     void PrepareContainer( DataGridContext dataGridContext, object item );
     void ClearContainer();
+    void CleanRecyclingCandidate();
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs
new file mode 100644
index 00000000..2356d331
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs
@@ -0,0 +1,299 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class IndexerDescriptor : PropertyDescriptor
+  {
+    #region Static Fields
+
+    private static readonly object NotInitialized = new object();
+    private static readonly object NotSet = new object();
+
+    #endregion
+
+    // The name must be set to Item[] for binding to get notified when the data item implements INotifyPropertyChanged.
+    private IndexerDescriptor( string indexerName, string parametersList, object[] parameterValues, PropertyInfo propertyInfo, Attribute[] attributes )
+        : base( string.Format( "{0}[]", indexerName ), attributes )
+    {
+      m_displayName = string.Format( "{0}[{1}]", indexerName, parametersList );
+      m_indexerName = indexerName;
+      m_indexerParameters = parametersList;
+      m_indexerParameterValues = parameterValues;
+      m_propertyInfo = propertyInfo;
+    }
+
+    #region ComponentType Property
+
+    public override Type ComponentType
+    {
+      get
+      {
+        return m_propertyInfo.DeclaringType;
+      }
+    }
+
+    #endregion
+
+    #region PropertyType Property
+
+    public override Type PropertyType
+    {
+      get
+      {
+        return m_propertyInfo.PropertyType;
+      }
+    }
+
+    #endregion
+
+    #region IsReadOnly Property
+
+    public sealed override bool IsReadOnly
+    {
+      get
+      {
+        if( !m_propertyInfo.CanWrite )
+          return true;
+
+        var attribute = ( ReadOnlyAttribute )this.Attributes[ typeof( ReadOnlyAttribute ) ];
+
+        return ( attribute != null )
+            && ( attribute.IsReadOnly );
+      }
+    }
+
+    #endregion
+
+    #region DisplayName Property
+
+    public override string DisplayName
+    {
+      get
+      {
+        return m_displayName;
+      }
+    }
+
+    private readonly string m_displayName;
+
+    #endregion
+
+    #region IndexerName Internal Property
+
+    internal string IndexerName
+    {
+      get
+      {
+        return m_indexerName;
+      }
+    }
+
+    private readonly string m_indexerName;
+
+    #endregion
+
+    #region IndexerParameters Internal Property
+
+    internal string IndexerParameters
+    {
+      get
+      {
+        return m_indexerParameters;
+      }
+    }
+
+    private readonly string m_indexerParameters;
+
+    #endregion
+
+    #region DefaultValue Private Property
+
+    private object DefaultValue
+    {
+      get
+      {
+        if( m_defaultValue == IndexerDescriptor.NotInitialized )
+        {
+          var attribute = ( DefaultValueAttribute )this.Attributes[ typeof( DefaultValueAttribute ) ];
+          if( attribute != null )
+          {
+            var propertyType = this.PropertyType;
+            var value = attribute.Value;
+
+            if( ( value != null ) && ( propertyType.IsEnum ) && ( Enum.GetUnderlyingType( propertyType ) == value.GetType() ) )
+            {
+              value = Enum.ToObject( propertyType, value );
+            }
+
+            m_defaultValue = value;
+          }
+          else
+          {
+            m_defaultValue = IndexerDescriptor.NotSet;
+          }
+        }
+
+        return m_defaultValue;
+      }
+    }
+
+    private object m_defaultValue = IndexerDescriptor.NotInitialized;
+
+    #endregion
+
+    #region AmbientValue Private Property
+
+    private object AmbientValue
+    {
+      get
+      {
+        if( m_ambientValue == IndexerDescriptor.NotInitialized )
+        {
+          var attribute = ( AmbientValueAttribute )this.Attributes[ typeof( AmbientValueAttribute ) ];
+          if( attribute != null )
+          {
+            m_ambientValue = attribute.Value;
+          }
+          else
+          {
+            m_ambientValue = IndexerDescriptor.NotSet;
+          }
+        }
+
+        return m_ambientValue;
+      }
+    }
+
+    private object m_ambientValue = IndexerDescriptor.NotInitialized;
+
+    #endregion
+
+    public override bool ShouldSerializeValue( object component )
+    {
+      if( this.IsReadOnly )
+        return this.Attributes.Contains( DesignerSerializationVisibilityAttribute.Content );
+
+      if( this.DefaultValue != IndexerDescriptor.NotSet )
+        return !object.Equals( this.GetValue( component ), this.DefaultValue );
+
+      return true;
+    }
+
+    public override object GetValue( object component )
+    {
+      if( component == null )
+        return null;
+
+      return m_propertyInfo.GetValue( component, m_indexerParameterValues );
+    }
+
+    public override void SetValue( object component, object value )
+    {
+      if( ( component == null ) || this.IsReadOnly )
+        return;
+
+      m_propertyInfo.SetValue( component, value, m_indexerParameterValues );
+
+      this.OnValueChanged( component, EventArgs.Empty );
+    }
+
+    public override bool CanResetValue( object component )
+    {
+      if( this.IsReadOnly )
+        return false;
+
+      if( this.DefaultValue != IndexerDescriptor.NotSet )
+        return !object.Equals( this.GetValue( component ), this.DefaultValue );
+
+      return ( this.AmbientValue != IndexerDescriptor.NotSet )
+          && ( this.ShouldSerializeValue( component ) );
+    }
+
+    public override void ResetValue( object component )
+    {
+      if( ( component == null ) || this.IsReadOnly )
+        return;
+
+      if( this.DefaultValue != IndexerDescriptor.NotSet )
+      {
+        this.SetValue( component, this.DefaultValue );
+      }
+      else if( this.AmbientValue != IndexerDescriptor.NotSet )
+      {
+        this.SetValue( component, this.AmbientValue );
+      }
+    }
+
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      var descriptor = obj as IndexerDescriptor;
+      if( object.ReferenceEquals( descriptor, null ) )
+        return false;
+
+      return ( base.Equals( descriptor ) )
+          && ( descriptor.ComponentType == this.ComponentType )
+          && ( descriptor.IsReadOnly == this.IsReadOnly )
+          && ( descriptor.SupportsChangeEvents == this.SupportsChangeEvents )
+          && ( descriptor.IndexerName == this.IndexerName )
+          && ( descriptor.IndexerParameters == this.IndexerParameters );
+    }
+
+    internal static IndexerDescriptor Create( PropertyInfo propertyInfo, object[] parameterNames, object[] parameterValues )
+    {
+      if( propertyInfo == null )
+        throw new ArgumentNullException( "propertyInfo" );
+
+      if( parameterNames == null )
+        throw new ArgumentNullException( "parameterNames" );
+
+      if( parameterNames.Length <= 0 )
+        throw new ArgumentException( "The indexer must contain at least one index.", "parameterNames" );
+
+      if( parameterValues == null )
+        throw new ArgumentNullException( "parameterValues" );
+
+      if( parameterValues.Length <= 0 )
+        throw new ArgumentException( "The indexer must contain at least one index.", "parameterValues" );
+
+      var parameters = propertyInfo.GetIndexParameters();
+      if( ( parameters == null ) || ( parameters.Length <= 0 ) )
+        throw new ArgumentException( "The target property is not a valid indexer.", "propertyInfo" );
+
+      var attributes = ( from entry in propertyInfo.GetCustomAttributes( true )
+                         let attr = ( entry as Attribute )
+                         where ( attr != null )
+                         select attr ).ToArray();
+      var parametersList = IndexerParametersParser.Parse( parameterNames );
+      var indexerName = propertyInfo.Name;
+
+      return new IndexerDescriptor( indexerName, parametersList, parameterValues, propertyInfo, attributes );
+    }
+
+    private readonly PropertyInfo m_propertyInfo;
+    private readonly object[] m_indexerParameterValues;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs
new file mode 100644
index 00000000..37452bfa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs
@@ -0,0 +1,258 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class IndexerParametersParser
+  {
+    #region Static Fields
+
+    private const char Separator = ',';
+    private const char DoubleQuote = '"';
+
+    #endregion
+
+    internal static string Parse( IEnumerable<object> values )
+    {
+      if( values == null )
+        return string.Empty;
+
+      var sb = new StringBuilder();
+      var first = true;
+
+      foreach( var value in values )
+      {
+        if( !first )
+        {
+          sb.Append( "," );
+        }
+        else
+        {
+          first = false;
+        }
+
+        if( value == null )
+        {
+          sb.Append( "null" );
+        }
+        else
+        {
+          sb.Append( Convert.ToString( value, CultureInfo.InvariantCulture ) );
+        }
+      }
+
+      return sb.ToString();
+    }
+
+    internal static IEnumerable<string> Parse( string value )
+    {
+      var parameters = ( value != null ) ? value.Trim() : string.Empty;
+      var length = parameters.Length;
+      if( length <= 0 )
+        return Enumerable.Empty<string>();
+
+      var values = new List<string>();
+      var state = ParserState.Start;
+      var index = 0;
+
+      while( index < length )
+      {
+        var c = parameters[ index ];
+
+        switch( state )
+        {
+          case ParserState.Start:
+            {
+              if( char.IsWhiteSpace( c ) )
+              {
+                index++;
+              }
+              else
+              {
+                state = ParserState.FindValue;
+              }
+            }
+            break;
+
+          case ParserState.FindValue:
+            {
+              if( char.IsWhiteSpace( c ) )
+              {
+                index++;
+              }
+              else if( c == IndexerParametersParser.Separator )
+              {
+                // A parameter is missing.
+                return Enumerable.Empty<string>();
+              }
+              else if( c == IndexerParametersParser.DoubleQuote )
+              {
+                state = ParserState.ExtractString;
+              }
+              else
+              {
+                state = ParserState.ExtractValue;
+              }
+            }
+            break;
+
+          case ParserState.FindSeparator:
+            {
+              if( char.IsWhiteSpace( c ) )
+              {
+                index++;
+              }
+              else if( c == IndexerParametersParser.Separator )
+              {
+                index++;
+                state = ParserState.FindValue;
+              }
+              else
+              {
+                // Unexpected character.
+                return Enumerable.Empty<string>();
+              }
+            }
+            break;
+
+          case ParserState.ExtractString:
+            {
+              if( !IndexerParametersParser.AddString( parameters, length, ref index, values ) )
+                return Enumerable.Empty<string>();
+
+              state = ParserState.FindSeparator;
+            }
+            break;
+
+          case ParserState.ExtractValue:
+            {
+              if( !IndexerParametersParser.AddValue( parameters, length, ref index, values ) )
+                return Enumerable.Empty<string>();
+
+              state = ParserState.FindSeparator;
+            }
+            break;
+
+          default:
+            throw new NotImplementedException();
+        }
+      }
+
+      if( state != ParserState.FindSeparator )
+        return Enumerable.Empty<string>();
+
+      return values;
+    }
+
+    private static bool AddString( string source, int length, ref int index, IList<string> values )
+    {
+      if( ( index >= length ) || ( source[ index ] != IndexerParametersParser.DoubleQuote ) )
+        return false;
+
+      var currentIndex = index + 1;
+      var startIndex = currentIndex;
+      var containsSeparator = false;
+
+      while( currentIndex < length )
+      {
+        var c = source[ currentIndex ];
+        if( c == IndexerParametersParser.DoubleQuote )
+        {
+          Debug.Assert( startIndex < length );
+          Debug.Assert( startIndex <= currentIndex );
+
+          var value = source.Substring( startIndex, currentIndex - startIndex ).Trim();
+          if( value.Length <= 0 )
+          {
+            return false;
+          }
+          else if( containsSeparator )
+          {
+            values.Add( string.Format( "\"{0}\"", value ) );
+          }
+          else
+          {
+            values.Add( value );
+          }
+
+          index = currentIndex + 1;
+
+          return true;
+        }
+        else
+        {
+          containsSeparator = containsSeparator || ( c == IndexerParametersParser.Separator );
+          currentIndex++;
+        }
+      }
+
+      return false;
+    }
+
+    private static bool AddValue( string source, int length, ref int index, IList<string> values )
+    {
+      if( index >= length )
+        return false;
+
+      var currentIndex = index;
+      var startIndex = currentIndex;
+
+      while( currentIndex < length )
+      {
+        var c = source[ currentIndex ];
+
+        if( c == IndexerParametersParser.Separator )
+          break;
+
+        // Unexpected character.
+        if( c == IndexerParametersParser.DoubleQuote )
+          return false;
+
+        currentIndex++;
+      }
+
+      var value = source.Substring( startIndex, currentIndex - startIndex ).Trim();
+      if( value.Length <= 0 )
+        return false;
+
+      values.Add( value );
+
+      index = currentIndex;
+
+      return true;
+    }
+
+    #region ParserState Private Enum
+
+    private enum ParserState
+    {
+      Start,
+      FindValue,
+      FindSeparator,
+      ExtractString,
+      ExtractValue,
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
index f613bf2b..ac971a5c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
@@ -14,14 +14,8 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Diagnostics;
-using System.Windows.Threading;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.DataGrid
@@ -49,6 +43,7 @@ namespace Xceed.Wpf.DataGrid
       m_sTextBlockStyle = new Style( typeof( TextBlock ) );
       m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextTrimmingProperty, trimmingBinding ) );
       m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextWrappingProperty, wrappingBinding ) );
+      m_sTextBlockStyle.Seal();
     }
 
     public InnerCellContentPresenter()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs
deleted file mode 100644
index b48ecd0e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ItemPropertiesChangedEventManager : WeakEventManager
-  {
-    private ItemPropertiesChangedEventManager()
-    {
-    }
-
-    public static void AddListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridItemPropertyCollection itemProperties = source as DataGridItemPropertyCollection;
-      itemProperties.CollectionChanged += new NotifyCollectionChangedEventHandler( ItemProperties_CollectionChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridItemPropertyCollection itemProperties = source as DataGridItemPropertyCollection;
-      itemProperties.CollectionChanged -= new NotifyCollectionChangedEventHandler( ItemProperties_CollectionChanged );
-    }
-
-    private static ItemPropertiesChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ItemPropertiesChangedEventManager );
-        ItemPropertiesChangedEventManager currentManager = ( ItemPropertiesChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ItemPropertiesChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void ItemProperties_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertyNameMap.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertyNameMap.cs
deleted file mode 100644
index 885d4d5e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertyNameMap.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ItemPropertyNameMap : FieldNameMap, INotifyCollectionChanged, IWeakEventListener
-  {
-    #region Constructors
-
-    internal ItemPropertyNameMap( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        throw new ArgumentNullException( "itemProperties" );
-
-      m_dataGridItemPropertyCollection = new WeakReference( itemProperties );
-
-      CollectionChangedEventManager.AddListener( itemProperties, this );
-    }
-
-    #endregion
-
-    #region ItemProperties Internal Property
-
-    internal DataGridItemPropertyCollection ItemProperties
-    {
-      get
-      {
-        return ( DataGridItemPropertyCollection )m_dataGridItemPropertyCollection.Target;
-      }
-    }
-
-    private readonly WeakReference m_dataGridItemPropertyCollection; //null
-
-    #endregion
-
-    protected override bool TryGetSource( string targetName, out string sourceName )
-    {
-      var itemProperties = this.ItemProperties;
-      if( itemProperties == null )
-        throw new InvalidOperationException( "Garbage collection has been performed on the collection." );
-
-      sourceName = null;
-
-      if( !string.IsNullOrEmpty( targetName ) )
-      {
-        foreach( var itemProperty in itemProperties )
-        {
-          if( itemProperty.Synonym == targetName )
-          {
-            sourceName = itemProperty.Name;
-            break;
-          }
-        }
-      }
-
-      return ( sourceName != null );
-    }
-
-    protected override bool TryGetTarget( string sourceName, out string targetName )
-    {
-      var itemProperties = this.ItemProperties;
-      if( itemProperties == null )
-        throw new InvalidOperationException( "Garbage collection has been performed on the collection." );
-
-      targetName = null;
-
-      if( !string.IsNullOrEmpty( sourceName ) )
-      {
-        var itemProperty = itemProperties[ sourceName ];
-        if( ( itemProperty != null ) && !string.IsNullOrEmpty( itemProperty.Synonym ) )
-        {
-          targetName = itemProperty.Synonym;
-        }
-      }
-
-      return ( targetName != null );
-    }
-
-    private void OnItemPropertyCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      Debug.Assert( sender == this.ItemProperties );
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Reset:
-          this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-          break;
-
-        case NotifyCollectionChangedAction.Add:
-          if( ( e.NewItems == null ) || ( e.NewItems.Count != 1 ) )
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-          }
-          else
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, e.NewItems[ 0 ] ) );
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          if( ( e.OldItems == null ) || ( e.OldItems.Count != 1 ) )
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-          }
-          else
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, e.OldItems[ 0 ] ) );
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          if( ( e.OldItems == null ) || ( e.NewItems == null ) || ( e.OldItems.Count != 1 ) || ( e.NewItems.Count != 1 ) )
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-          }
-          else
-          {
-            this.RaiseCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, e.NewItems[ 0 ], e.OldItems[ 0 ] ) );
-          }
-          break;
-
-        default:
-          break;
-      }
-    }
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    private void RaiseCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnItemPropertyCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
index 518bb197..bd6e7139 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
@@ -25,6 +25,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -36,87 +37,67 @@ namespace Xceed.Wpf.DataGrid
 {
   internal static class ItemsSourceHelper
   {
-    public static bool IsSourceSupportingChangeNotification( object obj )
-    {
-      if( obj == null )
-        throw new ArgumentNullException( "obj" );
+    #region Static Fields
+
+    private static readonly Type EntityObjectType = Type.GetType(
+      "System.Data.Objects.DataClasses.EntityObject, System.Data.Entity, Version=" + _XceedVersionInfo.FrameworkVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089",
+      false, false );
+
+    #endregion
 
-      if( obj is INotifyCollectionChanged )
+    internal static bool IsSourceSupportingChangeNotification( object source )
+    {
+      if( source is INotifyCollectionChanged )
         return true;
 
-      IBindingList bindingList = obj as IBindingList;
+      var collection = source as IBindingList;
 
-      return ( ( bindingList != null )
-            && ( bindingList.SupportsChangeNotification ) );
+      return ( collection != null )
+          && ( collection.SupportsChangeNotification );
     }
 
-    public static bool IsSourceSupportingDBNull( IEnumerable toCheck )
+    private static bool IsSupportingDBNull( IEnumerable source )
     {
-      if( toCheck is DataGridCollectionView )
-      {
-        // false because all the DBNull conversion should have been done in the DataGridCollectionView.ItemProperties converter.
+      // return false because all the DBNull conversion should have been done in the DataGridCollectionView.ItemProperties converter.
+      if( source is DataGridCollectionView )
         return false;
-      }
 
-      if( toCheck is DataView )
+      if( source is DataView )
         return true;
 
-      CollectionView cv = toCheck as CollectionView;
-
-      if( cv != null )
-        return ItemsSourceHelper.IsSourceSupportingDBNull( cv.SourceCollection );
+      var collectionView = source as CollectionView;
+      if( collectionView != null )
+        return ItemsSourceHelper.IsSupportingDBNull( collectionView.SourceCollection );
 
       return false;
     }
 
-    public static bool IsItemSupportingDBNull( object toCheck )
+    internal static bool IsItemSupportingDBNull( object source )
     {
-      return ( toCheck is System.Data.DataRow ) || ( toCheck is System.Data.DataRowView );
+      return ( source is System.Data.DataRow )
+          || ( source is DataRowView );
     }
 
-    public static bool IsDataView( IEnumerable toCheck )
+    internal static bool IsDataView( IEnumerable source )
     {
-      if( toCheck is DataGridCollectionView )
+      if( source is DataGridCollectionView )
         return false;
 
-      if( toCheck is DataView )
+      if( source is DataView )
         return true;
 
-      CollectionView cv = toCheck as CollectionView;
-
-      if( ( cv != null ) && ( cv.SourceCollection is DataView ) )
-        return true;
-
-      return false;
-    }
-
-    [Obsolete( "You should use 'DataGridContext.ItemsSourceCollection as DataGridCollectionViewBase'" )]
-    public static DataGridCollectionViewBase TryGetDataGridCollectionViewBase( IEnumerable itemsSource )
-    {
-      // This method is intended to return null if not using a DataGridCollectionViewBase.
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSource as DataGridCollectionViewBase;
-
-      // This is to ensure that this is not the master Generator ( and this CollectionView is the ItemsCollection )
-      if( dataGridCollectionViewBase == null )
-      {
-        CollectionView collectionView = itemsSource as CollectionView;
-
-        dataGridCollectionViewBase = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as DataGridCollectionViewBase;
-      }
+      var collectionView = source as CollectionView;
 
-      return dataGridCollectionViewBase;
+      return ( collectionView != null )
+          && ( collectionView.SourceCollection is DataView );
     }
 
-    public static IList TryGetIList( IEnumerable itemsSourceCollection )
+    internal static IList TryGetIList( IEnumerable itemsSourceCollection )
     {
-
-      CollectionView collectionView = itemsSourceCollection as ItemCollection;
-
+      var collectionView = itemsSourceCollection as ItemCollection;
       if( collectionView != null )
       {
-        IList list = collectionView.SourceCollection as IList;
-
+        var list = collectionView.SourceCollection as IList;
         if( list != null )
           return list;
       }
@@ -124,184 +105,206 @@ namespace Xceed.Wpf.DataGrid
       return itemsSourceCollection as IList;
     }
 
-    public static bool IsValueType( Type type )
+    private static bool IsValueType( Type itemType )
     {
-      bool isValueType = type.IsValueType;
+      if( typeof( string ) == itemType )
+        return true;
+
+      if( !itemType.IsValueType )
+        return false;
 
-      return ( ( ( isValueType ) && ( type.IsPrimitive ) ) ||
-        ( ( isValueType ) &&
-        ( ( type == typeof( decimal ) ) ||
-        ( type == typeof( DateTime ) ) ||
-        ( type == typeof( TimeSpan ) ) ||
-        ( type == typeof( Guid ) ) ) ) ||
-        ( type == typeof( string ) ) );
+      return ( itemType.IsPrimitive )
+          || ( typeof( decimal ) == itemType )
+          || ( typeof( DateTime ) == itemType )
+          || ( typeof( TimeSpan ) == itemType )
+          || ( typeof( Guid ) == itemType );
     }
 
-    public static bool IsEntityObjectLoadable( EntityObject entityObject )
+    internal static bool IsEntityObjectLoadable( EntityObject entityObject )
     {
-      return
-        ( ( entityObject.EntityState & EntityState.Added ) != EntityState.Added ) &&
-        ( ( entityObject.EntityState & EntityState.Detached ) != EntityState.Detached );
+      return ( ( entityObject.EntityState & EntityState.Added ) != EntityState.Added )
+          && ( ( entityObject.EntityState & EntityState.Detached ) != EntityState.Detached );
     }
 
-    public static bool IsEntityFramework( Type type )
+    private static bool IsEntityFramework( Type itemType )
     {
-      // The EntityFramework assembly is not loaded.  We are running on the client framework.
-      if( EntityObjectType == null )
-        return false;
+      var entityObjectType = ItemsSourceHelper.EntityObjectType;
 
-      return EntityObjectType.IsAssignableFrom( type );
+      // The EntityFramework assembly is not loaded.  We are running on the client framework.
+      return ( entityObjectType != null )
+          && ( entityObjectType.IsAssignableFrom( itemType ) );
     }
 
-    public static bool IsEntityFramework( object o )
+    internal static bool IsEntityFramework( object source )
     {
-      if( o == null )
-        return false;
-
-      return ItemsSourceHelper.IsEntityFramework( o.GetType() );
+      return ( source != null )
+          && ( ItemsSourceHelper.IsEntityFramework( source.GetType() ) );
     }
 
-    public static object GetFirstItemByEnumerable( IEnumerable enumerable )
+    internal static object GetFirstItemByEnumerable( IEnumerable source )
     {
-      if( enumerable == null )
+      if( source == null )
         return null;
 
-      object current = null;
-      IList list = enumerable as IList;
-
-      if( list != null )
-        return ( ( list.Count > 0 ) ? list[ 0 ] : null );
+      return source.Cast<object>().FirstOrDefault();
+    }
 
-      try
-      {
-        IEnumerator enumerator = enumerable.GetEnumerator();
+    internal static DataGridItemPropertyCollection GetRootCollection( DataGridItemPropertyCollection collection )
+    {
+      if( collection == null )
+        return null;
 
+      var owner = collection.Owner;
+      if( owner == null )
+        return collection;
 
-        if( enumerator.MoveNext() )
-        {
-          current = enumerator.Current;
-        }
+      return ItemsSourceHelper.GetRootCollection( owner );
+    }
 
-      }
-      catch( NotSupportedException )
-      {
-        current = null;
-      }
+    internal static DataGridItemPropertyCollection GetRootCollection( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        return null;
 
-      return current;
+      return ItemsSourceHelper.GetRootCollection( itemProperty.ContainingCollection );
     }
 
-    public static object AddNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, out int itemIndex )
+    internal static object AddNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, out int itemIndex )
     {
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-
+      var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
       if( dataGridCollectionViewBase != null )
       {
         if( !dataGridCollectionViewBase.CanAddNew )
           throw new InvalidOperationException( "An attempt was made to add a new data item to a source that does not support insertion." );
 
         itemIndex = dataGridCollectionViewBase.Count;
+
         return dataGridCollectionViewBase.AddNew();
       }
 
+      var newItem = default( object );
+
       if( ( dataGridControl != null ) && ( dataGridControl.ItemsSource == null ) )
       {
         //unbound
 #pragma warning disable 618
-        AddingNewDataItemEventArgs eventArgs = new AddingNewDataItemEventArgs();
+        var eventArgs = new AddingNewDataItemEventArgs();
         dataGridControl.OnAddingNewDataItem( eventArgs );
-        object newItem = eventArgs.DataItem;
+
+        newItem = eventArgs.DataItem;
 #pragma warning restore 618
 
         if( newItem == null )
           throw new InvalidOperationException( "The AddingNewDataItem event did not return a new data item because the grid is not bound to a data source." );
 
         itemIndex = dataGridControl.Items.Add( newItem );
+
         return newItem;
       }
 
-      DataView dataView = itemsSourceCollection as DataView;
-
+      var dataView = itemsSourceCollection as DataView;
       if( dataView == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        dataView = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as DataView;
+        dataView = ( collectionView == null ) ? null : collectionView.SourceCollection as DataView;
       }
 
       if( dataView != null )
       {
         itemIndex = dataView.Count;
+
         return dataView.AddNew();
       }
 
-      IBindingList bindingList = itemsSourceCollection as IBindingList;
-
+      var bindingList = itemsSourceCollection as IBindingList;
       if( bindingList == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        bindingList = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as IBindingList;
+        bindingList = ( collectionView == null ) ? null : collectionView.SourceCollection as IBindingList;
       }
 
       if( ( bindingList != null ) && ( bindingList.AllowNew ) )
       {
         itemIndex = bindingList.Count;
-        return bindingList.AddNew();
+        newItem = bindingList.AddNew();
       }
-
-      Type itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( itemsSourceCollection );
-
-      if( itemType == null )
-        throw new InvalidOperationException( "An attempt was made to use a source whose item type cannot be determined." );
-
-      try
+      else
       {
-        itemIndex = -1;
-        return Activator.CreateInstance( itemType );
+        var itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( itemsSourceCollection );
+        if( itemType == null )
+          throw new InvalidOperationException( "An attempt was made to use a source whose item type cannot be determined." );
+
+        try
+        {
+          itemIndex = -1;
+          newItem = Activator.CreateInstance( itemType );
+        }
+        catch( MissingMethodException exception )
+        {
+          throw new InvalidOperationException( "An attempt was made to use a source whose item type does not have a default constructor.", exception );
+        }
+        catch( Exception exception )
+        {
+          throw new InvalidOperationException( "An unsuccessful attempt was made to create an instance of the source's item type using the item's default constructor.", exception );
+        }
       }
-      catch( MissingMethodException exception )
+
+      var initializableObject = ItemsSourceHelper.GetSupportInitializeObject( newItem );
+      if( initializableObject != null )
       {
-        throw new InvalidOperationException( "An attempt was made to use a source whose item type does not have a default constructor.", exception );
+        initializableObject.BeginInit();
       }
-      catch( Exception exception )
+
+      var editableObject = ItemsSourceHelper.GetEditableObject( newItem );
+      if( editableObject != null )
       {
-        throw new InvalidOperationException( "An unsuccessful attempt was made to create an instance of the source's item type using the item's default constructor.", exception );
+        editableObject.BeginEdit();
       }
+
+      return newItem;
     }
 
-    public static void CancelNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, int newItemIndex )
+    internal static void CancelNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, int newItemIndex )
     {
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-
+      var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
       if( dataGridCollectionViewBase != null )
       {
         if( dataGridCollectionViewBase.CurrentAddItem == newItem )
         {
-          // The DataGridCollectionViewBAse's CancelNew will take care of calling
-          // the item's CancelEdit if it must do so.
+          // The DataGridCollectionViewBase's CancelNew will take care of calling the item's CancelEdit if it must do so.
           dataGridCollectionViewBase.CancelNew();
         }
 
         return;
       }
 
+      //if unbound
       if( ( dataGridControl != null ) && ( dataGridControl.ItemsSource == null ) )
-      {
-        //unbound
         return;
+
+      var editableObject = ItemsSourceHelper.GetEditableObject( newItem );
+      if( editableObject != null )
+      {
+        editableObject.CancelEdit();
+      }
+
+      var initializableObject = ItemsSourceHelper.GetSupportInitializeObject( newItem );
+      if( initializableObject != null )
+      {
+        initializableObject.EndInit();
       }
 
-      ICancelAddNew cancelAddNew = itemsSourceCollection as ICancelAddNew;
+      if( ItemsSourceHelper.IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically( editableObject ) )
+        return;
 
+      var cancelAddNew = itemsSourceCollection as ICancelAddNew;
       if( cancelAddNew == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        cancelAddNew = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as ICancelAddNew;
+        cancelAddNew = ( collectionView == null ) ? null : collectionView.SourceCollection as ICancelAddNew;
       }
 
       if( cancelAddNew != null )
@@ -310,25 +313,14 @@ namespace Xceed.Wpf.DataGrid
         return;
       }
 
-      IEditableObject editableObject = ItemsSourceHelper.GetEditableObject( newItem );
-
-      // editableObject can be an xceed datarow when directly inserted as Items in the DataGridControl.
-      if( ( editableObject != null ) && ( !( editableObject is Xceed.Wpf.DataGrid.DataRow ) ) )
-      {
-        editableObject.CancelEdit();
-        return;
-      }
-
-      if( newItemIndex != -1 )
+      if( newItemIndex >= 0 )
       {
-        IList list = itemsSourceCollection as IList;
-
+        var list = itemsSourceCollection as IList;
         if( list == null )
         {
-          CollectionView collectionView = itemsSourceCollection as CollectionView;
+          var collectionView = itemsSourceCollection as CollectionView;
 
-          list = ( collectionView == null ) ?
-            null : collectionView.SourceCollection as IList;
+          list = ( collectionView == null ) ? null : collectionView.SourceCollection as IList;
         }
 
         if( ( list != null ) && ( !list.IsFixedSize ) )
@@ -338,36 +330,45 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public static void EndNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, ref int newItemIndex )
+    internal static void EndNewDataItem( IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, ref int newItemIndex )
     {
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-
+      var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
       if( dataGridCollectionViewBase != null )
       {
         if( dataGridCollectionViewBase.CurrentAddItem == newItem )
         {
-          // The DataGridCollectionViewBase's EndNew will take care of calling
-          // the item's EndEdit if it must do so.
+          // The DataGridCollectionViewBase's EndNew will take care of calling the item's EndEdit if it must do so.
           dataGridCollectionViewBase.CommitNew();
         }
 
         return;
       }
 
+      //if unbound
       if( ( dataGridControl != null ) && ( dataGridControl.ItemsSource == null ) )
-      {
-        //unbound
         return;
+
+      var editableObject = ItemsSourceHelper.GetEditableObject( newItem );
+      if( editableObject != null )
+      {
+        editableObject.EndEdit();
+      }
+
+      var initializableObject = ItemsSourceHelper.GetSupportInitializeObject( newItem );
+      if( initializableObject != null )
+      {
+        initializableObject.EndInit();
       }
 
-      ICancelAddNew cancelAddNew = itemsSourceCollection as ICancelAddNew;
+      if( ItemsSourceHelper.IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically( editableObject ) )
+        return;
 
+      var cancelAddNew = itemsSourceCollection as ICancelAddNew;
       if( cancelAddNew == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        cancelAddNew = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as ICancelAddNew;
+        cancelAddNew = ( collectionView == null ) ? null : collectionView.SourceCollection as ICancelAddNew;
       }
 
       if( cancelAddNew != null )
@@ -376,39 +377,24 @@ namespace Xceed.Wpf.DataGrid
         return;
       }
 
-      IEditableObject editableObject = ItemsSourceHelper.GetEditableObject( newItem );
-
-      // editableObject can be a datarow when directly inserted as Items in the DataGridControl.
-      if( ( editableObject != null ) && ( !( editableObject is Xceed.Wpf.DataGrid.DataRow ) ) )
-      {
-        editableObject.EndEdit();
-        return;
-      }
-
-      IBindingList bindingList = itemsSourceCollection as IBindingList;
-
+      var bindingList = itemsSourceCollection as IBindingList;
       if( bindingList == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        bindingList = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as IBindingList;
+        bindingList = ( collectionView == null ) ? null : collectionView.SourceCollection as IBindingList;
       }
 
+      // If the item is already added into the list by IBindingList.AddNew.
       if( ( bindingList != null ) && ( bindingList.AllowNew ) )
-      {
-        // In that case the item is already added into the list by IBindingList.AddNew.
         return;
-      }
-
-      IList list = itemsSourceCollection as IList;
 
+      var list = itemsSourceCollection as IList;
       if( list == null )
       {
-        CollectionView collectionView = itemsSourceCollection as CollectionView;
+        var collectionView = itemsSourceCollection as CollectionView;
 
-        list = ( collectionView == null ) ?
-          null : collectionView.SourceCollection as IList;
+        list = ( collectionView == null ) ? null : collectionView.SourceCollection as IList;
       }
 
       if( ( list == null ) || ( list.IsFixedSize ) )
@@ -418,217 +404,219 @@ namespace Xceed.Wpf.DataGrid
       list.Add( newItem );
     }
 
-    public static Dictionary<string, FieldDescriptor> GetFieldDescriptors( PropertyDescriptorCollection properties, bool supportDBNull )
+    private static PropertyDescription GetPropertyDescriptionFromItemProperty( PropertyDescriptionRouteDictionary propertyDescriptions, DataGridItemPropertyRoute itemPropertyRoute )
     {
-      int fieldCount = properties.Count;
+      if( ( propertyDescriptions == null ) || ( itemPropertyRoute == null ) )
+        return null;
+
+      var propertyRoute = PropertyRouteBuilder.ToPropertyRoute( itemPropertyRoute );
+      if( propertyRoute == null )
+        return null;
+
+      PropertyDescriptionRoute propertyDescription;
+      if( !propertyDescriptions.TryGetValue( propertyRoute, out propertyDescription ) )
+        return null;
 
-      Dictionary<string, FieldDescriptor> fieldDescriptors =
-        new Dictionary<string, FieldDescriptor>( fieldCount );
+      return propertyDescription.Current;
+    }
 
-      ItemsSourceHelper.ExtractFieldDescriptors( string.Empty, properties, supportDBNull, fieldDescriptors );
+    internal static void CreateAndAddItemPropertiesForPropertyDescriptions( DataGridItemPropertyCollection itemProperties, IEnumerable<PropertyDescriptionRoute> propertyDescriptions )
+    {
+      if( ( itemProperties == null ) || ( propertyDescriptions == null ) )
+        return;
 
-      return fieldDescriptors;
+      using( itemProperties.DeferCollectionChanged() )
+      {
+        foreach( var propertyDescription in propertyDescriptions )
+        {
+          ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription( itemProperties, propertyDescription );
+        }
+      }
     }
 
-    public static void ExtractFieldDescriptors( string namePrefix, PropertyDescriptorCollection properties, bool supportDBNull, Dictionary<string, FieldDescriptor> fieldDescriptors )
+    internal static void CreateAndAddItemPropertyForPropertyDescription( DataGridItemPropertyCollection itemProperties, PropertyDescriptionRoute propertyDescription )
     {
-      int propertyCount = properties.Count;
+      if( ( itemProperties == null ) || ( propertyDescription == null ) )
+        return;
+
+      if( !propertyDescription.Current.IsBrowsable )
+        return;
 
-      for( int i = 0; i < propertyCount; i++ )
+      var ancestors = new Stack<PropertyDescription>();
+      for( var current = propertyDescription; current != null; current = current.Parent )
       {
-        PropertyDescriptor propertyDescriptor = properties[ i ];
-        string name = propertyDescriptor.Name;
+        var description = current.Current;
+        if( description.IsSubRelationship )
+          return;
 
-        if( ( fieldDescriptors.ContainsKey( name ) ) && ( !string.IsNullOrEmpty( namePrefix ) ) )
-          name = namePrefix + "." + name;
+        ancestors.Push( description );
+      }
 
-        Type type = propertyDescriptor.PropertyType;
+      var parentItemProperty = default( DataGridItemPropertyBase );
+      var isRoot = true;
 
-        DataGridForeignKeyDescription foreignKeyDescription = null;
+      while( ancestors.Count > 0 )
+      {
+        var description = ancestors.Pop();
+        var itemProperty = ( isRoot ) ? itemProperties[ description.Name ] : parentItemProperty.ItemProperties[ description.Name ];
 
-        // Try to retreive the ForeignKeyDescription if the field is an Enum
-        if( ( type != null ) && ( type.IsEnum ) )
+        if( itemProperty == null )
         {
-          foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum( type );
+          itemProperty = ItemsSourceHelper.CreateItemPropertyFromPropertyDescription( description );
+          Debug.Assert( itemProperty != null );
+
+          if( isRoot )
+          {
+            itemProperties.Add( itemProperty );
+          }
+          else
+          {
+            Debug.Assert( parentItemProperty != null );
+            parentItemProperty.ItemProperties.Add( itemProperty );
+          }
         }
 
-        fieldDescriptors[ name ] = new FieldDescriptor( name,
-                                                        propertyDescriptor.DisplayName,
-                                                        type,
-                                                        propertyDescriptor,
-                                                        null,
-                                                        null,
-                                                        propertyDescriptor.IsReadOnly,
-                                                        false,
-                                                        supportDBNull,
-                                                        propertyDescriptor.IsBrowsable,
-                                                        ItemsSourceHelper.IsASubRelationship( propertyDescriptor.PropertyType ),
-                                                        false,
-                                                        foreignKeyDescription );
+        parentItemProperty = itemProperty;
+        isRoot = false;
       }
     }
 
-    public static void GenerateColumnsFromItemsSourceFields( ColumnCollection columns, IDictionary<Type, CellEditor> defaultCellEditors, Dictionary<string, FieldDescriptor> fields,
-                                                             bool autoCreateForeignKeyConfigurations )
+    internal static void CreateColumnsFromPropertyDescriptions(
+      ColumnHierarchyManager columnManager,
+      IDictionary<Type, CellEditor> defaultCellEditors,
+      PropertyDescriptionRouteDictionary propertyDescriptions,
+      bool autoCreateForeignKeyConfigurations )
     {
-      using( columns.DeferColumnAdditionMessages() )
+      Debug.Assert( columnManager != null );
+
+      var columns = columnManager.Columns;
+
+      using( columnManager.DeferUpdate() )
       {
-        foreach( FieldDescriptor field in fields.Values )
+        using( columns.DeferNotifications() )
         {
-          string fieldName = field.Name;
-          ColumnBase column = columns[ fieldName ];
-          Column dataColumn = column as Column;
-          Type dataType = field.DataType;
-
-          if( column == null )
+          foreach( var propertyDescriptionRoute in propertyDescriptions.Values )
           {
-            dataColumn = ItemsSourceHelper.CreateColumnFromItemsSourceField( defaultCellEditors, field, autoCreateForeignKeyConfigurations );
+            var fieldName = PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( propertyDescriptionRoute ) );
+            var columnBase = columns[ fieldName ];
+            var column = columnBase as Column;
 
-            if( dataColumn != null )
-            {
-              columns.Add( dataColumn );
-            }
-          }
-          else if( dataColumn != null )
-          {
-            if( field.ReadOnly )
+            if( columnBase == null )
             {
-              if( dataColumn.ReadLocalValue( Column.ReadOnlyProperty ) == DependencyProperty.UnsetValue )
-              {
-                dataColumn.ReadOnly = field.ReadOnly;
-              }
-            }
+              column = ItemsSourceHelper.CreateColumnFromPropertyDescription( defaultCellEditors, propertyDescriptionRoute, autoCreateForeignKeyConfigurations );
 
-            if( field.OverrideReadOnlyForInsertion )
-            {
-              if( dataColumn.ReadLocalValue( ColumnBase.OverrideReadOnlyForInsertionProperty ) == DependencyProperty.UnsetValue )
+              if( column != null )
               {
-                dataColumn.OverrideReadOnlyForInsertion = field.OverrideReadOnlyForInsertion;
+                columns.Add( column );
               }
             }
-
-            if( dataColumn.ReadLocalValue( Column.TitleProperty ) == DependencyProperty.UnsetValue )
+            else if( column != null )
             {
-              dataColumn.Title = field.DisplayName;
+              ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, defaultCellEditors, autoCreateForeignKeyConfigurations, propertyDescriptionRoute );
             }
+          }
+        }
+      }
+    }
 
-            if( dataColumn.ReadLocalValue( Column.CellEditorProperty ) == DependencyProperty.UnsetValue )
-            {
-              CellEditor cellEditor = null;
+    internal static void UpdateColumnsFromPropertyDescriptions(
+      ColumnHierarchyManager columnManager,
+      IDictionary<Type, CellEditor> defaultCellEditors,
+      PropertyDescriptionRouteDictionary propertyDescriptions,
+      bool autoCreateForeignKeyConfigurations )
+    {
+      Debug.Assert( columnManager != null );
 
-              if( defaultCellEditors != null )
-              {
-                defaultCellEditors.TryGetValue( dataType, out cellEditor );
-              }
+      var columns = columnManager.Columns;
 
-              if( cellEditor == null )
-              {
-                object descriptionItemsSource = null;
-                object configurationItemsSource = null;
-                ForeignKeyConfiguration configuration = dataColumn.ForeignKeyConfiguration;
-
-                if( field.ForeignKeyDescription != null )
-                {
-                  descriptionItemsSource = field.ForeignKeyDescription.ItemsSource;
-                }
-
-                if( configuration != null )
-                {
-                  configurationItemsSource = configuration.ItemsSource;
-
-                  if( configurationItemsSource == null )
-                  {
-                    configurationItemsSource = dataColumn.ReadLocalValue( Column.ForeignKeyConfigurationProperty );
-                  }
-                }
-
-                // A foreign key ItemsSource is set and we can auto-create configuration
-                // OR
-                // if the foreign key ItemsSource was found in the ForeignKeyConfiguration
-                //
-                // use the Default ForeignKey CellEditor.
-                if( ( ( descriptionItemsSource != null ) && ( autoCreateForeignKeyConfigurations ) )
-                    || ( configurationItemsSource != null ) )
-                {
-                  cellEditor = DefaultCellEditorSelector.ForeignKeyCellEditor;
-                }
-              }
+      using( columnManager.DeferUpdate() )
+      {
+        using( columns.DeferNotifications() )
+        {
+          var columnsToRemove = new HashSet<ColumnBase>( ( from columnBase in columns
+                                                           let column = columnBase as Column
+                                                           where ( column != null ) && column.IsAutoCreated
+                                                           select column ) );
+
+          foreach( var propertyDescriptionRoute in propertyDescriptions.Values )
+          {
+            var fieldName = PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( propertyDescriptionRoute ) );
+            var columnBase = columns[ fieldName ];
+            var column = columnBase as Column;
+
+            if( columnBase == null )
+            {
+              column = ItemsSourceHelper.CreateColumnFromPropertyDescription( defaultCellEditors, propertyDescriptionRoute, autoCreateForeignKeyConfigurations );
 
-              if( cellEditor == null )
+              if( column != null )
               {
-                cellEditor = DefaultCellEditorSelector.SelectCellEditor( dataType );
+                columns.Add( column );
               }
-
-              dataColumn.CellEditor = cellEditor;
             }
-
-            if( ( field.ForeignKeyDescription != null )
-                && ( field.ForeignKeyDescription.ItemsSource != null )
-                && ( autoCreateForeignKeyConfigurations ) )
+            else if( column != null )
             {
-              // Update the ForeignKeyConfiguration from the ForeignKeyDescription
-              // found on the FieldDescriptor
-              ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription(
-                dataColumn,
-                field.ForeignKeyDescription,
-                autoCreateForeignKeyConfigurations );
-            }
+              columnsToRemove.Remove( column );
 
-            if( dataColumn.GetDisplayMemberBinding() == null )
-            {
-              dataColumn.SetDisplayMemberBinding( ItemsSourceHelper.CreateDefaultBinding( false, field.Name, field, dataColumn, false, dataType ) );
-              dataColumn.IsBindingAutoCreated = true;
-              dataColumn.IsBoundToDataGridUnboundItemProperty = field.IsDataGridUnboundItemProperty;
+              ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, defaultCellEditors, autoCreateForeignKeyConfigurations, propertyDescriptionRoute );
             }
+          }
 
-            column.DefaultCellRecyclingGroupDataType = dataType;
+          foreach( var column in columnsToRemove )
+          {
+            columns.Remove( column );
           }
         }
-      } //end using
+      }
     }
 
-    public static Column CreateColumnFromItemsSourceField( IDictionary<Type, CellEditor> defaultCellEditors, FieldDescriptor field, bool autoCreateForeignKeyConfigurations )
+    private static Column CreateColumnFromPropertyDescription( IDictionary<Type, CellEditor> defaultCellEditors, PropertyDescriptionRoute propertyDescriptionRoute, bool autoCreateForeignKeyConfigurations )
     {
-      if( ( field.IsASubRelationship ) || ( !field.Browsable ) )
+      if( propertyDescriptionRoute == null )
         return null;
 
-      string fieldName = field.Name;
-      Type dataType = field.DataType;
+      var propertyDescription = propertyDescriptionRoute.Current;
+      var dataType = propertyDescription.DataType;
 
-      Column dataColumn = new Column();
-      dataColumn.IsAutoCreated = true;
-      dataColumn.FieldName = fieldName;
-
-      bool readOnly = field.ReadOnly;
-      bool overrideReadOnlyForInsertion = field.OverrideReadOnlyForInsertion;
+      if( !propertyDescription.IsBrowsable || !propertyDescription.IsDisplayable )
+        return null;
 
-      // We only set ReadOnly when the value is true in order for the inheritence chain to work.  
-      // Otherwise, the column value is always used instead of the row or grid value.
-      if( readOnly )
+      for( var current = propertyDescriptionRoute; current != null; current = current.Parent )
       {
-        dataColumn.ReadOnly = readOnly;
+        var description = current.Current;
+        if( description.IsSubRelationship )
+          return null;
       }
 
-      dataColumn.OverrideReadOnlyForInsertion = overrideReadOnlyForInsertion;
-      dataColumn.Title = field.DisplayName;
+      var name = PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( propertyDescriptionRoute ) );
+      if( string.IsNullOrEmpty( name ) )
+        return null;
+
+      var column = new Column();
+      column.IsAutoCreated = true;
+      column.FieldName = name;
+      column.Title = propertyDescription.DisplayName;
+      column.OverrideReadOnlyForInsertion = propertyDescription.OverrideReadOnlyForInsertion;
+      column.SetDisplayMemberBinding( ItemsSourceHelper.CreateDefaultBinding( propertyDescriptionRoute ) );
+      column.IsBindingAutoCreated = true;
+      column.IsBoundToDataGridUnboundItemProperty = propertyDescription.IsDataGridUnboundItemProperty;
 
-      dataColumn.SetDisplayMemberBinding( ItemsSourceHelper.CreateDefaultBinding( false, field.Name, field, dataColumn, false, dataType ) );
-      dataColumn.IsBindingAutoCreated = true;
-      dataColumn.IsBoundToDataGridUnboundItemProperty = field.IsDataGridUnboundItemProperty;
+      if( propertyDescription.IsReadOnly )
+      {
+        column.ReadOnly = true;
+      }
 
-      CellEditor cellEditor = null;
+      var cellEditor = default( CellEditor );
 
-      if( defaultCellEditors != null )
+      if( ( defaultCellEditors != null ) && !defaultCellEditors.TryGetValue( dataType, out cellEditor ) )
       {
-        defaultCellEditors.TryGetValue( dataType, out cellEditor );
+        cellEditor = default( CellEditor );
       }
 
-      if( ( field.ForeignKeyDescription != null )
-        && ( field.ForeignKeyDescription.ItemsSource != null )
-        && ( autoCreateForeignKeyConfigurations ) )
+      var foreignKeyDescription = propertyDescription.ForeignKeyDescription;
+
+      if( ( foreignKeyDescription != null ) && ( foreignKeyDescription.ItemsSource != null ) && ( autoCreateForeignKeyConfigurations ) )
       {
-        // We will only use the default foreign key CellEditor
-        // if:
+        // We will only use the default foreign key CellEditor if:
         // - a ForeignKey ItemsSource was detected
         // - the grid allows the auto-creation of the ForeignKeyConfigurations
         // else, use the default CellEditor
@@ -637,12 +625,8 @@ namespace Xceed.Wpf.DataGrid
           cellEditor = DefaultCellEditorSelector.ForeignKeyCellEditor;
         }
 
-        // Update the ForeignKeyConfiguration from the ForeignKeyDescription
-        // found on the FieldDescriptor
-        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription(
-          dataColumn,
-          field.ForeignKeyDescription,
-          autoCreateForeignKeyConfigurations );
+        // Update the ForeignKeyConfiguration from the ForeignKeyDescription found on the FieldDescriptor
+        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( column, foreignKeyDescription, autoCreateForeignKeyConfigurations );
       }
 
       if( cellEditor == null )
@@ -650,1241 +634,2084 @@ namespace Xceed.Wpf.DataGrid
         cellEditor = DefaultCellEditorSelector.SelectCellEditor( dataType );
       }
 
-      dataColumn.CellEditor = cellEditor;
-      dataColumn.DefaultCellRecyclingGroupDataType = dataType;
+      column.CellEditor = cellEditor;
+      column.DefaultCellRecyclingGroupDataType = dataType;
 
-      return dataColumn;
+      return column;
     }
 
-    public static ICustomTypeDescriptor GetCustomTypeDescriptor( IEnumerable itemsSource, Type itemType )
+    internal static void UpdateColumnFromPropertyDescription(
+      ColumnBase column,
+      IDictionary<Type, CellEditor> defaultCellEditors,
+      bool autoCreateForeignKeyConfigurations,
+      PropertyDescriptionRoute propertyDescription )
     {
-      var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( itemsSource );
+      if( ( column == null ) || ( propertyDescription == null ) )
+        return;
+
+      var targetColumn = column as Column;
+      var targetPropertyDescription = propertyDescription.Current;
 
-      var descriptor = firstItem as ICustomTypeDescriptor;
-      if( descriptor != null )
+      if( targetPropertyDescription.IsReadOnly )
       {
-        if( !( descriptor is DataItemTypeDescriptor ) )
+        if( column.ReadLocalValue( Column.ReadOnlyProperty ) == DependencyProperty.UnsetValue )
         {
-          descriptor = DataItemTypeDescriptionProvider.GetTypeDescriptor( itemType, descriptor );
+          column.ReadOnly = targetPropertyDescription.IsReadOnly;
         }
       }
-      else
-      {
-        descriptor = ItemsSourceHelper.GetCustomTypeDescriptor( firstItem, itemType );
-      }
-
-      return descriptor;
-    }
 
-    public static ICustomTypeDescriptor GetCustomTypeDescriptor( object firstItem, Type itemType )
-    {
-      var descriptionProvider = TypeDescriptor.GetProvider( itemType );
-      if( !( descriptionProvider is DataItemTypeDescriptionProvider ) )
+      if( targetPropertyDescription.OverrideReadOnlyForInsertion )
       {
-        descriptionProvider = new DataItemTypeDescriptionProvider( descriptionProvider );
+        if( column.ReadLocalValue( ColumnBase.OverrideReadOnlyForInsertionProperty ) == DependencyProperty.UnsetValue )
+        {
+          column.OverrideReadOnlyForInsertion = targetPropertyDescription.OverrideReadOnlyForInsertion;
+        }
       }
 
-      return descriptionProvider.GetTypeDescriptor( itemType, firstItem );
-    }
-
-    public static System.Windows.Data.Binding CreateDefaultBinding( bool dataItemIsDataRow, string fieldName, FieldDescriptor sourceField, ColumnBase column, bool supportDBNull,
-                                                                    Type dataType )
-    {
-      DataGridBindingInfo bindingInfo = new DataGridBindingInfo();
-      PropertyDescriptor propertyDescriptor = null;
-      string bindingPath = null;
-      string bindingXPath = null;
-      bool readOnly;
-
-      if( sourceField != null )
-      {
-        dataType = sourceField.DataType;
-        supportDBNull = sourceField.SupportDBNull;
-        readOnly = ( sourceField.ReadOnly && !sourceField.OverrideReadOnlyForInsertion );
-        propertyDescriptor = sourceField.PropertyDescriptor;
-        bindingXPath = sourceField.BindingXPath;
-        bindingPath = sourceField.BindingPath;
-      }
-      else
+      if( column.ReadLocalValue( ColumnBase.TitleProperty ) == DependencyProperty.UnsetValue )
       {
-        readOnly = ( column.ReadOnly && !column.OverrideReadOnlyForInsertion );
+        column.Title = targetPropertyDescription.DisplayName;
       }
 
-      if( dataItemIsDataRow )
-      {
-        bindingInfo.Path = new PropertyPath( "Cells[" + fieldName + "].Content" );
-      }
-      else
+      if( column.ReadLocalValue( ColumnBase.CellEditorProperty ) == DependencyProperty.UnsetValue )
       {
-        // We always use Path and XPath to be able to write back to a binding on self (".").
-        // Because the "propertyDescriptor" received is readonly, we must use the normal binding path to pass over that.
-        if( !string.IsNullOrEmpty( bindingXPath ) )
-        {
-          bindingInfo.XPath = bindingXPath;
+        var cellEditor = default( CellEditor );
 
-          if( !string.IsNullOrEmpty( bindingPath ) )
-            bindingInfo.Path = new PropertyPath( bindingPath, ItemsSourceHelper.EmptyObjectArray );
-        }
-        else
+        if( defaultCellEditors != null )
         {
-          bindingInfo.Path = ItemsSourceHelper.CreatePropertyPath( fieldName, bindingPath, propertyDescriptor );
+          defaultCellEditors.TryGetValue( targetPropertyDescription.DataType, out cellEditor );
         }
-      }
 
-      bindingInfo.ReadOnly = readOnly;
-      bindingInfo.Converter = new ReadOnlyConverter( column, supportDBNull );
+        if( ( cellEditor == null ) && ( targetColumn != null ) )
+        {
+          var descriptionItemsSource = default( object );
+          var configurationItemsSource = default( object );
+          var configuration = targetColumn.ForeignKeyConfiguration;
 
-      bindingInfo.ValidationRules.Add( new SourceDataConverterValidationRule( supportDBNull, dataType ) );
+          if( targetPropertyDescription.ForeignKeyDescription != null )
+          {
+            descriptionItemsSource = targetPropertyDescription.ForeignKeyDescription.ItemsSource;
+          }
 
-      return bindingInfo.GetBinding();
-    }
+          if( configuration != null )
+          {
+            configurationItemsSource = configuration.ItemsSource;
 
-    public static PropertyPath CreatePropertyPath( string fieldName, string bindingPath, PropertyDescriptor propertyDescriptor )
-    {
-      PropertyPath propertyPath = null;
+            if( configurationItemsSource == null )
+            {
+              configurationItemsSource = targetColumn.ReadLocalValue( Column.ForeignKeyConfigurationProperty );
+            }
+          }
 
-      if( !string.IsNullOrEmpty( bindingPath ) )
-      {
-        // Using user defined column binding info.
-        propertyPath = new PropertyPath( bindingPath, ItemsSourceHelper.EmptyObjectArray );
+          // A foreign key ItemsSource is set and we can auto-create configuration, OR,
+          // if the foreign key ItemsSource was found in the ForeignKeyConfiguration, use the Default ForeignKey CellEditor.
+          if( ( ( descriptionItemsSource != null ) && ( autoCreateForeignKeyConfigurations ) ) || ( configurationItemsSource != null ) )
+          {
+            cellEditor = DefaultCellEditorSelector.ForeignKeyCellEditor;
+          }
+        }
+
+        if( cellEditor == null )
+        {
+          cellEditor = DefaultCellEditorSelector.SelectCellEditor( targetPropertyDescription.DataType );
+        }
+
+        column.CellEditor = cellEditor;
       }
-      else
+
+      if( targetColumn != null )
       {
-        if( propertyDescriptor != null )
+        if( ( targetPropertyDescription.ForeignKeyDescription != null ) && ( targetPropertyDescription.ForeignKeyDescription.ItemsSource != null ) && ( autoCreateForeignKeyConfigurations ) )
         {
-          if( propertyDescriptor is DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase )
-          {
-            // Using a DataGridItemPropertyBase.
-            propertyPath = new PropertyPath( "(0)", propertyDescriptor );
-          }
-          else
-          {
-            // Not using our CollectionView.
-            propertyPath = new PropertyPath( "(0).(1)", EmptyDataItemSafePropertyDescriptor.Singleton, propertyDescriptor );
-          }
+          // Update the ForeignKeyConfiguration from the ForeignKeyDescription found on the FieldDescriptor
+          ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( targetColumn, targetPropertyDescription.ForeignKeyDescription, autoCreateForeignKeyConfigurations );
         }
-        else
+
+        if( targetColumn.GetDisplayMemberBinding() == null )
         {
-          propertyPath = new PropertyPath( fieldName, ItemsSourceHelper.EmptyObjectArray );
+          targetColumn.SetDisplayMemberBinding( ItemsSourceHelper.CreateDefaultBinding( propertyDescription ) );
+          targetColumn.IsBindingAutoCreated = true;
+          targetColumn.IsBoundToDataGridUnboundItemProperty = targetPropertyDescription.IsDataGridUnboundItemProperty;
         }
       }
 
-      return propertyPath;
+      column.DefaultCellRecyclingGroupDataType = targetPropertyDescription.DataType;
     }
 
-    public static Dictionary<string, FieldDescriptor> GetFields( IEnumerable itemsSource, Type itemType )
+    internal static DataGridItemPropertyBase GetItemPropertyFromProperty( DataGridItemPropertyCollection itemProperties, string propertyPath )
     {
-      DataView dataView = itemsSource as DataView;
-
-      if( dataView != null )
-        return ItemsSourceHelper.GetFieldsForDataView( dataView );
+      if( itemProperties == null )
+        return null;
 
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSource as DataGridCollectionViewBase;
+      return ItemsSourceHelper.GetItemPropertyFromProperty( itemProperties, PropertyRouteParser.Parse( propertyPath ) );
+    }
 
-      if( dataGridCollectionViewBase != null )
-        return ItemsSourceHelper.GetFieldsForDataGridCollectionViewBase( dataGridCollectionViewBase, dataGridCollectionViewBase.ItemProperties );
+    internal static DataGridItemPropertyBase GetItemPropertyFromProperty( DataGridItemPropertyCollection itemProperties, PropertyRoute propertyRoute )
+    {
+      if( ( itemProperties == null ) || ( propertyRoute == null ) )
+        return null;
 
-      bool supportsDBNull = ItemsSourceHelper.IsSourceSupportingDBNull( itemsSource );
-      ITypedList typedList = itemsSource as ITypedList;
+      if( propertyRoute.Parent != null )
+      {
+        var parentItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemProperties, propertyRoute.Parent );
+        if( parentItemProperty == null )
+          return null;
 
-      if( typedList != null )
-        return ItemsSourceHelper.GetFieldDescriptors( typedList.GetItemProperties( null ), supportsDBNull );
+        itemProperties = parentItemProperty.ItemPropertiesInternal;
+        if( itemProperties == null )
+          return null;
+      }
 
-      if( itemType == null )
-        itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( itemsSource );
+      return itemProperties[ propertyRoute.Current.Name ];
+    }
 
-      return ItemsSourceHelper.GetFieldsForItemType( itemsSource, itemType, supportsDBNull );
+    internal static object GetValueFromItemProperty( DataGridItemPropertyBase itemProperty, object item )
+    {
+      return ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item, null );
     }
 
-    public static Dictionary<string, FieldDescriptor> GetFields( Dictionary<string, FieldDescriptor> masterFields, FieldNameMap fieldMap, IEnumerable itemsSource, Type itemType )
+    internal static object GetValueFromItemProperty( DataGridItemPropertyBase itemProperty, object item, object defaultValue )
     {
-      Dictionary<string, FieldDescriptor> fieldDescriptors;
-      DataGridCollectionViewBase dataGridCollectionViewBase = itemsSource as DataGridCollectionViewBase;
+      if( itemProperty == null )
+        throw new ArgumentNullException( "itemProperty" );
 
-      if( dataGridCollectionViewBase != null )
+      // Make sure the DataGridItemProperty is still in use.
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        return defaultValue;
+
+      var parentItemProperty = collection.Owner;
+      if( parentItemProperty != null )
       {
-        var itemProperties = dataGridCollectionViewBase.ItemProperties;
+        item = ItemsSourceHelper.GetValueFromItemProperty( parentItemProperty, item );
+      }
 
-        fieldDescriptors = new Dictionary<string, FieldDescriptor>( itemProperties.Count );
+      if( item == null )
+        return defaultValue;
 
-        foreach( var itemProperty in itemProperties )
-        {
-          string detailFieldName = itemProperty.Name;
-          string masterFieldName;
+      return itemProperty.GetValue( item );
+    }
 
-          if( !fieldMap.TryGetColumnFieldName( detailFieldName, out masterFieldName ) )
-          {
-            Debug.WriteLine( string.Format( "No mapping was found for the item property." ) );
-            continue;
-          }
+    internal static void SetValueForItemProperty( DataGridItemPropertyBase itemProperty, object item, object value )
+    {
+      if( itemProperty == null )
+        throw new ArgumentNullException( "itemProperty" );
 
-          FieldDescriptor masterField;
-          if( !masterFields.TryGetValue( masterFieldName, out masterField ) )
-          {
-            Debug.WriteLine( string.Format( "An item property is mapped to a non-existent master field." ) );
-            continue;
-          }
+      // Make sure the DataGridItemProperty is still in use.
+      var collection = itemProperty.ContainingCollection;
+      if( collection == null )
+        return;
 
-          FieldDescriptor detailField = ItemsSourceHelper.CreateFieldFromDataGridItemProperty( itemProperty );
-          if( detailField.DataType != masterField.DataType )
-          {
-            Debug.WriteLine( string.Format( "The data type of an item property doesn't match the data type of its master field." ) );
-            continue;
-          }
+      var parentItemProperty = collection.Owner;
+      if( parentItemProperty != null )
+      {
+        item = ItemsSourceHelper.GetValueFromItemProperty( parentItemProperty, item );
+      }
 
-          FieldDescriptor oldDetailField;
-          if( fieldDescriptors.TryGetValue( masterFieldName, out oldDetailField ) )
-          {
-            Debug.WriteLine( string.Format( "Another detail field is already linked to the master field." ) );
-            continue;
-          }
+      if( item == null )
+        return;
 
-          fieldDescriptors.Add( masterFieldName, detailField );
-        }
-      }
-      else
-      {
-        fieldDescriptors = ItemsSourceHelper.GetFields( itemsSource, itemType );
-        var fieldNames = fieldDescriptors.Keys.ToArray();
+      itemProperty.SetValue( item, value );
+    }
 
-        foreach( var fieldName in fieldNames )
-        {
-          string detailFieldName = fieldName;
-          string masterFieldName;
+    internal static void AutoDetectSynonyms( DataGridCollectionViewBase collectionView )
+    {
+      if( collectionView == null )
+        return;
 
-          if( !fieldMap.TryGetColumnFieldName( detailFieldName, out masterFieldName ) )
-          {
-            fieldDescriptors.Remove( detailFieldName );
-            continue;
-          }
+      // The root CollectionView does not need to have its ItemProperties binded.
+      var masterCollectionView = collectionView.RootDataGridCollectionViewBase;
+      if( ( masterCollectionView == null ) || ( masterCollectionView == collectionView ) )
+        return;
 
-          FieldDescriptor masterField;
-          if( !masterFields.TryGetValue( masterFieldName, out masterField ) )
-          {
-            fieldDescriptors.Remove( masterFieldName );
+      ItemsSourceHelper.AutoDetectSynonyms( masterCollectionView.ItemProperties, collectionView.ItemProperties );
+    }
 
-            Debug.WriteLine( string.Format( "An item property is mapped to a non-existent master field." ) );
-            continue;
-          }
+    internal static void AutoDetectSynonyms( DataGridCollectionViewBase collectionView, DataGridItemPropertyRoute detailItemPropertyRoute )
+    {
+      if( ( collectionView == null ) || ( detailItemPropertyRoute == null ) )
+        return;
 
-          FieldDescriptor detailField = fieldDescriptors[ fieldName ];
-          if( detailField.DataType != masterField.DataType )
-          {
-            fieldDescriptors.Remove( fieldName );
+      // The root CollectionView does not need to have its ItemProperties binded.
+      var masterCollectionView = collectionView.RootDataGridCollectionViewBase;
+      if( ( masterCollectionView == null ) || ( masterCollectionView == collectionView ) )
+        return;
 
-            Debug.WriteLine( string.Format( "The data type of an item property doesn't match the data type of its master field." ) );
-            continue;
-          }
-        }
-      }
+      var masterItemProperty = ItemsSourceHelper.AutoDetectSynonyms( masterCollectionView.ItemProperties, detailItemPropertyRoute );
+      if( masterItemProperty == null )
+        return;
 
-      return fieldDescriptors;
+      // Do the auto detection on child properties.
+      ItemsSourceHelper.AutoDetectSynonyms( masterItemProperty.ItemPropertiesInternal, detailItemPropertyRoute.Current.ItemPropertiesInternal );
     }
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForItemType( IEnumerable itemsSource, Type itemType, bool supportsDBNull )
+    private static void AutoDetectSynonyms( DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyCollection detailItemProperties )
     {
-      if( itemType == null )
-        return new Dictionary<string, FieldDescriptor>();
-
-      if( typeof( XmlNode ).IsAssignableFrom( itemType ) )
-        return new Dictionary<string, FieldDescriptor>();
-
-      if( itemType.IsArray )
-        return ItemsSourceHelper.GetFieldsForJaggedArray( itemType, itemsSource );
+      if( ( masterItemProperties == null ) || ( detailItemProperties == null ) )
+        return;
 
-      if( itemType.IsInterface )
-        return ItemsSourceHelper.GetFieldsForInterface( itemType );
+      foreach( var detailItemProperty in detailItemProperties )
+      {
+        ItemsSourceHelper.AutoDetectSynonyms( masterItemProperties, detailItemProperty, true );
+      }
+    }
 
-      if( ItemsSourceHelper.IsEntityFramework( itemType ) )
-        return ItemsSourceHelper.GetFieldsForEntityFramework( itemType );
+    private static DataGridItemPropertyBase AutoDetectSynonyms( DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyRoute detailItemPropertyRoute )
+    {
+      if( ( masterItemProperties == null ) || ( detailItemPropertyRoute == null ) )
+        return null;
 
-      if( ItemsSourceHelper.IsValueType( itemType ) )
-        return ItemsSourceHelper.GetFieldsForValueType( itemType, supportsDBNull );
+      if( detailItemPropertyRoute.Parent == null )
+        return ItemsSourceHelper.AutoDetectSynonyms( masterItemProperties, detailItemPropertyRoute.Current, false );
 
-      var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( itemsSource, itemType );
-      if( customTypeDescriptor != null )
-        return ItemsSourceHelper.GetFieldsForCustomTypeDescriptor( customTypeDescriptor, itemType, supportsDBNull );
+      var masterParentItemProperty = ItemsSourceHelper.AutoDetectSynonyms( masterItemProperties, detailItemPropertyRoute.Parent );
+      if( masterParentItemProperty == null )
+        return null;
 
-      return ItemsSourceHelper.GetFieldDescriptors( TypeDescriptor.GetProperties( itemType ), supportsDBNull );
+      return ItemsSourceHelper.AutoDetectSynonyms( masterParentItemProperty.ItemPropertiesInternal, detailItemPropertyRoute.Current, false );
     }
 
-    public static Type GetItemTypeFromEnumeration( IEnumerable source )
+    private static DataGridItemPropertyBase AutoDetectSynonyms( DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyBase detailItemProperty, bool autoDetectSubProperties )
     {
-      if( source == null )
+      if( ( masterItemProperties == null ) || ( detailItemProperty == null ) )
         return null;
 
-      Type listType = source.GetType();
+      var masterItemProperty = default( DataGridItemPropertyBase );
 
-      if( typeof( Array ).IsAssignableFrom( listType ) )
-        return listType.GetElementType();
+      if( string.IsNullOrEmpty( detailItemProperty.Synonym ) )
+      {
+        masterItemProperty = masterItemProperties[ detailItemProperty.Name ];
 
-      Type itemType = ItemsSourceHelper.GetTypedListIndexerType( listType );
+        if( ( masterItemProperty != null ) && ( masterItemProperty.DataType == detailItemProperty.DataType ) )
+        {
+          detailItemProperty.SetSynonym( masterItemProperty.Name );
+        }
+        else
+        {
+          masterItemProperty = null;
+        }
+      }
+      else if( ( detailItemProperty.ItemPropertiesInternal != null ) && ( detailItemProperty.Synonym == detailItemProperty.Name ) )
+      {
+        masterItemProperty = masterItemProperties[ detailItemProperty.Name ];
+      }
 
-      if( itemType != null )
-        return itemType;
+      if( autoDetectSubProperties && ( masterItemProperty != null ) && ( masterItemProperty.ItemPropertiesInternal != null ) && ( detailItemProperty.ItemPropertiesInternal != null ) )
+      {
+        ItemsSourceHelper.AutoDetectSynonyms( masterItemProperty.ItemPropertiesInternal, detailItemProperty.ItemPropertiesInternal );
+      }
 
-      itemType = ItemsSourceHelper.GetTypedEnumerationItemType( listType );
+      return masterItemProperty;
+    }
 
+    internal static ICustomTypeDescriptor GetCustomTypeDescriptorFromItem( object item, Type itemType )
+    {
+      var descriptionProvider = default( TypeDescriptionProvider );
       if( itemType != null )
-        return itemType;
-
-      object item = ItemsSourceHelper.GetFirstItemByEnumerable( source );
+      {
+        descriptionProvider = TypeDescriptor.GetProvider( itemType );
+      }
 
-      if( item != null )
-        return item.GetType();
+      if( !( descriptionProvider is DataItemTypeDescriptionProvider ) )
+      {
+        descriptionProvider = new DataItemTypeDescriptionProvider( descriptionProvider );
+      }
 
-      return typeof( object );
+      return descriptionProvider.GetTypeDescriptor( itemType, item );
     }
 
-    public static IEditableObject GetEditableObject( object item )
+    private static ICustomTypeDescriptor GetCustomTypeDescriptor( IEnumerable itemsSource, Type itemType )
     {
-      System.Data.DataRow dataRow = item as System.Data.DataRow;
+      if( ( itemsSource == null ) && ( itemType == null ) )
+        return null;
 
-      if( dataRow != null )
-        return new DataRowEditableWrapper( dataRow );
+      var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( itemsSource );
 
-      return item as IEditableObject;
+      return ItemsSourceHelper.GetCustomTypeDescriptor( firstItem, itemType );
     }
 
-    public static bool IsASubRelationship( Type dataType )
+    private static ICustomTypeDescriptor GetCustomTypeDescriptor( object item, Type itemType )
     {
-      if( ( !dataType.IsValueType ) && ( dataType != typeof( string ) ) )
-      {
-        if( typeof( IEnumerable ).IsAssignableFrom( dataType ) )
-        {
-          if( typeof( byte[] ).IsAssignableFrom( dataType ) )
-            return false;
+      var descriptor = item as ICustomTypeDescriptor;
+      if( descriptor == null )
+        return ItemsSourceHelper.GetCustomTypeDescriptorFromItem( item, itemType );
 
-          return true;
-        }
-
-        if( typeof( IListSource ).IsAssignableFrom( dataType ) )
-          return true;
-      }
+      if( !( descriptor is DataItemTypeDescriptor ) )
+        return DataItemTypeDescriptionProvider.GetTypeDescriptor( itemType, descriptor );
 
-      return false;
+      return descriptor;
     }
 
-    public static object TryGetDataRowFromDataItem( object dataItem )
+    internal static void ResetPropertyDescriptions( PropertyDescriptionRouteDictionary collection, DataGridItemPropertyMap itemPropertyMap, DataGridControl dataGridControl, IEnumerable itemsSource )
     {
-      DataRowView dataRowView = dataItem as DataRowView;
+      if( collection == null )
+        throw new ArgumentNullException( "collection" );
 
-      if( dataRowView != null )
+      if( dataGridControl == null )
+        throw new ArgumentNullException( "dataGridControl" );
+
+      collection.Clear();
+
+      var masterPropertyDescriptions = dataGridControl.ItemsSourcePropertyDescriptions;
+
+      if( ( collection != masterPropertyDescriptions ) && dataGridControl.AreDetailsFlatten )
       {
-        return dataRowView.Row;
+        var collectionView = itemsSource as DataGridCollectionViewBase;
+        if( collectionView != null )
+        {
+          ItemsSourceHelper.SetPropertyDescriptions( collection, masterPropertyDescriptions, itemPropertyMap, collectionView );
+        }
+      }
+      else
+      {
+        ItemsSourceHelper.SetPropertyDescriptions( collection, null, itemsSource, null, true );
       }
-
-      return dataItem;
     }
 
-    public static System.Data.DataView TryGetDataViewFromDataGridContext( DataGridContext context )
+    internal static void SetPropertyDescriptions( PropertyDescriptionRouteDictionary collection, DataTable model, IEnumerable itemsSource, Type itemType, bool displayable )
     {
-      if( context == null )
-        return null;
+      if( collection == null )
+        throw new ArgumentNullException( "collection" );
 
-      System.Data.DataView dataView = context.ItemsSourceCollection as System.Data.DataView;
+      var descriptions = default( IEnumerable<PropertyDescriptionRoute> );
+      var supportsDBNull = ItemsSourceHelper.IsSupportingDBNull( itemsSource );
 
-      // Maybe the context is a detail
-      if( dataView == null )
+      if( model != null )
       {
-        DataGridCollectionViewBase collectionViewBase =
-          context.ItemsSourceCollection as DataGridCollectionViewBase;
-
-        if( collectionViewBase != null )
-        {
-          dataView = collectionViewBase.SourceCollection as System.Data.DataView;
-        }
-      }
-
-      return dataView;
-    }
-
-    public static Type GetColumnDataType( System.Data.DataColumn column )
-    {
-      Type columnType;
-
-      if( column.AllowDBNull )
-      {
-        if( column.DataType == typeof( Boolean ) )
-          columnType = typeof( Nullable<Boolean> );
-        else if( column.DataType == typeof( Boolean ) )
-          columnType = typeof( Nullable<Boolean> );
-        else if( column.DataType == typeof( Byte ) )
-          columnType = typeof( Nullable<Byte> );
-        else if( column.DataType == typeof( Char ) )
-          columnType = typeof( Nullable<Char> );
-        else if( column.DataType == typeof( DateTime ) )
-          columnType = typeof( Nullable<DateTime> );
-        else if( column.DataType == typeof( Decimal ) )
-          columnType = typeof( Nullable<Decimal> );
-        else if( column.DataType == typeof( Double ) )
-          columnType = typeof( Nullable<Double> );
-        else if( column.DataType == typeof( Int16 ) )
-          columnType = typeof( Nullable<Int16> );
-        else if( column.DataType == typeof( Int32 ) )
-          columnType = typeof( Nullable<Int32> );
-        else if( column.DataType == typeof( Int64 ) )
-          columnType = typeof( Nullable<Int64> );
-        else if( column.DataType == typeof( SByte ) )
-          columnType = typeof( Nullable<SByte> );
-        else if( column.DataType == typeof( Single ) )
-          columnType = typeof( Nullable<Single> );
-        else if( column.DataType == typeof( TimeSpan ) )
-          columnType = typeof( Nullable<TimeSpan> );
-        else if( column.DataType == typeof( UInt16 ) )
-          columnType = typeof( Nullable<UInt16> );
-        else if( column.DataType == typeof( UInt32 ) )
-          columnType = typeof( Nullable<UInt32> );
-        else if( column.DataType == typeof( UInt64 ) )
-          columnType = typeof( Nullable<UInt64> );
-        else
-          columnType = column.DataType;
+        descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataTable( model, displayable );
+      }
+      else if( itemsSource is DataView )
+      {
+        descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataView( ( DataView )itemsSource, displayable );
+      }
+      else if( itemsSource is DataGridCollectionViewBase )
+      {
+        descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataGridCollectionView( ( DataGridCollectionViewBase )itemsSource );
+      }
+      else if( itemsSource is ITypedList )
+      {
+        descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors( ( ( ITypedList )itemsSource ).GetItemProperties( null ), supportsDBNull, displayable );
       }
       else
-        columnType = column.DataType;
-      return columnType;
+      {
+        if( itemType == null )
+        {
+          itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( itemsSource );
+        }
+
+        descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromItemType( itemsSource, itemType, supportsDBNull, displayable );
+      }
+
+      if( descriptions != null )
+      {
+        foreach( var description in descriptions )
+        {
+          collection.Add( description, true );
+        }
+      }
     }
 
-    public static void CleanUpColumns( ColumnCollection columns, bool deleteAutoCreatedColumn )
+    private static void SetPropertyDescriptions( PropertyDescriptionRouteDictionary detailCollection, PropertyDescriptionRouteDictionary masterCollection, DataGridItemPropertyMap itemPropertyMap, DataGridCollectionViewBase collectionView )
     {
-      ColumnBase[] tempColumns = new ColumnBase[ columns.Count ];
-      columns.CopyTo( tempColumns, 0 );
+      if( collectionView == null )
+        return;
 
-      foreach( ColumnBase column in tempColumns )
+      foreach( var itemProperty in collectionView.ItemProperties )
       {
-        Column dataColumn = column as Column;
+        var masterItemProperty = default( DataGridItemPropertyBase );
+        if( !itemPropertyMap.TryGetMasterItemProperty( itemProperty, out masterItemProperty ) )
+        {
+          Debug.WriteLine( string.Format( "No mapping was found for the item property." ) );
+          continue;
+        }
 
-        if( dataColumn == null )
+        var masterPropertyRoute = PropertyRouteBuilder.ToPropertyRoute( DataGridItemPropertyRoute.Create( masterItemProperty ) );
+        if( masterPropertyRoute == null )
+        {
+          masterPropertyRoute = PropertyRouteBuilder.ToPropertyRoute( new PropertyRouteSegment( PropertyRouteSegmentType.Property, masterItemProperty.Name ) );
+        }
+
+        var masterPropertyDescription = masterCollection[ masterPropertyRoute ];
+        if( masterPropertyDescription == null )
+        {
+          Debug.WriteLine( string.Format( "An item property is mapped to a non-existent master field." ) );
           continue;
+        }
 
-        if( ( deleteAutoCreatedColumn ) && ( dataColumn.IsAutoCreated ) )
+        var detailPropertyDescription = ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty( itemProperty );
+        if( detailPropertyDescription.Current.DataType != masterPropertyDescription.Current.DataType )
         {
-          columns.Remove( column );
+          Debug.WriteLine( string.Format( "The data type of an item property doesn't match the data type of its master field." ) );
+          continue;
         }
-        else if( dataColumn.IsBindingAutoCreated )
+
+        if( detailCollection.Contains( masterPropertyRoute ) )
         {
-          dataColumn.IsBindingAutoCreated = false;
-          dataColumn.IsBoundToDataGridUnboundItemProperty = false;
-          dataColumn.SetDisplayMemberBinding( null );
+          Debug.WriteLine( string.Format( "Another detail field is already linked to the master field." ) );
+          continue;
         }
+
+        detailCollection.Add( masterPropertyRoute, detailPropertyDescription, false );
       }
     }
 
-    public static FieldDescriptor CreateFieldFromDataGridItemProperty( DataGridItemPropertyBase itemProperty )
+    internal static void SetPropertyDescriptionsFromItemProperty( PropertyDescriptionRouteDictionary propertyDescriptions, DataTable model, IEnumerable itemsSource, Type itemType, DataGridItemPropertyRoute itemPropertyRoute )
     {
-      var propertyDescriptor = itemProperty.GetPropertyDescriptorForBinding();
+      if( ( propertyDescriptions == null ) || ( itemPropertyRoute == null ) )
+        return;
+
+      var key = PropertyRouteBuilder.ToPropertyRoute( itemPropertyRoute );
+      ItemsSourceHelper.SetPropertyDescriptions( propertyDescriptions, model, itemsSource, itemType, key );
+
+      var propertyDescription = default( PropertyDescriptionRoute );
+      if( !propertyDescriptions.TryGetValue( key, out propertyDescription ) )
+        return;
 
-      string name = propertyDescriptor.Name;
-      Type type = propertyDescriptor.PropertyType;
+      var itemProperty = itemPropertyRoute.Current;
+      if( itemProperty.ItemPropertiesInternal == null )
+        return;
 
-      // If an ItemProperty is in the public ItemProperties of the collection view,
-      // we always want to consider that property is not a detail and browsable.
-      return new FieldDescriptor( name,
-                                  propertyDescriptor.DisplayName,
-                                  propertyDescriptor.PropertyType,
-                                  propertyDescriptor,
-                                  null,
-                                  null,
-                                  itemProperty.IsReadOnly,
-                                  itemProperty.OverrideReadOnlyForInsertion.GetValueOrDefault( false ),
-                                  false,
-                                  true,
-                                  false,
-                                  itemProperty is DataGridUnboundItemProperty,
-                                  itemProperty.ForeignKeyDescription );
+      foreach( var childItemProperty in itemProperty.ItemPropertiesInternal )
+      {
+        ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty(
+          propertyDescriptions,
+          null,
+          null,
+          itemProperty.DataType,
+          DataGridItemPropertyRoute.Combine( childItemProperty, itemPropertyRoute ) );
+      }
     }
 
-    public static void UpdateColumnsOnItemsPropertiesChanged( DataGridControl dataGridControl, ColumnCollection columns, bool autoCreateForeignKeyConfigurations,
-                                                              NotifyCollectionChangedEventArgs e, DataGridItemPropertyCollection itemProperties )
+    internal static void InitializePropertyDescriptions( PropertyDescriptionRouteDictionary collection, DataGridItemPropertyRoute itemPropertyRoute, Type itemType, bool defaultPropertyDescriptionsCreated )
     {
-      if( dataGridControl == null )
+      if( ( collection == null ) || ( itemPropertyRoute == null ) )
         return;
 
-      switch( e.Action )
+      var propertyDescription = ItemsSourceHelper.GetPropertyDescriptionFromItemProperty( collection, itemPropertyRoute );
+      var itemProperty = itemPropertyRoute.Current;
+
+      itemProperty.SetUnspecifiedPropertiesValues( propertyDescription, itemType, defaultPropertyDescriptionsCreated );
+
+      if( itemProperty.ItemPropertiesInternal != null )
       {
-        case NotifyCollectionChangedAction.Add:
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
-            {
-              string name = itemProperty.Name;
+        foreach( var childItemProperty in itemProperty.ItemPropertiesInternal )
+        {
+          ItemsSourceHelper.InitializePropertyDescriptions( collection, DataGridItemPropertyRoute.Combine( childItemProperty, itemPropertyRoute ), itemProperty.DataType, defaultPropertyDescriptionsCreated );
+        }
+      }
+    }
 
-              if( columns[ name ] == null )
-              {
-                Column column = ItemsSourceHelper.CreateColumnFromItemsSourceField(
-                  dataGridControl.DefaultCellEditors,
-                  ItemsSourceHelper.CreateFieldFromDataGridItemProperty( itemProperty ),
-                  autoCreateForeignKeyConfigurations );
-
-                if( column != null )
-                {
-                  columns.Add( column );
-                }
-              }
-            }
-          }
+    internal static Type GetItemTypeFromEnumeration( IEnumerable source )
+    {
+      if( source == null )
+        return null;
 
-          break;
+      var enumerationType = source.GetType();
+      var itemType = ItemsSourceHelper.GetItemTypeFromEnumerationType( enumerationType );
 
-        case NotifyCollectionChangedAction.Remove:
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
-            {
-              string name = itemProperty.Name;
-              Column column = columns[ name ] as Column;
+      if( itemType != null )
+        return itemType;
 
-              if( ( column != null ) && ( column.IsAutoCreated ) )
-              {
-                columns.Remove( column );
-              }
-            }
+      var item = ItemsSourceHelper.GetFirstItemByEnumerable( source );
+      if( item != null )
+        return item.GetType();
 
-            break;
-          }
+      return typeof( object );
+    }
 
-        case NotifyCollectionChangedAction.Replace:
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
-            {
-              string name = itemProperty.Name;
-              Column column = columns[ name ] as Column;
+    internal static Type GetItemTypeFromEnumerationType( Type enumerationType )
+    {
+      if( enumerationType == null )
+        return null;
 
-              if( ( column != null ) && ( column.IsAutoCreated ) )
-              {
-                columns.Remove( column );
-              }
-            }
+      if( typeof( Array ).IsAssignableFrom( enumerationType ) )
+        return enumerationType.GetElementType();
 
-            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
-            {
-              string name = itemProperty.Name;
+      var itemType = ItemsSourceHelper.GetTypedListIndexerType( enumerationType );
+      if( itemType != null )
+        return itemType;
 
-              if( columns[ name ] == null )
-              {
-                Column column = ItemsSourceHelper.CreateColumnFromItemsSourceField(
-                  dataGridControl.DefaultCellEditors,
-                  ItemsSourceHelper.CreateFieldFromDataGridItemProperty( itemProperty ),
-                  autoCreateForeignKeyConfigurations );
-
-                if( column != null )
-                {
-                  columns.Add( column );
-                }
-              }
-            }
+      return ItemsSourceHelper.GetTypedEnumerationItemType( enumerationType );
+    }
 
-            break;
-          }
+    internal static IEditableObject GetEditableObject( object item )
+    {
+      var dataRow = item as System.Data.DataRow;
+      if( dataRow != null )
+        return new DataRowEditableWrapper( dataRow );
 
-        case NotifyCollectionChangedAction.Reset:
-          {
-            for( int i = columns.Count - 1; i >= 0; i-- )
-            {
-              Column dataColumn = columns[ i ] as Column;
+      return item as IEditableObject;
+    }
 
-              if( ( dataColumn != null ) && ( dataColumn.IsAutoCreated ) )
-              {
-                columns.Remove( dataColumn );
-              }
-            }
+    internal static ISupportInitialize GetSupportInitializeObject( object item )
+    {
+      return item as ISupportInitialize;
+    }
 
-            foreach( DataGridItemPropertyBase itemProperty in itemProperties )
-            {
-              string name = itemProperty.Name;
+    internal static bool IsASubRelationship( Type dataType )
+    {
+      if( ( dataType == null ) || ( dataType.IsValueType ) || ( typeof( string ).IsAssignableFrom( dataType ) ) )
+        return false;
 
-              if( columns[ name ] == null )
-              {
-                Column column = ItemsSourceHelper.CreateColumnFromItemsSourceField(
-                  dataGridControl.DefaultCellEditors,
-                  ItemsSourceHelper.CreateFieldFromDataGridItemProperty( itemProperty ),
-                  autoCreateForeignKeyConfigurations );
-
-                if( column != null )
-                {
-                  columns.Add( column );
-                }
-              }
-            }
+      if( typeof( IEnumerable ).IsAssignableFrom( dataType ) )
+        return !typeof( byte[] ).IsAssignableFrom( dataType );
 
-            break;
-          }
+      return typeof( IListSource ).IsAssignableFrom( dataType );
+    }
 
-        //case NotifyCollectionChangedAction.Move:
-        default:
-          break;
-      }
+    internal static object TryGetDataRowFromDataItem( object dataItem )
+    {
+      var dataRowView = dataItem as DataRowView;
+      if( dataRowView != null )
+        return dataRowView.Row;
+
+      return dataItem;
+    }
+
+    internal static DataView TryGetDataViewFromDataGridContext( DataGridContext context )
+    {
+      if( context == null )
+        return null;
+
+      var dataView = context.ItemsSourceCollection as DataView;
+      if( dataView != null )
+        return dataView;
+
+      var collectionViewBase = context.ItemsSourceCollection as DataGridCollectionViewBase;
+      if( collectionViewBase != null )
+        return collectionViewBase.SourceCollection as DataView;
+
+      return null;
     }
 
-    internal static System.Windows.Data.Binding AutoCreateDisplayMemberBinding( Column column, DataGridContext dataGridContext, object dataItem, out bool isDataGridUnboundItemProperty )
+    internal static Type GetColumnDataType( DataColumn column )
     {
-      System.Windows.Data.Binding displayMemberBinding = null;
+      if( !column.AllowDBNull )
+        return column.DataType;
 
-      if( column == null )
-        throw new ArgumentNullException( "column" );
+      if( column.DataType == typeof( Boolean ) )
+        return typeof( Nullable<Boolean> );
 
-      string name = column.FieldName;
+      if( column.DataType == typeof( Byte ) )
+        return typeof( Nullable<Byte> );
 
-      // Don't create the default binding if FieldName is null and we're in design-time.
-      if( !string.IsNullOrEmpty( name ) )
-      {
-        ItemsSourceHelper.FieldDescriptor fieldDescriptor;
-        dataGridContext.ItemsSourceFieldDescriptors.TryGetValue( name, out fieldDescriptor );
+      if( column.DataType == typeof( Char ) )
+        return typeof( Nullable<Char> );
 
-        isDataGridUnboundItemProperty = ( fieldDescriptor == null ) ? false :
-          fieldDescriptor.IsDataGridUnboundItemProperty;
+      if( column.DataType == typeof( DateTime ) )
+        return typeof( Nullable<DateTime> );
 
-        displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding( dataItem is DataRow, name, fieldDescriptor, column, false, typeof( object ) );
-      }
-      else
-      {
-        isDataGridUnboundItemProperty = false;
-      }
+      if( column.DataType == typeof( Decimal ) )
+        return typeof( Nullable<Decimal> );
+
+      if( column.DataType == typeof( Double ) )
+        return typeof( Nullable<Double> );
+
+      if( column.DataType == typeof( Int16 ) )
+        return typeof( Nullable<Int16> );
+
+      if( column.DataType == typeof( Int32 ) )
+        return typeof( Nullable<Int32> );
 
-      return displayMemberBinding;
+      if( column.DataType == typeof( Int64 ) )
+        return typeof( Nullable<Int64> );
+
+      if( column.DataType == typeof( SByte ) )
+        return typeof( Nullable<SByte> );
+
+      if( column.DataType == typeof( Single ) )
+        return typeof( Nullable<Single> );
+
+      if( column.DataType == typeof( TimeSpan ) )
+        return typeof( Nullable<TimeSpan> );
+
+      if( column.DataType == typeof( UInt16 ) )
+        return typeof( Nullable<UInt16> );
+
+      if( column.DataType == typeof( UInt32 ) )
+        return typeof( Nullable<UInt32> );
+
+      if( column.DataType == typeof( UInt64 ) )
+        return typeof( Nullable<UInt64> );
+
+      return column.DataType;
     }
 
-    private static Type GetTypedListIndexerType( Type listType )
+    internal static void CleanUpColumns( ColumnCollection columns, bool deleteAutoCreatedColumn )
     {
-      if( ( !typeof( IList ).IsAssignableFrom( listType ) && !typeof( ITypedList ).IsAssignableFrom( listType ) ) && !typeof( IListSource ).IsAssignableFrom( listType ) )
-        return null;
+      var tempColumns = new ColumnBase[ columns.Count ];
+      columns.CopyTo( tempColumns, 0 );
+
+      foreach( ColumnBase column in tempColumns )
+      {
+        var dataColumn = column as Column;
+        if( dataColumn == null )
+          continue;
 
-      PropertyInfo info = null;
-      PropertyInfo[] properties = listType.GetProperties( BindingFlags.Public | BindingFlags.Instance );
+        if( ( deleteAutoCreatedColumn ) && ( dataColumn.IsAutoCreated ) )
+        {
+          columns.Remove( column );
+        }
+        else if( dataColumn.IsBindingAutoCreated )
+        {
+          dataColumn.IsBindingAutoCreated = false;
+          dataColumn.IsBoundToDataGridUnboundItemProperty = false;
+          dataColumn.SetDisplayMemberBinding( null );
+        }
+      }
+    }
+
+    internal static PropertyDescriptionRoute CreateOrGetPropertyDescriptionFromColumn( DataGridContext dataGridContext, ColumnBase column, Type itemType )
+    {
+      if( ( dataGridContext == null ) || ( column == null ) || string.IsNullOrEmpty( column.FieldName ) )
+        return null;
+
+      var key = PropertyRouteParser.Parse( column.FieldName );
+      if( key == null )
+        return null;
+
+      var propertyDescriptions = dataGridContext.ItemsSourcePropertyDescriptions;
+      if( propertyDescriptions == null )
+        return null;
+
+      var propertyDescriptionRoute = default( PropertyDescriptionRoute );
+      if( !propertyDescriptions.TryGetValue( key, out propertyDescriptionRoute ) )
+      {
+        if( ( itemType == null ) || typeof( EmptyDataItem ).IsAssignableFrom( itemType ) )
+        {
+          var dataGridCollectionView = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+          if( dataGridCollectionView != null )
+          {
+            itemType = dataGridCollectionView.ItemType;
+          }
+          else
+          {
+            var dataItem = ItemsSourceHelper.GetFirstItemByEnumerable( dataGridContext.Items );
+
+            itemType = ( ( dataItem != null ) && !( dataItem is EmptyDataItem ) ) ? dataItem.GetType() : null;
+          }
+        }
+
+        ItemsSourceHelper.SetPropertyDescriptions( propertyDescriptions, null, dataGridContext.Items, itemType, key );
+
+        if( !propertyDescriptions.TryGetValue( key, out propertyDescriptionRoute ) )
+          return null;
+      }
+
+      return propertyDescriptionRoute;
+    }
+
+    internal static System.Windows.Data.Binding CreateDefaultBinding( PropertyDescriptionRoute propertyDescriptionRoute )
+    {
+      if( propertyDescriptionRoute == null )
+        return null;
+
+      var propertyDescription = propertyDescriptionRoute.Current;
+      var bindingXPath = propertyDescription.XPath;
+      var bindingPath = new StringBuilder();
+      var isPropertyDescriptorFirstAccessor = false;
+
+      var propertyDescriptors = new List<PropertyDescriptor>();
+      if( propertyDescription.PropertyDescriptor != null )
+      {
+        bindingPath.Append( "(" ).Append( propertyDescriptors.Count ).Append( ")" );
+        propertyDescriptors.Add( propertyDescription.PropertyDescriptor );
+        isPropertyDescriptorFirstAccessor = true;
+      }
+      else if( !string.IsNullOrEmpty( propertyDescription.Path ) )
+      {
+        bindingPath.Append( propertyDescription.Path );
+      }
+
+      var currentPropertyDescriptionRoute = propertyDescriptionRoute.Parent;
+
+      while( currentPropertyDescriptionRoute != null )
+      {
+        var currentPropertyDescription = currentPropertyDescriptionRoute.Current;
+
+        if( currentPropertyDescription.SupportDBNull )
+          throw new InvalidOperationException( "Cannot create binding when a parent property supports DBNull." );
+
+        if( currentPropertyDescription.IsDataGridUnboundItemProperty )
+          throw new InvalidOperationException( "Cannot create binding when a parent property is linked to an UnboundDataGridItemProperty." );
+
+        if( currentPropertyDescription.ForeignKeyDescription != null )
+          throw new InvalidOperationException( "Cannot create binding when a parent property is a foreign key." );
+
+        if( !string.IsNullOrEmpty( bindingXPath ) )
+          throw new InvalidOperationException( "Cannot create binding when a child property has an XPath." );
+
+        bindingXPath = currentPropertyDescription.XPath;
+
+        if( currentPropertyDescription.PropertyDescriptor != null )
+        {
+          isPropertyDescriptorFirstAccessor = true;
+
+          if( bindingPath.Length != 0 )
+          {
+            bindingPath.Insert( 0, "." );
+          }
+
+          bindingPath.Insert( 0, ")" ).Insert( 0, propertyDescriptors.Count ).Insert( 0, "(" );
+          propertyDescriptors.Add( currentPropertyDescription.PropertyDescriptor );
+        }
+        else if( !string.IsNullOrEmpty( currentPropertyDescription.Path ) )
+        {
+          isPropertyDescriptorFirstAccessor = false;
+
+          if( bindingPath.Length != 0 )
+          {
+            bindingPath.Insert( 0, "." );
+          }
+
+          bindingPath.Insert( 0, currentPropertyDescription.Path );
+        }
+
+        currentPropertyDescriptionRoute = currentPropertyDescriptionRoute.Parent;
+      }
+
+      var bindingInfo = new DataGridBindingInfo();
+
+      if( !string.IsNullOrEmpty( bindingXPath ) )
+      {
+        bindingInfo.XPath = bindingXPath;
+      }
+      else
+      {
+        // We must insert a PropertyDescriptor to manage EmptyDataItem when the accessor is not from a DataGridItemPropertyBase.
+        if( isPropertyDescriptorFirstAccessor && !( propertyDescriptors.Last() is DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase ) )
+        {
+          if( bindingPath.Length != 0 )
+          {
+            bindingPath.Insert( 0, "." );
+          }
+
+          bindingPath.Insert( 0, ")" ).Insert( 0, propertyDescriptors.Count ).Insert( 0, "(" );
+          propertyDescriptors.Add( EmptyDataItemSafePropertyDescriptor.Singleton );
+        }
+      }
+
+      bindingInfo.Path = new PropertyPath( bindingPath.ToString(), propertyDescriptors.ToArray() );
+      bindingInfo.ReadOnly = ( propertyDescription.IsReadOnly && !propertyDescription.OverrideReadOnlyForInsertion );
+      bindingInfo.Converter = new SourceDataConverter( propertyDescription.SupportDBNull );
+
+      bindingInfo.ValidationRules.Add( new SourceDataConverterValidationRule( propertyDescription.SupportDBNull, propertyDescription.DataType ) );
+
+      return bindingInfo.GetBinding();
+    }
+
+    private static Type GetTypedListIndexerType( Type listType )
+    {
+      if( ( !typeof( IList ).IsAssignableFrom( listType ) && !typeof( ITypedList ).IsAssignableFrom( listType ) ) && !typeof( IListSource ).IsAssignableFrom( listType ) )
+        return null;
+
+      var info = default( PropertyInfo );
+      var propertyInfos = listType.GetProperties( BindingFlags.Public | BindingFlags.Instance );
+
+      foreach( var propertyInfo in propertyInfos )
+      {
+        if( ( propertyInfo.GetIndexParameters().Length > 0 ) && ( propertyInfo.PropertyType != typeof( object ) ) )
+        {
+          info = propertyInfo;
+
+          if( info.Name == "Item" )
+            return info.PropertyType;
+        }
+      }
+
+      if( info != null )
+        return info.PropertyType;
+
+      return null;
+    }
+
+    private static Type GetTypedEnumerationItemType( Type listType )
+    {
+      if( listType == null )
+        return null;
+
+      foreach( Type interfaceType in listType.GetInterfaces() )
+      {
+        if( ( interfaceType.IsGenericType ) && ( interfaceType.GetGenericTypeDefinition() == typeof( IEnumerable<> ) ) )
+          return interfaceType.GetGenericArguments()[ 0 ];
+      }
+
+      return null;
+    }
+
+    private static void SetPropertyDescriptions( PropertyDescriptionRouteDictionary propertyDescriptions, DataTable model, IEnumerable itemsSource, Type itemType, PropertyRoute propertyRoute )
+    {
+      if( ( propertyDescriptions == null ) || ( propertyRoute == null ) || propertyDescriptions.Contains( propertyRoute ) )
+        return;
+
+      var parentKey = propertyRoute.Parent;
+      if( parentKey != null )
+      {
+        ItemsSourceHelper.SetPropertyDescriptions( propertyDescriptions, model, itemsSource, itemType, parentKey );
+
+        PropertyDescriptionRoute parentPropertyDescriptionRoute;
+        if( !propertyDescriptions.TryGetValue( parentKey, out parentPropertyDescriptionRoute ) )
+          return;
+
+        var parentItemType = parentPropertyDescriptionRoute.Current.DataType;
+        var childPropertyDescriptions = new PropertyDescriptionRouteDictionary();
+
+        ItemsSourceHelper.SetPropertyDescriptions( childPropertyDescriptions, null, null, parentItemType, false );
+
+        foreach( var childPropertyDescriptionRoute in childPropertyDescriptions.Values )
+        {
+          var newPropertyDescriptionRoute = PropertyDescriptionRoute.Combine( childPropertyDescriptionRoute, parentPropertyDescriptionRoute );
+          var newPropertyRoute = PropertyRouteBuilder.ToPropertyRoute( newPropertyDescriptionRoute );
+
+          if( ( newPropertyRoute == null ) || propertyDescriptions.Contains( newPropertyRoute ) )
+            continue;
+
+          propertyDescriptions.Add( newPropertyRoute, newPropertyDescriptionRoute, false );
+        }
+
+        var currentSegment = propertyRoute.Current;
+        if( currentSegment.Type == PropertyRouteSegmentType.Indexer )
+        {
+          var indexerDescriptionRoute = ItemsSourceHelper.CreateIndexerDescription( itemsSource, parentItemType, currentSegment.Name, false );
+          if( indexerDescriptionRoute != null )
+          {
+            var newIndexerDescriptionRoute = PropertyDescriptionRoute.Combine( indexerDescriptionRoute, parentPropertyDescriptionRoute );
+            if( newIndexerDescriptionRoute != null )
+            {
+              var newIndexerRoute = PropertyRouteBuilder.ToPropertyRoute( newIndexerDescriptionRoute );
+              if( ( newIndexerRoute != null ) && !propertyDescriptions.Contains( newIndexerRoute ) )
+              {
+                propertyDescriptions.Add( newIndexerRoute, newIndexerDescriptionRoute, false );
+              }
+            }
+          }
+        }
+      }
+      else
+      {
+        ItemsSourceHelper.SetPropertyDescriptions( propertyDescriptions, model, itemsSource, itemType, false );
+
+        var currentSegment = propertyRoute.Current;
+        if( currentSegment.Type == PropertyRouteSegmentType.Indexer )
+        {
+          var newIndexerDescriptionRoute = ItemsSourceHelper.CreateIndexerDescription( itemsSource, itemType, currentSegment.Name, false );
+          if( newIndexerDescriptionRoute != null )
+          {
+            var newIndexerRoute = PropertyRouteBuilder.ToPropertyRoute( newIndexerDescriptionRoute );
+            if( ( newIndexerRoute != null ) && !propertyDescriptions.Contains( newIndexerRoute ) )
+            {
+              propertyDescriptions.Add( newIndexerRoute, newIndexerDescriptionRoute, false );
+            }
+          }
+        }
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataTable( DataTable source, bool displayable )
+    {
+      Debug.Assert( source != null );
+
+      var foreignKeyConstraints = ItemsSourceHelper.GetForeignKeyConstraints( source.Constraints );
+      var columns = source.Columns;
+
+      foreach( DataColumn column in columns )
+      {
+        yield return new PropertyDescriptionRoute(
+                           new DataTablePropertyDescription(
+                             new DataRowColumnPropertyDescriptor( column ),
+                             column,
+                             foreignKeyConstraints,
+                             displayable ) );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataView( DataView source, bool displayable )
+    {
+      Debug.Assert( source != null );
+
+      var itemProperties = ( ( ITypedList )source ).GetItemProperties( null );
+      var dataTable = source.Table;
+      var foreignKeyConstraints = ItemsSourceHelper.GetForeignKeyConstraints( dataTable.Constraints );
+      var columns = dataTable.Columns;
+
+      foreach( PropertyDescriptor propertyDescriptor in itemProperties )
+      {
+        yield return new PropertyDescriptionRoute( new DataTablePropertyDescription( propertyDescriptor, columns[ propertyDescriptor.Name ], foreignKeyConstraints, displayable ) );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataGridCollectionView( DataGridCollectionViewBase source )
+    {
+      if( source == null )
+        return Enumerable.Empty<PropertyDescriptionRoute>();
+
+      return ItemsSourceHelper.CreatePropertyDescriptionsFromItemProperties( source.ItemProperties );
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromItemProperties( IEnumerable<DataGridItemPropertyBase> source )
+    {
+      if( source == null )
+        yield break;
+
+      foreach( var itemProperty in source )
+      {
+        yield return ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty( itemProperty );
+
+        foreach( var childItemProperty in ItemsSourceHelper.CreatePropertyDescriptionsFromItemProperties( itemProperty.ItemPropertiesInternal ) )
+        {
+          yield return childItemProperty;
+        }
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromPropertyDescriptors( PropertyDescriptorCollection source, bool supportsDBNull, bool displayable )
+    {
+      if( source == null )
+        yield break;
+
+      foreach( PropertyDescriptor propertyDescriptor in source )
+      {
+        yield return new PropertyDescriptionRoute( new PropertyDescriptorPropertyDescription( propertyDescriptor, supportsDBNull, displayable ) );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromItemType( IEnumerable itemsSource, Type itemType, bool supportsDBNull, bool displayable )
+    {
+      if( itemType == null )
+        return Enumerable.Empty<PropertyDescriptionRoute>();
+
+      if( typeof( XmlNode ).IsAssignableFrom( itemType ) )
+        return Enumerable.Empty<PropertyDescriptionRoute>();
+
+      if( itemType.IsArray )
+        return ItemsSourceHelper.CreatePropertyDescriptionsFromJaggedArray( itemType, itemsSource, displayable );
+
+      if( itemType.IsInterface )
+        return ItemsSourceHelper.CreatePropertyDescriptionsFromInterface( itemType, displayable );
+
+      if( ItemsSourceHelper.IsEntityFramework( itemType ) )
+        return ItemsSourceHelper.CreatePropertyDescriptionsFromEntityFramework( itemType, displayable );
+
+      if( ItemsSourceHelper.IsValueType( itemType ) )
+      {
+        var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( itemsSource, itemType );
+
+        return ItemsSourceHelper.CreatePropertyDescriptionsFromValueType( itemType, supportsDBNull, null, displayable ).Concat(
+                 ( customTypeDescriptor != null )
+                   ? ItemsSourceHelper.CreatePropertyDescriptionsFromCustomTypeDescriptor( customTypeDescriptor, itemType, supportsDBNull, false )
+                   : ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors( TypeDescriptor.GetProperties( itemType ), supportsDBNull, false ) );
+      }
+      else
+      {
+        var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( itemsSource, itemType );
+        if( customTypeDescriptor != null )
+          return ItemsSourceHelper.CreatePropertyDescriptionsFromCustomTypeDescriptor( customTypeDescriptor, itemType, supportsDBNull, displayable );
+
+        return ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors( TypeDescriptor.GetProperties( itemType ), supportsDBNull, displayable );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromJaggedArray( Type itemType, IEnumerable jaggedArray, bool displayable )
+    {
+      var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( jaggedArray ) as Array;
+      if( ( firstItem == null ) || ( itemType == null ) )
+        yield break;
+
+      var fieldCount = firstItem.GetLength( 0 );
+      var fieldType = itemType.GetElementType();
+
+      for( int i = 0; i < fieldCount; i++ )
+      {
+        yield return new PropertyDescriptionRoute( new JaggedArrayPropertyDescription( i, fieldType, displayable ) );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromInterface( Type itemType, bool displayable )
+    {
+      var propertyDescriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors( TypeDescriptor.GetProperties( itemType ), false, displayable ).ToList();
+      var names = new HashSet<string>( propertyDescriptions.Select( item => PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( item ) ) ) );
+
+      foreach( var interfaceType in itemType.GetInterfaces() )
+      {
+        foreach( PropertyDescriptor propertyDescriptor in TypeDescriptor.GetProperties( interfaceType ) )
+        {
+          PropertyDescription propertyDescription;
+
+          if( names.Contains( propertyDescriptor.Name ) )
+          {
+            var newName = string.Format( "{0}.{1}", interfaceType.FullName, propertyDescriptor.Name );
+            propertyDescription = new NamedPropertyDescriptorPropertyDescription( newName, propertyDescriptor, false, displayable );
+          }
+          else
+          {
+            propertyDescription = new PropertyDescriptorPropertyDescription( propertyDescriptor, false, displayable );
+          }
+
+          Debug.Assert( propertyDescription != null );
+
+          names.Add( propertyDescription.Name );
+          propertyDescriptions.Add( new PropertyDescriptionRoute( propertyDescription ) );
+        }
+      }
+
+      return propertyDescriptions;
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromEntityFramework( Type itemType, bool displayable )
+    {
+      foreach( PropertyDescriptor propertyDescriptor in TypeDescriptor.GetProperties( itemType ) )
+      {
+        yield return new PropertyDescriptionRoute( new EntityFrameworkPropertyDescription( propertyDescriptor, displayable ) );
+      }
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromValueType( Type itemType, bool supportsDBNull, DataGridForeignKeyDescription foreignKeyDescription, bool displayable )
+    {
+      yield return new PropertyDescriptionRoute( new ValueTypePropertyDescription( itemType, supportsDBNull, foreignKeyDescription, displayable ) );
+    }
+
+    private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromCustomTypeDescriptor( ICustomTypeDescriptor customTypeDescriptor, Type itemType, bool supportsDBNull, bool displayable )
+    {
+      if( customTypeDescriptor == null )
+        return Enumerable.Empty<PropertyDescriptionRoute>();
+
+      return ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors( customTypeDescriptor.GetProperties(), supportsDBNull, displayable );
+    }
+
+    private static PropertyDescriptionRoute CreatePropertyDescriptionFromDataGridItemProperty( DataGridItemPropertyBase source )
+    {
+      if( source == null )
+        return null;
+
+      var collection = source.ContainingCollection;
+      var ancestors = ( collection != null ) ? ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty( collection.Owner ) : null;
+
+      return PropertyDescriptionRoute.Combine( new ItemPropertyPropertyDescription( source ), ancestors );
+    }
+
+    private static PropertyDescriptionRoute CreateIndexerDescription( IEnumerable itemsSource, Type itemType, string index, bool displayable )
+    {
+      if( ( itemType == null ) || string.IsNullOrEmpty( index ) )
+        return null;
+
+      var typeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( itemsSource, itemType ) as DataItemTypeDescriptor;
+      if( typeDescriptor == null )
+        return null;
+
+      var parameters = IndexerParametersParser.Parse( index ).ToArray();
+      if( parameters.Length <= 0 )
+        return null;
+
+      var indexerDescriptor = typeDescriptor.GetIndexer( parameters );
+      if( indexerDescriptor == null )
+        return null;
+
+      var supportsDBNull = ItemsSourceHelper.IsSupportingDBNull( itemsSource );
+
+      return new PropertyDescriptionRoute( new IndexerDescriptorPropertyDescription( indexerDescriptor, supportsDBNull, displayable ) );
+    }
+
+    private static Dictionary<string, ForeignKeyConstraint> GetForeignKeyConstraints( ConstraintCollection constraints )
+    {
+      var foreignKeyConstraints = new Dictionary<string, ForeignKeyConstraint>();
+
+      // Detect every ForeignKeyConstraints
+      foreach( Constraint constraint in constraints )
+      {
+        var foreignKeyConstraint = constraint as ForeignKeyConstraint;
+        if( foreignKeyConstraint == null )
+          continue;
+
+        // We only support auto-detection when the ForeignKey is composed of a single column
+        if( ( foreignKeyConstraint.Columns != null ) && ( foreignKeyConstraint.Columns.Length == 1 ) )
+        {
+          foreignKeyConstraints.Add( foreignKeyConstraint.Columns[ 0 ].ColumnName, foreignKeyConstraint );
+        }
+      }
+
+      return foreignKeyConstraints;
+    }
+
+    private static DataGridForeignKeyDescription GetDataGridForeignKeyDescriptionForEnum( Type enumType )
+    {
+      if( ( enumType == null ) || !enumType.IsEnum )
+        return null;
+
+      var description = new DataGridForeignKeyDescription();
+
+      // Using "." as default value path will revert to Self when used as SelectedValuePath when bound to a DataGridForeignKeyDictionary or ComboBox (default editor)
+      description.ValuePath = ".";
+      description.ItemsSource = Enum.GetValues( enumType );
+      description.IsAutoCreated = true;
+
+      return description;
+    }
+
+    private static DataTableForeignKeyDescription GetDataGridForeignKeyDescriptionForForeignKeyConstraint( ForeignKeyConstraint foreignKeyConstraint )
+    {
+      if( foreignKeyConstraint == null )
+        return null;
+
+      var columns = foreignKeyConstraint.Columns;
+      if( ( columns == null ) || ( columns.Length != 1 ) )
+        return null;
+
+      var description = new DataTableForeignKeyDescription();
+      description.ForeignKeyConstraint = foreignKeyConstraint;
+      description.IsAutoCreated = true;
+
+      return description;
+    }
+
+    private static DataGridItemPropertyBase CreateItemPropertyFromPropertyDescription( PropertyDescription propertyDescription )
+    {
+      if( propertyDescription == null )
+        return null;
+
+      return new DataGridItemProperty(
+                   propertyDescription.Name,
+                   propertyDescription.PropertyDescriptor,
+                   propertyDescription.DisplayName,
+                   propertyDescription.XPath,
+                   propertyDescription.Path,
+                   propertyDescription.DataType,
+                   true,
+                   propertyDescription.IsReadOnly,
+                   propertyDescription.OverrideReadOnlyForInsertion,
+                   propertyDescription.IsDisplayable,
+                   propertyDescription.IsSubRelationship,
+                   propertyDescription.ForeignKeyDescription );
+    }
+
+    internal static List<DataGridDetailDescription> CreateDetailDescriptions( Type itemType, IEnumerable enumeration )
+    {
+      var dataTable = enumeration as DataTable;
+      if( dataTable == null )
+      {
+        var dataView = enumeration as DataView;
+        if( dataView != null )
+        {
+          dataTable = dataView.Table;
+        }
+      }
+
+      if( dataTable != null )
+        return ItemsSourceHelper.CreateDetailDescriptions( dataTable );
+
+      if( itemType != null )
+      {
+        //We do not support automatic Master/Detail detection with an Xml source
+        if( typeof( XmlNode ).IsAssignableFrom( itemType ) )
+          return new List<DataGridDetailDescription>( 0 );
+
+        //Unbound mode, we do not support Master/Detail in this scenario.
+        if( typeof( DataRow ).IsAssignableFrom( itemType ) )
+          return new List<DataGridDetailDescription>( 0 );
+
+        //we do not support Master/Details when Item is a Value type...
+        if( ItemsSourceHelper.IsValueType( itemType ) )
+          return new List<DataGridDetailDescription>( 0 );
+
+        //Check if the object is a Entity Framework Entity, before checking for IEnumerable (since Entity Framework does have IEnumerable
+        //properties, but require special handling )...
+        if( ItemsSourceHelper.IsEntityFramework( itemType ) )
+          return ItemsSourceHelper.CreateDetailDescriptionsForEntityFramework( itemType );
+
+        //If the first item maps to an object that implements IEnumerable, expand that as a Relation ( and only that )...
+        if( typeof( IEnumerable ).IsAssignableFrom( itemType ) )
+          return ItemsSourceHelper.CreateDetailDescriptionsForEnumerable();
+
+        if( typeof( IListSource ).IsAssignableFrom( itemType ) )
+          return ItemsSourceHelper.CreateDetailDescriptionsForListSource();
+      }
+
+      //If the Source collection implements ITypedList
+      var typedList = enumeration as ITypedList;
+      if( typedList != null )
+        return ItemsSourceHelper.GetDataGridDetailDescriptions( typedList.GetItemProperties( null ) );
+
+      var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor( enumeration, itemType );
+      if( customTypeDescriptor != null )
+        return ItemsSourceHelper.GetDataGridDetailDescriptions( customTypeDescriptor.GetProperties() );
+
+      if( itemType != null )
+        return ItemsSourceHelper.GetDataGridDetailDescriptions( TypeDescriptor.GetProperties( itemType ) );
+
+      return new List<DataGridDetailDescription>( 0 );
+    }
+
+    internal static List<DataGridDetailDescription> CreateDetailDescriptions( DataTable dataTable )
+    {
+      if( dataTable == null )
+        return new List<DataGridDetailDescription>( 0 );
+
+      return ItemsSourceHelper.CreateDetailDescriptionsForDataTable( dataTable );
+    }
+
+    private static List<DataGridDetailDescription> CreateDetailDescriptionsForDataTable( DataTable dataTable )
+    {
+      var detailDescriptions = new List<DataGridDetailDescription>( dataTable.ChildRelations.Count );
+
+      foreach( DataRelation relation in dataTable.ChildRelations )
+      {
+        var description = new DataRelationDetailDescription( relation );
+        description.IsAutoCreated = true;
+        description.IsInitialized = true;
+        detailDescriptions.Add( description );
+      }
+
+      return detailDescriptions;
+    }
+
+    private static List<DataGridDetailDescription> CreateDetailDescriptionsForEntityFramework( Type type )
+    {
+      var detailDescriptions = new List<DataGridDetailDescription>();
+
+      // Gets all the public properties of the type.
+      var propertyInfos = type.GetProperties( BindingFlags.Instance | BindingFlags.Public );
+
+      // Loop throught the properties to build up the detail descriptions.
+      foreach( var propertyInfo in propertyInfos )
+      {
+        // We must use Reflection to check for the EntityFramework types.
+        var propertyType = propertyInfo.PropertyType;
+
+        // The property must be of type RelatedEnd and IEnumerable to continue.
+        if( ( propertyType.BaseType != null )
+          && ( propertyType.BaseType.FullName == "System.Data.Objects.DataClasses.RelatedEnd" )
+          && ( typeof( IEnumerable ).IsAssignableFrom( propertyType ) ) )
+        {
+          detailDescriptions.Add( new EntityDetailDescription( propertyInfo.Name ) );
+        }
+      }
+
+      return detailDescriptions;
+    }
+
+    private static List<DataGridDetailDescription> CreateDetailDescriptionsForEnumerable()
+    {
+      var detailDescriptions = new List<DataGridDetailDescription>( 1 );
+
+      var description = new EnumerableDetailDescription();
+      description.IsAutoCreated = true;
+      description.IsInitialized = true;
+      detailDescriptions.Add( description );
+
+      return detailDescriptions;
+    }
+
+    private static List<DataGridDetailDescription> CreateDetailDescriptionsForListSource()
+    {
+      var detailDescriptions = new List<DataGridDetailDescription>( 1 );
+
+      var description = new ListSourceDetailDescription();
+      description.IsAutoCreated = true;
+      description.IsInitialized = true;
+      detailDescriptions.Add( description );
+
+      return detailDescriptions;
+    }
+
+    private static List<DataGridDetailDescription> GetDataGridDetailDescriptions( PropertyDescriptorCollection properties )
+    {
+      var detailDescriptions = new List<DataGridDetailDescription>( properties.Count );
+
+      foreach( PropertyDescriptor property in properties )
+      {
+        // We only create details for properties that are browsable.
+        if( !property.IsBrowsable )
+          continue;
+
+        if( ItemsSourceHelper.IsASubRelationship( property.PropertyType ) )
+        {
+          var description = new PropertyDetailDescription( property );
+          description.IsAutoCreated = true;
+          description.IsInitialized = true;
+          detailDescriptions.Add( description );
+        }
+      }
+
+      return detailDescriptions;
+    }
+
+    private static bool IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically( IEditableObject item )
+    {
+      return ( item is DataRowView )
+          || ( item is DataRow );
+    }
+
+    #region DataTablePropertyDescription Private Class
+
+    private sealed class DataTablePropertyDescription : PropertyDescription
+    {
+      internal DataTablePropertyDescription( PropertyDescriptor propertyDescriptor, DataColumn column, IDictionary<string, ForeignKeyConstraint> constraints, bool isDisplayable )
+      {
+        if( propertyDescriptor == null )
+          throw new ArgumentNullException( "propertyDescriptor" );
+
+        m_propertyDescriptor = propertyDescriptor;
+        m_column = column;
+        m_isDisplayable = isDisplayable;
+
+        if( constraints != null )
+        {
+          ForeignKeyConstraint constraint;
+          if( constraints.TryGetValue( propertyDescriptor.Name, out constraint ) )
+          {
+            m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForForeignKeyConstraint( constraint );
+          }
+        }
+      }
+
+      internal override string Name
+      {
+        get
+        {
+          return m_propertyDescriptor.Name;
+        }
+      }
+
+      internal override string DisplayName
+      {
+        get
+        {
+          if( m_column != null )
+            return m_column.Caption;
+
+          return m_propertyDescriptor.DisplayName;
+        }
+      }
+
+      internal override Type DataType
+      {
+        get
+        {
+          return m_propertyDescriptor.PropertyType;
+        }
+      }
+
+      internal override PropertyDescriptor PropertyDescriptor
+      {
+        get
+        {
+          return m_propertyDescriptor;
+        }
+      }
+
+      internal override bool IsReadOnly
+      {
+        get
+        {
+          return m_propertyDescriptor.IsReadOnly;
+        }
+      }
+
+      internal override bool SupportDBNull
+      {
+        get
+        {
+          return ( m_column != null )
+              && ( m_column.AllowDBNull );
+        }
+      }
+
+      internal override bool IsBrowsable
+      {
+        get
+        {
+          return m_propertyDescriptor.IsBrowsable;
+        }
+      }
+
+      internal override bool IsDisplayable
+      {
+        get
+        {
+          return m_isDisplayable;
+        }
+      }
+
+      internal override bool IsSubRelationship
+      {
+        get
+        {
+          return ( m_column == null )
+              && ( ItemsSourceHelper.IsASubRelationship( this.DataType ) );
+        }
+      }
+
+      internal override DataGridForeignKeyDescription ForeignKeyDescription
+      {
+        get
+        {
+          return m_foreignKeyDescription;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_propertyDescriptor.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as DataTablePropertyDescription;
+        if( target == null )
+          return false;
+
+        return ( object.Equals( target.m_propertyDescriptor, m_propertyDescriptor ) )
+            && ( object.Equals( target.m_column, m_column ) );
+      }
+
+      private readonly PropertyDescriptor m_propertyDescriptor;
+      private readonly DataColumn m_column;
+      private readonly bool m_isDisplayable;
+      private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
+    }
+
+    #endregion
+
+    #region ItemPropertyPropertyDescription Private Class
+
+    private sealed class ItemPropertyPropertyDescription : PropertyDescription
+    {
+      internal ItemPropertyPropertyDescription( DataGridItemPropertyBase itemProperty )
+      {
+        if( itemProperty == null )
+          throw new ArgumentNullException( "itemProperty" );
+
+        m_itemProperty = itemProperty;
+        m_propertyDescriptor = itemProperty.GetPropertyDescriptorForBinding();
+        Debug.Assert( m_propertyDescriptor != null );
+      }
+
+      internal override string Name
+      {
+        get
+        {
+          return m_itemProperty.Name;
+        }
+      }
+
+      internal override string DisplayName
+      {
+        get
+        {
+          return m_propertyDescriptor.DisplayName;
+        }
+      }
+
+      internal override Type DataType
+      {
+        get
+        {
+          return m_propertyDescriptor.PropertyType;
+        }
+      }
+
+      internal override PropertyDescriptor PropertyDescriptor
+      {
+        get
+        {
+          return m_propertyDescriptor;
+        }
+      }
+
+      internal override bool IsReadOnly
+      {
+        get
+        {
+          return m_propertyDescriptor.IsReadOnly;
+        }
+      }
+
+      internal override bool OverrideReadOnlyForInsertion
+      {
+        get
+        {
+          return m_itemProperty.OverrideReadOnlyForInsertion.GetValueOrDefault( false );
+        }
+      }
+
+      internal override bool IsBrowsable
+      {
+        get
+        {
+          return m_propertyDescriptor.IsBrowsable;
+        }
+      }
+
+      internal override bool IsDisplayable
+      {
+        get
+        {
+          return m_itemProperty.IsDisplayable;
+        }
+      }
+
+      internal override bool IsSubRelationship
+      {
+        get
+        {
+          return m_itemProperty.IsASubRelationship;
+        }
+      }
+
+      internal override DataGridForeignKeyDescription ForeignKeyDescription
+      {
+        get
+        {
+          return m_itemProperty.ForeignKeyDescription;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return m_itemProperty.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as ItemPropertyPropertyDescription;
+        if( target == null )
+          return false;
+
+        return object.Equals( target.m_itemProperty, m_itemProperty );
+      }
+
+      private readonly DataGridItemPropertyBase m_itemProperty;
+      private readonly PropertyDescriptor m_propertyDescriptor;
+    }
+
+    #endregion
+
+    #region PropertyDescriptorPropertyDescription Private Class
+
+    private class PropertyDescriptorPropertyDescription : PropertyDescription
+    {
+      internal PropertyDescriptorPropertyDescription( PropertyDescriptor propertyDescriptor, bool supportDBNull, bool isDisplayable )
+      {
+        if( propertyDescriptor == null )
+          throw new ArgumentNullException( "propertyDescriptor" );
+
+        m_propertyDescriptor = propertyDescriptor;
+        m_supportDBNull = supportDBNull;
+        m_isDisplayable = isDisplayable;
+        m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum( propertyDescriptor.PropertyType );
+      }
+
+      internal override string Name
+      {
+        get
+        {
+          return m_propertyDescriptor.Name;
+        }
+      }
+
+      internal override string DisplayName
+      {
+        get
+        {
+          return m_propertyDescriptor.DisplayName;
+        }
+      }
+
+      internal override Type DataType
+      {
+        get
+        {
+          return m_propertyDescriptor.PropertyType;
+        }
+      }
+
+      internal override PropertyDescriptor PropertyDescriptor
+      {
+        get
+        {
+          return m_propertyDescriptor;
+        }
+      }
+
+      internal override bool IsReadOnly
+      {
+        get
+        {
+          return m_propertyDescriptor.IsReadOnly;
+        }
+      }
+
+      internal override bool SupportDBNull
+      {
+        get
+        {
+          return m_supportDBNull;
+        }
+      }
+
+      internal override bool IsBrowsable
+      {
+        get
+        {
+          return m_propertyDescriptor.IsBrowsable;
+        }
+      }
+
+      internal override bool IsDisplayable
+      {
+        get
+        {
+          return m_isDisplayable;
+        }
+      }
 
-      for( int i = 0; i < properties.Length; i++ )
+      internal override bool IsSubRelationship
       {
-        if( ( properties[ i ].GetIndexParameters().Length > 0 ) && ( properties[ i ].PropertyType != typeof( object ) ) )
+        get
         {
-          info = properties[ i ];
-
-          if( info.Name == "Item" )
-            return info.PropertyType;
+          return ItemsSourceHelper.IsASubRelationship( this.DataType );
         }
       }
 
-      if( info != null )
-        return info.PropertyType;
+      internal override DataGridForeignKeyDescription ForeignKeyDescription
+      {
+        get
+        {
+          return m_foreignKeyDescription;
+        }
+      }
 
-      return null;
-    }
+      public override int GetHashCode()
+      {
+        return m_propertyDescriptor.GetHashCode();
+      }
 
-    private static Type GetTypedEnumerationItemType( Type listType )
-    {
-      foreach( Type interfaceType in listType.GetInterfaces() )
+      public override bool Equals( object obj )
       {
-        if( ( interfaceType.IsGenericType ) && ( interfaceType.GetGenericTypeDefinition() == typeof( IEnumerable<> ) ) )
-          return interfaceType.GetGenericArguments()[ 0 ];
+        var target = obj as PropertyDescriptorPropertyDescription;
+        if( target == null )
+          return false;
+
+        return ( object.Equals( target.m_propertyDescriptor, m_propertyDescriptor ) )
+            && ( target.m_supportDBNull == m_supportDBNull );
       }
 
-      return null;
+      private readonly PropertyDescriptor m_propertyDescriptor;
+      private readonly bool m_supportDBNull;
+      private readonly bool m_isDisplayable;
+      private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
     }
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForDataView( DataView dataView )
-    {
-      PropertyDescriptorCollection itemProperties = ( ( ITypedList )dataView ).GetItemProperties( null );
-      int fieldCount = itemProperties.Count;
-      Dictionary<string, FieldDescriptor> fieldDescriptors = new Dictionary<string, FieldDescriptor>( fieldCount );
-
-      Dictionary<string, ForeignKeyConstraint> foreignKeyConstraints =
-        ItemsSourceHelper.GetForeignKeyConstraints( dataView.Table.Constraints );
+    #endregion
 
-      DataColumnCollection columns = dataView.Table.Columns;
+    #region NamedPropertyDescriptorPropertyDescription Private Class
 
-      for( int i = 0; i < fieldCount; i++ )
+    private sealed class NamedPropertyDescriptorPropertyDescription : PropertyDescriptorPropertyDescription
+    {
+      internal NamedPropertyDescriptorPropertyDescription( string name, PropertyDescriptor propertyDescriptor, bool supportDBNull, bool isDisplayable )
+        : base( propertyDescriptor, supportDBNull, isDisplayable )
       {
-        PropertyDescriptor propertyDescriptor = itemProperties[ i ];
-
-        string name = propertyDescriptor.Name;
-        DataColumn column = columns[ name ];
-
-        string displayName =
-          ( column == null ) ?
-          propertyDescriptor.DisplayName : column.Caption;
+        if( name == null )
+          throw new ArgumentNullException( "name" );
 
-        bool allowBDNull =
-          ( column == null ) ?
-          false : column.AllowDBNull;
+        m_name = name;
+      }
 
-        ForeignKeyConstraint foreignKeyConstraint = null;
-        foreignKeyConstraints.TryGetValue( name, out foreignKeyConstraint );
+      internal override string Name
+      {
+        get
+        {
+          return m_name;
+        }
+      }
 
-        DataTableForeignKeyDescription foreignKeyDescription =
-          ItemsSourceHelper.GetDataGridForeignKeyDescriptionForForeignKeyConstraint( foreignKeyConstraint );
+      public override int GetHashCode()
+      {
+        return m_name.GetHashCode();
+      }
 
-        fieldDescriptors[ name ] = new FieldDescriptor( name,
-                                                        displayName,
-                                                        propertyDescriptor.PropertyType,
-                                                        propertyDescriptor,
-                                                        null,
-                                                        name,
-                                                        propertyDescriptor.IsReadOnly,
-                                                        false,
-                                                        allowBDNull,
-                                                        propertyDescriptor.IsBrowsable,
-                                                        ( column == null ) && ItemsSourceHelper.IsASubRelationship( propertyDescriptor.PropertyType ),
-                                                        false,
-                                                        foreignKeyDescription );
+      public override bool Equals( object obj )
+      {
+        var target = obj as NamedPropertyDescriptorPropertyDescription;
+        if( target == null )
+          return false;
 
-        Debug.Assert( ( column != null ) || ( ItemsSourceHelper.IsASubRelationship( propertyDescriptor.PropertyType ) ),
-          "If we don't have a column that corresponds to the property of a DataRowView, it is safe to assume that we have a sub relation." );
+        return ( target.m_name == m_name )
+            && ( base.Equals( target ) );
       }
 
-      return fieldDescriptors;
+      private readonly string m_name;
     }
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForDataTable( DataTable dataTable )
-    {
-      DataColumnCollection columns = dataTable.Columns;
-      int fieldCount = columns.Count;
+    #endregion
 
-      Dictionary<string, FieldDescriptor> fieldDescriptors = new Dictionary<string, FieldDescriptor>( fieldCount );
-      Dictionary<string, ForeignKeyConstraint> foreignKeyConstraints =
-       ItemsSourceHelper.GetForeignKeyConstraints( dataTable.Constraints );
+    #region IndexerDescriptorPropertyDescription Private Class
 
-      for( int i = 0; i < fieldCount; i++ )
+    private class IndexerDescriptorPropertyDescription : PropertyDescriptorPropertyDescription
+    {
+      internal IndexerDescriptorPropertyDescription( DataItemIndexerDescriptor indexerDescriptor, bool supportDBNull, bool isDisplayable )
+        : base( indexerDescriptor, supportDBNull, isDisplayable )
       {
-        DataColumn column = columns[ i ];
+      }
 
-        string name = column.Caption;
+      public override int GetHashCode()
+      {
+        return base.GetHashCode();
+      }
 
-        ForeignKeyConstraint foreignKeyConstraint = null;
-        foreignKeyConstraints.TryGetValue( name, out foreignKeyConstraint );
+      public override bool Equals( object obj )
+      {
+        return ( obj is IndexerDescriptorPropertyDescription )
+            && ( base.Equals( obj ) );
+      }
 
-        DataTableForeignKeyDescription foreignKeyDescription =
-          ItemsSourceHelper.GetDataGridForeignKeyDescriptionForForeignKeyConstraint( foreignKeyConstraint );
+      internal override PropertyRouteSegment ToPropertyRouteSegment()
+      {
+        var descriptor = ( DataItemIndexerDescriptor )this.PropertyDescriptor;
 
-        fieldDescriptors[ name ] = new FieldDescriptor( name,
-                                                        name,
-                                                        column.DataType,
-                                                        null,
-                                                        null,
-                                                        "[" + name + "]",
-                                                        column.ReadOnly,
-                                                        false,
-                                                        column.AllowDBNull,
-                                                        true,
-                                                        false,
-                                                        false,
-                                                        foreignKeyDescription );
+        return new PropertyRouteSegment( PropertyRouteSegmentType.Indexer, descriptor.IndexerParameters );
       }
-
-      return fieldDescriptors;
     }
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForDataGridCollectionViewBase( DataGridCollectionViewBase dataGridCollectionViewBase,
-                                                                                               DataGridItemPropertyCollection itemProperties )
-    {
-      int fieldCount = itemProperties.Count;
-
-      Dictionary<string, FieldDescriptor> fieldDescriptors =
-        new Dictionary<string, FieldDescriptor>( fieldCount );
-
-      for( int i = 0; i < fieldCount; i++ )
-      {
-        DataGridItemPropertyBase itemProperty = itemProperties[ i ];
-        fieldDescriptors[ itemProperty.Name ] = ItemsSourceHelper.CreateFieldFromDataGridItemProperty( itemProperty );
-      }
+    #endregion
 
-      return fieldDescriptors;
-    }
+    #region JaggedArrayPropertyDescription Private Class
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForInterface( Type itemType )
+    private sealed class JaggedArrayPropertyDescription : PropertyDescription
     {
-      Dictionary<string, FieldDescriptor> fieldDescriptors = new Dictionary<string, FieldDescriptor>();
-      ItemsSourceHelper.ExtractFieldDescriptors( string.Empty, TypeDescriptor.GetProperties( itemType ), false, fieldDescriptors );
-
-      foreach( Type interfaceType in itemType.GetInterfaces() )
+      internal JaggedArrayPropertyDescription( int index, Type dataType, bool isDisplayable )
       {
-        ItemsSourceHelper.ExtractFieldDescriptors( interfaceType.FullName, TypeDescriptor.GetProperties( interfaceType ), false, fieldDescriptors );
-      }
+        if( index < 0 )
+          throw new ArgumentException( "index" );
 
-      return fieldDescriptors;
-    }
+        if( dataType == null )
+          throw new ArgumentNullException( "dataType" );
 
-    private static Dictionary<string, FieldDescriptor> GetFieldsForJaggedArray( Type itemType, IEnumerable jaggedArray )
-    {
-      int fieldCount = 0;
-      IEnumerator enumerator = jaggedArray.GetEnumerator();
-      enumerator.MoveNext();
+        m_name = ".[" + index.ToString( CultureInfo.InvariantCulture ) + "]";
+        m_dataType = dataType;
+        m_isDisplayable = isDisplayable;
+        m_propertyDescriptor = new JaggedArrayPropertyDescriptor( index, dataType );
+        m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum( dataType );
+      }
 
-      try
+      internal override string Name
       {
-        Array arrayItem = enumerator.Current as Array;
-        fieldCount = arrayItem.GetLength( 0 );
+        get
+        {
+          return m_name;
+        }
       }
-      catch
+
+      internal override string DisplayName
       {
+        get
+        {
+          return m_name;
+        }
       }
 
-      Dictionary<string, FieldDescriptor> fieldDescriptors =
-        new Dictionary<string, FieldDescriptor>( fieldCount );
-
-      Type fieldType = itemType.GetElementType();
-
-      for( int i = 0; i < fieldCount; i++ )
+      internal override Type DataType
       {
-        string name = ".[" + i.ToString( CultureInfo.InvariantCulture ) + "]";
-
-        DataGridForeignKeyDescription foreignKeyDescription = null;
-
-        // Try to retreive the ForeignKeyDescription if the field is an Enum
-        if( ( fieldType != null ) && ( fieldType.IsEnum ) )
+        get
         {
-          foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum( fieldType );
+          return m_dataType;
         }
-
-        fieldDescriptors[ name ] = new FieldDescriptor( name,
-                                                        name,
-                                                        fieldType,
-                                                        new JaggedArrayPropertyDescriptor( i, fieldType ),
-                                                        null,
-                                                        null,
-                                                        false,
-                                                        false,
-                                                        false,
-                                                        true,
-                                                        ItemsSourceHelper.IsASubRelationship( fieldType ),
-                                                        false,
-                                                        foreignKeyDescription );
       }
 
-      return fieldDescriptors;
-    }
-
-    private static Dictionary<string, FieldDescriptor> GetFieldsForEntityFramework( Type itemType )
-    {
-      PropertyDescriptorCollection propertyDescriptors = TypeDescriptor.GetProperties( itemType );
-      Dictionary<string, FieldDescriptor> fieldDescriptors = new Dictionary<string, FieldDescriptor>( propertyDescriptors.Count );
-
-      foreach( PropertyDescriptor propertyDescriptor in propertyDescriptors )
+      internal override PropertyDescriptor PropertyDescriptor
       {
-        bool isEntityKey = false;
-        bool allowNull = false;
-
-        EdmScalarPropertyAttribute attribute = propertyDescriptor.Attributes[ typeof( EdmScalarPropertyAttribute ) ] as EdmScalarPropertyAttribute;
-
-        if( attribute != null )
+        get
         {
-          isEntityKey = attribute.EntityKeyProperty;
-          allowNull = attribute.IsNullable;
+          return m_propertyDescriptor;
         }
-
-        string name = propertyDescriptor.Name;
-
-        fieldDescriptors[ name ] = new FieldDescriptor(
-          name,
-          propertyDescriptor.DisplayName,
-          propertyDescriptor.PropertyType,
-          propertyDescriptor,
-          null,
-          name,
-          ( propertyDescriptor.IsReadOnly || isEntityKey ), // A column must be read-only if it's an EntityKey (except for the InsertionRow)
-          ( !propertyDescriptor.IsReadOnly && isEntityKey ),
-          allowNull,
-          propertyDescriptor.IsBrowsable,
-          ItemsSourceHelper.IsASubRelationship( propertyDescriptor.PropertyType ),
-          false,
-          null );
       }
 
-      return fieldDescriptors;
-    }
-
-    private static Dictionary<string, FieldDescriptor> GetFieldsForValueType( Type itemType, bool supportsDBNull )
-    {
-      return ItemsSourceHelper.GetFieldsForValueType( itemType, supportsDBNull, null );
-    }
-
-    private static Dictionary<string, FieldDescriptor> GetFieldsForValueType( Type itemType, bool supportsDBNull, DataGridForeignKeyDescription foreignKeyDescription )
-    {
-      Dictionary<string, FieldDescriptor> fieldDescriptors = new Dictionary<string, FieldDescriptor>();
-      FieldDescriptor fieldDescriptor = new FieldDescriptor( ".",
-                                                             string.Empty,
-                                                             itemType,
-                                                             null,
-                                                             null,
-                                                             ".",
-                                                             true,
-                                                             false,
-                                                             supportsDBNull,
-                                                             true,
-                                                             ItemsSourceHelper.IsASubRelationship( itemType ),
-                                                             false,
-                                                             foreignKeyDescription );
-
-      fieldDescriptors.Add( ".", fieldDescriptor );
-
-      return fieldDescriptors;
-    }
-
-    private static Dictionary<string, FieldDescriptor> GetFieldsForCustomTypeDescriptor( ICustomTypeDescriptor customTypeDescriptor, Type itemType, bool supportsDBNull )
-    {
-      var className = customTypeDescriptor.GetClassName();
-      var customType = ( className == null ) ? null : Type.GetType( className );
-
-      if( ( customType != null ) && ( ItemsSourceHelper.IsValueType( customType ) ) )
+      internal override bool IsReadOnly
       {
-        DataGridForeignKeyDescription foreignKeyDescription = null;
-
-        // Try to retreive the ForeignKeyDescription if the field is an Enum
-        if( ( itemType != null ) && ( itemType.IsEnum ) )
+        get
         {
-          foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum( itemType );
+          return false;
         }
-
-        return ItemsSourceHelper.GetFieldsForValueType( itemType, supportsDBNull, foreignKeyDescription );
       }
 
-      return ItemsSourceHelper.GetFieldDescriptors( customTypeDescriptor.GetProperties(), supportsDBNull );
-    }
-
-    private static Dictionary<string, ForeignKeyConstraint> GetForeignKeyConstraints( ConstraintCollection constraints )
-    {
-      Dictionary<string, ForeignKeyConstraint> foreignKeyConstraints =
-        new Dictionary<string, ForeignKeyConstraint>();
-
-      // Detect every ForeignKeyConstraints
-      foreach( Constraint constraint in constraints )
+      internal override bool IsDisplayable
       {
-        ForeignKeyConstraint foreignKeyConstraint = constraint as ForeignKeyConstraint;
-
-        // Not a ForeignKeyConstraint
-        if( foreignKeyConstraint == null )
-          continue;
-
-        // We only support auto-detection when the ForeignKey is composed of 
-        // a single column
-        if( ( foreignKeyConstraint.Columns != null )
-          && ( foreignKeyConstraint.Columns.Length == 1 ) )
+        get
         {
-          foreignKeyConstraints.Add( foreignKeyConstraint.Columns[ 0 ].ColumnName, foreignKeyConstraint );
+          return m_isDisplayable;
         }
       }
 
-      return foreignKeyConstraints;
-    }
-
-    internal static DataGridForeignKeyDescription GetDataGridForeignKeyDescriptionForEnum( Type enumType )
-    {
-      DataGridForeignKeyDescription foreignKeyDescription = null;
-
-      if( ( enumType != null ) && ( enumType.IsEnum ) )
+      internal override bool IsSubRelationship
       {
-        foreignKeyDescription = new DataGridForeignKeyDescription();
-
-        // Using "." as default value path will revert to Self when used as 
-        // SelectedValuePath when bound to a DataGridForeignKeyDictionary or
-        // ComboBox (default editor)
-        foreignKeyDescription.ValuePath = ".";
-        foreignKeyDescription.ItemsSource = Enum.GetValues( enumType );
-        foreignKeyDescription.IsAutoCreated = true;
+        get
+        {
+          return ItemsSourceHelper.IsASubRelationship( this.DataType );
+        }
       }
 
-      return foreignKeyDescription;
-    }
-
-    private static DataTableForeignKeyDescription GetDataGridForeignKeyDescriptionForForeignKeyConstraint( ForeignKeyConstraint foreignKeyConstraint )
-    {
-      DataTableForeignKeyDescription foreignKeyDescription = null;
-
-      if( foreignKeyConstraint != null )
+      internal override DataGridForeignKeyDescription ForeignKeyDescription
       {
-        if( ( foreignKeyConstraint.Columns != null )
-          && ( foreignKeyConstraint.Columns.Length == 1 ) )
+        get
         {
-          foreignKeyDescription = new DataTableForeignKeyDescription();
-          ( ( DataTableForeignKeyDescription )foreignKeyDescription ).ForeignKeyConstraint = foreignKeyConstraint;
-          foreignKeyDescription.IsAutoCreated = true;
+          return m_foreignKeyDescription;
         }
       }
 
-      return foreignKeyDescription;
-    }
+      public override int GetHashCode()
+      {
+        return m_name.GetHashCode();
+      }
 
-    #region Static Fields
+      public override bool Equals( object obj )
+      {
+        var target = obj as JaggedArrayPropertyDescription;
+        if( target == null )
+          return false;
 
-    private static readonly object[] EmptyObjectArray = new object[ 0 ];
+        return ( target.m_name == m_name )
+            && ( target.m_dataType == m_dataType );
+      }
 
-    private static Type EntityObjectType = Type.GetType(
-      "System.Data.Objects.DataClasses.EntityObject, System.Data.Entity, Version=" + _XceedVersionInfo.FrameworkVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089",
-      false, false );
+      private readonly string m_name;
+      private readonly Type m_dataType;
+      private readonly bool m_isDisplayable;
+      private readonly PropertyDescriptor m_propertyDescriptor;
+      private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
+    }
 
     #endregion
 
-    #region FieldDescriptor Nested Type
-
-    internal class FieldDescriptor
-    {
-      public FieldDescriptor(
-        string name,
-        string displayName,
-        Type dataType,
-        PropertyDescriptor propertyDescriptor,
-        string bindingXPath,
-        string bindingPath,
-        bool readOnly,
-        bool overrideReadOnlyForInsertion,
-        bool supportDBNull,
-        bool browsable,
-        bool isASubRelationship,
-        bool isDataGridUnboundItemProperty,
-        DataGridForeignKeyDescription foreignKeyDescription )
-      {
-        if( name == null )
-          throw new ArgumentNullException( "name" );
+    #region EntityFrameworkPropertyDescription Private Class
 
-        if( displayName == null )
-          throw new ArgumentNullException( "displayName" );
+    private sealed class EntityFrameworkPropertyDescription : PropertyDescription
+    {
+      internal EntityFrameworkPropertyDescription( PropertyDescriptor propertyDescriptor, bool isDisplayable )
+      {
+        if( propertyDescriptor == null )
+          throw new ArgumentNullException( "propertyDescriptor" );
 
-        if( dataType == null )
-          throw new ArgumentNullException( "dataType" );
+        var attribute = propertyDescriptor.Attributes[ typeof( EdmScalarPropertyAttribute ) ] as EdmScalarPropertyAttribute;
+        if( attribute != null )
+        {
+          m_isEntityKey = attribute.EntityKeyProperty;
+          m_supportDBNull = attribute.IsNullable;
+        }
+        else
+        {
+          m_isEntityKey = false;
+          m_supportDBNull = false;
+        }
 
-        this.ReadOnly = readOnly;
-        this.OverrideReadOnlyForInsertion = overrideReadOnlyForInsertion;
-        m_name = name;
-        m_displayName = displayName;
-        m_dataType = dataType;
+        m_isDisplayable = isDisplayable;
         m_propertyDescriptor = propertyDescriptor;
-        m_bindingPath = bindingPath;
-        m_bindingXPath = bindingXPath;
-        this.SupportDBNull = supportDBNull;
-        this.Browsable = browsable;
-        this.IsASubRelationship = isASubRelationship;
-        this.IsDataGridUnboundItemProperty = isDataGridUnboundItemProperty;
-        this.ForeignKeyDescription = foreignKeyDescription;
       }
 
-      #region Name PROPERTY
-
-      public string Name
+      internal override string Name
       {
         get
         {
-          return m_name;
+          return m_propertyDescriptor.Name;
         }
       }
 
-      private string m_name; // = null
-
-      #endregion Name PROPERTY
-
-      #region DisplayName PROPERTY
-
-      public string DisplayName
+      internal override string DisplayName
       {
         get
         {
-          return m_displayName;
+          return m_propertyDescriptor.DisplayName;
         }
       }
 
-      private string m_displayName; // = null
-
-      #endregion DisplayName PROPERTY
-
-      #region BindingPath PROPERTY
-
-      public string BindingPath
+      internal override Type DataType
       {
         get
         {
-          return m_bindingPath;
+          return m_propertyDescriptor.PropertyType;
         }
       }
 
-      private string m_bindingPath; // = null
-
-      #endregion BindingPath PROPERTY
-
-      #region BindingXPath PROPERTY
-
-      public string BindingXPath
+      internal override PropertyDescriptor PropertyDescriptor
       {
         get
         {
-          return m_bindingXPath;
+          return m_propertyDescriptor;
         }
       }
 
-      private string m_bindingXPath; // = null
-
-      #endregion BindingXPath PROPERTY
-
-      #region DataType PROPERTY
-
-      public Type DataType
+      internal override bool IsReadOnly
       {
         get
         {
-          return m_dataType;
+          return ( m_isEntityKey )
+              || ( m_propertyDescriptor.IsReadOnly );
         }
       }
 
-      private Type m_dataType; // = null
-
-      #endregion DataType PROPERTY
-
-      #region PropertyDescriptor PROPERTY
-
-      public PropertyDescriptor PropertyDescriptor
+      internal override bool OverrideReadOnlyForInsertion
       {
         get
         {
-          return m_propertyDescriptor;
+          return ( m_isEntityKey )
+              && ( !m_propertyDescriptor.IsReadOnly );
         }
       }
 
-      private PropertyDescriptor m_propertyDescriptor; // = null
-
-      #endregion PropertyDescriptor PROPERTY
-
-      #region ReadOnly PROPERTY
-
-      public bool ReadOnly
+      internal override bool SupportDBNull
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.ReadOnly ];
-        }
-        private set
-        {
-          m_flags[ ( int )FieldDescriptorFlags.ReadOnly ] = value;
+          return m_supportDBNull;
         }
       }
 
-      #endregion ReadOnly PROPERTY
-
-      #region OverrideReadOnlyForInsertion Property
-
-      public bool OverrideReadOnlyForInsertion
+      internal override bool IsBrowsable
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.OverrideReadOnlyForInsertion ];
-        }
-        private set
-        {
-          m_flags[ ( int )FieldDescriptorFlags.OverrideReadOnlyForInsertion ] = value;
+          return m_propertyDescriptor.IsBrowsable;
         }
       }
 
-      #endregion OverrideReadOnlyForInsertion Property
-
-      #region SupportDBNull PROPERTY
-
-      public bool SupportDBNull
+      internal override bool IsDisplayable
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.SupportDBNull ];
+          return m_isDisplayable;
         }
-        private set
+      }
+
+      internal override bool IsSubRelationship
+      {
+        get
         {
-          m_flags[ ( int )FieldDescriptorFlags.SupportDBNull ] = value;
+          return ItemsSourceHelper.IsASubRelationship( this.DataType );
         }
       }
 
-      #endregion SupportDBNull PROPERTY
+      public override int GetHashCode()
+      {
+        return m_propertyDescriptor.GetHashCode();
+      }
+
+      public override bool Equals( object obj )
+      {
+        var target = obj as EntityFrameworkPropertyDescription;
+        if( target == null )
+          return false;
+
+        return object.Equals( target.m_propertyDescriptor, m_propertyDescriptor );
+      }
+
+      private readonly PropertyDescriptor m_propertyDescriptor;
+      private readonly bool m_isEntityKey;
+      private readonly bool m_supportDBNull;
+      private readonly bool m_isDisplayable;
+    }
+
+    #endregion
+
+    #region ValueTypePropertyDescription Private Class
+
+    private sealed class ValueTypePropertyDescription : PropertyDescription
+    {
+      internal ValueTypePropertyDescription( Type dataType, bool supportDBNull, DataGridForeignKeyDescription foreignKeyDescription, bool isDisplayable )
+      {
+        if( dataType == null )
+          throw new ArgumentNullException( "dataType" );
 
-      #region Browsable Property
+        m_dataType = dataType;
+        m_supportDBNull = supportDBNull;
+        m_isDisplayable = isDisplayable;
+        m_foreignKeyDescription = foreignKeyDescription;
+      }
 
-      public bool Browsable
+      internal override string Name
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.Browsable ];
+          return ".";
         }
-        private set
+      }
+
+      internal override string DisplayName
+      {
+        get
         {
-          m_flags[ ( int )FieldDescriptorFlags.Browsable ] = value;
+          return string.Empty;
         }
       }
 
-      #endregion Browsable Property
-
-      #region IsASubRelationship Property
-
-      public bool IsASubRelationship
+      internal override Type DataType
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.IsASubRelationship ];
+          return m_dataType;
         }
-        private set
+      }
+
+      internal override string Path
+      {
+        get
         {
-          m_flags[ ( int )FieldDescriptorFlags.IsASubRelationship ] = value;
+          return this.Name;
         }
       }
 
-      #endregion IsASubRelationship Property
-
-      #region IsDataGridUnboundItemProperty Property
-
-      public bool IsDataGridUnboundItemProperty
+      internal override bool SupportDBNull
       {
         get
         {
-          return m_flags[ ( int )FieldDescriptorFlags.IsDataGridUnboundItemProperty ];
+          return m_supportDBNull;
         }
-        private set
+      }
+
+      internal override bool IsDisplayable
+      {
+        get
         {
-          m_flags[ ( int )FieldDescriptorFlags.IsDataGridUnboundItemProperty ] = value;
+          return m_isDisplayable;
         }
       }
 
-      #endregion IsDataGridUnboundItemProperty Property
-
-      #region ForeignKeyDescription Property
-
-      public DataGridForeignKeyDescription ForeignKeyDescription
+      internal override bool IsSubRelationship
       {
-        get;
-        private set;
+        get
+        {
+          return ItemsSourceHelper.IsASubRelationship( this.DataType );
+        }
       }
 
-      #endregion
-
-      private BitVector32 m_flags = new BitVector32();
-
-      [Flags]
-      private enum FieldDescriptorFlags
+      internal override DataGridForeignKeyDescription ForeignKeyDescription
       {
-        ReadOnly = 1,
-        SupportDBNull = 2,
-        Browsable = 4,
-        IsASubRelationship = 8,
-        IsForeignKey = 16,
-        OverrideReadOnlyForInsertion = 32,
-        IsDataGridUnboundItemProperty = 64
+        get
+        {
+          return m_foreignKeyDescription;
+        }
       }
-    }
-
-    #endregion
-
-    #region ReadOnlyConverter Private Class
 
-    private sealed class ReadOnlyConverter : IValueConverter
-    {
-      internal ReadOnlyConverter( ColumnBase column, bool supportDBNull )
+      public override int GetHashCode()
       {
-        m_converter = new SourceDataConverter( supportDBNull );
-        m_column = column;
+        return m_dataType.GetHashCode();
       }
 
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      public override bool Equals( object obj )
       {
-        return m_converter.Convert( value, targetType, parameter, culture );
+        var target = obj as ValueTypePropertyDescription;
+        if( target == null )
+          return false;
+
+        return ( target.m_dataType == m_dataType );
       }
 
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      internal override PropertyRouteSegment ToPropertyRouteSegment()
       {
-        if( ( m_column != null ) && ( m_column.ReadOnly ) && ( !m_column.OverrideReadOnlyForInsertion ) )
-          return Binding.DoNothing;
-
-        return m_converter.ConvertBack( value, targetType, parameter, culture );
+        return PropertyRouteSegment.Self;
       }
 
-      private readonly IValueConverter m_converter;
-      private readonly ColumnBase m_column;
+      private readonly Type m_dataType;
+      private readonly bool m_supportDBNull;
+      private readonly bool m_isDisplayable;
+      private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs
index d2df5e8c..4ffb8f02 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs
@@ -20,7 +20,6 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -28,8 +27,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal sealed class LateGroupLevelDescription : IGroupLevelDescription, INotifyPropertyChanged, IWeakEventListener
   {
-    #region Constructor
-
     internal LateGroupLevelDescription( GroupDescription groupDescription, IEnumerable<GroupLevelDescription> groupLevelDescriptions )
     {
       if( groupDescription == null )
@@ -53,8 +50,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion
-
     #region GroupDescription Property
 
     public GroupDescription GroupDescription
@@ -287,24 +282,21 @@ namespace Xceed.Wpf.DataGrid
       if( typeof( PropertyChangedEventManager ) == managerType )
       {
         this.OnGroupLevelDescriptionPropertyChanged( sender, ( PropertyChangedEventArgs )e );
-        return true;
+      }
+      else
+      {
+        return false;
       }
 
-      return false;
+      return true;
     }
 
     #endregion
 
-    #region Private Fields
-
     private GroupLevelDescription m_groupLevelDescription;
     private GroupLevelDescriptionFinder m_finder;
     private bool m_raiseEventOnGroupLevelDescriptionFound; //false
 
-    #endregion
-
-    #region GroupLevelDescriptionFinder Private Class
-
     private sealed class GroupLevelDescriptionFinder : INotifyPropertyChanged, IWeakEventListener, IDisposable
     {
       internal GroupLevelDescriptionFinder( GroupDescription groupDescription, IEnumerable<GroupLevelDescription> groupLevelDescriptions )
@@ -324,6 +316,8 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
+      #region GroupLevelDescription Property
+
       internal GroupLevelDescription GroupLevelDescription
       {
         get
@@ -332,6 +326,8 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
+      #endregion
+
       public event PropertyChangedEventHandler PropertyChanged;
 
       private void RaisePropertyChanged( string propertyName )
@@ -361,13 +357,18 @@ namespace Xceed.Wpf.DataGrid
 
       private static bool TryFind( IEnumerable<GroupLevelDescription> collection, GroupDescription description, out GroupLevelDescription result )
       {
-        if( ( collection == null ) || ( description == null ) )
-        {
-          result = null;
-        }
-        else
+        result = default( GroupLevelDescription );
+
+        if( ( collection != null ) && ( description != null ) )
         {
-          result = collection.Where( item => ( item.GroupDescription == description ) ).FirstOrDefault();
+          foreach( var item in collection )
+          {
+            if( ( item == null ) || ( item.GroupDescription != description ) )
+              continue;
+
+            result = item;
+            break;
+          }
         }
 
         return ( result != null );
@@ -425,7 +426,5 @@ namespace Xceed.Wpf.DataGrid
       private GroupLevelDescription m_groupLevelDescription; //null
       private IEnumerable<GroupLevelDescription> m_groupLevelDescriptions; //null
     }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs
deleted file mode 100644
index 26ec0d4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://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.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.ExceptionServices;
-using System.Text;
-using System.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class Log
-  {
-    internal Log()
-    {
-      this.CreateBackgroungWorker();
-    }
-
-    #region SyncRoot Private Property
-
-    private object SyncRoot
-    {
-      get
-      {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
-        }
-
-        return m_syncRoot;
-      }
-    }
-
-    private object m_syncRoot;
-
-    #endregion
-
-    #region Indentation Methods
-
-    private int GetIndentLevel()
-    {
-      return m_indentLevel;
-    }
-
-    private void IncreaseIndentLevel()
-    {
-      Interlocked.Increment( ref m_indentLevel );
-    }
-
-    private void DecreaseIndentLevel()
-    {
-      Interlocked.Decrement( ref m_indentLevel );
-    }
-
-    private int m_indentLevel;
-
-    #endregion
-
-    [Conditional( "LOG" )]
-    private void CreateBackgroungWorker()
-    {
-      m_queueSyncRoot = new object();
-      m_messageQueue = new Queue<string>( 100 );
-      m_backgroundWorker = new BackgroundWorker();
-      m_backgroundWorker.DoWork += new DoWorkEventHandler( DoWriteLine );
-    }
-
-    internal void Fail( string message )
-    {
-      this.Fail( UnknownSource.Instance, message );
-    }
-
-    internal void Fail( object source, string message )
-    {
-      this.Assert( source, false, message );
-    }
-
-    internal void Assert( bool condition, string message )
-    {
-      this.Assert( UnknownSource.Instance, condition, message );
-    }
-
-    internal void Assert( object source, bool condition, string message )
-    {
-      Debug.Assert( condition, message );
-      this.AssertCore( source, condition, message );
-    }
-
-    [Conditional( "LOG" )]
-    internal void WriteLine( object source, string message )
-    {
-      var sb = new StringBuilder();
-
-      lock( this.SyncRoot )
-      {
-        sb.Append( this.GetHeader( source ) );
-        sb.Append( this.GetMessage( string.Empty, message, string.Empty ) );
-
-        this.QueueWriteLine( sb.ToString() );
-      }
-    }
-
-    [MethodImpl( MethodImplOptions.NoInlining )]
-    internal Block BeginBlock( object source, string message )
-    {
-      var location = new StackFrame( 1 ).GetMethod().Name;
-
-      return new Block( this, source, location, message );
-    }
-
-    [Conditional( "LOG" )]
-    private void Start( object source, string location, string message )
-    {
-      lock( this.SyncRoot )
-      {
-        var sb = new StringBuilder();
-        sb.Append( this.GetHeader( source ) );
-        sb.Append( this.GetMessage( location, "Start", message ) );
-
-        this.QueueWriteLine( sb.ToString() );
-        this.IncreaseIndentLevel();
-      }
-    }
-
-    [Conditional( "LOG" )]
-    private void End( object source, string location, string message )
-    {
-      lock( this.SyncRoot )
-      {
-        this.DecreaseIndentLevel();
-
-        var sb = new StringBuilder();
-        sb.Append( this.GetHeader( source ) );
-        sb.Append( this.GetMessage( location, "End", message ) );
-
-        this.QueueWriteLine( sb.ToString() );
-      }
-    }
-
-    private string GetHeader( object source )
-    {
-      var sb = new StringBuilder();
-      sb.AppendFormat( "{0} | {1}", DateTime.Now.ToString( "HHmmss" ), Thread.CurrentThread.GetHashCode() );
-
-      if( ( source == null ) || ( source == UnknownSource.Instance ) )
-      {
-        sb.AppendFormat( " : {0,10}", "Unknown" );
-      }
-      else
-      {
-        sb.AppendFormat( " : {0:0000000000}", source.GetHashCode() );
-      }
-
-      sb.Append( " : " );
-
-      var indentLevel = this.GetIndentLevel();
-      if( indentLevel > 0 )
-      {
-        sb.Append( ' ', indentLevel * 2 );
-      }
-
-      return sb.ToString();
-    }
-
-    private string GetMessage( string prefix, string message, string suffix )
-    {
-      var sb = new StringBuilder();
-
-      foreach( var part in new string[] { prefix, message, suffix } )
-      {
-        if( string.IsNullOrEmpty( part ) )
-          continue;
-
-        if( sb.Length > 0 )
-        {
-          sb.Append( " - " );
-        }
-
-        sb.Append( part );
-      }
-
-      return sb.ToString();
-    }
-
-    [Conditional( "LOG" )]
-    private void QueueWriteLine( string message )
-    {
-      lock( m_queueSyncRoot )
-      {
-        m_messageQueue.Enqueue( message );
-      }
-
-      if( !m_backgroundWorker.IsBusy )
-      {
-        m_backgroundWorker.RunWorkerAsync();
-      }
-    }
-
-    private void DoWriteLine( object sender, DoWorkEventArgs e )
-    {
-      string message;
-
-      while( m_messageQueue.Count > 0 )
-      {
-        lock( m_queueSyncRoot )
-        {
-          message = m_messageQueue.Dequeue();
-        }
-
-        lock( this.SyncRoot )
-        {
-          using( TextWriter tw = new StreamWriter( m_defaultPath + "\\" + m_defaultFileName, true ) )
-          {
-            tw.WriteLine( message );
-          }
-        }
-      }
-    }
-
-    [Conditional( "LOG" )]
-    internal void AssertCore( object source, bool condition, string message )
-    {
-      if( condition )
-        return;
-
-      var stackTrace = new StackTrace();
-      var sb = new StringBuilder();
-
-      lock( this.SyncRoot )
-      {
-        sb.Append( this.GetHeader( source ) );
-        sb.Append( this.GetMessage( "# - ", message, string.Empty ) );
-
-        this.QueueWriteLine( sb.ToString() );
-        this.QueueWriteLine( stackTrace.ToString() );
-      }
-    }
-
-    [Conditional( "LOG" )]
-    internal void StartUp( string gridUniqueName = "" )
-    {
-      m_defaultPath = Environment.GetEnvironmentVariable( "AstoriaLogs" );
-      if( string.IsNullOrEmpty( m_defaultPath ) )
-      {
-        m_defaultPath = Path.Combine( Environment.GetFolderPath( Environment.SpecialFolder.ApplicationData ), @"XceedLog" );
-      }
-
-      var now = DateTime.Now;
-      m_defaultFileName = Environment.UserName + "-" + Environment.MachineName + "-" + now.ToString( "yyMMdd-HHmmss-" ) + Guid.NewGuid().ToString() + ".txt";
-
-      this.OverridePaths( gridUniqueName );
-
-      // Make sure the destination folder exists.
-      if( !Directory.Exists( m_defaultPath ) )
-      {
-        Directory.CreateDirectory( m_defaultPath );
-      }
-
-      this.QueueWriteLine( "*** App starting - Version : " + typeof( Log ).Assembly.GetName().Version.ToString() + " - Start time : " + now.ToString( "yy-MM-dd HH:mm:ss" ) );
-
-      AppDomain.CurrentDomain.FirstChanceException += new EventHandler<FirstChanceExceptionEventArgs>( this.OnFirstChanceException );
-    }
-
-    [Conditional( "CUSTOMLOG" )]
-    private void OverridePaths( string gridUniqueName )
-    {
-      m_defaultPath = Path.Combine( Environment.GetFolderPath( Environment.SpecialFolder.LocalApplicationData ), @"..\Local Settings\Application Data\WMC\Gtseq\Logs\" );
-
-      var now = DateTime.Now;
-      m_defaultFileName = gridUniqueName + "-TID_" + Thread.CurrentThread.ManagedThreadId + "-" + now.ToString( "yyMMdd-HHmmss" ) + ".log";
-    }
-
-    [MethodImpl( MethodImplOptions.NoInlining )]
-    private void OnFirstChanceException( object sender, FirstChanceExceptionEventArgs e )
-    {
-      this.WriteException( e.Exception as Exception );
-    }
-
-    [Conditional( "LOG" )]
-    [MethodImpl( MethodImplOptions.NoInlining )]
-    private void WriteException( Exception e )
-    {
-      if( e != null )
-      {
-        StackTrace stackTrace = new StackTrace( 2 );
-        string stackTraceString = stackTrace.ToString();
-
-        if( stackTraceString.IndexOf( "xceed", StringComparison.InvariantCultureIgnoreCase ) >= 0 )
-        {
-          lock( this.SyncRoot )
-          {
-            this.WriteLine( UnknownSource.Instance, e.ToString() );
-            this.QueueWriteLine( "--------------------" );
-            this.QueueWriteLine( stackTraceString );
-          }
-        }
-      }
-      else
-      {
-        this.QueueWriteLine( "FirstChanceException with a null/no exception." );
-      }
-    }
-
-    private string m_defaultPath;
-    private string m_defaultFileName;
-    private object m_queueSyncRoot;
-    private Queue<string> m_messageQueue;
-    private BackgroundWorker m_backgroundWorker;
-
-    #region UnknownSource Private Class
-
-    private sealed class UnknownSource
-    {
-      internal static readonly UnknownSource Instance = new UnknownSource();
-
-      private UnknownSource()
-      {
-      }
-
-      public override int GetHashCode()
-      {
-        return 0;
-      }
-
-      public override bool Equals( object obj )
-      {
-        return base.Equals( obj );
-      }
-
-      public override string ToString()
-      {
-        return "Unknown source";
-      }
-    }
-
-    #endregion
-
-    #region Block Private Class
-
-    internal sealed class Block : IDisposable
-    {
-      internal Block( Log log, object source, string location, string message )
-      {
-        if( source == null )
-          throw new ArgumentNullException( "source" );
-
-        m_log = log;
-        m_source = source;
-        m_location = location;
-
-        m_log.Start( source, location, message );
-      }
-
-      internal void Break( string message )
-      {
-        if( Interlocked.CompareExchange( ref m_source, null, null ) == null )
-          return;
-
-        m_message = message;
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var source = m_source;
-        if( Interlocked.CompareExchange( ref m_source, null, source ) == null )
-          return;
-
-        if( disposing )
-        {
-          m_log.End( source, m_location, m_message );
-        }
-
-        m_location = null;
-        m_message = null;
-      }
-
-      ~Block()
-      {
-        this.Dispose( false );
-      }
-
-      private Log m_log;
-      private object m_source;
-      private string m_location;
-      private string m_message;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs
index 60f6fbc0..8dcb102f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs
@@ -81,7 +81,7 @@ namespace Xceed.Wpf.DataGrid.Markup
             {
               var container = dictionaries[ index ].Value;
               if( container.Status == ResourceDictionaryStatus.NotSet )
-                throw new InvalidOperationException( "TODODOC: A circular reference has been detected in a ResourceDictionary." );
+                throw new InvalidOperationException( "A circular reference has been detected in a ResourceDictionary." );
 
               dictionary = container.Target;
             }
@@ -243,7 +243,7 @@ namespace Xceed.Wpf.DataGrid.Markup
             throw new ArgumentNullException( "value" );
 
           if( m_resource != null )
-            throw new InvalidOperationException( "TODODOC: The property can only be set once." );
+            throw new InvalidOperationException( "The property can only be set once." );
 
           m_resource = new WeakReference( value );
         }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
index ef9cc2bb..f2614724 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
@@ -159,19 +159,29 @@ namespace Xceed.Wpf.DataGrid.Markup
 
     public override int GetHashCode()
     {
+      var hashCode = 0;
+
       var elementType = this.TargetElementType;
       if( elementType != null )
-        return elementType.GetHashCode();
+      {
+        hashCode += elementType.GetHashCode();
+      }
 
       var viewType = this.TargetViewType;
       if( viewType != null )
-        return viewType.GetHashCode();
+      {
+        hashCode *= 11;
+        hashCode += viewType.GetHashCode();
+      }
 
       var themeType = this.ThemeType;
       if( themeType != null )
-        return themeType.GetHashCode();
+      {
+        hashCode *= 17;
+        hashCode += themeType.GetHashCode();
+      }
 
-      return 0;
+      return hashCode;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs
index 71cce324..72d9cb18 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs
@@ -15,206 +15,297 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using Xceed.Utils.Wpf;
 
 namespace Xceed.Wpf.DataGrid
 {
   public class ObservableColumnCollection : ObservableCollection<ColumnBase>
   {
+    #region [] Property
+
     public ColumnBase this[ string fieldName ]
     {
       get
       {
-        ColumnBase column = null;
-
-        m_fieldNameToColumns.TryGetValue( fieldName, out column );
+        if( fieldName != null )
+        {
+          ColumnBase value;
+          if( m_fieldNameToColumn.TryGetValue( fieldName, out value ) )
+            return value;
+        }
 
-        return column;
+        return null;
       }
     }
 
-    #region ProcessingVisibleColumnsUpdate Property
+    #endregion
+
+    #region SyncRoot Private Property
 
-    internal AutoResetFlag ProcessingVisibleColumnsUpdate
+    private object SyncRoot
     {
       get
       {
-        return m_processingVisibleColumnsUpdate;
+        return ( ( ICollection )this ).SyncRoot;
       }
     }
 
-    private readonly AutoResetFlag m_processingVisibleColumnsUpdate = AutoResetFlagFactory.Create();
-
     #endregion
 
-    #region ProcessingCollectionChangedUpdate Property
+    // This method has better performance than the one on the base class.
+    public new bool Contains( ColumnBase item )
+    {
+      if( item == null )
+        return false;
+
+      return object.ReferenceEquals( item, this[ item.FieldName ] );
+    }
 
-    internal bool ProcessingCollectionChangedUpdate
+    protected virtual void OnItemAdding( ColumnBase item )
     {
-      get;
-      set;
     }
 
-    #endregion
+    protected virtual void OnItemAdded( ColumnBase item )
+    {
+    }
 
-    protected override void RemoveItem( int index )
+    protected virtual void OnItemRemoving( ColumnBase item )
     {
-      ColumnBase column = this[ index ];
+    }
 
-      if( column != null )
-      {
-        this.UnregisterColumnChangedEvent( column );
+    protected virtual void OnItemRemoved( ColumnBase item )
+    {
+    }
 
-        m_fieldNameToColumns.Remove( column.FieldName );
-      }
+    protected override void RemoveItem( int index )
+    {
+      var item = this[ index ];
+      Debug.Assert( item != null );
+
+      this.OnItemRemovingCore( item );
 
       base.RemoveItem( index );
+
+      this.OnItemRemovedCore( item );
     }
 
     protected override void InsertItem( int index, ColumnBase item )
     {
-      if( item != null )
-      {
-        if( ( item != null ) && ( string.IsNullOrEmpty( item.FieldName ) == true ) )
-          throw new ArgumentException( "A column must have a fieldname.", "item" );
+      if( item == null )
+        throw new ArgumentNullException( "item" );
 
-        if( m_fieldNameToColumns.ContainsKey( item.FieldName ) )
-          throw new DataGridException( "A column with same field name already exists in collection." );
+      var fieldName = item.FieldName;
+      if( string.IsNullOrEmpty( fieldName ) )
+        throw new ArgumentException( "A column must have a fieldname.", "item" );
 
-        m_fieldNameToColumns.Add( item.FieldName, item );
+      if( m_fieldNameToColumn.ContainsKey( fieldName ) )
+        throw new DataGridException( "A column with same field name already exists in collection." );
 
-        this.RegisterColumnChangedEvent( item );
-      }
+      this.OnItemAddingCore( item );
 
       base.InsertItem( index, item );
+
+      this.OnItemAddedCore( item );
     }
 
     protected override void ClearItems()
     {
-      foreach( ColumnBase column in this )
+      var items = new List<ColumnBase>( this );
+
+      foreach( var item in items )
       {
-        this.UnregisterColumnChangedEvent( column );
+        this.OnItemRemovingCore( item );
       }
 
-      m_fieldNameToColumns.Clear();
+      Debug.Assert( m_fieldNameToColumn.Count == 0 );
+      m_fieldNameToColumn.Clear();
 
       base.ClearItems();
+
+      foreach( var item in items )
+      {
+        this.OnItemRemovedCore( item );
+      }
     }
 
     protected override void SetItem( int index, ColumnBase item )
     {
-      if( ( item != null ) && ( string.IsNullOrEmpty( item.FieldName ) == true ) )
-        throw new ArgumentException( "A column must have a fieldname.", "item" );
+      if( item == null )
+        throw new ArgumentNullException( "item" );
 
-      if( m_fieldNameToColumns.ContainsKey( item.FieldName ) )
-        throw new DataGridException( "A column with same field name already exists in collection." );
+      var fieldName = item.FieldName;
+      if( string.IsNullOrEmpty( fieldName ) )
+        throw new ArgumentException( "A column must have a fieldname.", "item" );
 
-      ColumnBase column = this[ index ];
+      var oldItem = this[ index ];
+      Debug.Assert( oldItem != null );
 
-      if( ( column != null ) && ( column != item ) )
+      if( oldItem.FieldName != fieldName )
       {
-        this.UnregisterColumnChangedEvent( column );
-
-        m_fieldNameToColumns.Remove( column.FieldName );
+        if( m_fieldNameToColumn.ContainsKey( fieldName ) )
+          throw new DataGridException( "A column with same field name already exists in collection." );
       }
 
-      if( ( item != null ) && ( column != item ) )
+      this.OnItemRemovingCore( oldItem );
+      this.OnItemAddingCore( item );
+
+      base.SetItem( index, item );
+
+      this.OnItemRemovedCore( oldItem );
+      this.OnItemAddedCore( item );
+    }
+
+    protected override void OnPropertyChanged( PropertyChangedEventArgs e )
+    {
+      lock( this.SyncRoot )
       {
-        m_fieldNameToColumns.Add( item.FieldName, item );
+        if( m_deferCount != 0 )
+        {
+          if( m_deferPropertyChangedEventArgs == null )
+          {
+            m_deferPropertyChangedEventArgs = e;
+          }
+          else if( !string.IsNullOrEmpty( m_deferPropertyChangedEventArgs.PropertyName ) && !object.Equals( m_deferPropertyChangedEventArgs.PropertyName, e.PropertyName ) )
+          {
+            m_deferPropertyChangedEventArgs = new PropertyChangedEventArgs( string.Empty );
+          }
 
-        this.RegisterColumnChangedEvent( item );
+          return;
+        }
       }
 
-      base.SetItem( index, item );
+      base.OnPropertyChanged( e );
     }
 
     protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
     {
-      if( ( m_columnAdditionMessagesDeferedCount > 0 ) && ( e.Action == NotifyCollectionChangedAction.Add ) && ( e.NewStartingIndex == ( this.Count - e.NewItems.Count ) ) )
+      lock( this.SyncRoot )
       {
-        if( m_deferedColumnAdditionMessageStartIndex == -1 )
+        if( m_deferCount != 0 )
         {
-          m_deferedColumnAdditionMessageStartIndex = e.NewStartingIndex;
-        }
+          if( m_deferCollectionChangedEventArgs == null )
+          {
+            m_deferCollectionChangedEventArgs = e;
+          }
+          else if( m_deferCollectionChangedEventArgs.Action != NotifyCollectionChangedAction.Reset )
+          {
+            m_deferCollectionChangedEventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
+          }
 
-        foreach( object item in e.NewItems )
-        {
-          m_deferedColumns.Add( ( ColumnBase )item );
+          return;
         }
       }
-      else
-      {
-        base.OnCollectionChanged( e );
-      }
+
+      base.OnCollectionChanged( e );
     }
 
-    internal IDisposable DeferColumnAdditionMessages()
+    internal IDisposable DeferNotifications()
     {
-      return new DeferedColumnAdditionMessageDisposable( this );
+      return new DeferredDisposable( new DeferState( this ) );
     }
 
-    internal event EventHandler ColumnVisibilityChanged;
+    private void OnItemAddingCore( ColumnBase item )
+    {
+      m_fieldNameToColumn.Add( item.FieldName, item );
+
+      this.OnItemAdding( item );
+    }
 
-    private void RegisterColumnChangedEvent( ColumnBase column )
+    private void OnItemAddedCore( ColumnBase item )
     {
-      column.VisiblePositionChanged += new EventHandler( this.OnColumnVisibilityChanged );
-      column.VisibleChanged += new EventHandler( this.OnColumnVisibilityChanged );
+      this.OnItemAdded( item );
     }
 
-    private void UnregisterColumnChangedEvent( ColumnBase column )
+    private void OnItemRemovingCore( ColumnBase item )
     {
-      column.VisiblePositionChanged -= new EventHandler( this.OnColumnVisibilityChanged );
-      column.VisibleChanged -= new EventHandler( this.OnColumnVisibilityChanged );
+      var fieldName = item.FieldName;
+
+      this.OnItemRemoving( item );
+
+      m_fieldNameToColumn.Remove( fieldName );
     }
 
-    private void OnColumnVisibilityChanged( object sender, EventArgs e )
+    private void OnItemRemovedCore( ColumnBase item )
     {
-      if( this.ColumnVisibilityChanged != null )
-      {
-        this.ColumnVisibilityChanged( this, new ColumnCollection.WrappedEventEventArgs( sender, e ) );
-      }
+      this.OnItemRemoved( item );
     }
 
-    private int m_columnAdditionMessagesDeferedCount = 0;
-    private int m_deferedColumnAdditionMessageStartIndex = -1;
-    private List<ColumnBase> m_deferedColumns = new List<ColumnBase>();
-    private Dictionary<string, ColumnBase> m_fieldNameToColumns = new Dictionary<string, ColumnBase>(); // To optimize indexing speed for FieldName
+    private int m_deferCount; //0
+    private PropertyChangedEventArgs m_deferPropertyChangedEventArgs; //null
+    private NotifyCollectionChangedEventArgs m_deferCollectionChangedEventArgs; //null
+
+    private readonly Dictionary<string, ColumnBase> m_fieldNameToColumn = new Dictionary<string, ColumnBase>();
+
+    #region DeferState Private Class
 
-    private sealed class DeferedColumnAdditionMessageDisposable : IDisposable
+    private sealed class DeferState : DeferredDisposableState
     {
-      internal DeferedColumnAdditionMessageDisposable( ObservableColumnCollection columns )
+      internal DeferState( ObservableColumnCollection target )
       {
-        if( columns == null )
-          throw new ArgumentNullException( "columns" );
+        Debug.Assert( target != null );
+        m_target = target;
+      }
 
-        m_columns = columns;
+      protected override object SyncRoot
+      {
+        get
+        {
+          return m_target.SyncRoot;
+        }
+      }
 
-        m_columns.m_columnAdditionMessagesDeferedCount++;
+      protected override bool IsDeferred
+      {
+        get
+        {
+          return ( m_target.m_deferCount != 0 );
+        }
       }
 
-      #region IDisposable Members
+      protected override void Increment()
+      {
+        m_target.m_deferCount++;
+      }
 
-      public void Dispose()
+      protected override void Decrement()
       {
-        m_columns.m_columnAdditionMessagesDeferedCount--;
+        m_target.m_deferCount--;
+      }
 
-        if( m_columns.m_columnAdditionMessagesDeferedCount == 0 )
+      protected override void OnDeferEnding( bool disposing )
+      {
+        m_propertyChangedEventArgs = m_target.m_deferPropertyChangedEventArgs;
+        m_collectionChangedEventArgs = m_target.m_deferCollectionChangedEventArgs;
+        m_target.m_deferPropertyChangedEventArgs = null;
+        m_target.m_deferCollectionChangedEventArgs = null;
+
+        base.OnDeferEnding( disposing );
+      }
+
+      protected override void OnDeferEnded( bool disposing )
+      {
+        if( m_collectionChangedEventArgs != null )
         {
-          if( m_columns.m_deferedColumns.Count > 0 )
-          {
-            m_columns.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, m_columns.m_deferedColumns, m_columns.m_deferedColumnAdditionMessageStartIndex ) );
-          }
+          m_target.OnCollectionChanged( m_collectionChangedEventArgs );
+        }
 
-          m_columns.m_deferedColumnAdditionMessageStartIndex = -1;
-          m_columns.m_deferedColumns.Clear();
+        if( m_propertyChangedEventArgs != null )
+        {
+          m_target.OnPropertyChanged( m_propertyChangedEventArgs );
         }
       }
 
-      #endregion
-
-      private ObservableColumnCollection m_columns; // = null
+      private readonly ObservableColumnCollection m_target;
+      private PropertyChangedEventArgs m_propertyChangedEventArgs;
+      private NotifyCollectionChangedEventArgs m_collectionChangedEventArgs;
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
index fd29c34b..f32c0d00 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@ using System.Windows.Markup;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - DataGrid" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 
 
 [assembly: CLSCompliant( true )]
@@ -47,9 +47,7 @@ using System.Windows.Markup;
 [assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Converters")]
 [assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Markup")]
 [assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Views")]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Automation")]
 [assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.ValidationRules")]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.FilterCriteria")]
 
 
 [assembly: SecurityRules( SecurityRuleSet.Level1 )]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs
new file mode 100644
index 00000000..90fe3db8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs
@@ -0,0 +1,139 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal abstract class PropertyDescription
+  {
+    internal abstract string Name
+    {
+      get;
+    }
+
+    internal virtual string DisplayName
+    {
+      get
+      {
+        return this.Name;
+      }
+    }
+
+    internal abstract Type DataType
+    {
+      get;
+    }
+
+    internal virtual string Path
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    internal virtual string XPath
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    internal virtual PropertyDescriptor PropertyDescriptor
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    internal virtual DataGridForeignKeyDescription ForeignKeyDescription
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    internal virtual bool IsReadOnly
+    {
+      get
+      {
+        return true;
+      }
+    }
+
+    internal virtual bool OverrideReadOnlyForInsertion
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    internal virtual bool SupportDBNull
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    internal virtual bool IsBrowsable
+    {
+      get
+      {
+        return true;
+      }
+    }
+
+    internal virtual bool IsDisplayable
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    internal virtual bool IsSubRelationship
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    internal virtual bool IsDataGridUnboundItemProperty
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    internal virtual PropertyRouteSegment ToPropertyRouteSegment()
+    {
+      var route = PropertyRouteParser.Parse( this.Name );
+      if( ( route == null ) || ( route.Parent != null ) )
+        return new PropertyRouteSegment( PropertyRouteSegmentType.Property, this.Name );
+
+      return route.Current;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs
new file mode 100644
index 00000000..5549d486
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs
@@ -0,0 +1,91 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class PropertyDescriptionRoute
+  {
+    internal PropertyDescriptionRoute( PropertyDescription description )
+      : this( description, null )
+    {
+    }
+
+    private PropertyDescriptionRoute( PropertyDescription description, PropertyDescriptionRoute parent )
+    {
+      if( description == null )
+        throw new ArgumentNullException( "description" );
+
+      m_description = description;
+      m_parent = parent;
+    }
+
+    #region Current Property
+
+    internal PropertyDescription Current
+    {
+      get
+      {
+        return m_description;
+      }
+    }
+
+    private readonly PropertyDescription m_description;
+
+    #endregion
+
+    #region Parent Property
+
+    internal PropertyDescriptionRoute Parent
+    {
+      get
+      {
+        return m_parent;
+      }
+    }
+
+    private readonly PropertyDescriptionRoute m_parent;
+
+    #endregion
+
+    internal static PropertyDescriptionRoute Combine( PropertyDescription description, PropertyDescriptionRoute ancestors )
+    {
+      return new PropertyDescriptionRoute( description, ancestors );
+    }
+
+    internal static PropertyDescriptionRoute Combine( PropertyDescriptionRoute descendants, PropertyDescription description )
+    {
+      if( description == null )
+        return descendants;
+
+      return PropertyDescriptionRoute.Combine( descendants, new PropertyDescriptionRoute( description ) );
+    }
+
+    internal static PropertyDescriptionRoute Combine( PropertyDescriptionRoute descendants, PropertyDescriptionRoute ancestors )
+    {
+      if( ancestors == null )
+        return descendants;
+
+      if( descendants == null )
+        return ancestors;
+
+      return PropertyDescriptionRoute.Combine(
+               descendants.Current,
+               PropertyDescriptionRoute.Combine( descendants.Parent, ancestors ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs
new file mode 100644
index 00000000..b305c627
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs
@@ -0,0 +1,109 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class PropertyDescriptionRouteDictionary
+  {
+    internal PropertyDescriptionRoute this[ PropertyRoute key ]
+    {
+      get
+      {
+        PropertyDescriptionRoute value;
+
+        if( this.TryGetValue( key, out value ) )
+          return value;
+
+        return null;
+      }
+    }
+
+    internal ICollection<PropertyDescriptionRoute> Values
+    {
+      get
+      {
+        return m_collection.Values;
+      }
+    }
+
+    internal void Clear()
+    {
+      m_collection.Clear();
+    }
+
+    internal void Add( PropertyDescriptionRoute value, bool overwrite )
+    {
+      PropertyDescriptionRouteDictionary.EnsureValue( value );
+
+      var key = PropertyRouteBuilder.ToPropertyRoute( value );
+
+      this.Add( key, value, overwrite );
+    }
+
+    internal void Add( PropertyRoute key, PropertyDescriptionRoute value, bool overwrite )
+    {
+      PropertyDescriptionRouteDictionary.EnsureKey( key );
+      PropertyDescriptionRouteDictionary.EnsureValue( value );
+
+      if( overwrite )
+      {
+        m_collection[ key ] = value;
+      }
+      else
+      {
+        m_collection.Add( key, value );
+      }
+    }
+
+    internal void Remove( PropertyRoute key )
+    {
+      PropertyDescriptionRouteDictionary.EnsureKey( key );
+
+      m_collection.Remove( key );
+    }
+
+    internal bool Contains( PropertyRoute key )
+    {
+      PropertyDescriptionRoute unused;
+
+      return this.TryGetValue( key, out unused );
+    }
+
+    internal bool TryGetValue( PropertyRoute key, out PropertyDescriptionRoute value )
+    {
+      PropertyDescriptionRouteDictionary.EnsureKey( key );
+
+      return m_collection.TryGetValue( key, out value );
+    }
+
+    private static void EnsureKey( PropertyRoute key )
+    {
+      if( key == null )
+        throw new ArgumentNullException( "key" );
+    }
+
+    private static void EnsureValue( PropertyDescriptionRoute value )
+    {
+      if( value == null )
+        throw new ArgumentNullException( "value" );
+    }
+
+    private readonly Dictionary<PropertyRoute, PropertyDescriptionRoute> m_collection = new Dictionary<PropertyRoute, PropertyDescriptionRoute>();
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs
new file mode 100644
index 00000000..f225c51b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs
@@ -0,0 +1,125 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class PropertyRoute
+  {
+    internal PropertyRoute( PropertyRouteSegment segment )
+      : this( segment, null )
+    {
+    }
+
+    private PropertyRoute( PropertyRouteSegment segment, PropertyRoute parent )
+    {
+      m_current = segment;
+      m_parent = parent;
+    }
+
+    #region Current Property
+
+    internal PropertyRouteSegment Current
+    {
+      get
+      {
+        return m_current;
+      }
+    }
+
+    private readonly PropertyRouteSegment m_current;
+
+    #endregion
+
+    #region Parent Property
+
+    internal PropertyRoute Parent
+    {
+      get
+      {
+        return m_parent;
+      }
+    }
+
+    private readonly PropertyRoute m_parent;
+
+    #endregion
+
+    public static bool operator ==( PropertyRoute x, PropertyRoute y )
+    {
+      if( object.ReferenceEquals( x, y ) )
+        return true;
+
+      if( object.ReferenceEquals( x, null ) || object.ReferenceEquals( y, null ) )
+        return false;
+
+      return ( PropertyRouteSegment.Equals( x.m_current, y.m_current ) )
+          && ( x.m_parent == y.m_parent );
+    }
+
+    public static bool operator !=( PropertyRoute x, PropertyRoute y )
+    {
+      return !( x == y );
+    }
+
+    public override int GetHashCode()
+    {
+      return m_current.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      var target = obj as PropertyRoute;
+      if( object.ReferenceEquals( target, null ) )
+        return false;
+
+      return ( target == this );
+    }
+
+    internal static PropertyRoute Combine( PropertyRouteSegment segment, PropertyRoute ancestors )
+    {
+      if( ancestors == null )
+        return new PropertyRoute( segment );
+
+      if( ancestors.Current.Type != PropertyRouteSegmentType.Other )
+        return new PropertyRoute( segment, ancestors );
+
+      var path = PropertyRouteParser.Parse( new PropertyRoute( segment, new PropertyRoute( ancestors.Current ) ) );
+      Debug.Assert( !string.IsNullOrEmpty( path ) );
+
+      return new PropertyRoute( new PropertyRouteSegment( PropertyRouteSegmentType.Other, path ), ancestors.Parent );
+    }
+
+    internal static PropertyRoute Combine( PropertyRoute descendants, PropertyRouteSegment segment )
+    {
+      return PropertyRoute.Combine( descendants, new PropertyRoute( segment ) );
+    }
+
+    internal static PropertyRoute Combine( PropertyRoute descendants, PropertyRoute ancestors )
+    {
+      if( ancestors == null )
+        return descendants;
+
+      if( descendants == null )
+        return ancestors;
+
+      return PropertyRoute.Combine(
+               descendants.Current,
+               PropertyRoute.Combine( descendants.Parent, ancestors ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs
new file mode 100644
index 00000000..6333694e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs
@@ -0,0 +1,187 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class PropertyRouteBuilder
+  {
+    internal PropertyRouteBuilder()
+    {
+    }
+
+    internal PropertyRouteBuilder( PropertyRoute route )
+    {
+      if( route == null )
+        return;
+
+      for( var c = route; c != null; c = c.Parent )
+      {
+        this.PushAncestor( c.Current );
+      }
+    }
+
+    internal PropertyRouteBuilder( PropertyDescriptionRoute route )
+    {
+      if( route == null )
+        return;
+
+      for( var c = route; c != null; c = c.Parent )
+      {
+        this.PushAncestor( c.Current );
+      }
+    }
+
+    internal PropertyRouteBuilder( DataGridItemPropertyRoute route )
+    {
+      if( route == null )
+        return;
+
+      for( var c = route; c != null; c = c.Parent )
+      {
+        this.PushAncestor( c.Current );
+      }
+    }
+
+    internal bool IsEmpty
+    {
+      get
+      {
+        return ( m_segments.Count <= 0 );
+      }
+    }
+
+    internal static PropertyRoute ToPropertyRoute( PropertyRouteSegment segment )
+    {
+      return new PropertyRoute( segment );
+    }
+
+    internal static PropertyRoute ToPropertyRoute( PropertyDescriptionRoute description )
+    {
+      if( description == null )
+        return null;
+
+      return PropertyRoute.Combine( PropertyRouteBuilder.ToSegment( description.Current ), PropertyRouteBuilder.ToPropertyRoute( description.Parent ) );
+    }
+
+    internal static PropertyRoute ToPropertyRoute( DataGridItemPropertyRoute itemProperty )
+    {
+      if( itemProperty == null )
+        return null;
+
+      return PropertyRoute.Combine( PropertyRouteBuilder.ToSegment( itemProperty.Current ), PropertyRouteBuilder.ToPropertyRoute( itemProperty.Parent ) );
+    }
+
+    internal void PushAncestor( PropertyRouteSegment segment )
+    {
+      m_segments.Insert( 0, segment );
+    }
+
+    internal void PushAncestor( PropertyDescription description )
+    {
+      if( description == null )
+        throw new ArgumentNullException( "description" );
+
+      this.PushAncestor( PropertyRouteBuilder.ToSegment( description ) );
+    }
+
+    internal void PushAncestor( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        throw new ArgumentNullException( "itemProperty" );
+
+      this.PushAncestor( PropertyRouteBuilder.ToSegment( itemProperty ) );
+    }
+
+    internal void PushDescendant( PropertyRouteSegment segment )
+    {
+      m_segments.Add( segment );
+    }
+
+    internal void PushDescendant( PropertyDescription description )
+    {
+      if( description == null )
+        throw new ArgumentNullException( "description" );
+
+      this.PushDescendant( PropertyRouteBuilder.ToSegment( description ) );
+    }
+
+    internal void PushDescendant( DataGridItemPropertyBase itemProperty )
+    {
+      if( itemProperty == null )
+        throw new ArgumentNullException( "itemProperty" );
+
+      this.PushDescendant( PropertyRouteBuilder.ToSegment( itemProperty ) );
+    }
+
+    internal void PopAncestor()
+    {
+      if( m_segments.Count <= 0 )
+        throw new InvalidOperationException();
+
+      m_segments.RemoveAt( 0 );
+    }
+
+    internal void PopDescendant()
+    {
+      if( m_segments.Count <= 0 )
+        throw new InvalidOperationException();
+
+      m_segments.RemoveAt( m_segments.Count - 1 );
+    }
+
+    internal PropertyRoute ToPropertyRoute()
+    {
+      if( m_segments.Count <= 0 )
+        return null;
+
+      var route = new PropertyRoute( m_segments[ 0 ] );
+
+      for( int i = 1; i < m_segments.Count; i++ )
+      {
+        route = PropertyRoute.Combine( m_segments[ i ], route );
+      }
+
+      return route;
+    }
+
+    private static PropertyRouteSegment ToSegment( PropertyDescription description )
+    {
+      Debug.Assert( description != null );
+
+      return description.ToPropertyRouteSegment();
+    }
+
+    private static PropertyRouteSegment ToSegment( DataGridItemPropertyBase itemProperty )
+    {
+      Debug.Assert( itemProperty != null );
+
+      var route = PropertyRouteParser.Parse( itemProperty.Name );
+      if( route == null )
+        throw new ArgumentException( "Unexpected DataGridItemPropertyBase.Name property value.", "itemProperty" );
+
+      if( route.Parent == null )
+        return route.Current;
+
+      return new PropertyRouteSegment( PropertyRouteSegmentType.Other, itemProperty.Name );
+    }
+
+    private readonly List<PropertyRouteSegment> m_segments = new List<PropertyRouteSegment>();
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs
new file mode 100644
index 00000000..379e91b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs
@@ -0,0 +1,317 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal static class PropertyRouteParser
+  {
+    #region Static Fields
+
+    private static readonly string ReservedSymbols = ".[]";
+
+    #endregion
+
+    internal static PropertyRoute Parse( string path )
+    {
+      path = ( path != null ) ? path.Trim() : string.Empty;
+
+      var length = path.Length;
+      if( length <= 0 )
+        return null;
+
+      var builder = new PropertyRouteBuilder();
+      var state = ParserState.Start;
+      var index = 0;
+
+      while( index < length )
+      {
+        var c = path[ index ];
+
+        if( char.IsWhiteSpace( c ) )
+        {
+          index++;
+        }
+        else
+        {
+          switch( state )
+          {
+            case ParserState.Start:
+              {
+                switch( c )
+                {
+                  case '.':
+                    index++;
+                    break;
+
+                  default:
+                    state = ParserState.Property;
+                    break;
+                }
+              }
+              break;
+
+            case ParserState.Separator:
+              {
+                switch( c )
+                {
+                  case '.':
+                    index++;
+                    break;
+
+                  case '[':
+                    break;
+
+                  default:
+                    {
+                      PropertyRouteParser.AddOther( path, length, ref index, builder );
+                      Debug.Assert( index >= length );
+                    }
+                    break;
+                }
+
+                state = ParserState.Property;
+              }
+              break;
+
+            case ParserState.Property:
+              {
+                switch( c )
+                {
+                  case '[':
+                    {
+                      if( PropertyRouteParser.AddIndexer( path, length, ref index, builder ) )
+                      {
+                        state = ParserState.Separator;
+                      }
+                      else
+                      {
+                        PropertyRouteParser.AddOther( path, length, ref index, builder );
+                        Debug.Assert( index >= length );
+                      }
+                    }
+                    break;
+
+                  default:
+                    {
+                      if( PropertyRouteParser.AddProperty( path, length, ref index, builder ) )
+                      {
+                        state = ParserState.Separator;
+                      }
+                      else
+                      {
+                        PropertyRouteParser.AddOther( path, length, ref index, builder );
+                        Debug.Assert( index >= length );
+                      }
+                    }
+                    break;
+                }
+              }
+              break;
+
+            default:
+              throw new NotImplementedException();
+          }
+        }
+      }
+
+      if( builder.IsEmpty )
+      {
+        builder.PushDescendant( PropertyRouteSegment.Self );
+      }
+
+      return builder.ToPropertyRoute();
+    }
+
+    internal static string Parse( DataGridItemPropertyBase itemProperty )
+    {
+      return PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( DataGridItemPropertyRoute.Create( itemProperty ) ) );
+    }
+
+    internal static string Parse( PropertyRoute route )
+    {
+      if( route == null )
+        return string.Empty;
+
+      var sb = new StringBuilder();
+      var childSegmentType = PropertyRouteSegmentType.Self;
+
+      while( route != null )
+      {
+        var segment = route.Current;
+        if( segment.Type != PropertyRouteSegmentType.Self )
+        {
+          if( !string.IsNullOrEmpty( segment.Name ) )
+          {
+            if( sb.Length != 0 )
+            {
+              switch( childSegmentType )
+              {
+                // For these type of segment, there is no need to put a separator.
+                case PropertyRouteSegmentType.Self:
+                case PropertyRouteSegmentType.Indexer:
+                  break;
+
+                default:
+                  sb.Insert( 0, "." );
+                  break;
+              }
+            }
+
+            if( segment.Type == PropertyRouteSegmentType.Indexer )
+            {
+              sb.Insert( 0, "]" );
+              sb.Insert( 0, segment.Name );
+              sb.Insert( 0, "[" );
+            }
+            else
+            {
+              sb.Insert( 0, segment.Name );
+            }
+          }
+        }
+        else
+        {
+          if( ( route.Parent == null ) && ( sb.Length == 0 ) )
+          {
+            sb.Append( segment.Name );
+          }
+        }
+
+        childSegmentType = segment.Type;
+        route = route.Parent;
+      }
+
+      return sb.ToString();
+    }
+
+    private static bool AddIndexer( string path, int length, ref int index, PropertyRouteBuilder builder )
+    {
+      if( ( index >= length ) || ( path[ index ] != '[' ) )
+        return false;
+
+      var currentIndex = index + 1;
+      var startIndex = currentIndex;
+
+      while( currentIndex < length )
+      {
+        var c = path[ currentIndex ];
+
+        if( c == ']' )
+        {
+          Debug.Assert( startIndex < length );
+          Debug.Assert( startIndex <= currentIndex );
+
+          var value = path.Substring( startIndex, currentIndex - startIndex ).Trim();
+          if( value.Length <= 0 )
+            return false;
+
+          // The value is parsed twice in order to get a standard name that could be used as a key for further use.
+          var parametersList = IndexerParametersParser.Parse( value );
+          var parameters = IndexerParametersParser.Parse( parametersList );
+          if( string.IsNullOrEmpty( parameters ) )
+            return false;
+
+          builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Indexer, parameters ) );
+          index = currentIndex + 1;
+
+          return true;
+        }
+        else if( PropertyRouteParser.ReservedSymbols.IndexOf( c ) >= 0 )
+        {
+          return false;
+        }
+
+        currentIndex++;
+      }
+
+      return false;
+    }
+
+    private static bool AddProperty( string path, int length, ref int index, PropertyRouteBuilder builder )
+    {
+      var currentIndex = index;
+
+      while( ( currentIndex < length ) && ( path[ currentIndex ] == '.' ) )
+      {
+        currentIndex++;
+      }
+
+      var startIndex = currentIndex;
+      var parens = 0;
+
+      while( currentIndex < length )
+      {
+        var c = path[ currentIndex ];
+
+        if( PropertyRouteParser.ReservedSymbols.IndexOf( c ) >= 0 )
+          break;
+
+        if( c == '(' )
+        {
+          parens++;
+        }
+        else if( c == ')' )
+        {
+          parens--;
+
+          // A closing parenthesis was found before an opening parenthesis.
+          if( parens < 0 )
+            return false;
+        }
+
+        currentIndex++;
+      }
+
+      if( ( parens != 0 ) || ( startIndex >= length ) )
+        return false;
+
+      var name = path.Substring( startIndex, currentIndex - startIndex ).Trim();
+      if( name.Length > 0 )
+      {
+        builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Property, name ) );
+        index = currentIndex;
+      }
+
+      return true;
+    }
+
+    private static void AddOther( string path, int length, ref int index, PropertyRouteBuilder builder )
+    {
+      if( index >= length )
+        return;
+
+      var value = path.Substring( index, length - index ).Trim();
+
+      builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Other, value ) );
+      index = length;
+    }
+
+    #region ParserState Private Enum
+
+    private enum ParserState
+    {
+      Start,
+      Separator,
+      Property,
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs
new file mode 100644
index 00000000..1b4327e2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs
@@ -0,0 +1,88 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal struct PropertyRouteSegment : IEquatable<PropertyRouteSegment>
+  {
+    #region Static Fields
+
+    internal static readonly PropertyRouteSegment Self = new PropertyRouteSegment( PropertyRouteSegmentType.Self, "." );
+
+    #endregion
+
+    internal PropertyRouteSegment( PropertyRouteSegmentType type, string name )
+    {
+      if( name == null )
+        throw new ArgumentNullException( "name" );
+
+      m_type = type;
+      m_name = name;
+    }
+
+    #region Type Property
+
+    internal PropertyRouteSegmentType Type
+    {
+      get
+      {
+        return m_type;
+      }
+    }
+
+    private readonly PropertyRouteSegmentType m_type;
+
+    #endregion
+
+    #region Name Property
+
+    internal string Name
+    {
+      get
+      {
+        return m_name;
+      }
+    }
+
+    private readonly string m_name;
+
+    #endregion
+
+    public static bool Equals( PropertyRouteSegment x, PropertyRouteSegment y )
+    {
+      return x.Equals( y );
+    }
+
+    public override int GetHashCode()
+    {
+      return m_name.GetHashCode() ^ m_type.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      return ( obj is PropertyRouteSegment )
+          && ( this.Equals( ( PropertyRouteSegment )obj ) );
+    }
+
+    public bool Equals( PropertyRouteSegment obj )
+    {
+      return ( obj.m_name == m_name )
+          && ( obj.m_type == m_type );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
index f847c2dd..c5cb9a49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
@@ -15,24 +15,36 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
 using System.Collections.Specialized;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class ReadOnlyColumnCollection : ReadOnlyObservableCollection<ColumnBase>
   {
-    public ReadOnlyColumnCollection()
-      : base( new ObservableCollection<ColumnBase>() )
+    internal ReadOnlyColumnCollection( ObservableColumnCollection collection )
+      : base( collection )
     {
     }
 
+    #region [] Property
+
+    internal ColumnBase this[ string fieldName ]
+    {
+      get
+      {
+        return ( ( ObservableColumnCollection )this.Items )[ fieldName ];
+      }
+    }
+
+    #endregion
+
     internal void RaiseItemChanged( ColumnBase column )
     {
-      this.OnCollectionChanged( 
-        new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, column, column, this.IndexOf( column ) ) );
+      Debug.Assert( column != null );
+
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, column, column, this.IndexOf( column ) ) );
     }
 
     internal void InternalClear()
@@ -59,5 +71,10 @@ namespace Xceed.Wpf.DataGrid
     {
       this.Items.RemoveAt( index );
     }
+
+    internal IDisposable DeferNotifications()
+    {
+      return ( ( ObservableColumnCollection )this.Items ).DeferNotifications();
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs
deleted file mode 100644
index 217e4e79..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class RecyclingManager
-  {
-    #region RefCount Property
-
-    public int RefCount
-    {
-      get
-      {
-        return m_generators.Count;
-      }
-    }
-
-    #endregion
-
-    public void EnqueueItemContainer( object item, DependencyObject container )
-    {
-      Debug.Assert( container != null );
-
-      var entry = new ItemRecyclingPoolContainer( item, container );
-
-      m_itemRecyclingPool.Add( entry, entry );
-    }
-
-    public DependencyObject DequeueItemContainer( object item )
-    {
-      if( m_itemRecyclingPool.Count <= 0 )
-        return null;
-
-      var retriever = new ItemRecyclingPoolContainerRetriever( item );
-
-      ItemRecyclingPoolEntry value;
-      if( !m_itemRecyclingPool.TryGetValue( retriever, out value ) )
-      {
-        value = m_itemRecyclingPool.First().Value;
-      }
-
-      m_itemRecyclingPool.Remove( value );
-
-      return value.Container;
-    }
-
-    public void EnqueueHeaderFooterContainer( object key, DependencyObject container )
-    {
-      Stack<DependencyObject> headerFooterItemTypeStack;
-
-      if( !m_headerRecyclingStacks.TryGetValue( key, out headerFooterItemTypeStack ) )
-      {
-        headerFooterItemTypeStack = new Stack<DependencyObject>();
-        m_headerRecyclingStacks.Add( key, headerFooterItemTypeStack );
-      }
-
-      headerFooterItemTypeStack.Push( container );
-    }
-
-    public DependencyObject DequeueHeaderFooterContainer( object key )
-    {
-      Stack<DependencyObject> headerFooterItemTypeStack;
-
-      if( m_headerRecyclingStacks.TryGetValue( key, out headerFooterItemTypeStack ) )
-      {
-        if( headerFooterItemTypeStack.Count > 0 )
-          return headerFooterItemTypeStack.Pop();
-      }
-
-      return null;
-    }
-
-    public void EnqueueGroupHeaderFooterContainer( object key, object item, DependencyObject container )
-    {
-      Dictionary<object, Stack<DependencyObject>> headerFooterRecyclingStacks;
-
-      if( !m_groupLevelRecyclingStacks.TryGetValue( key, out headerFooterRecyclingStacks ) )
-      {
-        headerFooterRecyclingStacks = new Dictionary<object, Stack<DependencyObject>>();
-        m_groupLevelRecyclingStacks.Add( key, headerFooterRecyclingStacks );
-      }
-
-      if( item is GroupHeaderFooterItem )
-      {
-        item = ( ( GroupHeaderFooterItem )item ).Template;
-      }
-
-      Stack<DependencyObject> headerFooterItemTypeStack;
-
-      if( !headerFooterRecyclingStacks.TryGetValue( item, out headerFooterItemTypeStack ) )
-      {
-        headerFooterItemTypeStack = new Stack<DependencyObject>();
-        headerFooterRecyclingStacks.Add( item, headerFooterItemTypeStack );
-      }
-
-      headerFooterItemTypeStack.Push( container );
-    }
-
-    public DependencyObject DequeueGroupHeaderFooterContainer( object key, object item )
-    {
-      Dictionary<object, Stack<DependencyObject>> headerFooterRecyclingStacks;
-
-      if( m_groupLevelRecyclingStacks.TryGetValue( key, out headerFooterRecyclingStacks ) )
-      {
-        if( item is GroupHeaderFooterItem )
-        {
-          item = ( ( GroupHeaderFooterItem )item ).Template;
-        }
-
-        Stack<DependencyObject> headerFooterItemTypeStack;
-
-        if( headerFooterRecyclingStacks.TryGetValue( item, out headerFooterItemTypeStack ) )
-        {
-          if( headerFooterItemTypeStack.Count > 0 )
-            return headerFooterItemTypeStack.Pop();
-        }
-      }
-
-      return null;
-    }
-
-    public IList<DependencyObject> Clear()
-    {
-      var removedContainers = new List<DependencyObject>( ( from entry in m_itemRecyclingPool.Values
-                                                            select entry.Container ) );
-
-      m_itemRecyclingPool.Clear();
-
-      foreach( Stack<DependencyObject> stack in m_headerRecyclingStacks.Values )
-      {
-        foreach( DependencyObject container in stack )
-        {
-          removedContainers.Add( container );
-        }
-
-        stack.Clear();
-      }
-
-      m_headerRecyclingStacks.Clear();
-
-      foreach( Dictionary<object, Stack<DependencyObject>> stacks in m_groupLevelRecyclingStacks.Values )
-      {
-        foreach( Stack<DependencyObject> stack in stacks.Values )
-        {
-          foreach( DependencyObject container in stack )
-          {
-            removedContainers.Add( container );
-          }
-
-          stack.Clear();
-        }
-
-        stacks.Clear();
-      }
-
-      m_groupLevelRecyclingStacks.Clear();
-
-      return removedContainers;
-    }
-
-    public void AddRef( CustomItemContainerGenerator reference )
-    {
-      Debug.Assert( reference != null );
-
-      if( m_generators.Contains( reference ) )
-        return;
-
-      m_generators.Add( reference );
-    }
-
-    public void RemoveRef( CustomItemContainerGenerator reference )
-    {
-      Debug.Assert( reference != null );
-
-      m_generators.Remove( reference );
-    }
-
-    #region Private Fields
-
-    private readonly Dictionary<object, Dictionary<object, Stack<DependencyObject>>> m_groupLevelRecyclingStacks = new Dictionary<object, Dictionary<object, Stack<DependencyObject>>>();
-    private readonly Dictionary<object, Stack<DependencyObject>> m_headerRecyclingStacks = new Dictionary<object, Stack<DependencyObject>>();
-    private readonly Dictionary<ItemRecyclingPoolEntry, ItemRecyclingPoolEntry> m_itemRecyclingPool = new Dictionary<ItemRecyclingPoolEntry, ItemRecyclingPoolEntry>( new ItemRecyclingPoolEqualityComparer() );
-    private readonly HashSet<CustomItemContainerGenerator> m_generators = new HashSet<CustomItemContainerGenerator>();
-
-    #endregion
-
-    #region ItemRecyclingPoolEntry Private Class
-
-    private abstract class ItemRecyclingPoolEntry
-    {
-      internal ItemRecyclingPoolEntry( object dataItem )
-      {
-        m_key = ( dataItem != null ) ? dataItem.GetHashCode() : 0;
-      }
-
-      internal int Key
-      {
-        get
-        {
-          return m_key;
-        }
-      }
-
-      // This property has been set here to remove the casts every time we want to
-      // retrieve the container from an instance of ItemRecyclingPoolContainer.
-      internal abstract DependencyObject Container
-      {
-        get;
-      }
-
-      public override int GetHashCode()
-      {
-        return m_key;
-      }
-
-      public override bool Equals( object obj )
-      {
-        var item = obj as ItemRecyclingPoolEntry;
-        if( item == null )
-          return false;
-
-        return ( item.m_key == m_key );
-      }
-
-      private readonly int m_key;
-    }
-
-    #endregion
-
-    #region ItemRecyclingPoolContainer Private Class
-
-    private sealed class ItemRecyclingPoolContainer : ItemRecyclingPoolEntry
-    {
-      internal ItemRecyclingPoolContainer( object dataItem, DependencyObject container )
-        : base( dataItem )
-      {
-        Debug.Assert( container != null );
-
-        m_container = container;
-      }
-
-      internal override DependencyObject Container
-      {
-        get
-        {
-          return m_container;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        if( !base.Equals( obj ) )
-          return false;
-
-        if( obj == this )
-          return true;
-
-        var item = obj as ItemRecyclingPoolContainer;
-
-        return ( item != null )
-            && ( item.m_container == m_container );
-      }
-
-      private readonly DependencyObject m_container;
-    }
-
-    #endregion
-
-    #region ItemRecyclingPoolContainerRetriever Private Class
-
-    private sealed class ItemRecyclingPoolContainerRetriever : ItemRecyclingPoolEntry
-    {
-      internal ItemRecyclingPoolContainerRetriever( object dataItem )
-        : base( dataItem )
-      {
-      }
-
-      internal override DependencyObject Container
-      {
-        get
-        {
-          throw new NotSupportedException( "A retriever has no container." );
-        }
-      }
-    }
-
-    #endregion
-
-    #region ItemRecyclingPoolEqualityComparer Private Class
-
-    private sealed class ItemRecyclingPoolEqualityComparer : IEqualityComparer<ItemRecyclingPoolEntry>
-    {
-      public int GetHashCode( ItemRecyclingPoolEntry obj )
-      {
-        Debug.Assert( obj != null );
-
-        return obj.GetHashCode();
-      }
-
-      public bool Equals( ItemRecyclingPoolEntry x, ItemRecyclingPoolEntry y )
-      {
-        if( object.ReferenceEquals( x, y ) )
-          return true;
-
-        if( object.ReferenceEquals( x, null ) || object.ReferenceEquals( y, null ) )
-          return false;
-
-        // If one of the entry is a retriever, invoke its Equals method so the retriever may do its job.
-        if( x is ItemRecyclingPoolContainerRetriever )
-          return x.Equals( y );
-
-        return y.Equals( x );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs
new file mode 100644
index 00000000..b60732a8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs
@@ -0,0 +1,84 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal struct RelativePoint : IEquatable<RelativePoint>
+  {
+    internal RelativePoint( UIElement element, Point relativePoint )
+    {
+      if( element == null )
+        throw new ArgumentNullException( "element" );
+
+      m_element = element;
+      m_relativePoint = relativePoint;
+    }
+
+    public static bool operator ==( RelativePoint x, RelativePoint y )
+    {
+      return x.Equals( y );
+    }
+
+    public static bool operator !=( RelativePoint x, RelativePoint y )
+    {
+      return !( x == y );
+    }
+
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      if( !( obj is RelativePoint ) )
+        return false;
+
+      return this.Equals( ( RelativePoint )obj );
+    }
+
+    public bool Equals( RelativePoint obj )
+    {
+      return ( object.Equals( obj.m_element, m_element ) )
+          && ( object.Equals( obj.m_relativePoint, m_relativePoint ) );
+    }
+
+    internal Point GetPoint( UIElement relativeTo )
+    {
+      if( relativeTo == null )
+        throw new ArgumentNullException( "element" );
+
+      if( m_element == null )
+        throw new InvalidOperationException();
+
+      if( relativeTo == m_element )
+        return m_relativePoint;
+
+      return m_element.TranslatePoint( m_relativePoint, relativeTo );
+    }
+
+    internal RelativePoint TranslateTo( UIElement relativeTo )
+    {
+      return new RelativePoint( relativeTo, this.GetPoint( relativeTo ) );
+    }
+
+    private readonly UIElement m_element;
+    private readonly Point m_relativePoint;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
index ac48d4b6..d9394dad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
@@ -31,17 +31,16 @@ using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
 using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Automation;
+using Xceed.Wpf.DataGrid.Utils;
 using Xceed.Wpf.DataGrid.ValidationRules;
 using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
   [TemplatePart( Name = "PART_CellsHost", Type = typeof( Panel ) )]
   [TemplatePart( Name = "PART_RowFocusRoot", Type = typeof( FrameworkElement ) )]
   [ContentProperty( "Cells" )]
-  public abstract class Row : Control, IDataGridItemContainer
+  public abstract class Row : Control, IDataGridItemContainer, INotifyPropertyChanged, IWeakEventListener
   {
     // This validation rule is meant to be used as the rule in error set in a Row's ValidationError when
     // we want to flag a validation error even though no binding's ValidationRules or CellValidationRules are invalid.
@@ -68,8 +67,7 @@ namespace Xceed.Wpf.DataGrid
       DataGridControl.CellEditorDisplayConditionsProperty.OverrideMetadata( typeof( Row ),
         new FrameworkPropertyMetadata( new PropertyChangedCallback( OnCellEditorDisplayConditionsChanged ) ) );
 
-      // We do this last to ensure all the Static content of the row is done before using 
-      // any static readonly field of the cell.
+      // We do this last to ensure all the Static content of the row is done before using any static readonly field of the cell.
       Row.SelectionBackgroundProperty = Cell.SelectionBackgroundProperty.AddOwner( typeof( Row ) );
       Row.SelectionForegroundProperty = Cell.SelectionForegroundProperty.AddOwner( typeof( Row ) );
       Row.InactiveSelectionBackgroundProperty = Cell.InactiveSelectionBackgroundProperty.AddOwner( typeof( Row ) );
@@ -94,8 +92,7 @@ namespace Xceed.Wpf.DataGrid
                                               new ExecutedRoutedEventHandler( OnCancelEditExecuted ),
                                               new CanExecuteRoutedEventHandler( OnCancelEditCanExecute ) ) );
 
-      // Cache the CellsCollection and always return it in the 
-      // getter of the DependencyProperty's CLR accessor
+      // Cache the CellsCollection and always return it in the getter of the DependencyProperty's CLR accessor
       m_cellsCache = new VirtualizingCellCollection( this );
 
       // Set the Value of the DependencyProperty
@@ -134,7 +131,7 @@ namespace Xceed.Wpf.DataGrid
     public static readonly DependencyProperty CellsProperty;
 
     // Define it as Virtualizing to avoid casts
-    private VirtualizingCellCollection m_cellsCache; // = null;
+    private readonly VirtualizingCellCollection m_cellsCache; // = null;
 
     public CellCollection Cells
     {
@@ -221,11 +218,13 @@ namespace Xceed.Wpf.DataGrid
 
     #region HasValidationError Read-Only Property
 
-    internal static readonly DependencyPropertyKey HasValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasValidationError", typeof( bool ), typeof( Row ), new UIPropertyMetadata( false ) );
+    internal static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
+      "HasValidationError",
+      typeof( bool ),
+      typeof( Row ),
+      new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty HasValidationErrorProperty =
-      HasValidationErrorPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty HasValidationErrorProperty = HasValidationErrorPropertyKey.DependencyProperty;
 
     public bool HasValidationError
     {
@@ -254,11 +253,13 @@ namespace Xceed.Wpf.DataGrid
 
     #region IsValidationErrorRestrictive Read-Only Property
 
-    private static readonly DependencyPropertyKey IsValidationErrorRestrictivePropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsValidationErrorRestrictive", typeof( bool ), typeof( Row ), new UIPropertyMetadata( false ) );
+    private static readonly DependencyPropertyKey IsValidationErrorRestrictivePropertyKey = DependencyProperty.RegisterReadOnly(
+      "IsValidationErrorRestrictive",
+      typeof( bool ),
+      typeof( Row ),
+      new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty =
-      IsValidationErrorRestrictivePropertyKey.DependencyProperty;
+    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty = IsValidationErrorRestrictivePropertyKey.DependencyProperty;
 
     public bool IsValidationErrorRestrictive
     {
@@ -478,10 +479,6 @@ namespace Xceed.Wpf.DataGrid
           this.ClearValue( Row.IsSelectedPropertyKey );
         }
 
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext != null )
-          dataGridContext.RaiseIsSelectedChangedAutomationEvent( this, value );
       }
     }
 
@@ -645,7 +642,8 @@ namespace Xceed.Wpf.DataGrid
 
     #region ValidationError Read-Only Property
 
-    public static readonly RoutedEvent ValidationErrorChangingEvent = EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( RowValidationErrorRoutedEventHandler ), typeof( Row ) );
+    public static readonly RoutedEvent ValidationErrorChangingEvent =
+           EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( RowValidationErrorRoutedEventHandler ), typeof( Row ) );
 
     public event RowValidationErrorRoutedEventHandler ValidationErrorChanging
     {
@@ -665,11 +663,11 @@ namespace Xceed.Wpf.DataGrid
       this.RaiseEvent( e );
     }
 
-    private static readonly DependencyPropertyKey ValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "ValidationError", typeof( RowValidationError ), typeof( Row ),
-        new PropertyMetadata( null,
-          new PropertyChangedCallback( Row.OnValidationErrorChanged ),
-          new CoerceValueCallback( Row.OnCoerceValidationError ) ) );
+    private static readonly DependencyPropertyKey ValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
+      "ValidationError",
+      typeof( RowValidationError ),
+      typeof( Row ),
+      new PropertyMetadata( null, new PropertyChangedCallback( Row.OnValidationErrorChanged ), new CoerceValueCallback( Row.OnCoerceValidationError ) ) );
 
     public static readonly DependencyProperty ValidationErrorProperty = Row.ValidationErrorPropertyKey.DependencyProperty;
 
@@ -719,7 +717,9 @@ namespace Xceed.Wpf.DataGrid
             Debug.Assert( rowState != null );
 
             if( rowState != null )
+            {
               rowState.SetItemValidationError( e.NewValue as RowValidationError );
+            }
           }
         }
       }
@@ -753,6 +753,23 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion ValidationError Read-Only Property
 
+    #region CanBeRecycled Protected Property
+
+    protected virtual bool CanBeRecycled
+    {
+      get
+      {
+        if( this.IsKeyboardFocused
+          || this.IsKeyboardFocusWithin
+          || this.IsBeingEdited )
+          return false;
+
+        return true;
+      }
+    }
+
+    #endregion
+
     #region UnboundDataItemContext Property
 
     internal UnboundDataItem UnboundDataItemContext
@@ -765,43 +782,45 @@ namespace Xceed.Wpf.DataGrid
 
     internal void ClearUnboundDataItemContext()
     {
-      if( m_unboundDataItemNode != null )
-      {
-        UnboundDataItem.FreeUnboundDataItem( m_unboundDataItemNode );
-        m_unboundDataItemNode = null;
-      }
-
       m_unboundDataItem = null;
     }
 
     internal void UpdateUnboundDataItemContext()
     {
-      object dataItem = this.DataContext;
-
+      var dataItem = this.DataContext;
       if( dataItem == null )
       {
         this.ClearUnboundDataItemContext();
-        return;
       }
-
-      if( m_unboundDataItemNode != null )
+      else
       {
-        object oldDataItem = m_unboundDataItemNode.DataItem;
-
-        if( ( m_unboundDataItemNode.IsAlive ) && ( object.Equals( oldDataItem, dataItem ) ) )
-          return;
+        if( m_unboundDataItem != null )
+        {
+          if( object.Equals( m_unboundDataItem.DataItem, dataItem ) )
+            return;
+        }
 
-        UnboundDataItem.FreeUnboundDataItem( m_unboundDataItemNode );
+        m_unboundDataItem = UnboundDataItem.GetUnboundDataItem( dataItem );
       }
-
-      m_unboundDataItemNode = UnboundDataItem.GetUnboundDataItemNode( dataItem, out m_unboundDataItem );
     }
 
-    private UnboundDataItem.UnboundDataItemNode m_unboundDataItemNode;
     private UnboundDataItem m_unboundDataItem;
 
     #endregion
 
+    #region VirtualizedCells Property
+
+    internal IEnumerable<Cell> VirtualizedCells
+    {
+      get
+      {
+        Debug.Assert( m_cellsCache != null );
+        return m_cellsCache.VirtualizedCells;
+      }
+    }
+
+    #endregion
+
     #region CreatedCells Property
 
     internal IEnumerable<Cell> CreatedCells
@@ -854,26 +873,17 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        m_flags[ ( int )RowFlags.IsContainerPrepared ] = value;
-      }
-    }
-
-    #endregion
+        if( value == this.IsContainerPrepared )
+          return;
 
-    #region IsInitializingInsertionRow Property
+        m_flags[ ( int )RowFlags.IsContainerPrepared ] = value;
 
-    internal bool IsInitializingInsertionRow
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsInitializingInsertionRow ];
-      }
-      set
-      {
-        m_flags[ ( int )RowFlags.IsInitializingInsertionRow ] = value;
+        this.OnPropertyChanged( Row.IsContainerPreparedPropertyName );
       }
     }
 
+    internal static readonly string IsContainerPreparedPropertyName = PropertyHelper.GetPropertyName( ( Row r ) => r.IsContainerPrepared );
+
     #endregion
 
     #region EmptyDataItem Property
@@ -917,6 +927,18 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region IsUnfocusable Property
+
+    internal virtual bool IsUnfocusable
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    #endregion
+
     public static Row FindFromChild( DependencyObject child )
     {
       return Row.FindFromChild( ( DataGridContext )null, child );
@@ -989,65 +1011,73 @@ namespace Xceed.Wpf.DataGrid
     {
       base.OnApplyTemplate();
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
       if( dataGridContext == null )
         throw new DataGridInternalException( "DataGridContext is null for Row." );
 
-      DataGridControl gridControl = dataGridContext.DataGridControl;
-      if( gridControl == null )
+      var dataGridControl = dataGridContext.DataGridControl;
+      if( dataGridControl == null )
         throw new DataGridInternalException( "DataGridControl is null for Row." );
 
       m_rowFocusRoot = this.GetTemplateChild( "PART_RowFocusRoot" ) as FrameworkElement;
 
-      var oldCellsHostPanel = m_cellsHostPanel;
-      var oldVirtualizingCellsHost = oldCellsHostPanel as IVirtualizingCellsHost;
-
-      if( oldVirtualizingCellsHost != null )
+      if( m_cellsHostPanel != null )
       {
-        oldVirtualizingCellsHost.ClearCellsHost();
+        var oldVirtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
+        if( oldVirtualizingCellsHost != null )
+        {
+          oldVirtualizingCellsHost.ClearCellsHost();
+        }
+
+        m_cellsHostPanel.Children.Clear();
       }
 
       m_cellsHostPanel = this.GetTemplateChild( "PART_CellsHost" ) as Panel;
 
+      // The PART_CellsHost children are handled internally, it is not allowed to add child elements directly through the template, so clear it.
+      if( m_cellsHostPanel != null )
+      {
+        m_cellsHostPanel.Children.Clear();
+      }
+
       if( m_rowFocusRoot == null )
       {
         m_rowFocusRoot = m_cellsHostPanel;
       }
 
+      //Get templated cells, if any (cells added to the visual tree of the row, but not through .Cells).
       m_templateCells.Clear();
-
       this.GetTemplateCells( this, m_templateCells );
 
-      this.PreparePreviousTemplateCells();
-
-      this.SynchronizeCellsWithColumns( gridControl, m_templateCells, false );
-
-      if( oldCellsHostPanel != null )
+      //This will, among other things, process cells added to Row.Cells, in xaml for instance.
+      //This must be done AFTER getting template cells, for cells added to Row.Cells will be part of the VisualTree after this call, thus would became template cells.
+      var fixedCellPanel = m_cellsHostPanel as FixedCellPanel;
+      if( fixedCellPanel != null )
       {
-        oldCellsHostPanel.Children.Clear();
+        fixedCellPanel.PrepareVirtualizationMode( dataGridContext );
+      }
+      else
+      {
+        m_cellsCache.MergeFreeCells();
       }
 
       var virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-      if( virtualizingCellsHost != null )
+      var hasVirtualizingCellsHost = virtualizingCellsHost != null;
+
+      // Ensure that old template cells are cleared, and remove cells not mapped to any columns.
+      this.SynchronizeActualAndTemplateCells( dataGridContext, dataGridContext.Columns, ( hasVirtualizingCellsHost && ( m_templateCells.Count > 0 ) ) );
+
+      if( hasVirtualizingCellsHost )
       {
-        this.PrepareCellsHost( dataGridContext );
+        this.PrepareVirtualizingCellsHost( dataGridContext, virtualizingCellsHost );
       }
       else
       {
-        // Reset the flag
-        if( gridControl.ForceGeneratorReset == false )
-        {
-          gridControl.ForceGeneratorReset = true;
-        }
-
-        if( ( m_cellsHostPanel != null ) && ( m_cellsHostPanel != oldCellsHostPanel ) )
-        {
-          m_cellsHostPanel.Children.Clear();
-        }
-
-        this.PutCellsInVisualTree( m_templateCells );
+        dataGridControl.ForceGeneratorReset = true;
+        this.PrepareNonVirtualizingCellsHost();
       }
 
+
       this.UpdateNavigationBehavior();
       this.UpdateCellsFocusableStatus();
     }
@@ -1091,7 +1121,7 @@ namespace Xceed.Wpf.DataGrid
         DependencyObject sourceElement = e.OriginalSource as DependencyObject;
 
         // Is not FixedColumnSplitter
-        if( !( sourceElement is Views.FixedColumnSplitter ) && ( !Row.IsPartOfFixedColumnSplitter( sourceElement ) ) )
+        if( !Row.IsPartOfFixedColumnSplitter( sourceElement ) )
         {
           bool focused = false;
 
@@ -1144,9 +1174,11 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected override AutomationPeer OnCreateAutomationPeer()
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
     {
-      return new RowAutomationPeer( this );
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( e.Property.Name );
     }
 
     protected override void OnVisualParentChanged( DependencyObject oldParent )
@@ -1191,40 +1223,39 @@ namespace Xceed.Wpf.DataGrid
 
       // We ensure to create the CurrentCell by fetching it from the CellsCollection
       // If there is a current column on the DataGridContext, try to restore the currency of the cell
-      if( ( this.IsCurrent ) && ( dataGridContext.CurrentColumn != null ) )
+      var currentColumn = dataGridContext.CurrentColumn;
+      if( ( this.IsCurrent ) && ( currentColumn != null ) )
       {
         //This will also trigger the creation of the Cell if it is virtualized.
-        Cell currentCell = m_cellsCache[ dataGridContext.CurrentColumn ];
+        Cell currentCell = m_cellsCache[ currentColumn ];
       }
 
       IVirtualizingCellsHost virtualizingCellsHost = this.CellsHostPanel as IVirtualizingCellsHost;
 
       if( virtualizingCellsHost != null )
       {
-        this.PrepareCellsHost( dataGridContext );
-      }
-      else
-      {
-        //re-Initialize all created cells for the new "assignation"
-        foreach( Cell cell in this.CreatedCells )
+        this.PrepareVirtualizingCellsHost( dataGridContext, virtualizingCellsHost );
+
+        // Template cells are not part of the VirtualzingCellsHost (thus not part of CreatedCells), so we must ensure they are prepared
+        if( m_templateCells != null )
         {
-          // Call Cell.PrepareContainer for cells already created          
-          cell.PrepareContainer( dataGridContext, item );
+          foreach( Cell cell in m_templateCells.Values )
+          {
+            cell.PrepareContainer( dataGridContext, item );
+          }
         }
       }
-
-      if( m_templateCells != null )
+      else
       {
-        // We must ensure every template cells are prepared
-        foreach( Cell cell in m_templateCells.Values )
+        // When not having a VirtualizingCellHost, both template and "default" cells are contained within the VirtualizingCellCollection, so they will all be in CreatedCells.
+        foreach( Cell cell in this.CreatedCells )
         {
           cell.PrepareContainer( dataGridContext, item );
         }
       }
 
-      // We must set isContainerPrepared because a verification is made in BeginEdit
-      // to ensure the container is prepared before entering in edition. The following
-      // RestoreEditionState will possibly trigger BeginEdit.
+      // We must set isContainerPrepared because a verification is made in BeginEdit to ensure the container is prepared before entering in edition.
+      // The following RestoreEditionState will possibly trigger BeginEdit.
       this.IsContainerPrepared = true;
 
       // Use the CurrentContext.InternalCurrentItem when restoring current item
@@ -1235,10 +1266,9 @@ namespace Xceed.Wpf.DataGrid
       if( ( currentItemInEdition != null ) && ( currentItemInEdition.Equals( item ) ) )
       {
         //PL: Should only occur when hitting a CollectionView reset while editing.
-        this.RestoreEditionState( gridControl.CurrentRowInEditionState, dataGridContext.CurrentColumn );
+        this.RestoreEditionState( gridControl.CurrentRowInEditionState, currentColumn );
       }
 
-
       this.UpdateMatchingDisplayConditions();
       this.UpdateNavigationBehavior();
     }
@@ -1253,20 +1283,15 @@ namespace Xceed.Wpf.DataGrid
 
       try
       {
-        // If there were some validation errors, we want to clear every Cells to be sure 
-        // they will never reflect the error state on another data item if they are not 
-        // explicitly prepared
+        // If there were some validation errors, we want to clear every Cells to be sure they will
+        // never reflect the error state on another data item if they are not explicitly prepared
         this.ClearCellsHost();
 
-        // Clear every Cells before clearing the Row's values to allow the Cell
-        // to check some properties on there parent row when processing a Cell.ClearContainer
-        // Ensure every prepared Cells are cleared correctly
-        foreach( Cell cell in m_cellsCache.Cells )
+        // Clear every Cells before clearing the Row's values to allow the Cell to check some properties on their
+        // parent row when processing a Cell.ClearContainer, which ensures every prepared Cells are cleared correctly
+        foreach( Cell cell in this.CreatedCells )
         {
-          if( cell.IsContainerPrepared )
-          {
-            cell.ClearContainer();
-          }
+          cell.ClearContainer();
         }
 
         // Clear all the DP's that are either public or somehow inherited.
@@ -1296,6 +1321,101 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    protected virtual void PartialClearContainer()
+    {
+      this.IsClearingContainer = true;
+
+      try
+      {
+        this.ClearCellsHost();
+
+        // Clear every Cells before clearing the Row's values to allow the Cell to check some properties on their
+        // parent row when processing a Cell.ClearContainer, which ensures every prepared Cells are cleared correctly
+        foreach( Cell cell in this.CreatedCells )
+        {
+          cell.PartialClearContainer();
+        }
+
+        // We need to clear both the ValidationError and the HasValidationError property.
+        // The clearing of ValidationError will take care of the tooltip/cached local tooltip
+        // The clearing of HasValidationError will take care of updating the DataGridControl HasValidationError property.
+        this.ClearValue( Row.ValidationErrorPropertyKey );
+        this.ClearValue( Row.HasValidationErrorPropertyKey );
+
+        this.ClearValue( Row.IsBeingEditedPropertyKey );
+        this.ClearValue( Row.IsDirtyPropertyKey );
+        this.ClearValue( Row.IsCurrentPropertyKey );
+
+        //No need to clear the IsSelected property, it will be properly set by the CustomItemContainerGenerator when recycling the row.
+
+        this.ClearValue( DataGridControl.ContainerGroupConfigurationProperty );
+      }
+      finally
+      {
+        this.IsClearingContainer = false;
+      }
+    }
+
+    protected virtual void SynchronizeActualAndTemplateCells( DataGridContext dataGridContext, ColumnCollection columns, bool initializeTemplateCells )
+    {
+      var oldTemplateCellsToRemove = new List<Cell>();
+      var unmappedCellsToRemove = new Hashtable();
+
+      //cycle through all the currently created cells, and place them in the right collection for further processing
+      foreach( var cell in this.CreatedCells )
+      {
+        // When switching row templates, it is possible for a cell that was a template cell to be replaced by a regular cell,
+        // but still have a counterpart in the template cells.  As a result, both conditions need to be checked.
+        if( Row.GetIsTemplateCell( cell ) || m_templateCells.ContainsKey( cell.FieldName ) )
+        {
+          oldTemplateCellsToRemove.Add( cell );
+          continue;
+        }
+
+        unmappedCellsToRemove.Add( cell.FieldName, cell );
+      }
+
+      //First remove old templated cells, so they eventually get replaced by the newly discovered ones.
+      foreach( var oldTemplateCell in oldTemplateCellsToRemove )
+      {
+        oldTemplateCell.ClearContainer();
+        m_cellsCache.InternalRemove( oldTemplateCell );
+      }
+
+      if( initializeTemplateCells || ( unmappedCellsToRemove.Count > 0 ) )
+      {
+        Xceed.Wpf.DataGrid.Views.ViewBase view = dataGridContext.DataGridControl.GetView();
+        foreach( ColumnBase column in columns )
+        {
+          var fieldName = column.FieldName;
+
+          //This column is still in use, keep the corresponding cell.
+          unmappedCellsToRemove.Remove( fieldName );
+
+          // Case 161385 : the following is because template cells are not part of Row.Cells when dealing with an IVirtualizingCellPanel.
+          // If dealing with an IVirtualizingCellPanel, need to do further processing if there is a template cell associated to this column.
+          if( initializeTemplateCells )
+          {
+            Cell cell = null;
+            m_templateCells.TryGetValue( fieldName, out cell );
+
+            if( cell != null )
+            {
+              cell.Initialize( dataGridContext, this, column );
+              cell.PrepareDefaultStyleKey( view );
+            }
+          }
+        }
+      }
+
+      // Lastly, clear cells that are not mapped to any column.
+      foreach( Cell unmappedcell in unmappedCellsToRemove.Values )
+      {
+        unmappedcell.ClearContainer();
+        m_cellsCache.InternalRemove( unmappedcell );
+      }
+    }
+
     internal static Row FromContainer( DependencyObject container )
     {
       if( container == null )
@@ -1316,17 +1436,14 @@ namespace Xceed.Wpf.DataGrid
     {
       Debug.Assert( ( row != null ) && ( exception != null ) );
 
-      // This method will set a validation error on the row and throw back a DataGridValidationException so that 
-      // the row stays in edition.
+      // This method will set a validation error on the row and throw back a DataGridValidationException so that the row stays in edition.
 
       if( exception is TargetInvocationException )
+      {
         exception = exception.InnerException;
+      }
 
-      row.SetValidationError( new RowValidationError(
-      Row.CustomRowValidationExceptionValidationRule,
-      row,
-      exception.Message,
-      exception ) );
+      row.SetValidationError( new RowValidationError( Row.CustomRowValidationExceptionValidationRule, row, exception.Message, exception ) );
 
       // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
       throw new DataGridValidationException( "An error occurred while attempting to end the edit process.", exception );
@@ -1337,9 +1454,9 @@ namespace Xceed.Wpf.DataGrid
       return ( ( row.CellEditorDisplayConditions & condition ) == condition );
     }
 
-    internal void PrepareCellsHost()
+    internal virtual object GetEditingDataContext()
     {
-      this.PrepareCellsHost( DataGridControl.GetDataGridContext( this ) );
+      return this.DataContext;
     }
 
     internal void ClearCellsHost()
@@ -1360,27 +1477,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    internal void SynchronizeCellsWithColumns( DataGridControl parentGrid, Dictionary<string, Cell> templateCells, bool onlyIfParentGridHasChanged )
-    {
-      if( ( !onlyIfParentGridHasChanged ) || ( parentGrid != m_parentGridUsedForCellsGeneration ) )
-      {
-        if( templateCells == null )
-        {
-          // Create a list of manually specified Cells in the Template. These will be 
-          // ignored by the Cell adding process.
-          templateCells = m_templateCells;
-        }
-
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext == null )
-          return;
-
-        this.GenerateMissingAndRemoveUnusedCells( dataGridContext, dataGridContext.Columns, templateCells );
-        m_parentGridUsedForCellsGeneration = parentGrid;
-      }
-    }
-
     internal void UpdateHasErrorFlags( Cell errorChangedCell )
     {
       System.Diagnostics.Debug.Assert( ( errorChangedCell == null ) || ( errorChangedCell.ParentRow == this ) );
@@ -1399,13 +1495,14 @@ namespace Xceed.Wpf.DataGrid
           rowHasValidationError = true;
 
           if( errorChangedCell.IsValidationErrorRestrictive )
+          {
             rowHasRestrictiveValidationError = true;
+          }
         }
 
         if( !rowHasRestrictiveValidationError )
         {
-          // Create a clone of the list to avoid concurrent access when iterating 
-          // and a Cell is added to CreatedCells because of ColumnVirtualization
+          // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
           List<Cell> createdCells = new List<Cell>( this.CreatedCells );
 
           foreach( Cell cell in createdCells )
@@ -1432,9 +1529,7 @@ namespace Xceed.Wpf.DataGrid
 
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
 
-      DataGridControl gridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
+      DataGridControl gridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
 
       if( gridControl != null )
       {
@@ -1464,76 +1559,92 @@ namespace Xceed.Wpf.DataGrid
       return ( ( this.EditTriggers & triggers ) == triggers );
     }
 
-    internal Cell ProvideCell( ColumnBase column )
+    internal Cell PrepareUnbindedCell( ColumnBase column, Cell cell )
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      bool isCurrentColumn = ( dataGridContext.CurrentColumn == column );
-      bool rowIsCurrent = this.IsCurrent;
+      if( column == null )
+        return cell;
 
-      Xceed.Wpf.DataGrid.Views.ViewBase view = dataGridContext.DataGridControl.GetView();
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+
+      if( dataGridContext == null )
+        return null;
+
+      //Generate a cell if it was not provided in xaml
+      if( cell == null )
+      {
+        cell = this.CreateCell( column );
+
+        // Make sure to add the cell to the VisualTree right away, so the binding engine works correctly when initializing the cell.
+        this.AddToVisualTree( cell );
+      }
+
+      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
+      cell.Initialize( dataGridContext, this, column );
+      cell.PrepareContainer( dataGridContext, this.DataContext );
+
+      //This is like doing a Measure/Arrange pass, in the sens that first time scrolling will be faster because the cell is ready to be displayed.
+      cell.ApplyTemplate();
+
+      //This is an out of view cell, it needs to be treated as such.  However, no need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
+      //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
+      cell.Visibility = Visibility.Collapsed;
+      cell.RemoveContentBinding();
+
+      return cell;
+    }
 
-      string fieldName = column.FieldName;
+    internal Cell ProvideCell( ColumnBase column )
+    {
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
       Cell cell = null;
 
+      // First verify if there is a corresponding Cell that has been explicitly positioned in the row template.
+      var fieldName = column.FieldName;
       if( fieldName != null )
       {
-        // Get the Cell from either the explicitly positioned cells of the row template
-        // or from the already created cells.
         m_templateCells.TryGetValue( fieldName, out cell );
       }
 
-      // We get the IVirtualizingCellsHost to be able to modify the LogicalParent if required
-      IVirtualizingCellsHost virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-
+      // If no template cell provided, create one and set it up.
       if( cell == null )
       {
         cell = this.CreateCell( column );
 
-        bool isNewDataContext;
-        Cell.AssignDataContext( cell, this.DataContext, this.UnboundDataItemContext, column, out isNewDataContext );
-
-        cell.Initialize( dataGridContext, this, column );
+        // Make sure to add the cell to the VisualTree right away, so the binding engine works correctly when initializing the cell.
+        this.AddToVisualTree( cell );
+      }
 
-        cell.PrepareDefaultStyleKey( view );
+      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
 
-        if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent ) )
-        {
-          virtualizingCellsHost.SetLogicalParent( cell );
-        }
-
-        //optimization so that lookup speed will be increased for the Cells
-        cell.SetValue( DataGridControl.DataGridContextPropertyKey, dataGridContext );
+      //The rest of the preparation of the cell must be done by the caller.
+      return cell;
+    }
 
-        if( ( rowIsCurrent ) && ( isCurrentColumn ) )
-        {
-          cell.SetIsCurrent( true );
-        }
+    internal void AddToVisualTree( Cell cell )
+    {
+      var virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
+      if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent ) )
+      {
+        virtualizingCellsHost.SetLogicalParent( cell );
+      }
+      else if( ( virtualizingCellsHost == null ) && ( m_cellsHostPanel != null ) )
+      {
+        m_cellsHostPanel.Children.Add( cell );
+      }
+    }
 
-        // We must update the Focusable status for the newly created cell since
-        // UpdateCellsFocusableStatus is only called in Row.OnApplyTemplate
-        this.UpdateCellFocusableStatus( cell );
+    internal void RemoveFromVisualTree( Cell cell )
+    {
+      IVirtualizingCellsHost virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
 
-        // The cell was just created, we must prepare it manually the first time
-        // since it is added by the PART_CellsHost and not directly put in it
-        // by the Row. Further PrepareContainer will be done when Row.PrepareContainer
-        // is called since it will be contained in Row.CreatedCells
-        cell.PrepareContainer( dataGridContext, this.DataContext );
+      if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent ) )
+      {
+        virtualizingCellsHost.ClearLogicalParent( cell );
       }
-      else
+      else if( ( virtualizingCellsHost == null ) && ( m_cellsHostPanel != null ) )
       {
-        if( virtualizingCellsHost == null )
-        {
-          cell.Initialize( dataGridContext, this, column );
-        }
-        else
-        {
-          Debug.Fail( "We do not want to return a template Cell since it already has a visual parent." );
-          // We do not want to return a template Cell since it already has a visual parent
-          cell = null;
-        }
+        m_cellsHostPanel.Children.Remove( cell );
       }
-
-      return cell;
     }
 
     internal void RefreshCellsDisplayedTemplate()
@@ -1568,9 +1679,6 @@ namespace Xceed.Wpf.DataGrid
 
       while( parent != null )
       {
-        if( parent is Views.FixedColumnSplitter )
-          break;
-
         // It is not necessary to go further than the Row.
         if( parent is Row )
           break;
@@ -1578,48 +1686,27 @@ namespace Xceed.Wpf.DataGrid
         parent = TreeHelper.GetParent( parent );
       }
 
-      return ( parent is Views.FixedColumnSplitter );
+      return false;
     }
 
-    private static bool IsPartOfCell( DependencyObject element )
+    private static IDisposable DeferCollectionViewRefresh( DataGridContext dataGridContext )
     {
-      bool retval = false;
-
-      DependencyObject parent = element;
-
-      while( ( parent is Row ) == false )
-      {
-        parent = TreeHelper.GetParent( parent );
-
-        //if the parent is null, then the item "clicked" is floating... let's consider it as a cell, so that 
-        //no specific actions are taken
-        if( parent == null )
-        {
-          retval = true;
-          break;
-        }
-
-        if( parent is Cell )
-        {
-          retval = true;
-          break;
-        }
-      }
+      if( dataGridContext == null )
+        return null;
 
-      return retval;
+      return dataGridContext.Items.DeferRefresh();
     }
 
-    private void PrepareCellsHost( DataGridContext dataGridContext )
+    private void PrepareVirtualizingCellsHost( DataGridContext dataGridContext, IVirtualizingCellsHost virtualizingCellsHost )
     {
-      var cellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-      if( ( cellsHost == null ) || ( dataGridContext == null ) )
+      if( dataGridContext == null )
         return;
 
       // Ensure to register to the TableViewColumnVirtualizationManager
-      cellsHost.PrepareCellsHost( dataGridContext );
+      virtualizingCellsHost.PrepareCellsHost( dataGridContext );
 
       // We force an InvalidateMeasure on the CellsHost to be sure the visible Cells are the good ones
-      cellsHost.InvalidateCellsHostMeasure();
+      virtualizingCellsHost.InvalidateCellsHostMeasure();
     }
 
     private void UpdateMatchingDisplayConditions()
@@ -1769,10 +1856,9 @@ namespace Xceed.Wpf.DataGrid
 
     private void UpdateCellsFocusableStatus()
     {
-      //cycle through all cells and 
+      //cycle through cells in view or those that are permanent (binded cells).
       foreach( Cell cell in this.CreatedCells )
       {
-
         //force an update of the NavigationBehavior characteristics
         this.UpdateCellFocusableStatus( cell );
       }
@@ -1783,9 +1869,7 @@ namespace Xceed.Wpf.DataGrid
       if( cell == null )
         return;
 
-      bool cellFocusable = true;
-
-      ColumnBase parentColumn = cell.ParentColumn;
+      var cellFocusable = true;
 
       if( !this.IsBeingEdited )
       {
@@ -1829,7 +1913,9 @@ namespace Xceed.Wpf.DataGrid
         var currentRowInEditionCellState = parentColumn.CurrentRowInEditionCellState;
 
         if( currentRowInEditionCellState != null )
+        {
           cachedCellStates.Add( parentColumn, currentRowInEditionCellState.Clone() );
+        }
       }
 
       try
@@ -1858,52 +1944,37 @@ namespace Xceed.Wpf.DataGrid
           CellState cachedCellState;
 
           if( cachedCellStates.TryGetValue( parentColumn, out cachedCellState ) )
+          {
             parentColumn.CurrentRowInEditionCellState = cachedCellState;
+          }
 
           cell.RestoreEditionState( currentColumn );
         }
       }
     }
 
-    private void PutCellsInVisualTree( Dictionary<string, Cell> templateCells )
+    private void PrepareNonVirtualizingCellsHost()
     {
-      if( m_cellsCache == null )
-      {
-        Debug.Fail( "PutCellsInVisualTree was called on a Row that is not a DataGridControl's descendant or whose DataGridControl ancestor has a null VisibleColumns property." );
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( dataGridContext == null )
         return;
-      }
 
       if( m_cellsHostPanel == null )
-      {
-        Debug.Fail( "PutCellsInVisualTree was called on a Row that doesn't have a Panel identified as the CellsHost in its VisualTree." );
-        return;
-      }
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
         return;
 
-      object dataItem = this.DataContext;
+      var cellsHostCollection = m_cellsHostPanel.Children;
 
-      // fill the cellsHostPanel in visible order.
-      foreach( ColumnBase column in this.GetColumnsByVisiblePosition( dataGridContext ) )
+      // Fill the cellsHostPanel in visible order.
+      foreach( var column in this.GetColumnsByVisiblePosition( dataGridContext ) )
       {
-        Cell cell = m_cellsCache[ column ];
+        //Cells will be created (if non-existing, via Row.ProvideCell()), initialized, and prepared through this call, including template cells.
+        var cell = m_cellsCache[ column ];
 
-        if( cell == null )
+        // An existing cell may not be in the VisualTree anymore, since m_cellsHostPanel.Children was just cleared in calling method.
+        if( !cellsHostCollection.Contains( cell ) && ( ( cell.FieldName == null ) || !m_templateCells.ContainsKey( cell.FieldName ) ) )
         {
-          //This situation is now a proof that something is awfully wrong since the VirtualizingCellCollection will create a cell if none is present.
-          throw new DataGridInternalException( "No cell found or created for " + column.FieldName + " column.", dataGridContext.DataGridControl );
+          cellsHostCollection.Add( cell );
         }
-
-        // We don't add a cell specifically (manually) positioned in the row template.
-        if( cell.FieldName == null || !templateCells.ContainsKey( cell.FieldName ) )
-        {
-          m_cellsHostPanel.Children.Add( cell );
-        }
-
-        // When explicitly put in the PART_CellsHost, we must call Cell.PrepareContainer
-        cell.PrepareContainer( dataGridContext, dataItem );
       }
     }
 
@@ -1983,12 +2054,46 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    protected virtual void GenerateMissingAndRemoveUnusedCells( DataGridContext dataGridContext, ColumnCollection columns, Dictionary<string, Cell> templateCells )
+    private void RemovePreviousTemplateCells()
+    {
+      List<Cell> removeList = new List<Cell>();
+
+      //cycle through all the cells, and if any of them have the attached property identifying them as Fixed Template Cells, then clear their FieldName property
+      foreach( Cell cell in this.CreatedCells )
+      {
+        if( Row.GetIsTemplateCell( cell ) )
+        {
+          removeList.Add( cell );
+        }
+      }
+
+      foreach( Cell removedCell in removeList )
+      {
+        removedCell.ClearContainer();
+        m_cellsCache.InternalRemove( removedCell );
+      }
+    }
+
+    private void SynchronizeCellsWithColumns( DataGridControl parentGrid, Dictionary<string, Cell> templateCells, bool onlyIfParentGridHasChanged )
+    {
+      if( ( !onlyIfParentGridHasChanged ) || ( parentGrid != m_parentGridUsedForCellsGeneration ) )
+      {
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
+
+        if( dataGridContext == null )
+          return;
+
+        this.GenerateMissingAndRemoveUnusedCells( dataGridContext, dataGridContext.Columns, templateCells );
+        m_parentGridUsedForCellsGeneration = parentGrid;
+      }
+    }
+
+    private void GenerateMissingAndRemoveUnusedCells( DataGridContext dataGridContext, ColumnCollection columns, Dictionary<string, Cell> templateCells )
     {
       Hashtable cellsDictionary = new Hashtable();
 
       //Take each and every cells already created and place them in a dictionary.
-      //This dictionary is gonna be used to manage cells that need to be removed at the end of the method's body.
+      //This dictionary will be used to manage cells that need to be removed at the end of the method's body.
       foreach( Cell cell in this.CreatedCells )
       {
         cellsDictionary.Add( cell.FieldName, cell );
@@ -2007,18 +2112,9 @@ namespace Xceed.Wpf.DataGrid
         //Try to get the Template Cell defined for this column
         templateCells.TryGetValue( fieldName, out cell );
 
-        //The cell has been found in the template cells.
+        //The cell has been found in the template cells, simply prepare it, no need to add it to the VirtualizingCellCollection
         if( cell != null )
         {
-          //A cell for this Column has been found in the Template cells, get rid of the corresponding Cell in the Cells collection (if any)
-          Cell oldCell;
-          if( m_cellsCache.TryGetCell( column, false, out oldCell ) )
-          {
-            //If an oldCell was present, clear it and remove it from the Cells collection
-            oldCell.ClearContainer();
-            m_cellsCache.InternalRemove( oldCell );
-          }
-
           cell.Initialize( dataGridContext, this, column );
 
           // Ensure to prepare a Cell if it is not prepared or virtualized
@@ -2027,9 +2123,6 @@ namespace Xceed.Wpf.DataGrid
             cell.PrepareContainer( dataGridContext, this.DataContext );
           }
 
-          //then add the Template cell to the Cells collection.
-          m_cellsCache.InternalAdd( cell );
-
           //finally, if the Row is current and the column in question is current, set the Currency state on the template cell.
           if( ( rowIsCurrent ) && ( column == currentColumn ) )
           {
@@ -2039,13 +2132,13 @@ namespace Xceed.Wpf.DataGrid
         //The cell is not part of the Template Cells... But it still needs some work to be done.
         else
         {
-          if( !m_cellsCache.TryGetCell( column, out cell ) )
+          if( !m_cellsCache.TryGetBindedCell( column, out cell ) )
           {
             cell = null;
           }
         }
 
-        //the Cell is a Template Cell OR is already present in the Row
+        //the cell is a template cell OR is already present in the Row
         if( cell != null )
         {
           //To ensure that the DefaultStyleKey is set appropriatly
@@ -2064,28 +2157,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void PreparePreviousTemplateCells()
-    {
-      List<Cell> removeList = new List<Cell>();
-
-      //cycle through all the cells, and if any of them have the 
-      //attached property identifying them as Fixed Template Cells, 
-      // then clear their FieldName property
-      foreach( Cell cell in this.CreatedCells )
-      {
-        if( Row.GetIsTemplateCell( cell ) )
-        {
-          removeList.Add( cell );
-        }
-      }
-
-      foreach( Cell removedCell in removeList )
-      {
-        removedCell.ClearContainer();
-        m_cellsCache.InternalRemove( removedCell );
-      }
-    }
-
     #region EDITION
 
     public static readonly RoutedEvent EditBeginningEvent = EventManager.RegisterRoutedEvent( "EditBeginning", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Row ) );
@@ -2254,7 +2325,7 @@ namespace Xceed.Wpf.DataGrid
         // This call will also validate that we're not starting a second row edition. It will also save the row state and update the columns' CurrentRowInEditionCellState.
         if( gridControl != null )
         {
-          gridControl.UpdateCurrentRowInEditionCellStates( this, this.DataContext );
+          gridControl.UpdateCurrentRowInEditionCellStates( this, this.GetEditingDataContext() );
         }
 
         this.SetIsBeingEdited( true );
@@ -2316,14 +2387,15 @@ namespace Xceed.Wpf.DataGrid
             currentCell = m_cellsCache[ dataGridContext.VisibleColumns[ firstEditableColumn ] ];
 
             if( currentCell != null )
+            {
               currentCell.BeginEdit();
+            }
           }
         }
       }
       catch( DataGridException )
       {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
+        // We swallow exception if it occurs because of a validation error or Cell was read-only or any other GridException.
       }
     }
 
@@ -2376,7 +2448,7 @@ namespace Xceed.Wpf.DataGrid
       if( this.IsCancelingEdition )
         throw new InvalidOperationException( "An attempt was made to end the edit process while it is being canceled." );
 
-      CancelRoutedEventArgs e = new CancelRoutedEventArgs( Row.EditEndingEvent, this );
+      var e = new CancelRoutedEventArgs( Row.EditEndingEvent, this );
 
       try
       {
@@ -2387,8 +2459,7 @@ namespace Xceed.Wpf.DataGrid
       }
       catch( Exception exception )
       {
-        // This method will set a validation error on the row and throw back a DataGridValidationException so that 
-        // the row stays in edition.
+        // This method will set a validation error on the row and throw back a DataGridValidationException so that  the row stays in edition.
         Row.SetRowValidationErrorOnException( this, exception );
       }
 
@@ -2396,17 +2467,15 @@ namespace Xceed.Wpf.DataGrid
 
       try
       {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
         if( dataGridContext == null )
         {
           Debug.Fail( "DataGridContext cannot be null." );
           return;
         }
 
-        IDisposable deferRefresh = ( ( this is DataRow )
-          && ( dataGridContext.ItemsSourceCollection is DataGridCollectionViewBase ) )
-          ? DataRow.DeferCollectionViewRefresh( dataGridContext ) : null;
+        var dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
+        var deferRefresh = ( ( dataGridCollectionViewBase != null ) ) ? Row.DeferCollectionViewRefresh( dataGridContext ) : null;
 
         try
         {
@@ -2417,11 +2486,9 @@ namespace Xceed.Wpf.DataGrid
         {
           if( deferRefresh != null )
           {
-            // If there is a validation error, The Dispose of the deferRefresh
-            // may clear (local value) the current error. Be sure to keep it in order
-            // to restore it if needed.
-            object hasValidationError = this.ReadLocalValue( Row.HasValidationErrorProperty );
-            object validationError = this.ReadLocalValue( Row.ValidationErrorProperty );
+            // If there is a validation error, deferRefresh.Dispose() may clear the current error. Be sure to keep it in order to restore it if needed.
+            var hasValidationError = this.ReadLocalValue( Row.HasValidationErrorProperty );
+            var validationError = this.ReadLocalValue( Row.ValidationErrorProperty );
 
             deferRefresh.Dispose();
 
@@ -2430,6 +2497,7 @@ namespace Xceed.Wpf.DataGrid
               // This will use the PropertyKey.
               this.SetHasValidationError( ( bool )hasValidationError );
             }
+
             if( validationError != DependencyProperty.UnsetValue )
             {
               this.SetValidationError( ( RowValidationError )validationError );
@@ -2439,9 +2507,8 @@ namespace Xceed.Wpf.DataGrid
 
         this.PreEditEnded();
 
-        // Item validation has passed if we reached this far.  
-        // Since it is the Row's HasValidationError which drives the error styles, setting 
-        // the ItemValidationError to null will not get in the way of the row's cells validation.
+        // Item validation has passed if we reached this far. Since it is the Row's HasValidationError which drives the error styles,
+        // setting the ItemValidationError to null will not get in the way of the row's cells validation.
         this.SetValidationError( null );
 
       }
@@ -2465,7 +2532,6 @@ namespace Xceed.Wpf.DataGrid
       foreach( Cell cell in this.CreatedCells )
       {
         cell.SetIsDirty( false );
-        cell.SetIsDirtyFromInitializingInsertionRow( false );
       }
 
       this.SetIsDirty( false );
@@ -2497,18 +2563,19 @@ namespace Xceed.Wpf.DataGrid
     {
       bool hasRestrictiveError = false;
 
-      // Create a clone of the list to avoid concurrent access when iterating 
-      // and a Cell is added to CreatedCells because of ColumnVirtualization
-      List<Cell> createdCells = new List<Cell>();
+      // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
+      var createdCells = new List<Cell>();
 
       Cell editCell = null;
 
-      foreach( Cell cell in this.CreatedCells )
+      foreach( var cell in this.CreatedCells )
       {
         createdCells.Add( cell );
 
         if( cell.IsBeingEdited )
+        {
           editCell = cell;
+        }
       }
 
       if( editCell != null )
@@ -2529,20 +2596,18 @@ namespace Xceed.Wpf.DataGrid
         if( cell == editCell )
           continue;
 
-        Nullable<DataGridUpdateSourceTrigger> contentBindingUpdateSourceTrigger = cell.GetContentBindingUpdateSourceTrigger();
-
-        bool updateContentBindingSource = ( contentBindingUpdateSourceTrigger == DataGridUpdateSourceTrigger.RowEndingEdit );
-
-        bool cascadeValidate = updateContentBindingSource;
-
+        var contentBindingUpdateSourceTrigger = cell.GetContentBindingUpdateSourceTrigger();
+        var updateContentBindingSource = ( contentBindingUpdateSourceTrigger == DataGridUpdateSourceTrigger.RowEndingEdit );
+        var cascadeValidate = updateContentBindingSource;
         Exception exception;
         CellValidationRule ruleInError;
 
-        ValidationResult result =
-          cell.ValidateAndSetAllErrors( true, true, updateContentBindingSource, cascadeValidate, out exception, out ruleInError );
+        var result = cell.ValidateAndSetAllErrors( true, true, updateContentBindingSource, cascadeValidate, out exception, out ruleInError );
 
         if( ( !result.IsValid ) && ( Cell.GetIsRuleInErrorRestrictive( ruleInError ) ) )
+        {
           hasRestrictiveError = true;
+        }
       }
 
       // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
@@ -2615,9 +2680,8 @@ namespace Xceed.Wpf.DataGrid
 
         if( dataGridContext != null )
         {
-          deferRefresh = ( ( this is DataRow )
-            && ( dataGridContext.ItemsSourceCollection is DataGridCollectionViewBase ) )
-            ? DataRow.DeferCollectionViewRefresh( dataGridContext ) : null;
+          deferRefresh = ( ( this is DataRow )  || ( dataGridContext.ItemsSourceCollection is DataGridCollectionViewBase ) )
+                         ? DataRow.DeferCollectionViewRefresh( dataGridContext ) : null;
         }
 
         try
@@ -2635,9 +2699,8 @@ namespace Xceed.Wpf.DataGrid
 
         this.PreEditCanceled();
 
-        // A row cannot have an ItemValidationError when not being edited.
-        // Since it is the Row's HasValidationError which drives the error styles, setting 
-        // the ItemValidationError to null will not get in the way of the row's cells validation.
+        // A row cannot have an ItemValidationError when not being edited. Since it is the Row's HasValidationError which drives the error styles,
+        // setting the ItemValidationError to null will not get in the way of the row's cells validation.
         this.SetValidationError( null );
 
       }
@@ -2683,16 +2746,18 @@ namespace Xceed.Wpf.DataGrid
     protected virtual void CancelEditCore()
     {
       // Restore the Cell.Content
-      foreach( Cell cell in this.CreatedCells )
+      foreach( var cell in this.CreatedCells )
       {
         if( cell.IsBeingEdited )
+        {
           cell.CancelEdit();
+        }
 
         cell.RevertEditedValue();
       }
 
 #if DEBUG
-      foreach( Cell cell in this.CreatedCells )
+      foreach( var cell in this.CreatedCells )
       {
         Debug.Assert( Cell.GetIsValidationErrorRestrictive( cell.ValidationError ) == false );
       }
@@ -2854,8 +2919,34 @@ namespace Xceed.Wpf.DataGrid
 
     #region IDataGridItemContainer Members
 
+    bool IDataGridItemContainer.CanBeRecycled
+    {
+      get
+      {
+        return this.CanBeRecycled;
+      }
+    }
+
+    bool IDataGridItemContainer.IsRecyclingCandidate
+    {
+      get
+      {
+        return m_isRecyclingCandidate;
+      }
+      set
+      {
+        m_isRecyclingCandidate = value;
+      }
+    }
+
     void IDataGridItemContainer.PrepareContainer( DataGridContext dataGridContext, object item )
     {
+      if( m_isRecyclingCandidate )
+      {
+        this.IsContainerPrepared = false;
+        m_isRecyclingCandidate = false;
+      }
+
       if( this.IsContainerPrepared )
         Debug.Fail( "A Row can't be prepared twice, it must be cleaned before PrepareContainer is called again" );
 
@@ -2863,18 +2954,97 @@ namespace Xceed.Wpf.DataGrid
     }
 
     void IDataGridItemContainer.ClearContainer()
+    {
+      if( m_isRecyclingCandidate )
+      {
+        this.PartialClearContainer();
+        return;
+      }
+
+      this.ClearContainer();
+    }
+
+    void IDataGridItemContainer.CleanRecyclingCandidate()
     {
       this.ClearContainer();
     }
 
     #endregion
 
-    #region Private Fields
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged( string propertyName )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    #endregion
+
+    #region IWeakEventListener Members
+
+    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return this.OnReceiveWeakEvent( managerType, sender, e );
+    }
+
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      return false;
+    }
+
+    #endregion
 
     private DataGridControl m_parentGridUsedForCellsGeneration; // = null
     private Panel m_cellsHostPanel; // = null
     private Dictionary<string, Cell> m_templateCells = new Dictionary<string, Cell>();
+    private List<RegionPresenterConfig> m_oldRegionPresenterConfigs; // = null
     private BitVector32 m_flags = new BitVector32();
+    private bool m_isRecyclingCandidate;
+
+    #region RegionPresenterConfig Private Class
+
+    private sealed class RegionPresenterConfig
+    {
+      public Nullable<bool> ReadOnly
+      {
+        get;
+        set;
+      }
+
+      public Nullable<bool> ShowCellTitles
+      {
+        get;
+        set;
+      }
+
+      public Nullable<Stretch> ImageStretch
+      {
+        get;
+        set;
+      }
+
+      public Nullable<StretchDirection> ImageStretchDirection
+      {
+        get;
+        set;
+      }
+
+      public List<string> FieldNameList
+      {
+        get
+        {
+          return m_fieldNameList;
+        }
+      }
+
+      private List<string> m_fieldNameList = new List<string>();
+    }
 
     #endregion
 
@@ -2890,7 +3060,6 @@ namespace Xceed.Wpf.DataGrid
       IsBeingEditedCache = 16,
       IsClearingContainer = 32,
       IsContainerPrepared = 64,
-      IsInitializingInsertionRow = 128,
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
index 774ceee3..4c6ce82e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
@@ -33,8 +33,7 @@ namespace Xceed.Wpf.DataGrid
       RowSelector.IsPressedProperty = RowSelector.IsPressedPropertyKey.DependencyProperty;
       RowSelector.RowTypeProperty = RowSelector.RowTypePropertyKey.DependencyProperty;
 
-      FocusableProperty.OverrideMetadata( typeof( RowSelector ),
-        new FrameworkPropertyMetadata( false ) );
+      UIElement.FocusableProperty.OverrideMetadata( typeof( RowSelector ), new FrameworkPropertyMetadata( false ) );
 
       DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( RowSelector ),
         new FrameworkPropertyMetadata( new PropertyChangedCallback( RowSelector.OnParentGridControlChanged ) ) );
@@ -72,9 +71,7 @@ namespace Xceed.Wpf.DataGrid
 
       m_sAllowResizeBinding = new Binding();
       m_sAllowResizeBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      m_sAllowResizeBinding.Path = new PropertyPath( "(0).(1)",
-        DataGridControl.DataGridContextProperty,
-        TableView.AllowRowResizeProperty );
+      m_sAllowResizeBinding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AllowRowResizeProperty );
 
       m_sAllowResizeBinding.Mode = BindingMode.OneWay;
     }
@@ -157,7 +154,9 @@ namespace Xceed.Wpf.DataGrid
     private void NotifyPropertyChanged( string propertyName )
     {
       if( this.PropertyChanged != null )
+      {
         this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+      }
     }
 
     #endregion
@@ -197,7 +196,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private void SetIsPressed( bool value )
+    internal void SetIsPressed( bool value )
     {
       this.SetValue( RowSelector.IsPressedPropertyKey, value );
     }
@@ -206,7 +205,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region IsCurrent
 
-    public static readonly DependencyProperty IsCurrentProperty = DependencyProperty.Register( "IsCurrent", typeof( bool ), typeof( RowSelector ), new FrameworkPropertyMetadata( false ) );
+    public static readonly DependencyProperty IsCurrentProperty = DependencyProperty.Register(
+      "IsCurrent",
+      typeof( bool ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( false ) );
 
     public bool IsCurrent
     {
@@ -220,7 +223,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region IsBeingEdited
 
-    public static readonly DependencyProperty IsBeingEditedProperty = DependencyProperty.Register( "IsBeingEdited", typeof( bool ), typeof( RowSelector ), new FrameworkPropertyMetadata( false ) );
+    public static readonly DependencyProperty IsBeingEditedProperty = DependencyProperty.Register(
+      "IsBeingEdited",
+      typeof( bool ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( false ) );
 
     public bool IsBeingEdited
     {
@@ -248,7 +255,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region HasValidationError
 
-    public static readonly DependencyProperty HasValidationErrorProperty = DependencyProperty.Register( "HasValidationError", typeof( bool ), typeof( RowSelector ), new FrameworkPropertyMetadata( false ) );
+    public static readonly DependencyProperty HasValidationErrorProperty = DependencyProperty.Register(
+      "HasValidationError",
+      typeof( bool ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( false ) );
 
     public bool HasValidationError
     {
@@ -262,9 +273,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region RowType
 
-    private static readonly DependencyPropertyKey RowTypePropertyKey
-        = DependencyProperty.RegisterReadOnly( "RowType", typeof( Type ), typeof( RowSelector ),
-            new FrameworkPropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey RowTypePropertyKey = DependencyProperty.RegisterReadOnly(
+      "RowType",
+      typeof( Type ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( null ) );
 
     public static readonly DependencyProperty RowTypeProperty;
 
@@ -285,9 +298,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region ContainerRect
 
-    public static readonly DependencyProperty ContainerRectProperty =
-        DependencyProperty.Register( "ContainerRect", typeof( Rect ), typeof( RowSelector ),
-            new FrameworkPropertyMetadata( null ) );
+    public static readonly DependencyProperty ContainerRectProperty = DependencyProperty.Register(
+      "ContainerRect",
+      typeof( Rect ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( null ) );
 
     public Rect ContainerRect
     {
@@ -305,9 +320,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region Visible Attached Property
 
-    public static readonly DependencyProperty VisibleProperty =
-        DependencyProperty.RegisterAttached( "Visible", typeof( bool ), typeof( RowSelector ),
-            new FrameworkPropertyMetadata( true ) );
+    public static readonly DependencyProperty VisibleProperty = DependencyProperty.RegisterAttached(
+      "Visible",
+      typeof( bool ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( true ) );
 
     public static bool GetVisible( DependencyObject d )
     {
@@ -323,9 +340,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region RowSelectorStyle Attached Property
 
-    public static readonly DependencyProperty RowSelectorStyleProperty =
-        DependencyProperty.RegisterAttached( "RowSelectorStyle", typeof( Style ), typeof( RowSelector ),
-            new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnRowSelectorStyleChanged ) ) );
+    public static readonly DependencyProperty RowSelectorStyleProperty = DependencyProperty.RegisterAttached(
+      "RowSelectorStyle",
+      typeof( Style ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnRowSelectorStyleChanged ) ) );
 
     public static Style GetRowSelectorStyle( DependencyObject obj )
     {
@@ -361,9 +380,11 @@ namespace Xceed.Wpf.DataGrid
 
     #region ReferenceElement Internal Property
 
-    internal static readonly DependencyProperty ReferenceElementProperty =
-        DependencyProperty.Register( "ReferenceElement", typeof( FrameworkElement ), typeof( RowSelector ),
-            new FrameworkPropertyMetadata( null ) );
+    internal static readonly DependencyProperty ReferenceElementProperty = DependencyProperty.Register(
+      "ReferenceElement",
+      typeof( FrameworkElement ),
+      typeof( RowSelector ),
+      new FrameworkPropertyMetadata( null ) );
 
     internal FrameworkElement ReferenceElement
     {
@@ -471,9 +492,7 @@ namespace Xceed.Wpf.DataGrid
         return;
 
       // Resets the row width or height depending on the orientation.
-      DependencyProperty property = ( this.Orientation == Orientation.Vertical )
-        ? FrameworkElement.HeightProperty
-        : FrameworkElement.WidthProperty;
+      DependencyProperty property = ( this.Orientation == Orientation.Vertical ) ? FrameworkElement.HeightProperty : FrameworkElement.WidthProperty;
 
       rowItem.ClearValue( property );
     }
@@ -500,9 +519,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( e.Cursor == null )
         {
-          e.Cursor = ( this.Orientation == Orientation.Vertical )
-            ? TableView.DefaultRowSelectorResizeNorthSouthCursor
-            : TableView.DefaultRowSelectorResizeWestEastCursor;
+          e.Cursor = ( this.Orientation == Orientation.Vertical ) ? TableView.DefaultRowSelectorResizeNorthSouthCursor : TableView.DefaultRowSelectorResizeWestEastCursor;
         }
       }
 
@@ -619,7 +636,7 @@ namespace Xceed.Wpf.DataGrid
 
     protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
     {
-      m_IsFromMouseButtonDown = true;
+      m_isFromMouseButtonDown = true;
 
       if( this.CaptureMouse() )
       {
@@ -664,7 +681,7 @@ namespace Xceed.Wpf.DataGrid
 
       base.OnMouseLeftButtonDown( e );
 
-      m_IsFromMouseButtonDown = false;
+      m_isFromMouseButtonDown = false;
     }
 
     protected override void OnMouseMove( MouseEventArgs e )
@@ -689,7 +706,7 @@ namespace Xceed.Wpf.DataGrid
       if( dataGridContext != null )
       {
         //Do not start the drag operation until we have an actual mouse mouve.
-        if( doDrag && !m_IsFromMouseButtonDown )
+        if( doDrag && !m_isFromMouseButtonDown )
         {
           dataGridContext.DataGridControl.DoDrag( e );
         }
@@ -727,7 +744,7 @@ namespace Xceed.Wpf.DataGrid
       base.OnLostMouseCapture( e );
     }
 
-    private bool m_IsFromMouseButtonDown = false;
+    private bool m_isFromMouseButtonDown = false;
 
     #endregion Button Behavior Code
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
index 2274ea15..e57d9bec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
@@ -117,9 +117,21 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
+      // The call to Mouse.Synchronize must not start dragging rows.
+      // Update the mouse status to make sure no container has invalid mouse over status.
+      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
       if( this.IsMouseOver )
       {
-        Mouse.Synchronize();
+        var dataGridContext = DataGridControl.GetDataGridContext( this );
+        var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
+
+        if( dataGridControl != null )
+        {
+          using( dataGridControl.InhibitDrag() )
+          {
+            Mouse.Synchronize();
+          }
+        }
       }
 
       return finalSize;
@@ -493,6 +505,7 @@ namespace Xceed.Wpf.DataGrid
       {
         this.Focusable = false;
         this.OverridesDefaultStyle = true;
+
         this.Child = new RowSelector();
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
index 60f021b3..4f67d28b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
@@ -15,20 +15,13 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Windows;
-using System.Windows.Data;
-using System.Collections;
+using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using Xceed.Utils.Wpf;
-using System.Windows.Input;
-using System.Diagnostics;
-using System.ComponentModel;
+using System.Windows.Data;
 using Xceed.Wpf.DataGrid.Views;
-using System.Collections.Specialized;
-using System.Windows.Media;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -251,14 +244,14 @@ namespace Xceed.Wpf.DataGrid
 
       if( scrollTip.m_mainColumn != null )
       {
-        PropertyChangedEventManager.RemoveListener( scrollTip.m_mainColumn, scrollTip, "DisplayMemberBinding" );
+        PropertyChangedEventManager.RemoveListener( scrollTip.m_mainColumn, scrollTip, Column.DisplayMemberBindingPropertyName );
       }
 
       scrollTip.m_mainColumn = null;
 
       if( oldItemContext != null )
       {
-        PropertyChangedEventManager.RemoveListener( oldItemContext.Columns, scrollTip, "MainColumn" );
+        PropertyChangedEventManager.RemoveListener( oldItemContext.Columns, scrollTip, ColumnCollection.MainColumnPropertyName );
       }
 
       scrollTip.ClearValue( ScrollTip.ContentProperty );
@@ -269,10 +262,10 @@ namespace Xceed.Wpf.DataGrid
 
         if( scrollTip.m_mainColumn != null )
         {
-          PropertyChangedEventManager.AddListener( scrollTip.m_mainColumn, scrollTip, "DisplayMemberBinding" );
+          PropertyChangedEventManager.AddListener( scrollTip.m_mainColumn, scrollTip, Column.DisplayMemberBindingPropertyName );
         }
 
-        PropertyChangedEventManager.AddListener( newItemContext.Columns, scrollTip, "MainColumn" );
+        PropertyChangedEventManager.AddListener( newItemContext.Columns, scrollTip, ColumnCollection.MainColumnPropertyName );
       }
 
       if( !scrollTip.IsInParentGridChanged )
@@ -510,20 +503,18 @@ namespace Xceed.Wpf.DataGrid
     {
       const int MaxItemToVisit = 100;
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
       if( dataGridContext == null )
         return;
 
-      DataGridControl parentGridControl = dataGridContext.DataGridControl;
-
+      var parentGridControl = dataGridContext.DataGridControl;
       if( parentGridControl == null )
         return;
 
       if( scrollBar.Orientation != m_itemsScrollingOrientation )
         return;
 
-      double maxOffset = 0;
+      var maxOffset = 0d;
 
       if( scrollBar.Orientation == Orientation.Vertical )
       {
@@ -534,10 +525,11 @@ namespace Xceed.Wpf.DataGrid
         maxOffset = parentGridControl.ScrollViewer.ExtentWidth;
       }
 
-      double offset = scrollBar.Track.Value;
+      var offset = scrollBar.Track.Value;
 
-      int itemMaxOffset = 0;
-      int itemOffset = 0;
+      var itemMaxOffset = 0;
+      var itemOffset = 0;
+      var itemHiddenRatio = 0d;
 
       if( this.IsPixelScrolling )
       {
@@ -547,7 +539,9 @@ namespace Xceed.Wpf.DataGrid
 
         if( ( maxOffset > 0 ) && ( itemsCount > 0 ) )
         {
-          itemOffset = ( int )( offset / ( maxOffset / itemsCount ) );
+          var position = offset / ( maxOffset / itemsCount );
+          itemOffset = ( int )position;
+          itemHiddenRatio = position - itemOffset;
         }
         else
         {
@@ -558,25 +552,24 @@ namespace Xceed.Wpf.DataGrid
       {
         itemMaxOffset = ( int )maxOffset;
         itemOffset = ( int )offset;
+        itemHiddenRatio = offset - itemOffset;
       }
 
-      object newValue = null;
-      DataGridContext itemContext = null;
+      object newValue;
+      DataGridContext itemContext;
 
       // If data is grouped, we do not want to keep the next data item if a HeaderFooterItem
       // is the current item returned. So we increment the scroll up to the next item in order
       // to get the real item that will be visible when the user will release the mouse
-      ItemContextVisitor visitor = new ItemContextVisitor( parentGridControl.ItemsHost is TableflowViewItemsHost );
-      int endOffset = Math.Min( itemOffset + MaxItemToVisit, itemMaxOffset );
+      var visitor = new ItemContextVisitor( parentGridControl.ItemsHost as TableflowViewItemsHost, itemHiddenRatio );
+      var endOffset = Math.Min( itemOffset + MaxItemToVisit, itemMaxOffset );
       bool visitWasStopped;
       ( ( IDataGridContextVisitable )parentGridControl.DataGridContext ).AcceptVisitor( itemOffset, endOffset, visitor, DataGridContextVisitorType.Items, out visitWasStopped );
 
-      object tempValue = visitor.Item;
-
       if( visitor.VisitSuccessful )
       {
-        newValue = tempValue;
         itemContext = visitor.ParentDataGridContext;
+        newValue = visitor.Item;
       }
       else
       {
@@ -588,40 +581,11 @@ namespace Xceed.Wpf.DataGrid
 
       // The TippedItemDataGridContext PropertChanged callback will take care of refreshing the ScrollTip CellContentTemplate.
       if( itemContext != DataGridControl.GetDataGridContext( this ) )
-        DataGridControl.SetDataGridContext( this, itemContext );
-
-      if( this.Content != newValue )
-        this.Content = newValue;
-    }
-
-    internal static bool IsItemInView( UIElement item, UIElement itemsHost )
-    {
-      GeneralTransform childTransform = item.TransformToAncestor( itemsHost );
-      Rect rectangle = childTransform.TransformBounds( new Rect( new Point( 0, 0 ), item.RenderSize ) );
-
-      //Check if the elements Rect intersects with that of the scrollviewer's
-      Rect result = Rect.Intersect( new Rect( new Point( 0, 0 ), itemsHost.RenderSize ), rectangle );
-
-      //if result is Empty then the element is not in view
-      return ( result != Rect.Empty );
-    }
-
-    internal static bool IsDataItemHiddenBySticky( DataGridContext dataGridContext, object tempValue )
-    {
-      // We only want to do special handling for a TableflowItemsHost.
-      TableflowViewItemsHost itemsHost = dataGridContext.DataGridControl.ItemsHost as TableflowViewItemsHost;
-
-      if( itemsHost == null )
-        return false;
-
-      int index = dataGridContext.CustomItemContainerGenerator.FindIndexForItem( tempValue, dataGridContext );
-
-      if( index > -1 )
       {
-        return itemsHost.IsDataItemHiddenBySticky( index );
+        DataGridControl.SetDataGridContext( this, itemContext );
       }
 
-      return false;
+      this.Content = newValue;
     }
 
     #endregion
@@ -635,27 +599,24 @@ namespace Xceed.Wpf.DataGrid
 
     protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      bool handled = false;
-
-      DataGridContext itemContext = DataGridControl.GetDataGridContext( this );
-
-      if( itemContext == null )
-        return handled;
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
+      if( dataGridContext == null )
+        return true;
 
       if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        if( itemContext.Columns == sender )
+        if( dataGridContext.Columns == sender )
         {
           if( m_mainColumn != null )
           {
-            PropertyChangedEventManager.RemoveListener( m_mainColumn, this, "DisplayMemberBinding" );
+            PropertyChangedEventManager.RemoveListener( m_mainColumn, this, Column.DisplayMemberBindingPropertyName );
           }
 
-          m_mainColumn = itemContext.Columns.MainColumn;
+          m_mainColumn = dataGridContext.Columns.MainColumn;
 
           if( m_mainColumn != null )
           {
-            PropertyChangedEventManager.AddListener( m_mainColumn, this, "DisplayMemberBinding" );
+            PropertyChangedEventManager.AddListener( m_mainColumn, this, Column.DisplayMemberBindingPropertyName );
           }
 
           // If a defaut template was created for the previous MainColumn
@@ -664,8 +625,6 @@ namespace Xceed.Wpf.DataGrid
           {
             this.RefreshDefaultScrollTipContentTemplate();
           }
-
-          handled = true;
         }
         else if( sender == m_mainColumn )
         {
@@ -675,12 +634,14 @@ namespace Xceed.Wpf.DataGrid
           {
             this.RefreshDefaultScrollTipContentTemplate();
           }
-
-          handled = true;
         }
       }
+      else
+      {
+        return false;
+      }
 
-      return handled;
+      return true;
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
index be8fd9de..aee175fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
@@ -19,28 +19,25 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Xceed.Utils.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class SelectedCellsStorage : ICloneable, IEnumerable<SelectionCellRangeWithItems>, IEnumerable
   {
-    #region Constructors
-
     internal SelectedCellsStorage( DataGridContext dataGridContext )
     {
       // dataGridContext can be null for store that we don't want to auto-get Items from index
       m_dataGridContext = dataGridContext;
     }
 
-    #endregion
-
     #region Count Property
 
     public int Count
     {
       get
       {
-        return m_unsortedRanges.Count;
+        return m_ranges.Count;
       }
     }
 
@@ -66,7 +63,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return m_unsortedRanges[ index ].Value;
+        return m_ranges[ index ].Value;
       }
       private set
       {
@@ -79,7 +76,7 @@ namespace Xceed.Wpf.DataGrid
 
     public void Add( SelectionCellRangeWithItems rangeWithItems )
     {
-      Debug.Assert( m_unsortedRanges.All( r => r.Value.CellRange.Intersect( rangeWithItems.CellRange ).IsEmpty ), "Part of this range is already selected" );
+      Debug.Assert( m_ranges.All( r => r.Value.CellRange.Intersect( rangeWithItems.CellRange ).IsEmpty ), "Part of this range is already selected" );
 
       var itemRangeWithItems = rangeWithItems.ItemRangeWithItems;
 
@@ -92,13 +89,13 @@ namespace Xceed.Wpf.DataGrid
 
     public void Clear()
     {
-      m_unsortedRanges.Clear();
-      m_sortedRanges.Clear();
+      m_ranges.Clear();
+      m_map.Clear();
     }
 
     public bool Contains( int itemIndex, int columnIndex )
     {
-      if( ( itemIndex < 0 ) || ( columnIndex < 0 ) )
+      if( ( itemIndex < 0 ) || ( itemIndex >= int.MaxValue ) || ( columnIndex < 0 ) || ( columnIndex >= int.MaxValue ) )
         return false;
 
       return this.Contains( new SelectionCellRange( itemIndex, columnIndex ) );
@@ -106,7 +103,7 @@ namespace Xceed.Wpf.DataGrid
 
     public bool Contains( SelectionCellRange range )
     {
-      if( ( m_unsortedRanges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( range ) ) )
+      if( ( m_ranges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( range ) ) )
         return false;
 
       return this.Contains( new SelectionCellRangeWithItems( range.ItemRange, null, range.ColumnRange ) );
@@ -114,7 +111,7 @@ namespace Xceed.Wpf.DataGrid
 
     public bool Contains( SelectionCellRangeWithItems rangeWithItems )
     {
-      if( ( m_unsortedRanges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( rangeWithItems ) ) )
+      if( ( m_ranges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( rangeWithItems ) ) )
         return false;
 
       if( rangeWithItems.Length == 1 )
@@ -125,7 +122,7 @@ namespace Xceed.Wpf.DataGrid
 
       foreach( var match in this.IndexOfOverlap( rangeWithItems ) )
       {
-        store.Remove( m_unsortedRanges[ match ].Value );
+        store.Remove( m_ranges[ match ].Value );
 
         if( store.Count == 0 )
           return true;
@@ -136,9 +133,13 @@ namespace Xceed.Wpf.DataGrid
 
     public bool Remove( SelectionCellRangeWithItems rangeWithItems )
     {
-      if( rangeWithItems.CellRange.IsEmpty )
+      if( SelectedCellsStorage.IsEmpty( rangeWithItems ) )
         return true;
 
+      // It improves performance to leave early and prevent empty enumerators creation.
+      if( m_ranges.Count <= 0 )
+        return false;
+
       // The SelectionCellRange.IsEmpty should be mapped to the item range's SelectionRange.IsEmpty property.
       Debug.Assert( !rangeWithItems.ItemRange.IsEmpty );
 
@@ -148,7 +149,7 @@ namespace Xceed.Wpf.DataGrid
       for( int i = matches.Count - 1; i >= 0; i-- )
       {
         var index = matches[ i ];
-        var currentRangeWithItems = m_unsortedRanges[ index ].Value;
+        var currentRangeWithItems = m_ranges[ index ].Value;
         var currentRange = currentRangeWithItems.CellRange;
         var overlap = rangeToRemove.Intersect( currentRange );
 
@@ -183,37 +184,18 @@ namespace Xceed.Wpf.DataGrid
 
     public void OffsetIndex( int startIndex, int offset )
     {
-      if( m_sortedRanges.Count == 0 )
+      if( m_map.Count == 0 )
         return;
 
       // Used to offset index after an add or remove from the data source of the grid.
       var offsetRange = new SelectionRange( startIndex, startIndex + Math.Abs( offset ) - 1 );
-      var comparer = new ItemRangeComparer( offsetRange );
 
-      // Find the first range that is greater or that overlaps the target range.
-      var index = this.FindIndex( comparer );
-      if( index < 0 )
-      {
-        index = ~index;
-      }
-      else
-      {
-        while( index > 0 )
-        {
-          if( comparer.Compare( m_sortedRanges[ index - 1 ] ) != 0 )
-            break;
-
-          index--;
-        }
-      }
-
-      var matches = m_sortedRanges.Skip( index ).OrderByDescending( item => item.Index ).ToList();
+      var entries = m_map.GetEntriesWithin( new RSTree2D<SelectionCellRangeWithItemsWrapper>.Area( startIndex, int.MaxValue - startIndex, 0, int.MaxValue ) ).OrderByDescending( e => e.Item.Index ).ToList();
 
       // Adjust the range of all ranges greater or that overlaps the target range.
-      foreach( var currentRangeWithItemsWrapper in matches )
+      foreach( var entry in entries )
       {
-        Debug.Assert( comparer.Compare( currentRangeWithItemsWrapper ) <= 0 );
-
+        var currentRangeWithItemsWrapper = entry.Item;
         var currentRangeIndex = currentRangeWithItemsWrapper.Index;
         var currentRangeWithItems = currentRangeWithItemsWrapper.Value;
         var currentRange = currentRangeWithItems.ItemRange;
@@ -361,16 +343,24 @@ namespace Xceed.Wpf.DataGrid
 
     public IEnumerable<SelectionRange> GetIntersectedColumnRanges( SelectionCellRange range )
     {
+      // It improves performance to leave early and prevent empty enumerators creation.
+      if( m_ranges.Count <= 0 )
+        return Enumerable.Empty<SelectionRange>();
+
       return ( from match in this.IndexOfOverlap( range )
-               let current = m_unsortedRanges[ match ].Value
+               let current = m_ranges[ match ].Value
                let intersection = current.CellRange.Intersect( range )
                select intersection.ColumnRange ).ToList();
     }
 
     public IEnumerable<SelectionCellRangeWithItems> GetIntersectedCellRangesWithItems( SelectionCellRange range )
     {
+      // It improves performance to leave early and prevent empty enumerators creation.
+      if( m_ranges.Count <= 0 )
+        return Enumerable.Empty<SelectionCellRangeWithItems>();
+
       return ( from match in this.IndexOfOverlap( range )
-               let current = m_unsortedRanges[ match ].Value
+               let current = m_ranges[ match ].Value
                let intersection = current.CellRange.Intersect( range )
                select new SelectionCellRangeWithItems(
                  intersection.ItemRange,
@@ -378,11 +368,50 @@ namespace Xceed.Wpf.DataGrid
                  intersection.ColumnRange ) ).ToList();
     }
 
+    private static RSTree2D<SelectionCellRangeWithItemsWrapper>.Area GetArea( SelectionCellRange range )
+    {
+      if( range.IsEmpty )
+        return RSTree2D<SelectionCellRangeWithItemsWrapper>.Area.Empty;
+
+      var itemRange = range.ItemRange;
+      var columnRange = range.ColumnRange;
+      int rs, re, cs, ce;
+
+      if( itemRange.StartIndex <= itemRange.EndIndex )
+      {
+        rs = itemRange.StartIndex;
+        re = itemRange.EndIndex;
+      }
+      else
+      {
+        rs = itemRange.EndIndex;
+        re = itemRange.StartIndex;
+      }
+
+      if( columnRange.StartIndex <= columnRange.EndIndex )
+      {
+        cs = columnRange.StartIndex;
+        ce = columnRange.EndIndex;
+      }
+      else
+      {
+        cs = columnRange.EndIndex;
+        ce = columnRange.StartIndex;
+      }
+
+      return new RSTree2D<SelectionCellRangeWithItemsWrapper>.Area( rs, re - rs + 1, cs, ce - cs + 1 );
+    }
+
+    private static RSTree2D<SelectionCellRangeWithItemsWrapper>.Area GetArea( SelectionCellRangeWithItems range )
+    {
+      return SelectedCellsStorage.GetArea( range.CellRange );
+    }
+
     private void Insert( int index, SelectionCellRangeWithItems item, bool repairIndex )
     {
       var wrapper = new SelectionCellRangeWithItemsWrapper( item, index );
 
-      m_unsortedRanges.Insert( index, wrapper );
+      m_ranges.Insert( index, wrapper );
 
       if( repairIndex )
       {
@@ -391,27 +420,36 @@ namespace Xceed.Wpf.DataGrid
 
       if( !SelectedCellsStorage.IsEmpty( item ) )
       {
-        var insertionIndex = ~this.FindIndex( new ItemComparer( wrapper ) );
-        Debug.Assert( insertionIndex >= 0 );
-
-        m_sortedRanges.Insert( insertionIndex, wrapper );
+        m_map.Add( SelectedCellsStorage.GetArea( item ), wrapper );
       }
     }
 
     private void RemoveAt( int index, bool repairIndex )
     {
-      var wrapper = m_unsortedRanges[ index ];
+      var wrapper = m_ranges[ index ];
+      var rangeWithItems = wrapper.Value;
+
       Debug.Assert( wrapper.Index == index );
 
-      if( !SelectedCellsStorage.IsEmpty( wrapper.Value ) )
+      if( !SelectedCellsStorage.IsEmpty( rangeWithItems ) )
       {
-        var removalIndex = this.FindIndex( new ItemComparer( wrapper ) );
-        Debug.Assert( removalIndex >= 0 );
+        var removed = m_map.Remove( SelectedCellsStorage.GetArea( rangeWithItems ), wrapper );
+        Debug.Assert( removed, "Failed to remove the selection range." );
 
-        m_sortedRanges.RemoveAt( removalIndex );
+        // Since there should be only a single instance of the wrapper within the collection, try an altenate strategy.
+        if( !removed )
+        {
+          var entry = m_map.FirstOrDefault( e => e.Item == wrapper );
+          if( entry.Item == wrapper )
+          {
+            removed = m_map.Remove( entry );
+          }
+
+          Debug.Assert( removed, "Failed to find the selection range." );
+        }
       }
 
-      m_unsortedRanges.RemoveAt( index );
+      m_ranges.RemoveAt( index );
 
       if( repairIndex )
       {
@@ -423,42 +461,28 @@ namespace Xceed.Wpf.DataGrid
     {
       Debug.Assert( index >= 0 );
 
-      for( int i = index; i < m_unsortedRanges.Count; i++ )
+      for( int i = index; i < m_ranges.Count; i++ )
       {
-        m_unsortedRanges[ i ].Index = i;
+        m_ranges[ i ].Index = i;
       }
     }
 
-    private IEnumerable<int> IndexOfOverlap( SelectionCellRange target )
+    private IEnumerable<int> IndexOfOverlap( SelectionCellRange range )
     {
-      if( ( m_sortedRanges.Count <= 0 ) || SelectedCellsStorage.IsEmpty( target ) )
-        yield break;
-
-      var comparer = new ItemRangeComparer( target.ItemRange );
-
-      var index = this.FindIndex( comparer );
-      if( index < 0 )
+      // It improves performance to leave early.
+      if( m_map.Count <= 0 )
         yield break;
 
-      while( index > 0 )
-      {
-        if( comparer.Compare( m_sortedRanges[ index - 1 ] ) != 0 )
-          break;
-
-        index--;
-      }
-
-      for( int i = index; i < m_sortedRanges.Count; i++ )
+      foreach( var entry in m_map.GetEntriesWithin( SelectedCellsStorage.GetArea( range ) ) )
       {
-        var wrapper = m_sortedRanges[ i ];
-        if( comparer.Compare( wrapper ) != 0 )
-          break;
+        var candidate = entry.Item;
+        var target = candidate.Value;
+        var overlap = range.Intersect( target.CellRange );
 
-        var currentRangeWithItems = wrapper.Value;
-        var overlap = target.Intersect( currentRangeWithItems.CellRange );
+        Debug.Assert( !SelectedCellsStorage.IsEmpty( overlap ) );
 
         if( !SelectedCellsStorage.IsEmpty( overlap ) )
-          yield return wrapper.Index;
+          yield return candidate.Index;
       }
     }
 
@@ -470,7 +494,7 @@ namespace Xceed.Wpf.DataGrid
 
       foreach( var match in this.IndexOfOverlap( targetRange ) )
       {
-        var currentRangeWithItems = m_unsortedRanges[ match ].Value;
+        var currentRangeWithItems = m_ranges[ match ].Value;
         var overlap = targetItemRange.Intersect( currentRangeWithItems.ItemRange );
 
         Debug.Assert( !overlap.IsEmpty );
@@ -480,41 +504,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private int FindIndex( ISelectionRangeComparer comparer )
-    {
-      Debug.Assert( comparer != null );
-
-      var lowerBound = 0;
-      var upperBound = m_sortedRanges.Count - 1;
-
-      while( lowerBound <= upperBound )
-      {
-        var middle = lowerBound + ( upperBound - lowerBound ) / 2;
-        var compare = comparer.Compare( m_sortedRanges[ middle ] );
-
-        if( compare < 0 )
-        {
-          if( middle == lowerBound )
-            return ~middle;
-
-          upperBound = middle - 1;
-        }
-        else if( compare > 0 )
-        {
-          if( middle == upperBound )
-            return ~( middle + 1 );
-
-          lowerBound = middle + 1;
-        }
-        else
-        {
-          return middle;
-        }
-      }
-
-      return ~0;
-    }
-
     private static bool IsEmpty( SelectionCellRange range )
     {
       return ( range.ItemRange.IsEmpty )
@@ -533,9 +522,9 @@ namespace Xceed.Wpf.DataGrid
     {
       var copy = new SelectedCellsStorage( m_dataGridContext );
 
-      for( int i = 0; i < m_unsortedRanges.Count; i++ )
+      for( int i = 0; i < m_ranges.Count; i++ )
       {
-        copy.Insert( i, m_unsortedRanges[ i ].Value, false );
+        copy.Insert( i, m_ranges[ i ].Value, false );
       }
 
       return copy;
@@ -547,7 +536,7 @@ namespace Xceed.Wpf.DataGrid
 
     public IEnumerator<SelectionCellRangeWithItems> GetEnumerator()
     {
-      return m_unsortedRanges.Select( item => item.Value ).GetEnumerator();
+      return m_ranges.Select( item => item.Value ).GetEnumerator();
     }
 
     #endregion
@@ -561,12 +550,8 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Private Fields
-
-    private readonly List<SelectionCellRangeWithItemsWrapper> m_unsortedRanges = new List<SelectionCellRangeWithItemsWrapper>();
-    private readonly List<SelectionCellRangeWithItemsWrapper> m_sortedRanges = new List<SelectionCellRangeWithItemsWrapper>();
-
-    #endregion
+    private readonly List<SelectionCellRangeWithItemsWrapper> m_ranges = new List<SelectionCellRangeWithItemsWrapper>();
+    private readonly RSTree2D<SelectionCellRangeWithItemsWrapper> m_map = new RSTree2D<SelectionCellRangeWithItemsWrapper>();
 
     #region SelectionCellRangeWithItemsWrapper Private Class
 
@@ -605,145 +590,5 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
-
-    #region ISelectionRangeComparer Private Interface
-
-    private interface ISelectionRangeComparer
-    {
-      int Compare( SelectionCellRangeWithItemsWrapper item );
-    }
-
-    #endregion
-
-    #region ItemComparer Private Class
-
-    private sealed class ItemComparer : ISelectionRangeComparer
-    {
-      internal ItemComparer( SelectionCellRangeWithItemsWrapper target )
-      {
-        if( target == null )
-          throw new ArgumentNullException( "target" );
-
-        if( SelectedCellsStorage.IsEmpty( target.Value ) )
-          throw new ArgumentException( "The selection range must not be empty.", "target" );
-
-        m_target = target;
-      }
-
-      public int Compare( SelectionCellRangeWithItemsWrapper item )
-      {
-        if( m_target == item )
-          return 0;
-
-        var xri = m_target.Value;
-        var yri = item.Value;
-
-        int compare;
-
-        compare = ItemComparer.Compare( xri.ItemRange, yri.ItemRange );
-        if( compare != 0 )
-        {
-          Debug.Assert( ( ( compare < 0 ) && ItemRangeComparer.Compare( xri.ItemRange, item ) <= 0 )
-                     || ( ( compare > 0 ) && ItemRangeComparer.Compare( xri.ItemRange, item ) >= 0 ) );
-
-          return compare;
-        }
-
-        Debug.Assert( ItemRangeComparer.Compare( xri.ItemRange, item ) == 0 );
-
-        compare = ItemComparer.Compare( xri.CellRange.ColumnRange, yri.CellRange.ColumnRange );
-        if( compare != 0 )
-          return compare;
-
-        Debug.Assert( xri.CellRange == yri.CellRange );
-
-        return ( m_target.Index - item.Index );
-      }
-
-      private static int Compare( SelectionRange xr, SelectionRange yr )
-      {
-        int xs, xe, ys, ye;
-        ItemComparer.GetBounds( xr, out xs, out xe );
-        ItemComparer.GetBounds( yr, out ys, out ye );
-
-        if( xs < ys )
-        {
-          return -1;
-        }
-        else if( xs > ys )
-        {
-          return 1;
-        }
-
-        Debug.Assert( !xr.Intersect( yr ).IsEmpty );
-
-        if( xe < ye )
-        {
-          return -1;
-        }
-        else if( xe > ye )
-        {
-          return 1;
-        }
-
-        Debug.Assert( xr == yr );
-        return 0;
-      }
-
-      private static void GetBounds( SelectionRange range, out int startIndex, out int endIndex )
-      {
-        if( range.StartIndex <= range.EndIndex )
-        {
-          startIndex = range.StartIndex;
-          endIndex = range.EndIndex;
-        }
-        else
-        {
-          endIndex = range.StartIndex;
-          startIndex = range.EndIndex;
-        }
-      }
-
-      private readonly SelectionCellRangeWithItemsWrapper m_target;
-    }
-
-    #endregion
-
-    #region ItemRangeComparer Private Class
-
-    private sealed class ItemRangeComparer : ISelectionRangeComparer
-    {
-      internal ItemRangeComparer( SelectionRange target )
-      {
-        if( target.IsEmpty )
-          throw new ArgumentException( "The selection range must not be empty.", "target" );
-
-        m_target = target;
-      }
-
-      public int Compare( SelectionCellRangeWithItemsWrapper item )
-      {
-        return ItemRangeComparer.Compare( m_target, item );
-      }
-
-      internal static int Compare( SelectionRange range, SelectionCellRangeWithItemsWrapper wrapper )
-      {
-        var itemRange = wrapper.Value.ItemRange;
-
-        if( range < itemRange )
-          return -1;
-
-        if( range > itemRange )
-          return 1;
-
-        Debug.Assert( !range.Intersect( itemRange ).IsEmpty );
-
-        return 0;
-      }
-
-      private readonly SelectionRange m_target;
-    }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
index eae732ef..85ce3541 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
@@ -19,28 +19,25 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Xceed.Utils.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class SelectedItemsStorage : ICloneable, IEnumerable<SelectionRangeWithItems>, IEnumerable
   {
-    #region Constructors
-
     internal SelectedItemsStorage( DataGridContext dataGridContext )
     {
       // dataGridContext can be null for store that we don't want to auto-get Items from index
       m_dataGridContext = dataGridContext;
     }
 
-    #endregion
-
     #region Count Property
 
     public int Count
     {
       get
       {
-        return m_unsortedRanges.Count;
+        return m_ranges.Count;
       }
     }
 
@@ -80,7 +77,7 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        return m_unsortedRanges[ index ].Value;
+        return m_ranges[ index ].Value;
       }
       private set
       {
@@ -206,27 +203,27 @@ namespace Xceed.Wpf.DataGrid
     public void Clear()
     {
       m_itemsCount = 0;
-      m_unsortedRanges.Clear();
-      m_sortedRanges.Clear();
+      m_ranges.Clear();
+      m_map.Clear();
     }
 
     public SelectionRange[] ToSelectionRangeArray()
     {
-      return ( from item in m_unsortedRanges
+      return ( from item in m_ranges
                select item.Value.Range ).ToArray();
     }
 
     public bool Contains( int itemIndex )
     {
+      if( ( itemIndex < -1 ) || ( itemIndex >= int.MaxValue ) )
+        return false;
+
       return this.Contains( new SelectionRange( itemIndex ) );
     }
 
     public bool Contains( SelectionRange range )
     {
-      if( range.IsEmpty )
-        return false;
-
-      return ( this.FindIndex( new RangeComparer( range ) ) >= 0 );
+      return m_map.Overlaps( SelectedItemsStorage.GetArea( range ) );
     }
 
     public bool Contains( SelectionRangeWithItems rangeWithItems )
@@ -244,37 +241,18 @@ namespace Xceed.Wpf.DataGrid
 
     public void OffsetIndex( int startIndex, int offset )
     {
-      if( m_sortedRanges.Count == 0 )
+      if( m_map.Count == 0 )
         return;
 
       // Used to offset index after an add or remove from the data source of the grid.
       var offsetRange = new SelectionRange( startIndex, startIndex + Math.Abs( offset ) - 1 );
-      var comparer = new RangeComparer( offsetRange );
-
-      // Find the first range that is greater or that overlaps the target range.
-      var index = this.FindIndex( comparer );
-      if( index < 0 )
-      {
-        index = ~index;
-      }
-      else
-      {
-        while( index > 0 )
-        {
-          if( comparer.Compare( m_sortedRanges[ index - 1 ] ) != 0 )
-            break;
-
-          index--;
-        }
-      }
 
-      var matches = m_sortedRanges.Skip( index ).OrderByDescending( item => item.Index ).ToList();
+      var entries = m_map.GetEntriesWithin( new RSTree1D<SelectionRangeWithItemsWrapper>.Area( startIndex, int.MaxValue - startIndex ) ).OrderByDescending( e => e.Item.Index ).ToList();
 
       // Adjust the range of all ranges greater or that overlaps the target range.
-      foreach( var currentRangeWithItemsWrapper in matches )
+      foreach( var entry in entries )
       {
-        Debug.Assert( comparer.Compare( currentRangeWithItemsWrapper ) <= 0 );
-
+        var currentRangeWithItemsWrapper = entry.Item;
         var currentRangeIndex = currentRangeWithItemsWrapper.Index;
         var currentRangeWithItems = currentRangeWithItemsWrapper.Value;
         var currentRange = currentRangeWithItems.Range;
@@ -417,11 +395,24 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    private static RSTree1D<SelectionRangeWithItemsWrapper>.Area GetArea( SelectionRange range )
+    {
+      if( range.IsEmpty )
+        return RSTree1D<SelectionRangeWithItemsWrapper>.Area.Empty;
+
+      return new RSTree1D<SelectionRangeWithItemsWrapper>.Area( Math.Min( range.StartIndex, range.EndIndex ), range.Length );
+    }
+
+    private static RSTree1D<SelectionRangeWithItemsWrapper>.Area GetArea( SelectionRangeWithItems range )
+    {
+      return SelectedItemsStorage.GetArea( range.Range );
+    }
+
     private void Insert( int index, SelectionRangeWithItems item, bool repairIndex )
     {
       var wrapper = new SelectionRangeWithItemsWrapper( item, index );
 
-      m_unsortedRanges.Insert( index, wrapper );
+      m_ranges.Insert( index, wrapper );
 
       if( repairIndex )
       {
@@ -430,27 +421,36 @@ namespace Xceed.Wpf.DataGrid
 
       if( !item.IsEmpty )
       {
-        var insertionIndex = ~this.FindIndex( new ItemComparer( wrapper ) );
-        Debug.Assert( insertionIndex >= 0 );
-
-        m_sortedRanges.Insert( insertionIndex, wrapper );
+        m_map.Add( SelectedItemsStorage.GetArea( item ), wrapper );
       }
     }
 
     private void RemoveAt( int index, bool repairIndex )
     {
-      var wrapper = m_unsortedRanges[ index ];
+      var wrapper = m_ranges[ index ];
+      var rangeWithItems = wrapper.Value;
+
       Debug.Assert( wrapper.Index == index );
 
-      if( !wrapper.Value.IsEmpty )
+      if( !rangeWithItems.IsEmpty )
       {
-        var removalIndex = this.FindIndex( new ItemComparer( wrapper ) );
-        Debug.Assert( removalIndex >= 0 );
+        var removed = m_map.Remove( SelectedItemsStorage.GetArea( rangeWithItems ), wrapper );
+        Debug.Assert( removed, "Failed to remove the selection range." );
+
+        // Since there should be only a single instance of the wrapper within the collection, try an altenate strategy.
+        if( !removed )
+        {
+          var entry = m_map.FirstOrDefault( e => e.Item == wrapper );
+          if( entry.Item == wrapper )
+          {
+            removed = m_map.Remove( entry );
+          }
 
-        m_sortedRanges.RemoveAt( removalIndex );
+          Debug.Assert( removed, "Failed to find the selection range." );
+        }
       }
 
-      m_unsortedRanges.RemoveAt( index );
+      m_ranges.RemoveAt( index );
 
       if( repairIndex )
       {
@@ -462,9 +462,9 @@ namespace Xceed.Wpf.DataGrid
     {
       Debug.Assert( index >= 0 );
 
-      for( int i = index; i < m_unsortedRanges.Count; i++ )
+      for( int i = index; i < m_ranges.Count; i++ )
       {
-        m_unsortedRanges[ i ].Index = i;
+        m_ranges[ i ].Index = i;
       }
     }
 
@@ -560,71 +560,17 @@ namespace Xceed.Wpf.DataGrid
 
     private IEnumerable<int> IndexOfOverlap( SelectionRangeWithItems rangeWithItems )
     {
-      if( rangeWithItems.IsEmpty )
-        yield break;
-
-      var targetRange = rangeWithItems.Range;
-      var comparer = new RangeComparer( targetRange );
-
-      var index = this.FindIndex( comparer );
-      if( index < 0 )
-        yield break;
-
-      while( index > 0 )
-      {
-        if( comparer.Compare( m_sortedRanges[ index - 1 ] ) != 0 )
-          break;
-
-        index--;
-      }
-
-      for( int i = index; i < m_sortedRanges.Count; i++ )
+      foreach( var entry in m_map.GetEntriesWithin( SelectedItemsStorage.GetArea( rangeWithItems ) ) )
       {
-        var wrapper = m_sortedRanges[ i ];
-        if( comparer.Compare( wrapper ) != 0 )
-          break;
-
-        var currentRangeWithItems = wrapper.Value;
-        var overlap = targetRange.Intersect( currentRangeWithItems.Range );
-
-        if( !overlap.IsEmpty && ( rangeWithItems.IsItemsEqual( overlap, currentRangeWithItems ) ) )
-          yield return wrapper.Index;
-      }
-    }
-
-    private int FindIndex( ISelectionRangeComparer comparer )
-    {
-      Debug.Assert( comparer != null );
-
-      var lowerBound = 0;
-      var upperBound = m_sortedRanges.Count - 1;
+        var candidate = entry.Item;
+        var target = candidate.Value;
+        var overlap = rangeWithItems.Range.Intersect( target.Range );
 
-      while( lowerBound <= upperBound )
-      {
-        var middle = lowerBound + ( upperBound - lowerBound ) / 2;
-        var compare = comparer.Compare( m_sortedRanges[ middle ] );
-
-        if( compare < 0 )
-        {
-          if( middle == lowerBound )
-            return ~middle;
-
-          upperBound = middle - 1;
-        }
-        else if( compare > 0 )
-        {
-          if( middle == upperBound )
-            return ~( middle + 1 );
+        Debug.Assert( !overlap.IsEmpty );
 
-          lowerBound = middle + 1;
-        }
-        else
-        {
-          return middle;
-        }
+        if( !overlap.IsEmpty && ( rangeWithItems.IsItemsEqual( overlap, target ) ) )
+          yield return candidate.Index;
       }
-
-      return ~0;
     }
 
     #region ICloneable Members
@@ -633,9 +579,9 @@ namespace Xceed.Wpf.DataGrid
     {
       var copy = new SelectedItemsStorage( m_dataGridContext );
 
-      for( int i = 0; i < m_unsortedRanges.Count; i++ )
+      for( int i = 0; i < m_ranges.Count; i++ )
       {
-        copy.Insert( i, m_unsortedRanges[ i ].Value, false );
+        copy.Insert( i, m_ranges[ i ].Value, false );
       }
 
       copy.m_itemsCount = m_itemsCount;
@@ -649,7 +595,7 @@ namespace Xceed.Wpf.DataGrid
 
     public IEnumerator<SelectionRangeWithItems> GetEnumerator()
     {
-      return m_unsortedRanges.Select( item => item.Value ).GetEnumerator();
+      return m_ranges.Select( item => item.Value ).GetEnumerator();
     }
 
     #endregion
@@ -663,12 +609,8 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    #region Private Fields
-
-    private readonly List<SelectionRangeWithItemsWrapper> m_unsortedRanges = new List<SelectionRangeWithItemsWrapper>();
-    private readonly List<SelectionRangeWithItemsWrapper> m_sortedRanges = new List<SelectionRangeWithItemsWrapper>();
-
-    #endregion
+    private readonly List<SelectionRangeWithItemsWrapper> m_ranges = new List<SelectionRangeWithItemsWrapper>();
+    private readonly RSTree1D<SelectionRangeWithItemsWrapper> m_map = new RSTree1D<SelectionRangeWithItemsWrapper>();
 
     #region SelectionRangeWithItemsWrapper Private Class
 
@@ -707,124 +649,5 @@ namespace Xceed.Wpf.DataGrid
     }
 
     #endregion
-
-    #region ISelectionRangeComparer Private Interface
-
-    private interface ISelectionRangeComparer
-    {
-      int Compare( SelectionRangeWithItemsWrapper item );
-    }
-
-    #endregion
-
-    #region ItemComparer Private Class
-
-    private sealed class ItemComparer : ISelectionRangeComparer
-    {
-      internal ItemComparer( SelectionRangeWithItemsWrapper target )
-      {
-        if( target == null )
-          throw new ArgumentNullException( "target" );
-
-        if( target.Value.IsEmpty )
-          throw new ArgumentException( "The selection range must not be empty.", "target" );
-
-        m_target = target;
-      }
-
-      public int Compare( SelectionRangeWithItemsWrapper item )
-      {
-        if( item == m_target )
-          return 0;
-
-        var xr = m_target.Value.Range;
-        var yr = item.Value.Range;
-
-        int xs, xe, ys, ye;
-        ItemComparer.GetBounds( xr, out xs, out xe );
-        ItemComparer.GetBounds( yr, out ys, out ye );
-
-        if( xs < ys )
-        {
-          Debug.Assert( RangeComparer.Compare( xr, item ) <= 0 );
-          return -1;
-        }
-        else if( xs > ys )
-        {
-          Debug.Assert( RangeComparer.Compare( xr, item ) >= 0 );
-          return 1;
-        }
-
-        Debug.Assert( RangeComparer.Compare( xr, item ) == 0 );
-
-        if( xe < ye )
-        {
-          return -1;
-        }
-        else if( xe > ye )
-        {
-          return 1;
-        }
-
-        Debug.Assert( xr == yr );
-
-        return ( m_target.Index - item.Index );
-      }
-
-      private static void GetBounds( SelectionRange range, out int startIndex, out int endIndex )
-      {
-        if( range.StartIndex <= range.EndIndex )
-        {
-          startIndex = range.StartIndex;
-          endIndex = range.EndIndex;
-        }
-        else
-        {
-          endIndex = range.StartIndex;
-          startIndex = range.EndIndex;
-        }
-      }
-
-      private readonly SelectionRangeWithItemsWrapper m_target;
-    }
-
-    #endregion
-
-    #region RangeComparer Private Class
-
-    private sealed class RangeComparer : ISelectionRangeComparer
-    {
-      internal RangeComparer( SelectionRange target )
-      {
-        if( target.IsEmpty )
-          throw new ArgumentException( "The selection range must not be empty.", "target" );
-
-        m_target = target;
-      }
-
-      public int Compare( SelectionRangeWithItemsWrapper item )
-      {
-        return RangeComparer.Compare( m_target, item );
-      }
-
-      internal static int Compare( SelectionRange range, SelectionRangeWithItemsWrapper wrapper )
-      {
-        var itemRange = wrapper.Value.Range;
-
-        if( range < itemRange )
-          return -1;
-
-        if( range > itemRange )
-          return 1;
-
-        Debug.Assert( !range.Intersect( itemRange ).IsEmpty );
-
-        return 0;
-      }
-
-      private readonly SelectionRange m_target;
-    }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
index 394c17f7..201f46f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
@@ -33,11 +30,11 @@ namespace Xceed.Wpf.DataGrid
       if( ( itemIndex == -1 || columnIndex == -1 ) && ( itemIndex != -1 || columnIndex != -1 ) )
         throw new ArgumentException( "itemIndex and columnIndex must be equal if the value of one is -1." );
 
-      if( itemIndex < -1 )  
-        throw new ArgumentOutOfRangeException( "itemIndex", "itemIndex must be equal to or greater than -1." );
+      if( ( itemIndex < -1 ) || ( itemIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "itemIndex", "itemIndex must be equal to or greater than -1 and lower than int.MaxValue." );
 
-      if( columnIndex < -1 )  
-        throw new ArgumentOutOfRangeException( "columnIndex", "columnIndex must be equal to or greater than -1." );
+      if( ( columnIndex < -1 ) || ( columnIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "columnIndex", "columnIndex must be equal to or greater than -1 and lower than int.MaxValue." );
 
       m_itemRange = new SelectionRange( itemIndex );
       m_columnRange = new SelectionRange( columnIndex );
@@ -45,17 +42,17 @@ namespace Xceed.Wpf.DataGrid
 
     public SelectionCellRange( int itemStartIndex, int columnStartIndex, int itemEndIndex, int columnEndIndex )
     {
-      if( itemStartIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "itemStartIndex", "itemStartIndex must be equal to or greater than zero." );
+      if( ( itemStartIndex < 0 ) || ( itemStartIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "itemStartIndex", "itemStartIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
-      if( itemEndIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "itemEndIndex", "itemEndIndex must be equal to or greater than zero." );
+      if( ( itemEndIndex < 0 ) || ( itemEndIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "itemEndIndex", "itemEndIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
-      if( columnStartIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "columnStartIndex", "columnStartIndex must be equal to or greater than zero." );
+      if( ( columnStartIndex < 0 ) || ( columnStartIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "columnStartIndex", "columnStartIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
-      if( columnEndIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "columnEndIndex", "columnEndIndex must be equal to or greater than zero." );
+      if( ( columnEndIndex < 0 ) || ( columnEndIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "columnEndIndex", "columnEndIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
       m_itemRange = new SelectionRange( itemStartIndex, itemEndIndex );
       m_columnRange = new SelectionRange( columnStartIndex, columnEndIndex );
@@ -67,7 +64,7 @@ namespace Xceed.Wpf.DataGrid
       m_columnRange = columnRange;
     }
 
-    #endregion CONSTRUCTORS
+    #endregion
 
     #region ItemRange Property
 
@@ -85,7 +82,7 @@ namespace Xceed.Wpf.DataGrid
 
     private SelectionRange m_itemRange;
 
-    #endregion ItemRange Property
+    #endregion
 
     #region ColumnRange Property
 
@@ -103,7 +100,7 @@ namespace Xceed.Wpf.DataGrid
 
     private SelectionRange m_columnRange;
 
-    #endregion ColumnRange Property
+    #endregion
 
     #region Length Property
 
@@ -115,7 +112,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Length Property
+    #endregion
 
     #region IsEmpty Property
 
@@ -127,9 +124,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsEmpty Property
-
-    #region PUBLIC METHODS
+    #endregion
 
     public static bool operator ==( SelectionCellRange range1, SelectionCellRange range2 )
     {
@@ -206,11 +201,5 @@ namespace Xceed.Wpf.DataGrid
     {
       return ( m_itemRange.GetHashCode() ^ m_columnRange.GetHashCode() );
     }
-
-    #endregion PUBLIC METHODS
-
-    #region INTERNAL METHODS
-
-    #endregion INTERNAL METHODS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
index 63c9e863..183b8d8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
@@ -15,26 +15,29 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
-using System.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class SelectionCellRangeCollection : IList<SelectionCellRange>, IList
+  internal sealed class SelectionCellRangeCollection : IList<SelectionCellRange>, IList
   {
-    public SelectionCellRangeCollection( SelectedCellsStorage list )
+    internal SelectionCellRangeCollection( SelectedCellsStorage collection )
     {
-      m_list = list;
+      Debug.Assert( collection != null );
+
+      m_storage = collection;
     }
 
+    #region IList<> Members
+
     public SelectionCellRange this[ int index ]
     {
       get
       {
-        return m_list[ index ].CellRange;
+        return m_storage[ index ].CellRange;
       }
       set
       {
@@ -42,30 +45,74 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public int Count
+    public int IndexOf( SelectionCellRange item )
     {
-      get
+      var count = m_storage.Count;
+
+      for( int i = 0; i < count; i++ )
       {
-        return m_list.Count;
+        if( m_storage[ i ].CellRange == item )
+          return i;
       }
+
+      return -1;
     }
 
-    public bool IsReadOnly
+    public void Insert( int index, SelectionCellRange item )
     {
-      get
+      if( ( index < 0 ) || ( index > m_storage.Count ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
+
+      if( dataGridControl.SelectionUnit == SelectionUnit.Row )
+        throw new InvalidOperationException( "Can't add cell range when SelectionUnit is Row." );
+
+      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
       {
-        return false;
+        var minIndex = Math.Min( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
+        var maxIndex = Math.Max( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
+
+        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
+          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
+      }
+
+      var selectionManager = dataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
+      {
+        selectionManager.SelectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
       }
     }
 
-    public bool IsFixedSize
+    public void RemoveAt( int index )
     {
-      get
+      if( ( index < 0 ) || ( index >= m_storage.Count ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
       {
-        return false;
+        var cellRange = this[ index ];
+        selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( cellRange.ItemRange, null, cellRange.ColumnRange ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
       }
     }
 
+    #endregion
+
     #region IList Members
 
     object IList.this[ int index ]
@@ -80,10 +127,26 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    bool IList.IsReadOnly
+    {
+      get
+      {
+        return ( ( ICollection<SelectionCellRange> )this ).IsReadOnly;
+      }
+    }
+
+    bool IList.IsFixedSize
+    {
+      get
+      {
+        return false;
+      }
+    }
+
     int IList.Add( object item )
     {
       this.Add( ( SelectionCellRange )item );
-      return m_list.Count - 1;
+      return this.Count - 1;
     }
 
     void IList.Clear()
@@ -116,19 +179,19 @@ namespace Xceed.Wpf.DataGrid
       return this.IndexOf( ( SelectionCellRange )item );
     }
 
-    #endregion IList Members
+    #endregion
 
-    #region ICollection Members
+    #region ICollection<> Members
 
-    object ICollection.SyncRoot
+    public int Count
     {
       get
       {
-        return m_list;
+        return m_storage.Count;
       }
     }
 
-    bool ICollection.IsSynchronized
+    bool ICollection<SelectionCellRange>.IsReadOnly
     {
       get
       {
@@ -136,143 +199,103 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    void ICollection.CopyTo( Array array, int arrayIndex )
-    {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        array.SetValue( m_list[ i ].CellRange, arrayIndex );
-        arrayIndex++;
-      }
-    }
-
-    #endregion ICollection Members
-
-    #region IList<SelectionRange> Members
-
-    public int IndexOf( SelectionCellRange item )
+    public void Add( SelectionCellRange item )
     {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( m_list[ i ].CellRange == item )
-          return i;
-      }
-
-      return -1;
+      this.Insert( m_storage.Count, item );
     }
 
-    public void Insert( int index, SelectionCellRange item )
+    public void Clear()
     {
-      if( ( index < 0 ) || ( index > m_list.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      var dataGridContext = m_storage.DataGridContext;
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.SelectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
+        selectionManager.UnselectAllCells( dataGridContext );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public void RemoveAt( int index )
+    public bool Contains( SelectionCellRange item )
     {
-      if( ( index < 0 ) || ( index >= m_list.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        SelectionCellRange cellRange = this[ index ];
-        selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( cellRange.ItemRange, null, cellRange.ColumnRange ) );
-      }
-      finally
-      {
-        selectionManager.End( false, true, true );
-      }
+      return ( this.IndexOf( item ) >= 0 );
     }
 
-    #endregion
-
-    #region ICollection<SelectionRange> Members
-
-    public void Add( SelectionCellRange item )
+    public bool Remove( SelectionCellRange item )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
 
       if( dataGridControl.SelectionUnit == SelectionUnit.Row )
-        throw new InvalidOperationException( "Can't add cell range when SelectionUnit is Row." );
+        throw new InvalidOperationException( "Can't remove cell range when SelectionUnit is Row." );
 
-      SelectionManager selectionManager = dataGridControl.SelectionChangerManager;
+      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
+      {
+        var minIndex = Math.Min( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
+        var maxIndex = Math.Max( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
+
+        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
+          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
+      }
+
+      var selectionManager = dataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.SelectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
+        return selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public void Clear()
+    public void CopyTo( SelectionCellRange[] array, int arrayIndex )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
+      ( ( ICollection )this ).CopyTo( array, arrayIndex );
+    }
 
-      try
-      {
-        selectionManager.UnselectAllCells( dataGridContext );
-      }
-      finally
+    #endregion
+
+    #region ICollection Members
+
+    int ICollection.Count
+    {
+      get
       {
-        selectionManager.End( false, true, true );
+        return this.Count;
       }
     }
 
-    public bool Contains( SelectionCellRange item )
+    object ICollection.SyncRoot
     {
-      return this.IndexOf( item ) != -1;
+      get
+      {
+        return m_storage;
+      }
     }
 
-    public void CopyTo( SelectionCellRange[] array, int arrayIndex )
+    bool ICollection.IsSynchronized
     {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
+      get
       {
-        array[ arrayIndex ] = m_list[ i ].CellRange;
-        arrayIndex++;
+        return false;
       }
     }
 
-    public bool Remove( SelectionCellRange item )
+    void ICollection.CopyTo( Array array, int arrayIndex )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
+      var count = m_storage.Count;
 
-      try
-      {
-        return selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
-      }
-      finally
+      for( int i = 0; i < count; i++ )
       {
-        selectionManager.End( false, true, true );
+        array.SetValue( m_storage[ i ].CellRange, arrayIndex );
+        arrayIndex++;
       }
     }
 
@@ -282,11 +305,8 @@ namespace Xceed.Wpf.DataGrid
 
     public IEnumerator<SelectionCellRange> GetEnumerator()
     {
-      // We use a foreach to get the exception when the list is changed
-      foreach( SelectionCellRangeWithItems cellRangeWithItems in m_list )
-      {
-        yield return cellRangeWithItems.CellRange;
-      }
+      return ( from item in m_storage
+               select item.CellRange ).GetEnumerator();
     }
 
     #endregion
@@ -300,6 +320,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    private SelectedCellsStorage m_list;
+    private readonly SelectedCellsStorage m_storage;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
index c9e67cd4..3a62357a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
@@ -15,16 +15,12 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal struct SelectionCellRangeWithItems
   {
-    public static readonly SelectionCellRangeWithItems Empty = new SelectionCellRangeWithItems( 
-      SelectionRange.Empty, null, SelectionRange.Empty );
+    public static readonly SelectionCellRangeWithItems Empty = new SelectionCellRangeWithItems( SelectionRange.Empty, null, SelectionRange.Empty );
 
     public SelectionCellRangeWithItems( int itemIndex, object item, int columnIndex )
       : this( new SelectionRange( itemIndex ), new object[] { item }, new SelectionRange( columnIndex ) )
@@ -33,7 +29,7 @@ namespace Xceed.Wpf.DataGrid
 
     public SelectionCellRangeWithItems( SelectionRange itemRange, object[] items, SelectionRange columnRange )
     {
-      if( ( items != null ) && ( items.Length != itemRange.Length ) ) 
+      if( ( items != null ) && ( items.Length != itemRange.Length ) )
         throw new ArgumentException( "itemRange and items must have the same length." );
 
       m_itemRangeWithItems = new SelectionRangeWithItems( itemRange, items );
@@ -52,7 +48,7 @@ namespace Xceed.Wpf.DataGrid
 
     SelectionRangeWithItems m_itemRangeWithItems;
 
-    #endregion ItemRangeWithItems Property
+    #endregion
 
     #region ItemRange Property
 
@@ -64,7 +60,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemRange Property
+    #endregion
 
     #region ColumnRange Property
 
@@ -78,7 +74,7 @@ namespace Xceed.Wpf.DataGrid
 
     SelectionRange m_columnRange;
 
-    #endregion ColumnRange Property
+    #endregion
 
     #region CellRange Property
 
@@ -90,7 +86,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion CellRange Property
+    #endregion
 
     #region Length Property
 
@@ -102,22 +98,18 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Length Property
-
-    #region PUBLIC METHODS
+    #endregion
 
     public static bool operator ==( SelectionCellRangeWithItems rangeWithItems1, SelectionCellRangeWithItems rangeWithItems2 )
     {
-      return
-        ( rangeWithItems1.m_columnRange == rangeWithItems2.m_columnRange )
-        && ( rangeWithItems1.m_itemRangeWithItems == rangeWithItems2.m_itemRangeWithItems );
+      return ( rangeWithItems1.m_columnRange == rangeWithItems2.m_columnRange )
+          && ( rangeWithItems1.m_itemRangeWithItems == rangeWithItems2.m_itemRangeWithItems );
     }
 
     public static bool operator !=( SelectionCellRangeWithItems rangeWithItems1, SelectionCellRangeWithItems rangeWithItems2 )
     {
-      return
-        ( rangeWithItems1.m_columnRange != rangeWithItems2.m_columnRange )
-        || ( rangeWithItems1.m_itemRangeWithItems != rangeWithItems2.m_itemRangeWithItems );
+      return ( rangeWithItems1.m_columnRange != rangeWithItems2.m_columnRange )
+          || ( rangeWithItems1.m_itemRangeWithItems != rangeWithItems2.m_itemRangeWithItems );
     }
 
     public override int GetHashCode()
@@ -132,7 +124,5 @@ namespace Xceed.Wpf.DataGrid
 
       return ( ( SelectionCellRangeWithItems )obj ) == this;
     }
-
-    #endregion PUBLIC METHODS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
index 05698a9f..f2b08270 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
@@ -15,23 +15,25 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Collections;
-using System.Windows.Controls;
-using System.Diagnostics;
-using System.Windows;
+using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.DataGrid
 {
   internal class SelectionChanger
   {
-    #region CONSTRUCTORS
+    #region Static Fields
+
+    private static readonly SelectedItemsStorage EmptyItemsStore = new SelectedItemsStorage( null );
+    private static readonly SelectedCellsStorage EmptyCellsStore = new SelectedCellsStorage( null );
 
-    public SelectionChanger( DataGridContext owner )
+    #endregion
+
+    internal SelectionChanger( DataGridContext owner )
     {
       m_owner = owner;
       m_itemsToSelect = new SelectedItemsStorage( owner );
@@ -42,11 +44,9 @@ namespace Xceed.Wpf.DataGrid
       m_sourceChanges = new List<SourceChangeInfo>( 2 );
     }
 
-    #endregion CONSTRUCTORS
-
     #region Owner Property
 
-    public DataGridContext Owner
+    internal DataGridContext Owner
     {
       get
       {
@@ -54,11 +54,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    private DataGridContext m_owner;
+    private readonly DataGridContext m_owner;
 
-    #endregion Owner Property
-
-    #region PUBLIC METHODS
+    #endregion
 
     public bool SelectItems( SelectionRangeWithItems rangeWithItems )
     {
@@ -252,7 +250,7 @@ namespace Xceed.Wpf.DataGrid
           {
             int index = Array.IndexOf( existingSelectionRangeWithItems.Items, itemToUnselect );
 
-            if( index > -1 )
+            if( index >= 0 )
             {
               index = existingSelectionRangeWithItems.Range.GetIndexFromItemOffset( index );
 
@@ -653,16 +651,15 @@ namespace Xceed.Wpf.DataGrid
       m_toDeferSelect.Clear();
     }
 
-    public void UpdateSelectedItemsInChangeOfDataGridContext( bool itemsSourceChanged )
+    public void UpdateSelectedItemsInChangeOfDataGridContext()
     {
-      List<SelectionRangeWithItems> removedRangeWithItems;
-      List<SelectionRangeWithItems> unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove( out removedRangeWithItems );
-      SelectedItemsStorage ownerSelectedItems = m_owner.SelectedItemsStore;
-      int count = m_sourceChanges.Count;
+      var removedRangeWithItems = new List<SelectionRangeWithItems>();
+      var unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove( removedRangeWithItems );
+      var ownerSelectedItems = m_owner.SelectedItemsStore;
 
-      for( int i = 0; i < count; i++ )
+      for( int i = 0; i < m_sourceChanges.Count; i++ )
       {
-        SourceChangeInfo sourceChangeInfo = m_sourceChanges[ i ];
+        var sourceChangeInfo = m_sourceChanges[ i ];
 
         switch( sourceChangeInfo.Action )
         {
@@ -690,14 +687,12 @@ namespace Xceed.Wpf.DataGrid
         ownerSelectedItems.OffsetIndex( rangeWithItems.Range.StartIndex, -rangeWithItems.Length );
       }
 
-      count = m_toDeferSelect.Count;
-
-      for( int i = count - 1; i >= 0; i-- )
+      for( int i = m_toDeferSelect.Count - 1; i >= 0; i-- )
       {
         object item = m_toDeferSelect[ i ];
         int itemIndex = m_owner.Items.IndexOf( item );
 
-        if( itemIndex != -1 )
+        if( itemIndex >= 0 )
         {
           if( !m_itemsToUnselect.Contains( itemIndex ) )
           {
@@ -708,16 +703,16 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      if( ( m_itemsToUnselect.Count > 0 ) || ( m_itemsToSelect.Count > 0 ) || ( unselectedItemsFromRemove.Count > 0 ) )
+      if( ( m_itemsToUnselect.Count > 0 ) || ( m_itemsToSelect.Count > 0 ) || ( unselectedItemsFromRemove.Any() ) )
       {
-        Dictionary<int, DataRow> realizedDataRows = new Dictionary<int, DataRow>();
+        var realizedDataRows = new Dictionary<int, DataRow>();
 
         // Only want to update the realizedDataRows if the selection change is from user interaction and not
         // from the source being updated.  When the source is updated, the generator will recreate needed container,
         // so the old one will have the correct selection state.
-        foreach( DependencyObject container in m_owner.CustomItemContainerGenerator.RealizedContainers )
+        foreach( var container in m_owner.CustomItemContainerGenerator.RealizedContainers )
         {
-          DataRow dataRow = container as DataRow;
+          var dataRow = container as DataRow;
 
           if( ( dataRow != null ) && ( DataGridControl.GetDataGridContext( dataRow ) == m_owner ) )
           {
@@ -725,28 +720,28 @@ namespace Xceed.Wpf.DataGrid
           }
         }
 
-        bool sourceItemIsDataRow = false;
+        var sourceItemIsDataRow = false;
 
-        foreach( SelectionRangeWithItems rangeWithItems in m_itemsToUnselect )
+        foreach( var rangeWithItems in m_itemsToUnselect )
         {
           sourceItemIsDataRow |= this.SetIsSelectedOnDataRow( realizedDataRows, rangeWithItems, false );
           ownerSelectedItems.Remove( rangeWithItems );
         }
 
-        foreach( SelectionRangeWithItems rangeWithItems in m_itemsToSelect )
+        foreach( var rangeWithItems in m_itemsToSelect )
         {
           sourceItemIsDataRow |= this.SetIsSelectedOnDataRow( realizedDataRows, rangeWithItems, true );
           ownerSelectedItems.Add( rangeWithItems );
         }
 
-        foreach( SelectionRangeWithItems rangeWithItems in unselectedItemsFromRemove )
+        foreach( var rangeWithItems in unselectedItemsFromRemove )
         {
           m_itemsToUnselect.Add( rangeWithItems );
         }
 
         if( !sourceItemIsDataRow )
         {
-          foreach( KeyValuePair<int, DataRow> realizedItemPair in realizedDataRows )
+          foreach( var realizedItemPair in realizedDataRows )
           {
             if( ownerSelectedItems.Contains( new SelectionRange( realizedItemPair.Key ) ) )
             {
@@ -761,16 +756,15 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public void UpdateSelectedCellsInChangeOfDataGridContext( bool itemsSourceChanged )
+    public void UpdateSelectedCellsInChangeOfDataGridContext()
     {
-      List<SelectionCellRangeWithItems> removedCellsRangeWithItems;
-      List<SelectionCellRangeWithItems> unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove( out removedCellsRangeWithItems );
-      SelectedCellsStorage ownerSelectedCells = m_owner.SelectedCellsStore;
-      int count = m_sourceChanges.Count;
+      var removedCellsRangeWithItems = new List<SelectionCellRangeWithItems>();
+      var unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove( removedCellsRangeWithItems );
+      var ownerSelectedCells = m_owner.SelectedCellsStore;
 
-      for( int i = 0; i < count; i++ )
+      for( int i = 0; i < m_sourceChanges.Count; i++ )
       {
-        SourceChangeInfo sourceChangeInfo = m_sourceChanges[ i ];
+        var sourceChangeInfo = m_sourceChanges[ i ];
 
         switch( sourceChangeInfo.Action )
         {
@@ -792,22 +786,22 @@ namespace Xceed.Wpf.DataGrid
         }
       }
 
-      foreach( SelectionCellRangeWithItems cellRangeWithItems in removedCellsRangeWithItems )
+      foreach( var cellRangeWithItems in removedCellsRangeWithItems )
       {
         ownerSelectedCells.Remove( cellRangeWithItems );
         ownerSelectedCells.OffsetIndex( cellRangeWithItems.ItemRange.StartIndex, -cellRangeWithItems.ItemRange.Length );
       }
 
-      if( ( m_cellsToUnselect.Count > 0 ) || ( m_cellsToSelect.Count > 0 ) || ( unselectedCellsFromRemove.Count > 0 ) )
+      if( ( m_cellsToUnselect.Count > 0 ) || ( m_cellsToSelect.Count > 0 ) || ( unselectedCellsFromRemove.Any() ) )
       {
-        Dictionary<int, DataRow> realizedDataRows = new Dictionary<int, DataRow>();
+        var realizedDataRows = new Dictionary<int, DataRow>();
 
         // Only want to update the realizedCells if the selection change is from user interaction and not
         // from the source being updated.  When the source is updated, the generator will recreate needed container,
         // so the old one will have the correct selection state.
-        foreach( DependencyObject container in m_owner.CustomItemContainerGenerator.RealizedContainers )
+        foreach( var container in m_owner.CustomItemContainerGenerator.RealizedContainers )
         {
-          DataRow dataRow = container as DataRow;
+          var dataRow = container as DataRow;
 
           if( ( dataRow != null ) && ( DataGridControl.GetDataGridContext( dataRow ) == m_owner ) )
           {
@@ -816,10 +810,10 @@ namespace Xceed.Wpf.DataGrid
         }
 
         // We use the ColumnsByVisiblePosition for when column are changing position, we want to have the state before the change.
-        HashedLinkedList<ColumnBase> columnsByVisiblePositionLikedList = m_owner.ColumnsByVisiblePosition;
-        int columnIndex = 0;
-        Dictionary<ColumnBase, int> columnsVisiblePosition = new Dictionary<ColumnBase, int>( columnsByVisiblePositionLikedList.Count );
-        LinkedListNode<ColumnBase> columnNode = columnsByVisiblePositionLikedList.First;
+        var columnsByVisiblePositionLikedList = m_owner.ColumnsByVisiblePosition;
+        var columnIndex = 0;
+        var columnsVisiblePosition = new Dictionary<ColumnBase, int>( columnsByVisiblePositionLikedList.Count );
+        var columnNode = columnsByVisiblePositionLikedList.First;
 
         while( columnNode != null )
         {
@@ -828,19 +822,19 @@ namespace Xceed.Wpf.DataGrid
           columnNode = columnNode.Next;
         }
 
-        foreach( SelectionCellRangeWithItems cellRangeWithItems in m_cellsToUnselect )
+        foreach( var cellRangeWithItems in m_cellsToUnselect )
         {
           this.SetIsSelectedOnDataCell( columnsVisiblePosition, realizedDataRows, cellRangeWithItems, false );
           ownerSelectedCells.Remove( cellRangeWithItems );
         }
 
-        foreach( SelectionCellRangeWithItems cellRangeWithItems in m_cellsToSelect )
+        foreach( var cellRangeWithItems in m_cellsToSelect )
         {
           this.SetIsSelectedOnDataCell( columnsVisiblePosition, realizedDataRows, cellRangeWithItems, true );
           ownerSelectedCells.Add( cellRangeWithItems );
         }
 
-        foreach( SelectionCellRangeWithItems cellRangeWithItems in unselectedCellsFromRemove )
+        foreach( var cellRangeWithItems in unselectedCellsFromRemove )
         {
           m_cellsToUnselect.Add( cellRangeWithItems );
         }
@@ -929,7 +923,7 @@ namespace Xceed.Wpf.DataGrid
       int replacedItemCount = oldItems.Count;
       int cellRangeCount = selectedCellsStorage.Count;
 
-      if( oldItemIndex != -1 )
+      if( oldItemIndex >= 0 )
       {
         int itemIndex = oldItemIndex;
 
@@ -974,7 +968,7 @@ namespace Xceed.Wpf.DataGrid
           object newItem = newItems[ i ];
           int itemIndex = sourceItems.IndexOf( newItem );
 
-          if( itemIndex == -1 )
+          if( itemIndex < 0 )
             continue;
 
           if( selectedItemsStorage.Contains( itemIndex ) )
@@ -1007,59 +1001,61 @@ namespace Xceed.Wpf.DataGrid
 
     public SelectionInfo GetSelectionInfo()
     {
-      List<SelectionRangeWithItems> removedRangeWithItems;
-      List<SelectionRangeWithItems> unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove( out removedRangeWithItems );
-      List<SelectionCellRangeWithItems> removedCellsRangeWithItems;
-      List<SelectionCellRangeWithItems> unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove( out removedCellsRangeWithItems );
+      var unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove();
+      var unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove();
 
-      SelectedItemsStorage itemsToUnselect = ( SelectedItemsStorage )m_itemsToUnselect.Clone();
-      SelectedCellsStorage cellsToUnselect = ( SelectedCellsStorage )m_cellsToUnselect.Clone();
+      var itemsToUnselect = ( ( m_itemsToUnselect.Count > 0 ) || unselectedItemsFromRemove.Any() ) ? ( SelectedItemsStorage )m_itemsToUnselect.Clone() : SelectionChanger.EmptyItemsStore;
+      var itemsToSelect = ( m_itemsToSelect.Count > 0 ) ? ( SelectedItemsStorage )m_itemsToSelect.Clone() : SelectionChanger.EmptyItemsStore;
+      var cellsToUnselect = ( ( m_cellsToUnselect.Count > 0 ) || unselectedCellsFromRemove.Any() ) ? ( SelectedCellsStorage )m_cellsToUnselect.Clone() : SelectionChanger.EmptyCellsStore;
+      var cellsToSelect = ( m_cellsToSelect.Count > 0 ) ? ( SelectedCellsStorage )m_cellsToSelect.Clone() : SelectionChanger.EmptyCellsStore;
 
-      foreach( SelectionRangeWithItems rangeWithItems in unselectedItemsFromRemove )
+      foreach( var rangeWithItems in unselectedItemsFromRemove )
       {
         itemsToUnselect.Add( rangeWithItems );
       }
 
-      foreach( SelectionCellRangeWithItems cellRangeWithItems in unselectedCellsFromRemove )
+      foreach( var cellRangeWithItems in unselectedCellsFromRemove )
       {
         cellsToUnselect.Add( cellRangeWithItems );
       }
 
-      return new SelectionInfo(
-        m_owner, itemsToUnselect, ( SelectedItemsStorage )m_itemsToSelect.Clone(),
-        cellsToUnselect, ( SelectedCellsStorage )m_cellsToSelect.Clone() );
+      return new SelectionInfo( m_owner, itemsToUnselect, itemsToSelect, cellsToUnselect, cellsToSelect );
     }
 
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE METHODS
+    private IEnumerable<SelectionRangeWithItems> GetUnselectedItemsFromRemove()
+    {
+      return this.GetUnselectedItemsFromRemove( null );
+    }
 
-    private List<SelectionRangeWithItems> GetUnselectedItemsFromRemove( out List<SelectionRangeWithItems> removedRangeWithItems )
+    private IEnumerable<SelectionRangeWithItems> GetUnselectedItemsFromRemove( ICollection<SelectionRangeWithItems> removedRangeWithItems )
     {
-      List<SelectionRangeWithItems> unselectedItemsFromRemove = new List<SelectionRangeWithItems>( 8 );
-      removedRangeWithItems = new List<SelectionRangeWithItems>( 8 );
+      var store = m_owner.SelectedItemsStore;
+      if( ( store.Count <= 0 ) || ( m_sourceChanges.Count <= 0 ) )
+        return Enumerable.Empty<SelectionRangeWithItems>();
 
-      int count = m_sourceChanges.Count;
+      var unselectedItemsFromRemove = new List<SelectionRangeWithItems>();
 
-      for( int i = 0; i < count; i++ )
+      for( int i = 0; i < m_sourceChanges.Count; i++ )
       {
-        SourceChangeInfo sourceChangeInfo = m_sourceChanges[ i ];
-
+        var sourceChangeInfo = m_sourceChanges[ i ];
         if( ( sourceChangeInfo.Action != NotifyCollectionChangedAction.Remove ) || ( sourceChangeInfo.StartIndex == -1 ) )
           continue;
 
-        int startIndex = sourceChangeInfo.StartIndex;
-        int removedItemCount = sourceChangeInfo.Count;
-        object[] removedItems = new object[ removedItemCount ];
+        var startIndex = sourceChangeInfo.StartIndex;
+        var removedItemCount = sourceChangeInfo.Count;
+        var removedItems = new object[ removedItemCount ];
+
         sourceChangeInfo.Items.CopyTo( removedItems, 0 );
 
-        SelectionRangeWithItems rangeWithItemsToRemove = new SelectionRangeWithItems(
-          new SelectionRange( startIndex, startIndex + removedItemCount - 1 ),
-          removedItems );
+        var range = new SelectionRange( startIndex, startIndex + removedItemCount - 1 );
+        var rangeWithItemsToRemove = new SelectionRangeWithItems( range, removedItems );
 
-        removedRangeWithItems.Add( rangeWithItemsToRemove );
+        if( removedRangeWithItems != null )
+        {
+          removedRangeWithItems.Add( rangeWithItemsToRemove );
+        }
 
-        if( m_owner.SelectedItemsStore.Contains( rangeWithItemsToRemove ) )
+        if( store.Contains( rangeWithItemsToRemove ) )
         {
           unselectedItemsFromRemove.Add( rangeWithItemsToRemove );
         }
@@ -1068,35 +1064,38 @@ namespace Xceed.Wpf.DataGrid
       return unselectedItemsFromRemove;
     }
 
-    private List<SelectionCellRangeWithItems> GetUnselectedCellsFromRemove( out List<SelectionCellRangeWithItems> removedCellsRangeWithItems )
+    private IEnumerable<SelectionCellRangeWithItems> GetUnselectedCellsFromRemove()
     {
-      removedCellsRangeWithItems = new List<SelectionCellRangeWithItems>( 8 );
-      List<SelectionCellRangeWithItems> unselectedCellsFromRemove = new List<SelectionCellRangeWithItems>( 8 );
+      return this.GetUnselectedCellsFromRemove( null );
+    }
 
-      int count = m_sourceChanges.Count;
+    private IEnumerable<SelectionCellRangeWithItems> GetUnselectedCellsFromRemove( ICollection<SelectionCellRangeWithItems> removedCellsRangeWithItems )
+    {
+      var store = m_owner.SelectedCellsStore;
+      if( ( store.Count <= 0 ) || ( m_sourceChanges.Count <= 0 ) )
+        return Enumerable.Empty<SelectionCellRangeWithItems>();
 
-      for( int i = 0; i < count; i++ )
-      {
-        SourceChangeInfo sourceChangeInfo = m_sourceChanges[ i ];
+      var unselectedCellsFromRemove = new List<SelectionCellRangeWithItems>();
 
+      for( int i = 0; i < m_sourceChanges.Count; i++ )
+      {
+        var sourceChangeInfo = m_sourceChanges[ i ];
         if( ( sourceChangeInfo.Action != NotifyCollectionChangedAction.Remove ) || ( sourceChangeInfo.StartIndex == -1 ) )
           continue;
 
-        int startIndex = sourceChangeInfo.StartIndex;
-        int removedItemCount = sourceChangeInfo.Count;
-        object[] removedItems = new object[ removedItemCount ];
-        sourceChangeInfo.Items.CopyTo( removedItems, 0 );
-
-        SelectionCellRangeWithItems cellRangeWithItemsToRemove = new SelectionCellRangeWithItems(
-          new SelectionRange( startIndex, startIndex + removedItemCount - 1 ),
-          removedItems, new SelectionRange( 0, int.MaxValue - 1 ) );
+        var startIndex = sourceChangeInfo.StartIndex;
+        var removedItemCount = sourceChangeInfo.Count;
+        var range = new SelectionCellRange( new SelectionRange( startIndex, startIndex + removedItemCount - 1 ), new SelectionRange( 0, int.MaxValue - 1 ) );
 
-        removedCellsRangeWithItems.Add( cellRangeWithItemsToRemove );
+        if( removedCellsRangeWithItems != null )
+        {
+          var removedItems = new object[ removedItemCount ];
+          sourceChangeInfo.Items.CopyTo( removedItems, 0 );
 
-        IEnumerable<SelectionCellRangeWithItems> intersectedCellRangesWithItems =
-          m_owner.SelectedCellsStore.GetIntersectedCellRangesWithItems( cellRangeWithItemsToRemove.CellRange );
+          removedCellsRangeWithItems.Add( new SelectionCellRangeWithItems( range.ItemRange, removedItems, range.ColumnRange ) );
+        }
 
-        foreach( SelectionCellRangeWithItems cellRangeWithItems in intersectedCellRangesWithItems )
+        foreach( var cellRangeWithItems in store.GetIntersectedCellRangesWithItems( range ) )
         {
           unselectedCellsFromRemove.Add( cellRangeWithItems );
         }
@@ -1139,9 +1138,9 @@ namespace Xceed.Wpf.DataGrid
       SelectionCellRangeWithItems cellRangeWithItems,
       bool selected )
     {
-      object[] rangeItems = cellRangeWithItems.ItemRangeWithItems.Items;
-      bool selectionChanged = false;
-      SelectionRange columnRange = cellRangeWithItems.ColumnRange;
+      var rangeItems = cellRangeWithItems.ItemRangeWithItems.Items;
+      var selectionChanged = false;
+      var columnRange = cellRangeWithItems.ColumnRange;
 
       if( rangeItems != null )
       {
@@ -1149,13 +1148,13 @@ namespace Xceed.Wpf.DataGrid
 
         for( int i = 0; i < itemsCount; i++ )
         {
-          DataRow rangeItemAsDataRow = rangeItems[ i ] as DataRow;
+          var rangeItemAsDataRow = rangeItems[ i ] as DataRow;
 
           if( rangeItemAsDataRow != null )
           {
             selectionChanged = true;
 
-            foreach( DataCell dataCell in rangeItemAsDataRow.CreatedCells )
+            foreach( var dataCell in rangeItemAsDataRow.CreatedCells )
             {
               if( dataCell.IsContainerVirtualized )
                 continue;
@@ -1181,13 +1180,13 @@ namespace Xceed.Wpf.DataGrid
 
       if( !selectionChanged )
       {
-        SelectionRange itemRange = cellRangeWithItems.ItemRange;
+        var itemRange = cellRangeWithItems.ItemRange;
 
-        foreach( KeyValuePair<int, DataRow> realizedItemPair in realizedDataRows )
+        foreach( var realizedItemPair in realizedDataRows )
         {
           if( !itemRange.Intersect( new SelectionRange( realizedItemPair.Key ) ).IsEmpty )
           {
-            foreach( DataCell dataCell in realizedItemPair.Value.CreatedCells )
+            foreach( var dataCell in realizedItemPair.Value.CreatedCells )
             {
               if( dataCell.IsContainerVirtualized )
                 continue;
@@ -1207,24 +1206,18 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PRIVATE METHODS
-
-    #region FIELDS
-
-    private List<object> m_toDeferSelect;
-    private SelectedItemsStorage m_itemsToSelect;
-    private SelectedItemsStorage m_itemsToUnselect;
-    private SelectedCellsStorage m_cellsToSelect;
-    private SelectedCellsStorage m_cellsToUnselect;
-    private List<SourceChangeInfo> m_sourceChanges;
-
-    #endregion FIELDS
+    private readonly List<object> m_toDeferSelect;
+    private readonly SelectedItemsStorage m_itemsToSelect;
+    private readonly SelectedItemsStorage m_itemsToUnselect;
+    private readonly SelectedCellsStorage m_cellsToSelect;
+    private readonly SelectedCellsStorage m_cellsToUnselect;
+    private readonly List<SourceChangeInfo> m_sourceChanges;
 
-    #region SourceChangeInfo Class
+    #region SourceChangeInfo Private Class
 
-    private class SourceChangeInfo
+    private sealed class SourceChangeInfo
     {
-      public SourceChangeInfo( NotifyCollectionChangedAction action, int startIndex, int count, IList items )
+      internal SourceChangeInfo( NotifyCollectionChangedAction action, int startIndex, int count, IList items )
       {
         this.Action = action;
         this.StartIndex = startIndex;
@@ -1232,31 +1225,31 @@ namespace Xceed.Wpf.DataGrid
         this.Items = items;
       }
 
-      public NotifyCollectionChangedAction Action
+      internal NotifyCollectionChangedAction Action
       {
         get;
         private set;
       }
 
-      public int StartIndex
+      internal int StartIndex
       {
         get;
         private set;
       }
 
-      public int Count
+      internal int Count
       {
         get;
         private set;
       }
 
-      public IList Items
+      internal IList Items
       {
         get;
         private set;
       }
     }
 
-    #endregion SourceChangeInfo Class
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
index b1ae1911..69586ef5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
@@ -15,44 +15,139 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
 using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class SelectionItemCollection : IList<object>, IList
+  internal sealed class SelectionItemCollection : IList<object>, IList
   {
-    public SelectionItemCollection( SelectedItemsStorage list )
+    internal SelectionItemCollection( SelectedItemsStorage collection )
     {
-      m_list = list;
+      m_storage = collection;
     }
 
+    private bool FindItem( int index, DataGridContext dataGridContext, int itemsCount, out SelectionRangeWithItems range, out int offset )
+    {
+      var rangesCount = m_storage.Count;
+
+      range = SelectionRangeWithItems.Empty;
+      offset = index;
+
+      for( int i = 0; i < rangesCount; i++ )
+      {
+        if( offset < 0 )
+          break;
+
+        range = m_storage[ i ];
+        var length = range.Length;
+
+        if( offset < length )
+        {
+          var startAt = range.Range.StartIndex;
+          var endAt = range.Range.EndIndex;
+
+          if( startAt > endAt )
+          {
+            if( startAt - offset >= itemsCount )
+              break;
+          }
+          else
+          {
+            if( startAt + offset >= itemsCount )
+              break;
+          }
+
+          Debug.Assert( ( offset >= 0 ) && ( offset < length ) );
+
+          return true;
+        }
+        else
+        {
+          offset -= length;
+        }
+      }
+
+      return false;
+    }
+
+    private IEnumerable<object> EnumerateItems( SelectionRangeWithItems range, DataGridContext dataGridContext, int itemsCount )
+    {
+      var startAt = range.Range.StartIndex;
+      var endAt = range.Range.EndIndex;
+      var min = Math.Min( startAt, endAt );
+      var max = Math.Max( startAt, endAt );
+
+      if( startAt > endAt )
+      {
+        var upperLimit = Math.Min( startAt, itemsCount - 1 );
+
+        for( int i = upperLimit; i >= endAt; i-- )
+        {
+          object item;
+
+          try
+          {
+            item = range.GetItem( dataGridContext, startAt - i );
+          }
+          catch( ArgumentOutOfRangeException )
+          {
+            continue;
+          }
+
+          yield return item;
+        }
+      }
+      else
+      {
+        var upperLimit = Math.Min( endAt, itemsCount - 1 );
+
+        for( int i = startAt; i <= upperLimit; i++ )
+        {
+          object item;
+
+          try
+          {
+            item = range.GetItem( dataGridContext, i - startAt );
+          }
+          catch( ArgumentOutOfRangeException )
+          {
+            break;
+          }
+
+          yield return item;
+        }
+      }
+    }
+
+    #region IList<> Members
+
     public object this[ int index ]
     {
       get
       {
-        if( ( index < 0 ) || ( index >= m_list.ItemsCount ) )
+        if( ( index < 0 ) || ( index >= m_storage.ItemsCount ) )
           throw new ArgumentOutOfRangeException( "index", "The index must be equal or greater than zero and less than Count." );
 
-        int oldIndexOffset = 0;
-        int indexOffset = 0;
-        int count = m_list.Count;
+        var dataGridContext = m_storage.DataGridContext;
+        var itemsCount = dataGridContext.Items.Count;
+        var range = SelectionRangeWithItems.Empty;
+        var offset = default( int );
 
-        for( int i = 0; i < count; i++ )
+        if( this.FindItem( index, dataGridContext, itemsCount, out range, out offset ) )
         {
-          SelectionRangeWithItems rangeWithItems = m_list[ i ];
-          indexOffset += rangeWithItems.Length;
-
-          if( index < indexOffset )
-            return rangeWithItems.GetItem( m_list.DataGridContext, index - oldIndexOffset );
-
-          oldIndexOffset = indexOffset;
+          try
+          {
+            return range.GetItem( dataGridContext, offset );
+          }
+          catch( ArgumentOutOfRangeException )
+          {
+            // return null
+          }
         }
 
-        throw new ArgumentOutOfRangeException( "index", "The index must be less than Count." );
+        return null;
       }
       set
       {
@@ -60,23 +155,131 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public int Count
+    public int IndexOf( object item )
+    {
+      var rangesCount = m_storage.Count;
+      if( rangesCount <= 0 )
+        return -1;
+
+      var dataGridContext = m_storage.DataGridContext;
+      var itemsCount = default( int? );
+      var offset = 0;
+
+      for( int i = 0; i < rangesCount; i++ )
+      {
+        var range = m_storage[ i ];
+        if( range.Items != null )
+        {
+          var index = 0;
+
+          if( !itemsCount.HasValue )
+          {
+            itemsCount = dataGridContext.Items.Count;
+          }
+
+          foreach( var target in this.EnumerateItems( range, dataGridContext, itemsCount.Value ) )
+          {
+            if( object.Equals( target, item ) )
+              return offset + index;
+
+            index++;
+          }
+        }
+
+        offset += range.Length;
+      }
+
+      return -1;
+    }
+
+    public void Insert( int index, object item )
+    {
+      if( ( index < 0 ) || ( index > m_storage.ItemsCount ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
+
+      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
+        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." );
+
+      var selectionManager = dataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
+      {
+        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( dataGridContext.Items.IndexOf( item ), item ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
+      }
+    }
+
+    public void RemoveAt( int index )
+    {
+      if( ( index < 0 ) || ( index >= m_storage.ItemsCount ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var itemsCount = dataGridContext.Items.Count;
+      var range = SelectionRangeWithItems.Empty;
+      var offset = default( int );
+
+      if( !this.FindItem( index, dataGridContext, itemsCount, out range, out offset ) )
+        return;
+
+      object item;
+      int itemIndex;
+
+      try
+      {
+        item = range.GetItem( dataGridContext, offset );
+        itemIndex = range.Range.GetIndexFromItemOffset( offset );
+      }
+      catch( ArgumentOutOfRangeException )
+      {
+        return;
+      }
+
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
+      {
+        selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( itemIndex, item ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
+      }
+    }
+
+    #endregion
+
+    #region IList Members
+
+    object IList.this[ int index ]
     {
       get
       {
-        return m_list.ItemsCount;
+        return this[ index ];
+      }
+      set
+      {
+        this[ index ] = value;
       }
     }
 
-    public bool IsReadOnly
+    bool IList.IsReadOnly
     {
       get
       {
-        return false;
+        return ( ( ICollection<object> )this ).IsReadOnly;
       }
     }
 
-    public bool IsFixedSize
+    bool IList.IsFixedSize
     {
       get
       {
@@ -84,12 +287,10 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #region IList Members
-
     int IList.Add( object item )
     {
       this.Add( item );
-      return m_list.ItemsCount - 1;
+      return this.Count - 1;
     }
 
     void IList.Clear()
@@ -112,233 +313,146 @@ namespace Xceed.Wpf.DataGrid
       this.RemoveAt( index );
     }
 
-    #endregion IList Members
-
-    #region ICollection Members
+    bool IList.Contains( object item )
+    {
+      return this.Contains( item );
+    }
 
-    object ICollection.SyncRoot
+    int IList.IndexOf( object item )
     {
-      get
-      {
-        return m_list;
-      }
+      return this.IndexOf( item );
     }
 
-    bool ICollection.IsSynchronized
+    #endregion
+
+    #region ICollection<> Members
+
+    public int Count
     {
       get
       {
-        return false;
+        return m_storage.ItemsCount;
       }
     }
 
-    void ICollection.CopyTo( Array array, int arrayIndex )
+    bool ICollection<object>.IsReadOnly
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
+      get
       {
-        SelectionRangeWithItems rangeWithItems = m_list[ i ];
-        int rangeLength = rangeWithItems.Length;
-
-        for( int j = 0; j < rangeLength; j++ )
-        {
-          array.SetValue( rangeWithItems.GetItem( dataGridContext, j ), arrayIndex );
-          arrayIndex++;
-        }
+        return false;
       }
     }
 
-    #endregion ICollection Members
-
-    #region IList<object> Members
-
-    public int IndexOf( object item )
+    public void Add( object item )
     {
-      int indexOffset = 0;
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        SelectionRangeWithItems rangeWithItems = m_list[ i ];
-        object[] items = rangeWithItems.Items;
-
-        if( items != null )
-        {
-          int index = Array.IndexOf<object>( items, item );
-
-          if( index != -1 )
-            return indexOffset + index;
-        }
-
-        indexOffset += rangeWithItems.Length;
-      }
-
-      return -1;
+      this.Insert( m_storage.ItemsCount, item );
     }
 
-    public void Insert( int index, object item )
+    public void Clear()
     {
-      if( ( index < 0 ) || ( index > m_list.ItemsCount ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      var dataGridContext = m_storage.DataGridContext;
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.SelectItems( dataGridContext, 
-          new SelectionRangeWithItems( dataGridContext.Items.IndexOf( item ), item ) );
+        selectionManager.UnselectAllItems( dataGridContext );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public void RemoveAt( int index )
+    public bool Contains( object item )
     {
-      if( ( index < 0 ) || ( index >= m_list.ItemsCount ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      int oldIndexOffset = 0;
-      int indexOffset = 0;
-      int count = m_list.Count;
-      SelectionRangeWithItems rangeWithItemsFound = SelectionRangeWithItems.Empty;
-
-      for( int i = 0; i < count; i++ )
-      {
-        SelectionRangeWithItems rangeWithItems = m_list[ i ];
-        indexOffset += rangeWithItems.Length;
-
-        if( index < indexOffset )
-        {
-          rangeWithItemsFound = rangeWithItems; // .GetItem( dataGridContext, index - oldIndexOffset );
-          break;
-        }
-
-        oldIndexOffset = indexOffset;
-      }
-
-      if( !rangeWithItemsFound.IsEmpty )
-      {
-        DataGridContext dataGridContext = m_list.DataGridContext;
-        SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-        selectionManager.Begin();
-
-        try
-        {
-          selectionManager.UnselectItems( dataGridContext, 
-            new SelectionRangeWithItems(
-              rangeWithItemsFound.Range.GetIndexFromItemOffset( index - oldIndexOffset ),
-              rangeWithItemsFound.GetItem( dataGridContext, index - oldIndexOffset ) ) );
-        }
-        finally
-        {
-          selectionManager.End( false, true, true );
-        }
-      }
+      return ( this.IndexOf( item ) >= 0 );
     }
 
-    #endregion
-
-    #region ICollection<object> Members
-
-    public void Add( object item )
+    public bool Remove( object item )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
 
       if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." ); 
+        throw new InvalidOperationException( "Can't remove item when SelectionUnit is Cell." );
 
-      SelectionManager selectionManager = dataGridControl.SelectionChangerManager;
+      var selectionManager = dataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.SelectItems( dataGridContext, 
-          new SelectionRangeWithItems( dataGridContext.Items.IndexOf( item ), item ) );
+        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( SelectionRange.Empty, new object[] { item } ) );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public void Clear()
+    public void CopyTo( object[] array, int arrayIndex )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
+      ( ( ICollection )this ).CopyTo( array, arrayIndex );
+    }
 
-      try
-      {
-        selectionManager.UnselectAllItems( dataGridContext );
-      }
-      finally
+    #endregion
+
+    #region ICollection Members
+
+    int ICollection.Count
+    {
+      get
       {
-        selectionManager.End( false, true, true );
+        return this.Count;
       }
     }
 
-    public bool Contains( object item )
+    object ICollection.SyncRoot
     {
-      return this.IndexOf( item ) != -1;
+      get
+      {
+        return m_storage;
+      }
     }
 
-    public void CopyTo( object[] array, int arrayIndex )
+    bool ICollection.IsSynchronized
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
+      get
       {
-        SelectionRangeWithItems rangeWithItems = m_list[ i ];
-        int rangeLength = rangeWithItems.Length;
-
-        for( int j = 0; j < rangeLength; j++ )
-        {
-          array[ arrayIndex ] = rangeWithItems.GetItem( dataGridContext, j );
-          arrayIndex++;
-        }
+        return false;
       }
     }
 
-    public bool Remove( object item )
+    void ICollection.CopyTo( Array array, int arrayIndex )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
+      using( var enumerator = this.GetEnumerator() )
       {
-        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( SelectionRange.Empty, new object[] { item } ) );
-      }
-      finally
-      {
-        selectionManager.End( false, true, true );
+        while( enumerator.MoveNext() )
+        {
+          array.SetValue( enumerator.Current, arrayIndex );
+          arrayIndex++;
+        }
       }
     }
 
     #endregion
 
-    #region IEnumerable<SelectionRange> Members
+    #region IEnumerable<> Members
 
     public IEnumerator<object> GetEnumerator()
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
+      if( m_storage.Count <= 0 )
+        yield break;
 
-      // We use a foreach to get the exception when the list is changed
-      foreach( SelectionRangeWithItems rangeWithItems in m_list )
-      {
-        int rangeLength = rangeWithItems.Length;
+      var dataGridContext = m_storage.DataGridContext;
+      var itemsCount = dataGridContext.Items.Count;
 
-        for( int j = 0; j < rangeLength; j++ )
+      // We use a foreach to get the exception when the collection is changed.
+      foreach( var range in m_storage )
+      {
+        foreach( var item in this.EnumerateItems( range, dataGridContext, itemsCount ) )
         {
-          yield return rangeWithItems.GetItem( dataGridContext, j );
+          yield return item;
         }
       }
     }
@@ -354,6 +468,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    private SelectedItemsStorage m_list;
+    private readonly SelectedItemsStorage m_storage;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
index 95d7e215..aa118aee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
@@ -15,26 +15,29 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
-using System.Collections;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class SelectionItemRangeCollection : IList<SelectionRange>, IList
+  internal sealed class SelectionItemRangeCollection : IList<SelectionRange>, IList
   {
-    public SelectionItemRangeCollection( SelectedItemsStorage list )
+    internal SelectionItemRangeCollection( SelectedItemsStorage collection )
     {
-      m_list = list;
+      Debug.Assert( collection != null );
+
+      m_storage = collection;
     }
 
+    #region IList<> Members
+
     public SelectionRange this[ int index ]
     {
       get
       {
-        return m_list[ index ].Range;
+        return m_storage[ index ].Range;
       }
       set
       {
@@ -42,30 +45,73 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public int Count
+    public int IndexOf( SelectionRange item )
     {
-      get
+      var count = m_storage.Count;
+
+      for( int i = 0; i < count; i++ )
       {
-        return m_list.Count;
+        if( m_storage[ i ].Range == item )
+          return i;
       }
+
+      return -1;
     }
 
-    public bool IsReadOnly
+    public void Insert( int index, SelectionRange item )
     {
-      get
+      if( ( index < 0 ) || ( index > m_storage.Count ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
+
+      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
+        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." );
+
+      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
       {
-        return false;
+        var minIndex = Math.Min( item.StartIndex, item.EndIndex );
+        var maxIndex = Math.Max( item.StartIndex, item.EndIndex );
+
+        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
+          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
+      }
+
+      var selectionManager = dataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
+      {
+        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
       }
     }
 
-    public bool IsFixedSize
+    public void RemoveAt( int index )
     {
-      get
+      if( ( index < 0 ) || ( index >= m_storage.Count ) )
+        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
+
+      var dataGridContext = m_storage.DataGridContext;
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      selectionManager.Begin();
+
+      try
       {
-        return false;
+        selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( this[ index ], null ) );
+      }
+      finally
+      {
+        selectionManager.End( true, true );
       }
     }
 
+    #endregion
+
     #region IList Members
 
     object IList.this[ int index ]
@@ -80,10 +126,26 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
+    bool IList.IsReadOnly
+    {
+      get
+      {
+        return ( ( ICollection<SelectionRange> )this ).IsReadOnly;
+      }
+    }
+
+    bool IList.IsFixedSize
+    {
+      get
+      {
+        return false;
+      }
+    }
+
     int IList.Add( object item )
     {
       this.Add( ( SelectionRange )item );
-      return m_list.Count - 1;
+      return this.Count - 1;
     }
 
     void IList.Clear()
@@ -116,19 +178,19 @@ namespace Xceed.Wpf.DataGrid
       return this.IndexOf( ( SelectionRange )item );
     }
 
-    #endregion IList Members
+    #endregion
 
-    #region ICollection Members
+    #region ICollection<> Members
 
-    object ICollection.SyncRoot
+    public int Count
     {
       get
       {
-        return m_list;
+        return m_storage.Count;
       }
     }
 
-    bool ICollection.IsSynchronized
+    bool ICollection<SelectionRange>.IsReadOnly
     {
       get
       {
@@ -136,184 +198,119 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    void ICollection.CopyTo( Array array, int arrayIndex )
+    public void Add( SelectionRange item )
     {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        array.SetValue( m_list[ i ].Range, arrayIndex );
-        arrayIndex++;
-      }
+      this.Insert( m_storage.Count, item );
     }
 
-    #endregion ICollection Members
-
-    #region IList<SelectionRange> Members
-
-    public int IndexOf( SelectionRange item )
-    {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( m_list[ i ].Range == item )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public void Insert( int index, SelectionRange item )
+    public void Clear()
     {
-      if( ( index < 0 ) || ( index > m_list.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      var dataGridContext = m_storage.DataGridContext;
+      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
+        selectionManager.UnselectAllItems( dataGridContext );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public void RemoveAt( int index )
+    public bool Contains( SelectionRange item )
     {
-      if( ( index < 0 ) || ( index >= m_list.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( this[ index ], null ) );
-      }
-      finally
-      {
-        selectionManager.End( false, true, true );
-      }
+      return ( this.IndexOf( item ) >= 0 );
     }
 
-    #endregion
-
-    #region ICollection<SelectionRange> Members
-
-    public void Add( SelectionRange item )
+    public bool Remove( SelectionRange item )
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
+      var dataGridContext = m_storage.DataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
 
       if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." );
+        throw new InvalidOperationException( "Can't remove item when SelectionUnit is Cell." );
 
-      SelectionManager selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
+      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
       {
-        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
-      }
-      finally
-      {
-        selectionManager.End( false, true, true );
+        var minIndex = Math.Min( item.StartIndex, item.EndIndex );
+        var maxIndex = Math.Max( item.StartIndex, item.EndIndex );
+
+        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
+          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
       }
-    }
 
-    public void Clear()
-    {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
+      var selectionManager = dataGridControl.SelectionChangerManager;
       selectionManager.Begin();
 
       try
       {
-        selectionManager.UnselectAllItems( dataGridContext );
+        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
       }
       finally
       {
-        selectionManager.End( false, true, true );
+        selectionManager.End( true, true );
       }
     }
 
-    public bool Contains( SelectionRange item )
+    public void CopyTo( SelectionRange[] array, int arrayIndex )
     {
-      return this.IndexOf( item ) != -1;
+      ( ( ICollection )this ).CopyTo( array, arrayIndex );
     }
 
     internal bool Contains( int itemIndex )
     {
-      int count = m_list.Count;
+      return m_storage.Contains( itemIndex );
+    }
 
-      for( int i = 0; i < count; i++ )
+    #endregion
+
+    #region ICollection Members
+
+    int ICollection.Count
+    {
+      get
       {
-        SelectionRange range = m_list[ i ].Range;
-
-        int startIndex = range.StartIndex;
-        int endIndex = range.EndIndex;
-
-        if( startIndex > endIndex )
-        {
-          startIndex = range.EndIndex;
-          endIndex = range.StartIndex;
-        }
-
-        if( ( startIndex == itemIndex )
-          || ( endIndex == itemIndex )
-          || ( ( startIndex < itemIndex ) && ( itemIndex < endIndex ) ) )
-        {
-          return true;
-        }
+        return this.Count;
       }
-
-      return false;
     }
 
-    public void CopyTo( SelectionRange[] array, int arrayIndex )
+    object ICollection.SyncRoot
     {
-      int count = m_list.Count;
-
-      for( int i = 0; i < count; i++ )
+      get
       {
-        array[ arrayIndex ] = m_list[ i ].Range;
-        arrayIndex++;
+        return m_storage;
       }
     }
 
-    public bool Remove( SelectionRange item )
+    bool ICollection.IsSynchronized
     {
-      DataGridContext dataGridContext = m_list.DataGridContext;
-      SelectionManager selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
+      get
       {
-        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
+        return false;
       }
-      finally
+    }
+
+    void ICollection.CopyTo( Array array, int arrayIndex )
+    {
+      var count = m_storage.Count;
+
+      for( int i = 0; i < count; i++ )
       {
-        selectionManager.End( false, true, true );
+        array.SetValue( m_storage[ i ].Range, arrayIndex );
+        arrayIndex++;
       }
     }
 
     #endregion
 
-    #region IEnumerable<SelectionRange> Members
+    #region IEnumerable<> Members
 
     public IEnumerator<SelectionRange> GetEnumerator()
     {
-      // We use a foreach to get the exception when the list is changed
-      foreach( SelectionRangeWithItems rangeWithItems in m_list )
-      {
-        yield return rangeWithItems.Range;
-      }
+      return ( from item in m_storage
+               select item.Range ).GetEnumerator();
     }
 
     #endregion
@@ -327,6 +324,6 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
-    private SelectedItemsStorage m_list;
+    private readonly SelectedItemsStorage m_storage;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
index 861900b8..96c14252 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
@@ -40,8 +40,6 @@ namespace Xceed.Wpf.DataGrid
       None = 99
     }
 
-    #region CONSTRUCTORS
-
     public SelectionManager( DataGridControl owner )
     {
       if( owner == null )
@@ -50,9 +48,7 @@ namespace Xceed.Wpf.DataGrid
       m_owner = owner;
     }
 
-    #endregion CONSTRUCTORS
-
-    #region PUBLIC PROPERTIES
+    #region IsActive Property
 
     public bool IsActive
     {
@@ -62,9 +58,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PUBLIC PROPERTIES
-
-    #region PUBLIC METHODS
+    #endregion
 
     public IDisposable PushUpdateSelectionSource( UpdateSelectionSource updateSelectionSource )
     {
@@ -104,16 +98,16 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public void End( bool itemsSourceChanged, bool allowCancelingOfSelection, bool allowSynchronizeSelectionWithCurrent )
+    public void End( bool allowCancelingOfSelection, bool allowSynchronizeSelectionWithCurrent )
     {
       Debug.Assert( m_isActive );
 
-      List<SelectionInfo> activatedSelectionDeltas = new List<SelectionInfo>();
-      SelectionInfo selectionInfo;
+      var activatedSelectionDeltas = new List<SelectionInfo>();
+      var selectionInfo = default( SelectionInfo );
 
       try
       {
-        foreach( SelectionChanger selectionChanger in m_activatedSelectionChanger.Values )
+        foreach( var selectionChanger in m_activatedSelectionChanger.Values )
         {
           selectionInfo = selectionChanger.GetSelectionInfo();
 
@@ -125,21 +119,20 @@ namespace Xceed.Wpf.DataGrid
 
         if( activatedSelectionDeltas.Count > 0 )
         {
-          DataGridSelectionChangingEventArgs eventArgs = new DataGridSelectionChangingEventArgs(
-            new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ), allowCancelingOfSelection );
+          var eventArgs = new DataGridSelectionChangingEventArgs( new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ), allowCancelingOfSelection );
 
           m_owner.RaiseSelectionChanging( eventArgs );
 
-          if( ( eventArgs.Cancel ) && ( allowCancelingOfSelection ) )
+          if( allowCancelingOfSelection && eventArgs.Cancel )
           {
             this.Cancel();
-            throw new DataGridException( "Selection modification canceled." );
+            return;
           }
         }
 
-        foreach( SelectionChanger selectionChanger in m_activatedSelectionChanger.Values )
+        foreach( var selectionChanger in m_activatedSelectionChanger.Values )
         {
-          this.CommitSelectionChanger( selectionChanger, itemsSourceChanged );
+          this.CommitSelectionChanger( selectionChanger );
         }
 
         if( ( allowSynchronizeSelectionWithCurrent ) && ( m_owner.SynchronizeSelectionWithCurrent ) )
@@ -164,19 +157,31 @@ namespace Xceed.Wpf.DataGrid
           selectionInfo.DataGridContext.InvokeSelectionChanged( selectionInfo );
         }
 
-        m_owner.RaiseSelectionChanged(
-          new DataGridSelectionChangedEventArgs(
-            new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ) ) );
-
+        m_owner.RaiseSelectionChanged( new DataGridSelectionChangedEventArgs( new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ) ) );
         m_owner.NotifyGlobalSelectedItemsChanged();
       }
     }
 
     public bool ToggleItemSelection( SelectionRangePoint rangePosition )
     {
-      return this.ToggleItemSelection( 
-        rangePosition.DataGridContext, 
-        rangePosition.ItemIndex, rangePosition.Item );
+      var group = rangePosition.Group;
+      if( group != null )
+      {
+        bool unselect = false;
+        var range = rangePosition.ToSelectionRangeWithItems();
+
+        // When [un]selecting a group, select all children, and recursively
+        // the expanded details nodes.
+        return this.AffectSelectionRecursivelyOnDetails(
+          rangePosition.DataGridContext, range.Range.StartIndex, range.Range.EndIndex,
+          unselect );
+      }
+      else
+      {
+        return this.ToggleItemSelection(
+          rangePosition.DataGridContext,
+          rangePosition.ItemIndex, rangePosition.Item );
+      }
     }
 
     public bool ToggleItemSelection( DataGridContext context, int itemIndex, object item )
@@ -193,7 +198,7 @@ namespace Xceed.Wpf.DataGrid
 
     public bool ToggleCellSelection( DataGridContext context, int itemIndex, object item, int columnIndex )
     {
-      if( this.IsCellSelected( context, itemIndex, columnIndex) )
+      if( this.IsCellSelected( context, itemIndex, columnIndex ) )
       {
         return this.UnselectCells( context, new SelectionCellRangeWithItems( itemIndex, item, columnIndex ) );
       }
@@ -203,10 +208,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    public bool ToggleItemCellsSelection(
-      DataGridContext dataGridContext,
-      int itemIndex,
-      object item )
+    public bool ToggleItemCellsSelection( DataGridContext dataGridContext, int itemIndex, object item )
     {
       SelectedCellsStorage tempStorage = this.GetItemCellStorage( dataGridContext, itemIndex, item );
 
@@ -238,7 +240,19 @@ namespace Xceed.Wpf.DataGrid
 
     public bool SelectItems( SelectionRangePoint position )
     {
-      return this.SelectItems( position.DataGridContext, position.ToSelectionRangeWithItems() );
+      if( position.Group != null )
+      {
+        // When [un]selecting a group, select all children, and recursively
+        // the expanded details nodes.
+        var range = position.ToSelectionRangeWithItems();
+        return this.AffectSelectionRecursivelyOnDetails(
+          position.DataGridContext, range.Range.StartIndex, range.Range.EndIndex,
+          false );
+      }
+      else
+      {
+        return this.SelectItems( position.DataGridContext, position.ToSelectionRangeWithItems() );
+      }
     }
 
     public bool SelectItems( DataGridContext dataGridContext, SelectionRangeWithItems rangeWithItems )
@@ -276,11 +290,7 @@ namespace Xceed.Wpf.DataGrid
       return selected;
     }
 
-    public bool SelectItemCells(
-      DataGridContext dataGridContext,
-      int itemIndex,
-      object item,
-      bool preserveSelection )
+    public bool SelectItemCells( DataGridContext dataGridContext, int itemIndex, object item, bool preserveSelection )
     {
       bool selected = false;
       SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
@@ -318,12 +328,22 @@ namespace Xceed.Wpf.DataGrid
     public bool SelectJustThisItem( SelectionRangePoint point )
     {
       bool selected = false;
+      var group = point.Group;
 
-      var item = point.Item;
-      var itemIndex = point.ItemIndex;
-      if( itemIndex != -1 )
+      if( group != null )
+      {
+        this.UnselectAll();
+        // This will also recursively select all expanded detail childrens.
+        selected = this.SelectItems( point );
+      }
+      else
       {
-        selected = this.SelectJustThisItem( point.DataGridContext, itemIndex, item );
+        var item = point.Item;
+        var itemIndex = point.ItemIndex;
+        if( itemIndex != -1 )
+        {
+          selected = this.SelectJustThisItem( point.DataGridContext, itemIndex, item );
+        }
       }
 
       return selected;
@@ -370,67 +390,6 @@ namespace Xceed.Wpf.DataGrid
       return selectionChanger.UnselectItems( rangeWithItems );
     }
 
-    internal void UnselectAll()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all items and cells.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllItems();
-        activatedSelectionChanger.UnselectAllCells();
-      }
-    }
-
-    internal void UnselectAllItems()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllItems();
-      }
-    }
-
-    internal void UnselectAllItems( DataGridContext dataGridContext )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      selectionChanger.UnselectAllItems();
-    }
-
-    internal void UnselectAllCells()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllCells();
-      }
-    }
-
-    internal void UnselectAllCells( DataGridContext dataGridContext )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      selectionChanger.UnselectAllCells();
-    }
-
     public void CleanupDeferSelection( DataGridContext dataGridContext )
     {
       SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
@@ -444,7 +403,7 @@ namespace Xceed.Wpf.DataGrid
         case NotifyCollectionChangedAction.Replace:
           {
             // When we get a replace with the same instance, we just have nothing to do.
-            if( ( e.NewItems.Count == 1 ) && ( e.OldItems.Count == 1 ) && ( e.OldItems[ 0 ] == e.NewItems[ 0 ] ) )
+            if( ( e.NewItems.Count == e.OldItems.Count ) && e.NewItems.Cast<object>().SequenceEqual( e.OldItems.Cast<object>() ) )
               break;
 
             this.Begin();
@@ -461,7 +420,7 @@ namespace Xceed.Wpf.DataGrid
             }
             finally
             {
-              this.End( true, false, true );
+              this.End( false, true );
             }
 
             break;
@@ -484,7 +443,7 @@ namespace Xceed.Wpf.DataGrid
             }
             finally
             {
-              this.End( true, false, true );
+              this.End( false, true );
             }
 
             break;
@@ -507,7 +466,7 @@ namespace Xceed.Wpf.DataGrid
             }
             finally
             {
-              this.End( true, false, true );
+              this.End( false, true );
             }
 
             break;
@@ -578,11 +537,12 @@ namespace Xceed.Wpf.DataGrid
                     for( int j = 0; j < itemsCount; j++ )
                     {
                       object item = items[ j ];
-                      int index = sourceItems.IndexOf( item );
+                      object replacement = e.GetReplacement( item ) ?? item;
 
-                      if( index != -1 )
+                      int index = sourceItems.IndexOf( replacement );
+                      if( index >= 0 )
                       {
-                        selectionChanger.SelectItems( new SelectionRangeWithItems( index, item ) );
+                        selectionChanger.SelectItems( new SelectionRangeWithItems( index, replacement ) );
                       }
                     }
                   }
@@ -637,7 +597,7 @@ namespace Xceed.Wpf.DataGrid
             }
             finally
             {
-              this.End( true, false, true );
+              this.End( false, true );
             }
 
             break;
@@ -652,6 +612,16 @@ namespace Xceed.Wpf.DataGrid
       bool rowIsBeingEditedAndCurrentRowNotChanged,
       Nullable<UpdateSelectionSource> updateSelectionSourceParam )
     {
+      if( oldPosition != null && oldPosition.Group != null )
+      {
+        oldPosition = null;
+      }
+
+      if( newPosition != null && newPosition.Group != null )
+      {
+        newPosition = null;
+      }
+
       if( newPosition == null )
         return;
 
@@ -683,7 +653,7 @@ namespace Xceed.Wpf.DataGrid
           case SelectionMode.Single:
             {
               this.DoSingleSelection(
-                newPosition, 
+                newPosition,
                 oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, updateSelectionSource );
 
               break;
@@ -709,17 +679,71 @@ namespace Xceed.Wpf.DataGrid
       }
       finally
       {
-        try
-        {
-          this.End( false, true, false );
-        }
-        catch( DataGridException )
-        {
-          // This is to swallow when selection is aborted
-        }
+        this.End( true, false );
+      }
+    }
+
+    internal void UnselectAll()
+    {
+      // Add all the selected context to the activatedSelectionChanger since
+      // we will unselect all the selected item from it.
+      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
+      {
+        this.GetSelectionChanger( selectedDataGridContext );
+      }
+
+      // Unselect all items and cells.
+      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
+      {
+        activatedSelectionChanger.UnselectAllItems();
+        activatedSelectionChanger.UnselectAllCells();
+      }
+    }
+
+    internal void UnselectAllItems()
+    {
+      // Add all the selected context to the activatedSelectionChanger since
+      // we will unselect all the selected item from it.
+      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
+      {
+        this.GetSelectionChanger( selectedDataGridContext );
+      }
+
+      // Unselect all item.
+      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
+      {
+        activatedSelectionChanger.UnselectAllItems();
+      }
+    }
+
+    internal void UnselectAllItems( DataGridContext dataGridContext )
+    {
+      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
+      selectionChanger.UnselectAllItems();
+    }
+
+    internal void UnselectAllCells()
+    {
+      // Add all the selected context to the activatedSelectionChanger since
+      // we will unselect all the selected item from it.
+      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
+      {
+        this.GetSelectionChanger( selectedDataGridContext );
+      }
+
+      // Unselect all item.
+      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
+      {
+        activatedSelectionChanger.UnselectAllCells();
       }
     }
 
+    internal void UnselectAllCells( DataGridContext dataGridContext )
+    {
+      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
+      selectionChanger.UnselectAllCells();
+    }
+
     private void EnsureNodeTreeCreatedOnAllSubContext( DataGridContext context )
     {
       // context.GetChildContexts() do a EnsureNodeTreeCreated(), no need to do one before calling it
@@ -738,7 +762,7 @@ namespace Xceed.Wpf.DataGrid
     {
 
       //Group selection is not valid in single selection mode.
-      if( newPosition == null )
+      if( newPosition == null || newPosition.Group != null )
         return;
 
       bool applySelection = true;
@@ -755,7 +779,7 @@ namespace Xceed.Wpf.DataGrid
         //Special cases where selection should not be applied:
         //1. Focus was not in the datagrid
         //2. Ctrl is pressed but not the "page keys".
-        if(!oldFocusWasInTheGrid || (isCtrlPressed && !isPageKeys))
+        if( !oldFocusWasInTheGrid || ( isCtrlPressed && !isPageKeys ) )
         {
           applySelection = false;
         }
@@ -778,16 +802,13 @@ namespace Xceed.Wpf.DataGrid
 
         this.ApplySelection( null, newPosition, m_fromRowSelector, isValid,
           doRangeSelection: false,
-          allowRangeUnselection:false,
+          allowRangeUnselection: false,
           toggleSelection: false,
           keepSelection: m_fromRowSelector && cellSelection );
       }
     }
 
-    private void DoMultipleSelection(
-      SelectionRangePoint newPosition,
-      bool rowIsBeingEditedAndCurrentRowNotChanged,
-      UpdateSelectionSource updateSelectionSource )
+    private void DoMultipleSelection( SelectionRangePoint newPosition, bool rowIsBeingEditedAndCurrentRowNotChanged, UpdateSelectionSource updateSelectionSource )
     {
       if( newPosition == null )
         return;
@@ -798,7 +819,7 @@ namespace Xceed.Wpf.DataGrid
 
       //Handle the case where the selected item is not a datarow/cell.
       bool isValid = ( m_owner.SelectionUnit == SelectionUnit.Row ) || fromRowSelector
-        ? ( newPosition.ItemIndex != -1 )
+        ? ( newPosition.Group != null ) || ( newPosition.ItemIndex != -1 )
         : ( newPosition.ItemIndex != -1 ) && ( newPosition.ColumnIndex != -1 );
 
       switch( updateSelectionSource )
@@ -811,7 +832,8 @@ namespace Xceed.Wpf.DataGrid
         case UpdateSelectionSource.MouseDown:
           {
             m_updateSelectionOnNextMouseUp =
-              newPosition.GetIsSelected( m_owner.SelectionUnit );
+              newPosition.GetIsSelected( m_owner.SelectionUnit )
+              && !m_owner.UseDragToSelectBehavior;
 
             if( m_updateSelectionOnNextMouseUp )
             {
@@ -860,11 +882,11 @@ namespace Xceed.Wpf.DataGrid
       {
         //Never do range selections, Always keep selection, always toggle.
         this.ApplySelection( null, newPosition,
-          fromRowSelector, isValid, 
-          doRangeSelection:false, 
-          allowRangeUnselection:false,
-          toggleSelection:toggleSelection, 
-          keepSelection:true );
+          fromRowSelector, isValid,
+          doRangeSelection: false,
+          allowRangeUnselection: false,
+          toggleSelection: toggleSelection,
+          keepSelection: true );
       }
     }
 
@@ -878,6 +900,7 @@ namespace Xceed.Wpf.DataGrid
       if( newPosition == null )
         return;
 
+      Group group = newPosition.Group;
       DataGridContext dataGridContext = newPosition.DataGridContext;
       object item = newPosition.Item;
       int sourceDataItemIndex = newPosition.ItemIndex;
@@ -902,7 +925,7 @@ namespace Xceed.Wpf.DataGrid
 
       //Handle the case where the selected item is not a datarow/cell.
       bool isValid = ( m_owner.SelectionUnit == SelectionUnit.Row || fromRowSelector )
-        ? ( newPosition.ItemIndex != -1 )
+        ? ( newPosition.Group != null ) || ( newPosition.ItemIndex != -1 )
         : ( newPosition.ItemIndex != -1 ) && ( newPosition.ColumnIndex != -1 );
 
       //Special case management in relation to update selection source
@@ -959,7 +982,9 @@ namespace Xceed.Wpf.DataGrid
               bool isSelected = ( cellSelection )
                 ? dataGridContext.SelectedCellsStore.Contains( sourceDataItemIndex, columnIndex )
                 : dataGridContext.SelectedItemsStore.Contains( sourceDataItemIndex );
-              if( isSelected && rowIsBeingEditedAndCurrentRowNotChanged )
+              if( group == null
+                && isSelected
+                && rowIsBeingEditedAndCurrentRowNotChanged )
               {
                 applySelection = false;
               }
@@ -976,7 +1001,8 @@ namespace Xceed.Wpf.DataGrid
             else
             {
               m_updateSelectionOnNextMouseUp =
-                newPosition.GetIsSelected( m_owner.SelectionUnit );
+                newPosition.GetIsSelected( m_owner.SelectionUnit )
+                && !m_owner.UseDragToSelectBehavior;
               // If the target item is already selected, do not update
               // the selection on mouse down, differ this to mouse up.
               if( m_updateSelectionOnNextMouseUp )
@@ -985,7 +1011,7 @@ namespace Xceed.Wpf.DataGrid
 
                 if( isValid )
                 {
-                  if( !(ctrl && !shift) )
+                  if( !( ctrl && !shift ) )
                   {
                     m_updateSelectionOnNextMouseUp = !rowIsBeingEditedAndCurrentRowNotChanged;
                   }
@@ -1010,7 +1036,8 @@ namespace Xceed.Wpf.DataGrid
                 // If the target item is already selected, do not update
                 // the selection on mouse down, differ this to mouse up.
                 m_updateSelectionOnNextMouseUp =
-                  newPosition.GetIsSelected( SelectionUnit.Row );
+                  newPosition.GetIsSelected( SelectionUnit.Row )
+                  && !m_owner.UseDragToSelectBehavior;
 
                 if( m_updateSelectionOnNextMouseUp )
                 {
@@ -1164,6 +1191,21 @@ namespace Xceed.Wpf.DataGrid
       // Un-select a range if we keep previous selection, and
       // the selection anchor is a unselected item.
 
+      //Group selection not supported. Be sure to have no ranges
+      //that will be relative to a group position.
+      if( newPosition != null && newPosition.Group != null )
+        return;
+
+      if( oldPosition != null && oldPosition.Group != null )
+      {
+        oldPosition = null;
+      }
+
+      if( m_selectionRangeStartPoint != null && m_selectionRangeStartPoint.Group != null )
+      {
+        m_selectionRangeStartPoint = null;
+      }
+
       if( m_selectionRangeStartPoint == null )
       {
         m_selectionRangeStartPoint = oldPosition ?? newPosition;
@@ -1187,11 +1229,7 @@ namespace Xceed.Wpf.DataGrid
       this.DoRangeSelectionNoGroupSupport( newPosition, keepPreviousSelection, fromRowSelector, unselect );
     }
 
-    private void DoRangeSelectionNoGroupSupport(
-      SelectionRangePoint newPosition,
-      bool keepPreviousSelection,
-      bool fromRowSelector,
-      bool unselect )
+    private void DoRangeSelectionNoGroupSupport( SelectionRangePoint newPosition, bool keepPreviousSelection, bool fromRowSelector, bool unselect )
     {
       int starting_index = m_selectionRangeStartPoint.ItemGlobalIndex;
       int ending_index = newPosition.ItemGlobalIndex;
@@ -1267,7 +1305,7 @@ namespace Xceed.Wpf.DataGrid
     private void AffectSelectionRange( List<SelectionRangePoint> startPath, List<SelectionRangePoint> endPath, bool unselect )
     {
       // For each DataContext depth of each path.
-      for( int i = Math.Max( startPath.Count, endPath.Count ) - 1; i >= 0;i--)
+      for( int i = Math.Max( startPath.Count, endPath.Count ) - 1; i >= 0; i-- )
       {
         DataGridContext startContext = null;
         DataGridContext endContext = null;
@@ -1326,10 +1364,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-
     private void AffectSelectionRecursivelyForSelectRange( DataGridContext dataGridContext, int startIndex, int endIndex, bool unselect )
     {
-      if( startIndex > endIndex)
+      if( startIndex > endIndex )
         return;
 
       // We do not Recursively select the last item since the children
@@ -1344,11 +1381,7 @@ namespace Xceed.Wpf.DataGrid
       this.AffectSelection( dataGridContext, selectionRange, unselect );
     }
 
-    private bool AffectSelectionRecursivelyOnDetails(
-      DataGridContext dataGridContext,
-      int startIndex,
-      int endIndex,
-      bool unselect )
+    private bool AffectSelectionRecursivelyOnDetails( DataGridContext dataGridContext, int startIndex, int endIndex, bool unselect )
     {
       if( startIndex < 0 || endIndex < 0 )
         return false;
@@ -1381,10 +1414,7 @@ namespace Xceed.Wpf.DataGrid
       return wasAlreadyDone;
     }
 
-    private bool AffectSelection( 
-      DataGridContext dataGridContext,
-      SelectionRangeWithItems selectionRange, 
-      bool unselect )
+    private bool AffectSelection( DataGridContext dataGridContext, SelectionRangeWithItems selectionRange, bool unselect )
     {
       return ( unselect )
         ? this.UnselectItems( dataGridContext, selectionRange )
@@ -1413,7 +1443,7 @@ namespace Xceed.Wpf.DataGrid
 
     private bool IsItemCellsSelected( SelectionRangePoint selectionPoint )
     {
-      SelectedCellsStorage itemCells = this.GetItemCellStorage( selectionPoint.DataGridContext, 
+      SelectedCellsStorage itemCells = this.GetItemCellStorage( selectionPoint.DataGridContext,
         selectionPoint.ItemIndex, selectionPoint.Item );
 
       return this.IsItemCellsSelected( selectionPoint.DataGridContext, itemCells );
@@ -1516,20 +1546,23 @@ namespace Xceed.Wpf.DataGrid
 
     private List<SelectionRangePoint> CreatePathForSelectionPoint( SelectionRangePoint rangePoint )
     {
-      List<SelectionRangePoint> indexList = new List<SelectionRangePoint>();
-
-      int firstIndex;
-      int lastIndex;
-      this.ExtractRangePositionIndexes( rangePoint, out firstIndex, out lastIndex );
+      var indexList = new List<SelectionRangePoint>();
 
       indexList.Insert( 0, rangePoint );
 
       var context = rangePoint.DataGridContext;
       var parentContext = context.ParentDataGridContext;
+
       while( parentContext != null )
       {
-        int parentIndex = parentContext.Items.IndexOf( context.ParentItem );
-        indexList.Insert( 0, new SelectionRangePoint( parentContext, context.ParentItem, parentIndex, -1 ) );
+        var parentIndex = parentContext.Items.IndexOf( context.ParentItem );
+
+        var parentRangePoint = SelectionRangePoint.TryCreateRangePoint( parentContext, context.ParentItem, parentIndex, -1 );
+        if( parentRangePoint != null )
+        {
+          indexList.Insert( 0, parentRangePoint );
+        }
+
         context = parentContext;
         parentContext = parentContext.ParentDataGridContext;
       }
@@ -1548,34 +1581,38 @@ namespace Xceed.Wpf.DataGrid
         firstIndex = rangePosition.ItemIndex;
         lastIndex = firstIndex;
       }
+      else if( rangePosition.Group != null )
+      {
+        var groupRange = rangePosition.Group.GetRange();
+        firstIndex = groupRange.StartIndex;
+        lastIndex = groupRange.EndIndex;
+      }
 
       Debug.Assert( firstIndex <= lastIndex );
     }
 
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE METHODS
-
     private SelectionChanger GetSelectionChanger( DataGridContext dataGridContext )
     {
-      SelectionChanger selectionChanger = m_activatedSelectionChanger[ dataGridContext ] as SelectionChanger;
+      if( dataGridContext == null )
+        return null;
+
+      var selectionChanger = default( SelectionChanger );
 
-      if( selectionChanger != null )
-        return selectionChanger;
+      if( !m_activatedSelectionChanger.TryGetValue( dataGridContext, out selectionChanger ) )
+      {
+        selectionChanger = new SelectionChanger( dataGridContext );
+        m_activatedSelectionChanger.Add( dataGridContext, selectionChanger );
+      }
 
-      selectionChanger = new SelectionChanger( dataGridContext );
-      m_activatedSelectionChanger[ dataGridContext ] = selectionChanger;
       return selectionChanger;
     }
 
-    private void CommitSelectionChanger(
-      SelectionChanger selectionChanger,
-      bool itemsSourceChanged )
+    private void CommitSelectionChanger( SelectionChanger selectionChanger )
     {
       try
       {
-        selectionChanger.UpdateSelectedItemsInChangeOfDataGridContext( itemsSourceChanged );
-        selectionChanger.UpdateSelectedCellsInChangeOfDataGridContext( itemsSourceChanged );
+        selectionChanger.UpdateSelectedItemsInChangeOfDataGridContext();
+        selectionChanger.UpdateSelectedCellsInChangeOfDataGridContext();
       }
       finally
       {
@@ -1587,19 +1624,17 @@ namespace Xceed.Wpf.DataGrid
 
     private void UpdateCurrentToSelection()
     {
-      DataGridContext currentContext = m_owner.CurrentContext;
-      object currentItem;
-      int currentItemIndex;
-      ColumnBase currentColumn;
+      var currentContext = m_owner.CurrentContext;
+      var currentItemIndex = default( int );
+      var currentColumn = default( ColumnBase );
 
-      ColumnBase selectedColumn = null;
-      int selectedColumnIndex = -1;
-      int selectedItemIndex = -1;
-      object selectedItem = null;
+      var selectedColumn = default( ColumnBase );
+      var selectedColumnIndex = -1;
+      var selectedItemIndex = -1;
+      var selectedItem = default( object );
 
-      if( ( currentContext == null ) || ( !m_owner.SelectedContexts.Contains( currentContext ) ) )
+      if( ( currentContext == null ) || !m_owner.SelectedContexts.Contains( currentContext ) )
       {
-        currentItem = null;
         currentItemIndex = -1;
         currentColumn = null;
 
@@ -1611,7 +1646,6 @@ namespace Xceed.Wpf.DataGrid
       }
       else
       {
-        currentItem = currentContext.CurrentItem;
         currentItemIndex = currentContext.CurrentItemIndex;
         currentColumn = currentContext.CurrentColumn;
         currentContext.GetFirstSelectedItemFromStore( true, out selectedItemIndex, out selectedItem, out selectedColumnIndex );
@@ -1623,40 +1657,36 @@ namespace Xceed.Wpf.DataGrid
       if( m_owner.SelectionUnit == SelectionUnit.Cell )
       {
         if( ( currentItemIndex != -1 ) && ( currentColumn != null )
-          && currentContext.SelectedCellsStore.GetIntersectedColumnRanges(
-            new SelectionCellRange( currentItemIndex, currentColumn.VisiblePosition ) ).Any() )
+          && currentContext.SelectedCellsStore.GetIntersectedColumnRanges( new SelectionCellRange( currentItemIndex, currentColumn.VisiblePosition ) ).Any() )
           return;
 
         selectedColumn = currentContext.ColumnsByVisiblePosition.ElementAtOrDefault( selectedColumnIndex );
       }
       else
       {
-        if( ( currentItemIndex != -1 ) && ( currentContext.SelectedItemsStore.Contains( currentItemIndex ) ) )
+        if( ( currentItemIndex != -1 ) && currentContext.SelectedItemsStore.Contains( currentItemIndex ) )
           return;
 
         selectedColumn = currentContext.CurrentColumn;
       }
 
+      // No need to change Current when the previous and subsequent current are both null, even if SelectionUnit is set to Cell and columns do not correspond,
+      // since there is no current anyway.  It will be correctly updated next time an item becomes current.
+      if( selectedItem == currentContext.CurrentItem )
+        return;
+
       currentContext.SetCurrent( selectedItem, null, selectedItemIndex, selectedColumn, false, true, false, AutoScrollCurrentItemSourceTriggers.SelectionChanged );
     }
 
-    #endregion PRIVATE METHODS
-
-    #region FIELDS
-
     private bool m_isActive;
-    private Hashtable m_activatedSelectionChanger = new Hashtable();
-    private DataGridControl m_owner;
-
+    private readonly Dictionary<DataGridContext, SelectionChanger> m_activatedSelectionChanger = new Dictionary<DataGridContext, SelectionChanger>();
+    private readonly DataGridControl m_owner;
     private SelectionRangePoint m_selectionRangeStartPoint;
-
     private bool m_updateSelectionOnNextMouseUp = true;
     private bool m_fromRowSelector; // = false;
 
     // = Navigation ?
-    private UpdateSelectionSource m_currentUpdateSelectionSource; 
-
-    #endregion FIELDS
+    private UpdateSelectionSource m_currentUpdateSelectionSource;
 
     private class UpdateSelectionSourceHelper : IDisposable
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
index 50f8e157..973d85dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
@@ -30,11 +27,11 @@ namespace Xceed.Wpf.DataGrid
 
     public SelectionRange( int startIndex, int endIndex )
     {
-      if( startIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "startIndex", "startIndex must be equal to or greater than zero." );
+      if( ( startIndex < 0 ) || ( startIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "startIndex", "startIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
-      if( endIndex < 0 )  
-        throw new ArgumentOutOfRangeException( "endIndex", "endIndex must be equal to or greater than zero." );
+      if( ( endIndex < 0 ) || ( endIndex >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "endIndex", "endIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
       m_startIndex = startIndex;
       m_endIndex = endIndex;
@@ -43,14 +40,14 @@ namespace Xceed.Wpf.DataGrid
     public SelectionRange( int index )
     {
       // Only place where we accept index = -1
-      if( index < -1 )  
-        throw new ArgumentOutOfRangeException( "index", "index must be equal to or greater than -1." );
+      if( ( index < -1 ) || ( index >= int.MaxValue ) )
+        throw new ArgumentOutOfRangeException( "index", "index must be equal to or greater than -1 and lower than int.MaxValue." );
 
       m_startIndex = index;
       m_endIndex = index;
     }
 
-    #endregion CONSTRUCTORS
+    #endregion
 
     #region StartIndex Property
 
@@ -62,8 +59,8 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( value < 0 )  
-          throw new ArgumentOutOfRangeException( "StartIndex", "StartIndex must be equal to or greater than zero." );
+        if( ( value < 0 ) || ( value >= int.MaxValue ) )
+          throw new ArgumentOutOfRangeException( "StartIndex", "StartIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
         m_startIndex = value;
       }
@@ -71,7 +68,7 @@ namespace Xceed.Wpf.DataGrid
 
     private int m_startIndex;
 
-    #endregion StartIndex Property
+    #endregion
 
     #region EndIndex Property
 
@@ -83,8 +80,8 @@ namespace Xceed.Wpf.DataGrid
       }
       set
       {
-        if( value < 0 )  
-          throw new ArgumentOutOfRangeException( "EndIndex", "EndIndex must be equal to or greater than zero." );
+        if( ( value < 0 ) || ( value >= int.MaxValue ) )
+          throw new ArgumentOutOfRangeException( "EndIndex", "EndIndex must be equal to or greater than zero and lower than int.MaxValue." );
 
         m_endIndex = value;
       }
@@ -92,7 +89,7 @@ namespace Xceed.Wpf.DataGrid
 
     private int m_endIndex;
 
-    #endregion EndIndex Property
+    #endregion
 
     #region Length Property
 
@@ -107,7 +104,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Length Property
+    #endregion
 
     #region IsEmpty Property
 
@@ -119,9 +116,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion IsEmpty Property
-
-    #region PUBLIC METHODS
+    #endregion
 
     public static bool operator >( SelectionRange range1, SelectionRange range2 )
     {
@@ -229,9 +224,7 @@ namespace Xceed.Wpf.DataGrid
       if( rangeToExclude.IsEmpty )
         return new SelectionRange[] { this };
 
-      SelectionRange rangeIntersection = 
-        rangeIntersection = this.Intersect( rangeToExclude );
-
+      var rangeIntersection = this.Intersect( rangeToExclude );
       if( rangeIntersection.IsEmpty )
         return new SelectionRange[] { this };
 
@@ -241,7 +234,7 @@ namespace Xceed.Wpf.DataGrid
 
         if( rangeIntersection.EndIndex > m_endIndex )
         {
-          SelectionRange newRange = this;
+          var newRange = this;
           newRange.StartIndex = rangeIntersection.EndIndex - 1;
 
           if( rangeIntersection.StartIndex < m_startIndex )
@@ -261,7 +254,7 @@ namespace Xceed.Wpf.DataGrid
         {
           if( rangeIntersection.StartIndex < m_startIndex )
           {
-            SelectionRange newRange = this;
+            var newRange = this;
             newRange.EndIndex = rangeIntersection.StartIndex + 1;
             return new SelectionRange[] { newRange };
           }
@@ -308,7 +301,7 @@ namespace Xceed.Wpf.DataGrid
       if( !( obj is SelectionRange ) )
         return false;
 
-      SelectionRange selectionRange = ( SelectionRange )obj;
+      var selectionRange = ( SelectionRange )obj;
 
       return ( selectionRange.m_startIndex == m_startIndex )
         && ( selectionRange.m_endIndex == m_endIndex );
@@ -343,12 +336,6 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PUBLIC METHODS
-
-    #region INTERNAL METHODS
-
-    #endregion INTERNAL METHODS
-
     #region IComparable<SelectionRange> Members
 
     public int CompareTo( SelectionRange other )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs
index 50f8c2ea..cc23be8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs
@@ -15,18 +15,64 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Windows.Controls;
 
 namespace Xceed.Wpf.DataGrid
 {
-  internal class SelectionRangePoint
+  internal sealed class SelectionRangePoint
   {
-    public object Item { get; private set; }
-    public int ColumnIndex { get; set; }
-    public DataGridContext DataGridContext { get; private set; }
+    private SelectionRangePoint()
+    {
+    }
+
+    private SelectionRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnPosition )
+    {
+      if( dataGridContext == null )
+        throw new ArgumentNullException();
+
+      if( item == null )
+        throw new ArgumentNullException();
+
+      m_localIndex = itemIndex;
+
+      this.Item = item;
+      this.ColumnIndex = columnPosition;
+      this.DataGridContext = dataGridContext;
+    }
+
+    private SelectionRangePoint( Group group )
+    {
+      if( group == null )
+        throw new ArgumentNullException();
+
+      this.Group = group;
+      this.DataGridContext = group.DataGridContext;
+      this.ColumnIndex = -1;
+    }
+
+    public object Item
+    {
+      get;
+      private set;
+    }
+
+    public int ColumnIndex
+    {
+      get;
+      set;
+    }
+
+    public Group Group
+    {
+      get;
+      private set;
+    }
+
+    public DataGridContext DataGridContext
+    {
+      get;
+      private set;
+    }
 
     public int ItemIndex
     {
@@ -48,8 +94,7 @@ namespace Xceed.Wpf.DataGrid
       {
         if( m_globalIndex == null )
         {
-          m_globalIndex = this.DataGridContext.DataGridControl
-            .GetGlobalGeneratorIndexFromItem( this.DataGridContext, this.Item );
+          m_globalIndex = this.DataGridContext.DataGridControl.GetGlobalGeneratorIndexFromItem( this.DataGridContext, this.Item );
         }
 
         return m_globalIndex.Value;
@@ -58,16 +103,13 @@ namespace Xceed.Wpf.DataGrid
 
     public bool GetIsSelected( SelectionUnit selectionUnit )
     {
-      if(selectionUnit == SelectionUnit.Cell)
+      if( selectionUnit == SelectionUnit.Cell )
       {
-        if(this.ItemIndex != -1 && this.ColumnIndex != -1)
-        {
-          return this.DataGridContext.SelectedCellsStore.Contains( this.ItemIndex, this.ColumnIndex );
-        }
+        return this.DataGridContext.SelectedCellsStore.Contains( this.ItemIndex, this.ColumnIndex );
       }
-      else if(selectionUnit == SelectionUnit.Row)
+      else if( selectionUnit == SelectionUnit.Row )
       {
-        if(this.ItemIndex != -1)
+        if( this.ItemIndex >= 0 )
         {
           return this.DataGridContext.SelectedItemsStore.Contains( this.ItemIndex );
         }
@@ -76,26 +118,27 @@ namespace Xceed.Wpf.DataGrid
       return false;
     }
 
-    private SelectionRangePoint() { }
-
-    public SelectionRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnPosition )
+    public static SelectionRangePoint TryCreateRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnIndex )
     {
-      if( dataGridContext == null )
-        throw new ArgumentNullException();
+      if( ( dataGridContext == null ) || ( item == null ) )
+        return null;
 
-      if( item == null )
-        throw new ArgumentNullException();
+      if( !( item is GroupHeaderFooterItem ) )
+        return new SelectionRangePoint( dataGridContext, item, itemIndex, columnIndex );
 
-      m_localIndex = itemIndex;
-      this.Item = item;
-      this.ColumnIndex = columnPosition;
-      this.DataGridContext = dataGridContext;
+      var dataGridControl = dataGridContext.DataGridControl;
+      if( ( dataGridControl == null ) )
+        return null;
+
+      var group = dataGridContext.GetGroupFromCollectionViewGroup( ( ( GroupHeaderFooterItem )item ).Group );
+
+      return SelectionRangePoint.TryCreateRangePoint( group );
     }
 
-    public static SelectionRangePoint TryCreateRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnIndex )
+    public static SelectionRangePoint TryCreateRangePoint( Group group )
     {
-      if( dataGridContext != null && item != null )
-        return new SelectionRangePoint( dataGridContext, item, itemIndex, columnIndex );
+      if( group != null )
+        return new SelectionRangePoint( group );
 
       return null;
     }
@@ -105,36 +148,39 @@ namespace Xceed.Wpf.DataGrid
       if( dataGridContext == null )
         return null;
 
+      var dataGridControl = dataGridContext.DataGridControl;
+      if( dataGridControl == null )
+        return null;
+
       var column = dataGridContext.CurrentColumn;
       int columnIndex = ( column != null ) ? column.VisiblePosition : -1;
 
-      var oldPosition = SelectionRangePoint.TryCreateRangePoint(
-        dataGridContext, dataGridContext.CurrentItem,
-        dataGridContext.CurrentItemIndex, columnIndex );
+      var oldPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, dataGridContext.CurrentItem, dataGridContext.CurrentItemIndex, columnIndex );
+      if( oldPosition == null )
+      {
+        oldPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, dataGridContext.InternalCurrentItem, -1, columnIndex );
+      }
 
       return oldPosition;
     }
 
-
-
-    public SelectionRangePoint CreateCopy()
-    {
-      var copy = new SelectionRangePoint();
-
-      copy.m_globalIndex = this.m_globalIndex;
-      copy.m_localIndex = this.m_localIndex;
-      copy.Item = this.Item;
-      copy.ColumnIndex = this.ColumnIndex;
-      copy.DataGridContext = this.DataGridContext;
-
-      return copy;
-    }
-
     public SelectionRangeWithItems ToSelectionRangeWithItems()
     {
-      return new SelectionRangeWithItems( this.ItemIndex, this.Item );
-    }
+      if( this.Item != null )
+      {
+        return new SelectionRangeWithItems( this.ItemIndex, this.Item );
+      }
+      else
+      {
+        var group = this.Group;
+        var dataGridContext = group.DataGridContext;
+        var groupList = group.GetLeafItems().ToArray();
+        int firstIndex = dataGridContext.Items.IndexOf( groupList[ 0 ] );
+        int lastIndex = dataGridContext.Items.IndexOf( groupList[ groupList.Length - 1 ] );
 
+        return new SelectionRangeWithItems( new SelectionRange( firstIndex, lastIndex ), groupList );
+      }
+    }
 
     private int? m_globalIndex;
     private int? m_localIndex;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
index 8a70c3b8..ed281619 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Diagnostics;
 
 namespace Xceed.Wpf.DataGrid
@@ -33,7 +30,7 @@ namespace Xceed.Wpf.DataGrid
 
     public SelectionRangeWithItems( SelectionRange range, object[] items )
     {
-      if( ( items != null ) && ( items.Length != range.Length ) && ( !range.IsEmpty ) ) 
+      if( ( items != null ) && ( items.Length != range.Length ) && ( !range.IsEmpty ) )
         throw new ArgumentException( "selectionRange and items must have the same length." );
 
       m_items = ( items != null ) ? new OptimizedItemsList( items ) : null;
@@ -49,8 +46,6 @@ namespace Xceed.Wpf.DataGrid
       m_range = range;
     }
 
-
-
     #region SelectionRange Property
 
     public SelectionRange Range
@@ -63,7 +58,7 @@ namespace Xceed.Wpf.DataGrid
 
     private SelectionRange m_range;
 
-    #endregion SelectionRange Property
+    #endregion
 
     #region Items Property
 
@@ -80,7 +75,7 @@ namespace Xceed.Wpf.DataGrid
 
     private OptimizedItemsList m_items;
 
-    #endregion Items Property
+    #endregion
 
     #region ItemsList Property
 
@@ -95,7 +90,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion ItemsList Property
+    #endregion
 
     #region Length Property
 
@@ -107,9 +102,9 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion Length Property
+    #endregion
 
-    #region PUBLIC PROPERTIES
+    #region IsEmpty Property
 
     public bool IsEmpty
     {
@@ -119,9 +114,7 @@ namespace Xceed.Wpf.DataGrid
       }
     }
 
-    #endregion PUBLIC PROPERTIES
-
-    #region PUBLIC METHODS
+    #endregion
 
     public static bool operator ==( SelectionRangeWithItems rangeWithItems1, SelectionRangeWithItems rangeWithItems2 )
     {
@@ -164,7 +157,7 @@ namespace Xceed.Wpf.DataGrid
       }
 
       return true;
-    }    
+    }
 
     public object GetItem( DataGridContext dataGridContext, int offset )
     {
@@ -232,14 +225,14 @@ namespace Xceed.Wpf.DataGrid
       return ( ( SelectionRangeWithItems )obj ) == this;
     }
 
-    #endregion PUBLIC METHODS
+    #region OptimizedItemsList Private Class
 
     // Performance optimization.
-    // This wrapper class allow to store items as an array (exclusive)OR as an SharedList.
-    // This allow an uniform API to access the items, whether they are stored as an Array or an SharedList. 
+    // This wrapper class allows to store items as an array (exclusive)OR as a SharedList.
+    // This allows a uniform API to access the items, whether they are stored as an Array or as a SharedList. 
     //
-    // The SharedList allow us to be more efficient when we need to add items to the existing ones. 
-    // The Array allow to return a value to the SelectionRangeWithItems.Items property more efficiently.
+    // The SharedList allows us to be more efficient when we need to add items to the existing ones. 
+    // The Array allows the return of a value to the SelectionRangeWithItems.Items property more efficiently.
     private class OptimizedItemsList
     {
       public OptimizedItemsList( SharedList list )
@@ -257,7 +250,7 @@ namespace Xceed.Wpf.DataGrid
         m_itemsList = null;
       }
 
-      public object this[int index]
+      public object this[ int index ]
       {
         get
         {
@@ -275,7 +268,10 @@ namespace Xceed.Wpf.DataGrid
 
       public SharedList? SharedList
       {
-        get { return m_itemsList; }
+        get
+        {
+          return m_itemsList;
+        }
       }
 
       public object[] ItemsArray
@@ -311,5 +307,6 @@ namespace Xceed.Wpf.DataGrid
       private SharedList? m_itemsList;
     }
 
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs
index a19ffe49..049a8312 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs
@@ -46,7 +46,10 @@ namespace Xceed.Wpf.DataGrid
 
     public int Count
     {
-      get { return m_localCount; }
+      get
+      {
+        return m_localCount;
+      }
     }
 
     public void EnsureCapacity( int capacity )
@@ -85,7 +88,7 @@ namespace Xceed.Wpf.DataGrid
       if( ( startIndex < 0 )
         || ( length < 0 )
         || ( startIndex + length > m_localCount ) )
-        throw new DataGridInternalException( "specified range is invalid" );
+        throw new DataGridInternalException( "Specified range is invalid" );
 
       m_internalList.CopyTo( startIndex, array, arrayIndex, length );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs
new file mode 100644
index 00000000..93a86f29
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs
@@ -0,0 +1,123 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Xceed.Wpf.DataGrid.Utils;
+
+namespace Xceed.Wpf.DataGrid
+{
+  public class SortDirectionCycleCollection : Collection<SortDirection>, INotifyCollectionChanged, INotifyPropertyChanged
+  {
+    #region Static Fields
+
+    internal static readonly string CountPropertyName = PropertyHelper.GetPropertyName( ( SortDirectionCycleCollection s ) => s.Count );
+    internal static readonly string IndexerName = "Item[]";
+
+    #endregion
+
+    public SortDirectionCycleCollection()
+      : base( new List<SortDirection>() )
+    {
+    }
+
+    internal SortDirectionCycleCollection( IList<SortDirection> list )
+      : base( list )
+    {
+    }
+
+    protected override void ClearItems()
+    {
+      if( this.Count == 0 )
+        return;
+
+      base.ClearItems();
+      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
+      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+    }
+
+    protected override void InsertItem( int index, SortDirection item )
+    {
+      this.EnsureUnique( item );
+      base.InsertItem( index, item );
+      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
+      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, index ) );
+    }
+
+    protected override void RemoveItem( int index )
+    {
+      var item = base[ index ];
+
+      base.RemoveItem( index );
+      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
+      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, item, index ) );
+    }
+
+    protected override void SetItem( int index, SortDirection item )
+    {
+      var oldItem = base[ index ];
+      if( oldItem == item )
+        return;
+
+      this.EnsureUnique( item );
+      base.SetItem( index, item );
+      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, item, oldItem, index ) );
+    }
+
+    private void EnsureUnique( SortDirection item )
+    {
+      if( this.Contains( item ) )
+        throw new ArgumentException( "The SortDirection is already contained in the collection and cannot be added again.", "item" );
+    }
+
+    #region INotifyCollectionChanged Members
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    protected virtual void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
+    {
+      var handler = this.CollectionChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    #endregion
+
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged( string propertyName )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs
deleted file mode 100644
index bf36d778..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs
+++ /dev/null
@@ -1,382 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://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.Security;
-using System.Security.Permissions;
-
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Utils;
-using Xceed.Utils.Math;
-
-namespace Xceed.Wpf.DataGrid.Stats
-{
-  internal abstract class StatFunction
-  {
-    static StatFunction()
-    {
-#if DEBUG
-      //StatFunction.TestStatFunctions();
-#endif
-    }
-
-    protected StatFunction()
-    {
-    }
-
-    protected StatFunction( string resultPropertyName, string sourcePropertyName )
-      : this()
-    {
-      m_resultPropertyName = resultPropertyName;
-      m_sourcePropertyName = sourcePropertyName;
-      this.ExtractSourcePropertyNames();
-    }
-
-    #region ResultPropertyName Property
-
-    private string m_resultPropertyName;
-
-    public string ResultPropertyName
-    {
-      get
-      {
-        return m_resultPropertyName;
-      }
-      set
-      {
-        this.CheckSealed();
-        m_resultPropertyName = value;
-      }
-    }
-
-    #endregion ResultPropertyName Property
-
-    #region SourcePropertyName Property
-
-    private string m_sourcePropertyName;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string SourcePropertyName
-    {
-      get
-      {
-        return m_sourcePropertyName;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "SourcePropertyName" );
-
-        if( value.Trim().Length == 0 )
-          throw new ArgumentException( "SourcePropertyName cannot be empty.", "SourcePropertyName" );
-
-        this.CheckSealed();
-        m_sourcePropertyName = value;
-        this.ExtractSourcePropertyNames();
-      }
-    }
-
-    #endregion SourcePropertyName Property
-
-    #region PrerequisiteFunctions Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays" )]
-    protected internal virtual StatFunction[] PrerequisiteFunctions
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion PrerequisiteFunctions Property
-
-    #region SourcePropertyNames Property
-
-    private string[] m_sourcePropertyNames = new string[ 0 ];
-
-    internal string[] SourcePropertyNames
-    {
-      get
-      {
-        return m_sourcePropertyNames;
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private void ExtractSourcePropertyNames()
-    {
-      if( m_sourcePropertyName != null )
-      {
-        m_sourcePropertyNames = m_sourcePropertyName.Split( ',' );
-
-        for( int i = 0; i < m_sourcePropertyNames.Length; i++ )
-        {
-          m_sourcePropertyNames[ i ] = m_sourcePropertyNames[ i ].Trim();
-
-          if( m_sourcePropertyNames[ i ].Length == 0 )
-            throw new ArgumentException( "A multi-part SourcePropertyName cannot include an empty property name.", "SourcePropertyName" );
-        }
-      }
-    }
-
-    #endregion SourcePropertyNames Property
-
-    #region IsSealed Property
-
-    private bool m_sealed = false;
-
-    protected bool IsSealed
-    {
-      get
-      {
-        return m_sealed;
-      }
-    }
-
-    #endregion IsSealed Property
-
-    #region InCalculation Property
-
-    private bool m_inCalculation;
-
-    internal bool InCalculation
-    {
-      get
-      {
-        return m_inCalculation;
-      }
-    }
-
-    internal void StartCalculation()
-    {
-      m_inCalculation = true;
-    }
-
-    internal void EndCalculation()
-    {
-      m_inCalculation = false;
-    }
-
-    #endregion InCalculation Property
-
-    protected internal virtual bool RequiresAccumulation
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    protected internal virtual bool IsInitialized
-    {
-      get
-      {
-        return m_initialized;
-      }
-    }
-
-    protected internal virtual void Validate()
-    {
-      if( ( m_resultPropertyName == null ) || ( m_resultPropertyName.Length == 0 ) )
-        throw new InvalidOperationException( "The ResultPropertyName property must be set." );
-    }
-
-    protected internal virtual void InitializeFromInstance( StatFunction source )
-    {
-      this.SourcePropertyName = source.SourcePropertyName;
-    }
-
-    protected virtual void Initialize( Type[] sourcePropertyTypes )
-    {
-    }
-
-    internal void InitializeAccumulationTypes( Type[] sourcePropertyTypes )
-    {
-      this.Initialize( sourcePropertyTypes );
-      m_initialized = true;
-    }
-
-    protected internal abstract void Reset();
-
-    protected internal virtual void InitializePrerequisites( StatResult[] prerequisitesValues )
-    {
-      throw new NotImplementedException( "InitializePrerequisites must also be overridden when PrerequisiteFunctions has been overridden." ); 
-    }
-
-    protected internal abstract void Accumulate( object[] values );
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
-    protected internal abstract StatResult GetResult();
-
-    protected void CheckSealed()
-    {
-      if( m_sealed )
-        throw new InvalidOperationException( "The StatFunction cannot be changed once it has been added to the DataGridCollectionView." );
-    }
-
-    protected internal virtual bool IsEquivalent( StatFunction statFunction )
-    {
-      if( object.ReferenceEquals( statFunction, null ) )
-        return false;
-
-      if( object.ReferenceEquals( statFunction, this ) )
-        return true;
-
-      return ( this.GetType() == statFunction.GetType() ) &&
-             ( this.SourcePropertyName == statFunction.SourcePropertyName );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
-    protected internal virtual int GetEquivalenceKey()
-    {
-      return this.SourcePropertyName.GetHashCode();
-    }
-
-    internal static bool AreEquivalents( StatFunction statFunctionA, StatFunction statFunctionB )
-    {
-      if( ( statFunctionA != null ) && ( statFunctionB != null ) )
-      {
-        return statFunctionA.IsEquivalent( statFunctionB );
-      }
-      else
-      {
-        return ( statFunctionA == null ) && ( statFunctionB == null );
-      }
-    }
-
-    internal void ValidateSourcePropertyName( int expectedPropertyCount )
-    {
-      if( this.SourcePropertyNames.Length != expectedPropertyCount )
-        throw new InvalidOperationException( string.Format( "The SourcePropertyName property must be set to {0} field{1} with the Statistical function {2}.",
-          expectedPropertyCount, ( expectedPropertyCount > 1 ) ? "s" : "", this.GetType().Name ) );
-    }
-
-    internal void Seal()
-    {
-      m_sealed = true;
-    }
-
-    internal static bool CanProcessValues( object[] values, int count )
-    {
-      if( count > values.Length )
-        return false;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( ( values[ i ] == null ) || ( values[ i ] is DBNull ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    internal static TypeCode GetDefaultNumericalAccumulationType( Type dataType )
-    {
-      TypeCode accType = TypeCode.Empty;
-
-      switch( Type.GetTypeCode( dataType ) )
-      {
-        case TypeCode.Char:
-        case TypeCode.Byte:
-        case TypeCode.SByte:
-        case TypeCode.Int16:
-        case TypeCode.Int32:
-        case TypeCode.Int64:
-        case TypeCode.UInt16:
-        case TypeCode.UInt32:
-        case TypeCode.UInt64:
-          accType = TypeCode.Int64;
-          break;
-
-        case TypeCode.Single:
-        case TypeCode.Double:
-          accType = TypeCode.Double;
-          break;
-
-        case TypeCode.Decimal:
-          accType = TypeCode.Decimal;
-          break;
-      }
-
-      return accType;
-    }
-
-#if DEBUG
-    private static StatResult RunStatFunction( StatFunction statFunction, Type[] dataTypes, params object[] values )
-    {
-      return StatFunction.RunStatFunction( statFunction, dataTypes, values, null );
-    }
-
-    private static StatResult RunStatFunction( 
-      StatFunction statFunction, 
-      Type[] dataTypes, 
-      object[] valuesX, 
-      object[] valuesY )
-    {
-      statFunction.InitializeAccumulationTypes( dataTypes );
-      statFunction.StartCalculation();
-      statFunction.Reset();
-
-      try
-      {
-        if( statFunction.PrerequisiteFunctions != null && statFunction.PrerequisiteFunctions.Length > 0 )
-        {
-          StatResult[] preValues = new StatResult[ statFunction.PrerequisiteFunctions.Length ];
-
-          for( int i = 0; i < statFunction.PrerequisiteFunctions.Length; i++ )
-          {
-            preValues[ i ] = StatFunction.RunStatFunction( statFunction.PrerequisiteFunctions[ i ], dataTypes, valuesX, valuesY );
-
-            if( preValues[ i ].Value is Exception )
-              throw ( Exception )preValues[ i ].Value;
-          }
-
-          statFunction.InitializePrerequisites( preValues );
-        }
-
-        if( statFunction.RequiresAccumulation )
-        {
-          for( int i = 0; i < valuesX.Length; i++ )
-          {
-            if( valuesY == null )
-            {
-              statFunction.Accumulate( new object[] { valuesX[ i ] } );
-            }
-            else
-            {
-              statFunction.Accumulate( new object[] { valuesX[ i ], valuesY[ i ] } );
-            }
-          }
-        }
-
-        statFunction.EndCalculation();
-        return statFunction.GetResult();
-      }
-      catch( Exception ex )
-      {
-        return new StatResult( ex );
-      }
-    }
-#endif
-
-    private bool m_initialized; // = false
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs
deleted file mode 100644
index b258d705..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid.Stats
-{
-  internal sealed class StatFunctionCollection : ObservableCollection<StatFunction>
-  {
-    #region Constructor
-
-    internal StatFunctionCollection()
-      : base()
-    {
-    }
-
-    #endregion
-
-    #region [] Property
-
-    public StatFunction this[ string resultPropertyName ]
-    {
-      get
-      {
-        if( resultPropertyName == null )
-          return null;
-
-        StatFunction value;
-        if( m_lookup.TryGetValue( resultPropertyName, out value ) )
-          return value;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    public bool Contains( string resultPropertyName )
-    {
-      if( resultPropertyName == null )
-        return false;
-
-      return m_lookup.ContainsKey( resultPropertyName );
-    }
-
-    protected override void InsertItem( int index, StatFunction item )
-    {
-      this.PrepareStatFunction( item );
-      base.InsertItem( index, item );
-    }
-
-    protected override void SetItem( int index, StatFunction item )
-    {
-      this.PrepareStatFunction( item );
-      base.SetItem( index, item );
-    }
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.AddStatFunctions( e.NewItems.Cast<StatFunction>() );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          this.RemoveStatFunctions( e.OldItems.Cast<StatFunction>() );
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          this.RemoveStatFunctions( e.OldItems.Cast<StatFunction>() );
-          this.AddStatFunctions( e.NewItems.Cast<StatFunction>() );
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          this.ResetStatFunctions();
-          break;
-      }
-
-      base.OnCollectionChanged( e );
-    }
-
-    private void PrepareStatFunction( StatFunction item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      var key = item.ResultPropertyName;
-      if( key == null )
-        throw new ArgumentException( "TODODOC: The StatFunction must have a ResultPropertyName", "item" );
-
-      if( this.Contains( key ) )
-        throw new ArgumentException( "A StatFunction with the same ResultPropertyName already exists in the StatFunctionCollection." );
-
-      item.Validate();
-      item.Seal();
-    }
-
-    private void AddStatFunctions( IEnumerable<StatFunction> items )
-    {
-      foreach( StatFunction item in items )
-      {
-        m_lookup.Add( item.ResultPropertyName, item );
-      }
-    }
-
-    private void RemoveStatFunctions( IEnumerable<StatFunction> items )
-    {
-      foreach( StatFunction item in items )
-      {
-        m_lookup.Remove( item.ResultPropertyName );
-      }
-    }
-
-    private void ResetStatFunctions()
-    {
-      m_lookup.Clear();
-
-      this.AddStatFunctions( this );
-    }
-
-    #region Private Fields
-
-    private readonly Dictionary<string, StatFunction> m_lookup = new Dictionary<string, StatFunction>();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs
deleted file mode 100644
index daca1e0f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.DataGrid.Stats
-{
-  internal class StatFunctionComparer : IEqualityComparer<StatFunction>
-  {
-    internal static readonly StatFunctionComparer Default = new StatFunctionComparer();
-
-    public bool Equals( StatFunction x, StatFunction y )
-    {
-      return StatFunction.AreEquivalents( x, y );
-    }
-
-    public int GetHashCode( StatFunction statFunction )
-    {
-      if( statFunction == null )
-        return 0;
-
-      return statFunction.GetEquivalenceKey();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs
index 0586c10d..ffa6abeb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs
@@ -57,7 +57,7 @@ namespace Xceed.Wpf.DataGrid
       get;
     }
 
-    #endregion       
+    #endregion
 
     #region MaxSortLevels Protected Property
 
@@ -83,8 +83,7 @@ namespace Xceed.Wpf.DataGrid
 
     public bool CanExecute( ColumnBase column, bool resetSort )
     {
-      return ( column != null )
-          && ( this.CanExecuteCore( column, resetSort ) );
+      return this.CanExecuteCore( column, resetSort );
     }
 
     public void Execute( ColumnBase column, bool resetSort )
@@ -92,39 +91,67 @@ namespace Xceed.Wpf.DataGrid
       if( !this.CanExecute( column, resetSort ) )
         return;
 
-      using( this.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged ) )
+      var currentSortDirection = column.SortDirection;
+      var nextSortDirection = currentSortDirection;
+      var pattern = column.SortDirectionCycle;
+
+      if( ( pattern != null ) && ( pattern.Count > 0 ) )
       {
-        this.ExecuteCore( column, resetSort );
+        var index = pattern.IndexOf( currentSortDirection );
+
+        nextSortDirection = ( ( index < 0 ) || ( index == pattern.Count - 1 ) )
+                              ? pattern[ 0 ]
+                              : pattern[ index + 1 ];
       }
-    }
 
-    protected virtual bool CanExecuteCore( ColumnBase column, bool resetSort )
-    {
-      if( string.IsNullOrEmpty( column.FieldName ) )
-        return false;
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext == null )
+        return;
 
-      if( !this.CanSort || !this.Columns.Contains( column ) )
-        return false;
+      var eventArgs = new ColumnSortDirectionChangingEventArgs( DataGridControl.SortDirectionChangingEvent, column, dataGridContext, currentSortDirection, nextSortDirection );
+      dataGridContext.DataGridControl.RaiseSortDirectionChanging( eventArgs );
+
+      nextSortDirection = eventArgs.NextSortDirection;
+
+      if( currentSortDirection == nextSortDirection )
+        return;
 
-      if( column.SortDirection == SortDirection.None )
+      if( currentSortDirection == SortDirection.None )
       {
-        int maxSortCount = this.MaxSortLevels;
+        var maxSortCount = this.MaxSortLevels;
 
         // Cannot insert sort description since it would go beyond the max sort description count, but only if Shift key is pressed
         if( !resetSort && ( maxSortCount >= 0 ) && ( this.SortDescriptions.Count >= maxSortCount ) )
-          return false;
+          return;
 
         //When Shift key is not pressed, simply evaluate if one sort description can be added, since all others will be cleared.
         if( resetSort && maxSortCount == 0 )
-          return false;
+          return;
       }
 
+      using( this.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged ) )
+      {
+        this.ExecuteCore( column, nextSortDirection, resetSort );
+      }
+    }
+
+    protected virtual bool CanExecuteCore( ColumnBase column, bool resetSort )
+    {
+      if( ( column == null ) || string.IsNullOrEmpty( column.FieldName ) )
+        return false;
+
+      if( !this.CanSort || !this.Columns.Contains( column ) )
+        return false;
+
       return true;
     }
 
-    protected virtual void ExecuteCore( ColumnBase column, bool resetSort )
+    protected virtual void ExecuteCore( ColumnBase column, SortDirection direction, bool resetSort )
     {
-      if( !this.ToggleColumnSort( column, resetSort ) )
+      if( column == null )
+        return;
+
+      if( !this.ToggleColumnSort( column, direction, resetSort ) )
         return;
 
       this.UpdateColumnSort();
@@ -187,21 +214,6 @@ namespace Xceed.Wpf.DataGrid
       this.Execute( parameter as ColumnBase, true );
     }
 
-    protected static SortDirection GetNextSortDirection( SortDirection direction )
-    {
-      switch( direction )
-      {
-        case SortDirection.Ascending:
-          return SortDirection.Descending;
-
-        case SortDirection.Descending:
-          return SortDirection.None;
-
-        default:
-          return SortDirection.Ascending;
-      }
-    }
-
     protected static void DeferRestoreStateOnLevel( Disposer disposer, DataGridContext dataGridContext )
     {
       ToggleColumnSortCommand.ThrowIfNull( disposer, "disposer" );
@@ -236,10 +248,8 @@ namespace Xceed.Wpf.DataGrid
       return ListSortDirection.Ascending;
     }
 
-    private bool ToggleColumnSort( ColumnBase column, bool resetSort )
+    private bool ToggleColumnSort( ColumnBase column, SortDirection direction, bool resetSort )
     {
-      ToggleColumnSortCommand.ThrowIfNull( column, "column" );
-
       this.ValidateToggleColumnSort();
 
       using( var synchronizationContext = this.StartSynchronizing( this.GetSortDescriptionsSyncContext() ) )
@@ -254,8 +264,7 @@ namespace Xceed.Wpf.DataGrid
           var sortDescriptions = this.SortDescriptions;
           disposer.Add( this.DeferResortHelper( sortDescriptions ), DisposableType.DeferResort );
 
-          var newSortDirection = ToggleColumnSortCommand.GetNextSortDirection( column.SortDirection );
-          string columnName = column.FieldName;
+          var columnName = column.FieldName;
           int insertionIndex;
 
           if( ( resetSort ) &&
@@ -281,18 +290,18 @@ namespace Xceed.Wpf.DataGrid
 
           if( insertionIndex < sortDescriptions.Count )
           {
-            if( newSortDirection == SortDirection.None )
+            if( direction == SortDirection.None )
             {
               sortDescriptions.RemoveAt( insertionIndex );
             }
             else
             {
-              sortDescriptions[ insertionIndex ] = new SortDescription( columnName, ToggleColumnSortCommand.Convert( newSortDirection ) );
+              sortDescriptions[ insertionIndex ] = new SortDescription( columnName, ToggleColumnSortCommand.Convert( direction ) );
             }
           }
-          else if( newSortDirection != SortDirection.None )
+          else if( direction != SortDirection.None )
           {
-            sortDescriptions.Add( new SortDescription( columnName, ToggleColumnSortCommand.Convert( newSortDirection ) ) );
+            sortDescriptions.Add( new SortDescription( columnName, ToggleColumnSortCommand.Convert( direction ) ) );
           }
         }
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs
index 3a4d3cc4..7e2e5799 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs
@@ -180,8 +180,8 @@ namespace Xceed.Wpf.DataGrid
         if( !disposing )
           return;
 
-        var ownerRef = m_owner;
-        if( Interlocked.CompareExchange<WeakReference>( ref m_owner, null, ownerRef ) == null )
+        var ownerRef = Interlocked.Exchange( ref m_owner, null );
+        if( ownerRef == null )
           return;
 
         var owner = ( UpdateColumnSortCommand )ownerRef.Target;
@@ -194,11 +194,6 @@ namespace Xceed.Wpf.DataGrid
         m_columns = null;
       }
 
-      ~ResortCallback()
-      {
-        this.Dispose( false );
-      }
-
       private WeakReference m_owner;
       private SortDescriptionCollection m_sortDescriptions;
       private ColumnCollection m_columns;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs
new file mode 100644
index 00000000..0a05aa88
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs
@@ -0,0 +1,24 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Utils.Collections
+{
+  internal static class ArrayHelper
+  {
+    internal static readonly int[] Sizes = new int[] { 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459, 536870923, 1073741827, int.MaxValue };
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs
similarity index 51%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs
index 92c52d32..25c8c027 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs
@@ -1,44 +1,44 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Automation
-{
-  public delegate void QueryItemStatusRoutedEventHandler( object sender, QueryItemStatusRoutedEventArgs e );
-
-  public class QueryItemStatusRoutedEventArgs : RoutedEventArgs
-  {
-    public QueryItemStatusRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region ItemStatus Property
-
-    public string ItemStatus
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+
+namespace Xceed.Utils.Collections
+{
+  internal interface IBinaryTree<T> : INotifyCollectionChanged, INotifyPropertyChanged, IEnumerable<T>, IEnumerable
+  {
+    IBinaryTreeNode<T> Root
+    {
+      get;
+    }
+
+    IBinaryTreeNode<T> Find( T value );
+
+    IBinaryTreeNode<T> Insert( T value );
+    IBinaryTreeNode<T> InsertBefore( T value, IBinaryTreeNode<T> node );
+    IBinaryTreeNode<T> InsertAfter( T value, IBinaryTreeNode<T> node );
+
+    void Remove( T value );
+    void Remove( IBinaryTreeNode<T> node );
+
+    void Clear();
+
+    IEnumerable<T> GetItems( bool reverse );
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs
similarity index 59%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs
index 99b326a5..3840a304 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs
@@ -1,50 +1,52 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CustomDistinctValueItemFilterEventArgs : EventArgs
-  {
-    internal CustomDistinctValueItemFilterEventArgs( object title, object value )
-    {
-      this.Title = title;
-      this.Value = value;
-    }
-
-    public bool Accepted
-    {
-      get;
-      set;
-    }
-
-    public object Title
-    {
-      get;
-      private set;
-    }
-
-    public object Value
-    {
-      get;
-      private set;
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Utils.Collections
+{
+  internal interface IBinaryTreeNode<T>
+  {
+    T Value
+    {
+      get;
+    }
+
+    IBinaryTree<T> Tree
+    {
+      get;
+    }
+
+    IBinaryTreeNode<T> Parent
+    {
+      get;
+    }
+
+    IBinaryTreeNode<T> Left
+    {
+      get;
+    }
+
+    IBinaryTreeNode<T> Right
+    {
+      get;
+    }
+
+    IBinaryTreeNode<T> GetPrevious();
+    IBinaryTreeNode<T> GetNext();
+
+    IBinaryTreeNode<T> GetLeftmost();
+    IBinaryTreeNode<T> GetRightmost();
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs
new file mode 100644
index 00000000..4c2de480
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs
@@ -0,0 +1,121 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Xceed.Utils.Collections
+{
+  internal static class IListExtensions
+  {
+    internal static void Diff(
+      this IList source,
+      IList destination,
+      ICollection<object> itemsAdded,
+      ICollection<object> itemsRemoved,
+      ICollection<object> itemsMoved )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      if( destination == null )
+        throw new ArgumentNullException( "destination" );
+
+      // There is nothing to do since the caller is not interested by the result.
+      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
+        return;
+
+      IListExtensions.Diff( new IListWrapper( source ), new IListWrapper( destination ), itemsAdded, itemsRemoved, itemsMoved );
+    }
+
+    internal static void Diff<T>(
+      this IList<T> source,
+      IList<T> destination,
+      ICollection<T> itemsAdded,
+      ICollection<T> itemsRemoved,
+      ICollection<T> itemsMoved )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      if( destination == null )
+        throw new ArgumentNullException( "destination" );
+
+      // There is nothing to do since the caller is not interested by the result.
+      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
+        return;
+
+      var sourceCount = source.Count;
+      var sourcePositions = new Dictionary<T, int>( sourceCount );
+      var sequence = new List<int>( System.Math.Min( sourceCount, destination.Count ) );
+      var isAlive = new BitArray( sourceCount, false );
+      var hasNotMoved = default( BitArray );
+
+      for( var i = 0; i < sourceCount; i++ )
+      {
+        sourcePositions.Add( source[ i ], i );
+      }
+
+      foreach( var item in destination )
+      {
+        int index;
+
+        if( sourcePositions.TryGetValue( item, out index ) )
+        {
+          isAlive[ index ] = true;
+          sequence.Add( index );
+        }
+        else if( itemsAdded != null )
+        {
+          itemsAdded.Add( item );
+        }
+      }
+
+      // We may omit this part of the algorithm if the caller is not interested by the items that have moved.
+      if( itemsMoved != null )
+      {
+        hasNotMoved = new BitArray( sourceCount, false );
+
+        // The subsequence contains the position of the item that are in the destination collection and that have not moved.
+        foreach( var index in LongestIncreasingSubsequence.Find( sequence ) )
+        {
+          hasNotMoved[ index ] = true;
+        }
+      }
+
+      // We may omit this part of the algorithm if the caller is not interested by the items that have moved or were removed.
+      if( ( itemsRemoved != null ) || ( itemsMoved != null ) )
+      {
+        for( var i = 0; i < sourceCount; i++ )
+        {
+          if( isAlive[ i ] )
+          {
+            // We check if the move collection is not null first because the bit array is null when the move collection is null.
+            if( ( itemsMoved != null ) && !hasNotMoved[ i ] )
+            {
+              itemsMoved.Add( source[ i ] );
+            }
+          }
+          else if( itemsRemoved != null )
+          {
+            itemsRemoved.Add( source[ i ] );
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs
new file mode 100644
index 00000000..302813d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs
@@ -0,0 +1,136 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Xceed.Utils.Collections
+{
+  internal sealed class IListWrapper<T> : IList<T>
+  {
+    internal IListWrapper( IList source )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      m_source = source;
+    }
+
+    #region IList<> Members
+
+    public T this[ int index ]
+    {
+      get
+      {
+        return ( T )m_source[ index ];
+      }
+      set
+      {
+        m_source[ index ] = value;
+      }
+    }
+
+    public int IndexOf( T item )
+    {
+      return m_source.IndexOf( item );
+    }
+
+    public void Insert( int index, T item )
+    {
+      m_source.Insert( index, item );
+    }
+
+    public void RemoveAt( int index )
+    {
+      m_source.RemoveAt( index );
+    }
+
+    #endregion
+
+    #region ICollection<> Members
+
+    public int Count
+    {
+      get
+      {
+        return m_source.Count;
+      }
+    }
+
+    bool ICollection<T>.IsReadOnly
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    public void Add( T item )
+    {
+      m_source.Add( item );
+    }
+
+    public void Clear()
+    {
+      m_source.Clear();
+    }
+
+    public bool Contains( T item )
+    {
+      return m_source.Contains( item );
+    }
+
+    public void CopyTo( T[] array, int index )
+    {
+      m_source.CopyTo( array, index );
+    }
+
+    public bool Remove( T item )
+    {
+      var index = m_source.IndexOf( item );
+      if( index < 0 )
+        return false;
+
+      m_source.RemoveAt( index );
+
+      return true;
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<T> GetEnumerator()
+    {
+      return m_source.Cast<T>().GetEnumerator();
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return m_source.GetEnumerator();
+    }
+
+    #endregion
+
+    private readonly IList m_source;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs
new file mode 100644
index 00000000..dac4d8d8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs
@@ -0,0 +1,136 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Xceed.Utils.Collections
+{
+  internal sealed class IListWrapper : IList<object>
+  {
+    internal IListWrapper( IList source )
+    {
+      if( source == null )
+        throw new ArgumentNullException( "source" );
+
+      m_source = source;
+    }
+
+    #region IList<> Members
+
+    public object this[ int index ]
+    {
+      get
+      {
+        return m_source[ index ];
+      }
+      set
+      {
+        m_source[ index ] = value;
+      }
+    }
+
+    public int IndexOf( object item )
+    {
+      return m_source.IndexOf( item );
+    }
+
+    public void Insert( int index, object item )
+    {
+      m_source.Insert( index, item );
+    }
+
+    public void RemoveAt( int index )
+    {
+      m_source.RemoveAt( index );
+    }
+
+    #endregion
+
+    #region ICollection<> Members
+
+    public int Count
+    {
+      get
+      {
+        return m_source.Count;
+      }
+    }
+
+    bool ICollection<object>.IsReadOnly
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    public void Add( object item )
+    {
+      m_source.Add( item );
+    }
+
+    public void Clear()
+    {
+      m_source.Clear();
+    }
+
+    public bool Contains( object item )
+    {
+      return m_source.Contains( item );
+    }
+
+    public void CopyTo( object[] array, int index )
+    {
+      m_source.CopyTo( array, index );
+    }
+
+    public bool Remove( object item )
+    {
+      var index = m_source.IndexOf( item );
+      if( index < 0 )
+        return false;
+
+      m_source.RemoveAt( index );
+
+      return true;
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<object> GetEnumerator()
+    {
+      return m_source.Cast<object>().GetEnumerator();
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return m_source.GetEnumerator();
+    }
+
+    #endregion
+
+    private readonly IList m_source;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs
new file mode 100644
index 00000000..d797c3ac
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs
@@ -0,0 +1,944 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using Xceed.Wpf.DataGrid.Utils;
+
+namespace Xceed.Utils.Collections
+{
+  // This class implements a left-leaning red–black that is based on
+  // the research paper "Left-leaning Red-Black Trees" by Robert Sedgewick.
+  internal class LLRBTree<T> : IBinaryTree<T>
+  {
+    #region Static Fields
+
+    internal static readonly string RootPropertyName = PropertyHelper.GetPropertyName( ( LLRBTree<T> t ) => t.Root );
+
+    #endregion
+
+    internal LLRBTree()
+      : this( EqualityComparer<T>.Default )
+    {
+    }
+
+    internal LLRBTree( IEqualityComparer<T> comparer )
+    {
+      if( comparer == null )
+        throw new ArgumentNullException( "comparer" );
+
+      m_comparer = comparer;
+    }
+
+    #region Root Property
+
+    public IBinaryTreeNode<T> Root
+    {
+      get
+      {
+        return m_rootNode;
+      }
+    }
+
+    #endregion
+
+    public IBinaryTreeNode<T> Find( T value )
+    {
+      this.EnsureValue( value );
+
+      var node = this.FindNode( value );
+      if( ( node != null ) && ( node.Tree != this ) )
+        return null;
+
+      return node;
+    }
+
+    public IBinaryTreeNode<T> Insert( T value )
+    {
+      if( m_rootNode != null )
+        throw new InvalidOperationException( "This method cannot be called when the tree has a root node." );
+
+      this.EnsureNewValue( value );
+
+      m_rootNode = this.CreateNode( value );
+
+      if( m_rootNode == null )
+        throw new InvalidOperationException( "A node was not created." );
+
+      this.SetRootNodeColor();
+      this.OnPostInsert( m_rootNode, null );
+
+      return m_rootNode;
+    }
+
+    public IBinaryTreeNode<T> InsertBefore( T value, IBinaryTreeNode<T> node )
+    {
+      this.EnsureNewValue( value );
+      this.EnsureCurrentNode( node );
+
+      var pivotNode = ( Node )node;
+      var rightmostNode = ( pivotNode.Left != null ) ? pivotNode.Left.GetRightmost() : null;
+      var oldRootNode = m_rootNode;
+      var parentNode = rightmostNode ?? pivotNode;
+      var newNode = this.CreateNode( value );
+
+      if( newNode == null )
+        throw new InvalidOperationException( "A node was not created." );
+
+      if( rightmostNode != null )
+      {
+        parentNode.Right = newNode;
+      }
+      else
+      {
+        parentNode.Left = newNode;
+      }
+
+      newNode.Parent = parentNode;
+
+      this.BalanceUp( parentNode );
+      this.SetRootNodeColor();
+      this.OnPostInsert( newNode, oldRootNode );
+
+      return newNode;
+    }
+
+    public IBinaryTreeNode<T> InsertAfter( T value, IBinaryTreeNode<T> node )
+    {
+      this.EnsureNewValue( value );
+      this.EnsureCurrentNode( node );
+
+      var pivotNode = ( Node )node;
+      var leftmostNode = ( pivotNode.Right != null ) ? pivotNode.Right.GetLeftmost() : null;
+      var oldRootNode = m_rootNode;
+      var parentNode = leftmostNode ?? pivotNode;
+      var newNode = this.CreateNode( value );
+
+      if( newNode == null )
+        throw new InvalidOperationException( "A node was not created." );
+
+      if( leftmostNode != null )
+      {
+        parentNode.Left = newNode;
+      }
+      else
+      {
+        parentNode.Right = newNode;
+      }
+
+      newNode.Parent = parentNode;
+
+      this.BalanceUp( parentNode );
+      this.SetRootNodeColor();
+      this.OnPostInsert( newNode, oldRootNode );
+
+      return newNode;
+    }
+
+    public void Remove( T value )
+    {
+      this.EnsureValue( value );
+
+      this.Remove( this.FindNode( value ) );
+    }
+
+    public void Remove( IBinaryTreeNode<T> node )
+    {
+      this.EnsureCurrentNode( node );
+
+      var targetNode = ( Node )node;
+      var path = new Stack<Node>();
+      path.Push( targetNode );
+
+      this.FindPath( path, m_rootNode );
+
+      var oldValue = node.Value;
+      var oldRootNode = m_rootNode;
+      var oldParentNode = default( Node );
+
+      m_rootNode = this.Remove( path, true, out oldParentNode );
+
+      this.SetRootNodeColor();
+      this.OnPostRemove( oldValue, oldParentNode, oldRootNode );
+    }
+
+    public void Clear()
+    {
+      if( m_rootNode == null )
+        return;
+
+      this.Clear( m_rootNode );
+
+      m_rootNode = null;
+
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+      this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
+    }
+
+    public IEnumerable<T> GetItems( bool reverse )
+    {
+      return this.GetNodes( reverse ).Select( node => node.Value );
+    }
+
+    protected virtual Node CreateNode( T value )
+    {
+      return new Node( this, value );
+    }
+
+    protected virtual void ClearNode( Node node )
+    {
+      if( node == null )
+        return;
+
+      node.Parent = null;
+      node.Left = null;
+      node.Right = null;
+      node.IsRed = true;
+    }
+
+    protected virtual Node FindNode( T value )
+    {
+      foreach( var node in this.GetNodes( false ) )
+      {
+        if( m_comparer.Equals( value, node.Value ) )
+          return node;
+      }
+
+      return null;
+    }
+
+    protected virtual void EnsureValue( T value )
+    {
+    }
+
+    protected virtual void EnsureNewValue( T value )
+    {
+      this.EnsureValue( value );
+    }
+
+    private IEnumerable<Node> GetNodes( bool reverse )
+    {
+      if( m_rootNode == null )
+        yield break;
+
+      if( reverse )
+      {
+        for( var node = m_rootNode.GetRightmost() ?? m_rootNode; node != null; node = node.GetPrevious() )
+        {
+          yield return node;
+        }
+      }
+      else
+      {
+        for( var node = m_rootNode.GetLeftmost() ?? m_rootNode; node != null; node = node.GetNext() )
+        {
+          yield return node;
+        }
+      }
+    }
+
+    private Node Remove( Stack<Node> path, bool destroy, out Node oldParentNode )
+    {
+      Debug.Assert( path != null );
+      Debug.Assert( path.Count > 0 );
+
+      var node = path.Pop();
+
+      if( ( path.Count > 0 ) && ( node.Left == path.Peek() ) )
+      {
+        if( !this.IsRed( node.Left ) && !this.IsRed( node.Left.Left ) )
+        {
+          node = this.MoveRedLeft( node );
+
+          this.CutPath( path );
+          this.FindPath( path, node.Left );
+        }
+
+        node.Left = this.Remove( path, destroy, out oldParentNode );
+      }
+      else
+      {
+        if( this.IsRed( node.Left ) )
+        {
+          if( path.Count <= 0 )
+          {
+            path.Push( node );
+          }
+
+          node = this.RotateRight( node );
+
+          Debug.Assert( path.Count > 0 );
+
+          this.CutPath( path );
+          this.FindPath( path, node.Right );
+        }
+
+        if( ( node.Right == null ) && ( path.Count == 0 ) )
+        {
+          Debug.Assert( node.Left == null );
+
+          oldParentNode = node.Parent;
+
+          if( destroy )
+          {
+            this.ClearNode( node );
+          }
+
+          return null;
+        }
+
+        if( !this.IsRed( node.Right ) && !this.IsRed( node.Right.Left ) )
+        {
+          if( path.Count <= 0 )
+          {
+            path.Push( node );
+          }
+
+          node = this.MoveRedRight( node );
+
+          Debug.Assert( path.Count > 0 );
+
+          if( path.Peek() == node )
+          {
+            path.Pop();
+          }
+          else
+          {
+            this.CutPath( path );
+            this.FindPath( path, node.Right );
+          }
+        }
+
+        if( path.Count == 0 )
+        {
+          Debug.Assert( node.Right != null );
+
+          var child = default( Node );
+          var target = node.Right.GetLeftmost();
+
+          Debug.Assert( target != null );
+          Debug.Assert( target.Left == null );
+
+          if( target != node.Right )
+          {
+            path.Push( target );
+            this.FindPath( path, node.Right );
+
+            child = this.Remove( path, false, out oldParentNode );
+          }
+          else
+          {
+            oldParentNode = target;
+          }
+
+          target.Parent = node.Parent;
+          target.Left = node.Left;
+          target.Right = child;
+          target.IsRed = node.IsRed;
+
+          if( target.Left != null )
+          {
+            target.Left.Parent = target;
+          }
+
+          if( target.Right != null )
+          {
+            target.Right.Parent = target;
+          }
+
+          if( target.Parent != null )
+          {
+            if( target.Parent.Left == node )
+            {
+              target.Parent.Left = target;
+            }
+            else
+            {
+              target.Parent.Right = target;
+            }
+          }
+
+          Debug.Assert( destroy );
+          if( destroy )
+          {
+            this.ClearNode( node );
+          }
+
+          node = target;
+        }
+        else
+        {
+          node.Right = this.Remove( path, destroy, out oldParentNode );
+        }
+      }
+
+      return this.Balance( node );
+    }
+
+    private void BalanceUp( Node node )
+    {
+      while( node != null )
+      {
+        node = this.Balance( node ).Parent;
+      }
+    }
+
+    private Node Balance( Node node )
+    {
+      if( this.IsRed( node.Right ) && !this.IsRed( node.Left ) )
+      {
+        // Avoid right-leaning node
+        node = this.RotateLeft( node );
+      }
+
+      if( this.IsRed( node.Left ) && this.IsRed( node.Left.Left ) )
+      {
+        node = this.RotateRight( node );
+      }
+
+      if( this.IsRed( node.Left ) && this.IsRed( node.Right ) )
+      {
+        this.FlipColor( node );
+      }
+
+      return node;
+    }
+
+    private void FlipColor( Node node )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( node.Left != null );
+      Debug.Assert( node.Right != null );
+
+      node.Left.IsRed = !node.Left.IsRed;
+      node.Right.IsRed = !node.Right.IsRed;
+      node.IsRed = !node.IsRed;
+    }
+
+    private void SetRootNodeColor()
+    {
+      if( m_rootNode == null )
+        return;
+
+      m_rootNode.IsRed = false;
+    }
+
+    private void Clear( Node node )
+    {
+      if( node == null )
+        return;
+
+      this.Clear( node.Left );
+      this.Clear( node.Right );
+      this.ClearNode( node );
+    }
+
+    private Node RotateLeft( Node node )
+    {
+      Debug.Assert( node != null );
+
+      var right = node.Right;
+      Debug.Assert( right != null );
+
+      node.Right = right.Left;
+      if( node.Right != null )
+      {
+        node.Right.Parent = node;
+      }
+
+      var parentNode = node.Parent;
+
+      right.Parent = parentNode;
+      right.Left = node;
+      right.IsRed = node.IsRed;
+
+      node.Parent = right;
+      node.IsRed = true;
+
+      if( parentNode != null )
+      {
+        if( parentNode.Left == node )
+        {
+          parentNode.Left = right;
+        }
+        else
+        {
+          parentNode.Right = right;
+        }
+      }
+      else
+      {
+        m_rootNode = right;
+      }
+
+      return right;
+    }
+
+    private Node RotateRight( Node node )
+    {
+      Debug.Assert( node != null );
+
+      var left = node.Left;
+      Debug.Assert( left != null );
+
+      node.Left = left.Right;
+      if( node.Left != null )
+      {
+        node.Left.Parent = node;
+      }
+
+      var parentNode = node.Parent;
+
+      left.Parent = parentNode;
+      left.Right = node;
+      left.IsRed = node.IsRed;
+
+      node.Parent = left;
+      node.IsRed = true;
+
+      if( parentNode != null )
+      {
+        if( parentNode.Left == node )
+        {
+          parentNode.Left = left;
+        }
+        else
+        {
+          parentNode.Right = left;
+        }
+      }
+      else
+      {
+        m_rootNode = left;
+      }
+
+      return left;
+    }
+
+    private Node MoveRedLeft( Node node )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( node.Right != null );
+
+      this.FlipColor( node );
+
+      if( this.IsRed( node.Right.Left ) )
+      {
+        node.Right = this.RotateRight( node.Right );
+        node = this.RotateLeft( node );
+
+        this.FlipColor( node );
+      }
+
+      return node;
+    }
+
+    private Node MoveRedRight( Node node )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( node.Left != null );
+
+      this.FlipColor( node );
+
+      if( this.IsRed( node.Left.Left ) )
+      {
+        node = this.RotateRight( node );
+
+        this.FlipColor( node );
+      }
+
+      return node;
+    }
+
+    private void FindPath( Stack<Node> path, Node upTo )
+    {
+      Debug.Assert( path != null );
+
+      if( path.Count <= 0 )
+        throw new ArgumentException( "The path must contain at least one element.", "path" );
+
+      if( path.Peek() != upTo )
+      {
+        for( var parentNode = path.Peek().Parent; parentNode != null; parentNode = parentNode.Parent )
+        {
+          path.Push( parentNode );
+
+          if( parentNode == upTo )
+            break;
+        }
+
+        if( path.Peek() != upTo )
+          throw new InvalidOperationException();
+      }
+    }
+
+    private void CutPath( Stack<Node> path )
+    {
+      for( int i = 0; i < 2; i++ )
+      {
+        if( path.Count <= 1 )
+          break;
+
+        path.Pop();
+      }
+    }
+
+    private void OnPostInsert( Node newNode, Node oldRootNode )
+    {
+      Debug.Assert( newNode != null );
+
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, newNode.Value ) );
+
+      if( oldRootNode != m_rootNode )
+      {
+        this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
+      }
+    }
+
+    private void OnPostRemove( T value, Node parentNode, Node oldRootNode )
+    {
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, value ) );
+
+      if( oldRootNode != m_rootNode )
+      {
+        this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
+      }
+    }
+
+    private bool IsRed( Node node )
+    {
+      // A null node is "black".
+      return ( node != null )
+          && ( node.IsRed );
+    }
+
+    private void EnsureNode( IBinaryTreeNode<T> node )
+    {
+      if( node == null )
+        throw new ArgumentNullException( "node" );
+
+      if( !( node is Node ) )
+        throw new ArgumentException( "Unexpected node type.", "node" );
+    }
+
+    private void EnsureCurrentNode( IBinaryTreeNode<T> node )
+    {
+      this.EnsureNode( node );
+
+      if( node.Tree != this )
+        throw new ArgumentException( "The node is not within the tree.", "node" );
+    }
+
+    #region INotifyCollectionChanged Members
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    protected virtual void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
+    {
+      var handler = this.CollectionChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    #endregion
+
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected void OnPropertyChanged( string propertyName )
+    {
+      this.OnPropertyChanged( new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    IEnumerator<T> IEnumerable<T>.GetEnumerator()
+    {
+      return this.GetItems( false ).GetEnumerator();
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return ( ( IEnumerable<T> )this ).GetEnumerator();
+    }
+
+    #endregion
+
+    private readonly IEqualityComparer<T> m_comparer;
+
+    private Node m_rootNode;
+
+    #region Node Protected Class
+
+    protected class Node : IBinaryTreeNode<T>
+    {
+      public Node( LLRBTree<T> owner, T value )
+      {
+        Debug.Assert( owner != null );
+        Debug.Assert( value != null );
+
+        m_owner = owner;
+        m_value = value;
+        m_isRed = true;
+      }
+
+      public T Value
+      {
+        get
+        {
+          return m_value;
+        }
+      }
+
+      public LLRBTree<T> Tree
+      {
+        get
+        {
+          return m_owner;
+        }
+      }
+
+      public Node Parent
+      {
+        get
+        {
+          return m_parent;
+        }
+        internal set
+        {
+          if( value == m_parent )
+            return;
+
+          var oldNode = m_parent;
+
+          m_parent = value;
+
+          this.OnParentChanged( oldNode, m_parent );
+        }
+      }
+
+      public Node Left
+      {
+        get
+        {
+          return m_left;
+        }
+        internal set
+        {
+          if( value == m_left )
+            return;
+
+          var oldNode = m_left;
+
+          m_left = value;
+
+          this.OnLeftChanged( oldNode, m_left );
+        }
+      }
+
+      public Node Right
+      {
+        get
+        {
+          return m_right;
+        }
+        internal set
+        {
+          if( value == m_right )
+            return;
+
+          var oldNode = m_right;
+
+          m_right = value;
+
+          this.OnRightChanged( oldNode, m_right );
+        }
+      }
+
+      internal bool IsRed
+      {
+        get
+        {
+          return m_isRed;
+        }
+        set
+        {
+          m_isRed = value;
+        }
+      }
+
+      public Node GetPrevious()
+      {
+        if( m_left != null )
+          return m_left.GetRightmost();
+
+        var child = this;
+        var parent = m_parent;
+
+        while( parent != null )
+        {
+          if( parent.Right == child )
+            return parent;
+
+          child = parent;
+          parent = parent.Parent;
+        }
+
+        return null;
+      }
+
+      public Node GetNext()
+      {
+        if( m_right != null )
+          return m_right.GetLeftmost();
+
+        var child = this;
+        var parent = m_parent;
+
+        while( parent != null )
+        {
+          if( parent.Left == child )
+            return parent;
+
+          child = parent;
+          parent = parent.Parent;
+        }
+
+        return null;
+      }
+
+      public Node GetLeftmost()
+      {
+        var child = default( Node );
+
+        for( var current = this; current != null; current = current.Left )
+        {
+          child = current;
+        }
+
+        return child;
+      }
+
+      public Node GetRightmost()
+      {
+        var child = default( Node );
+
+        for( var current = this; current != null; current = current.Right )
+        {
+          child = current;
+        }
+
+        return child;
+      }
+
+      protected virtual void OnParentChanged( Node oldNode, Node newNode )
+      {
+      }
+
+      protected virtual void OnLeftChanged( Node oldNode, Node newNode )
+      {
+      }
+
+      protected virtual void OnRightChanged( Node oldNode, Node newNode )
+      {
+      }
+
+      IBinaryTree<T> IBinaryTreeNode<T>.Tree
+      {
+        get
+        {
+          return this.Tree;
+        }
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.Parent
+      {
+        get
+        {
+          return this.Parent;
+        }
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.Left
+      {
+        get
+        {
+          return this.Left;
+        }
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.Right
+      {
+        get
+        {
+          return this.Right;
+        }
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetPrevious()
+      {
+        return this.GetPrevious();
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetNext()
+      {
+        return this.GetNext();
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetLeftmost()
+      {
+        return this.GetLeftmost();
+      }
+
+      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetRightmost()
+      {
+        return this.GetRightmost();
+      }
+
+      private readonly T m_value;
+      private readonly LLRBTree<T> m_owner;
+      private Node m_parent; // null
+      private Node m_left; // null
+      private Node m_right; // null
+      private bool m_isRed;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
index dd294afe..08d6a7b4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using Xceed.Wpf.DataGrid;
 
@@ -37,17 +36,14 @@ namespace Xceed.Utils.Collections
     #region CONSTANTS
 
     private const int UseHashSetThreshold = 10;
+    private const int UseListThreshold = 8;
 
     #endregion
 
-    #region INTERNAL CONSTRUCTOR
-
     internal ObservableHashList()
     {
     }
 
-    #endregion
-
     #region IList Members
 
     public bool IsFixedSize
@@ -66,6 +62,29 @@ namespace Xceed.Utils.Collections
       }
     }
 
+    public object this[ int index ]
+    {
+      get
+      {
+        return m_items[ index ];
+      }
+      set
+      {
+        var count = this.Count;
+        if( ( index < 0 ) || ( index > count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        if( index == count )
+        {
+          this.InsertCore( index, value );
+        }
+        else
+        {
+          this.ReplaceCore( index, value );
+        }
+      }
+    }
+
     public int Add( object value )
     {
       int index = this.Count;
@@ -76,11 +95,13 @@ namespace Xceed.Utils.Collections
 
     public void Clear()
     {
-      m_items = null;
+      if( this.Count == 0 )
+        return;
+
       m_set = null;
-      this.OnPropertyChanged( "Item[]" );
-      this.OnPropertyChanged( "Count" );
-      this.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+      m_items.Clear();
+
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
     }
 
     public bool Contains( object value )
@@ -88,15 +109,12 @@ namespace Xceed.Utils.Collections
       if( m_set != null )
         return m_set.Contains( value );
 
-      if( m_items != null )
-        return m_items.Contains( value );
-
-      return false;
+      return m_items.Contains( value );
     }
 
     public int IndexOf( object value )
     {
-      if( m_items == null )
+      if( ( m_set != null ) && !m_set.Contains( value ) )
         return -1;
 
       return m_items.IndexOf( value );
@@ -121,34 +139,6 @@ namespace Xceed.Utils.Collections
       this.RemoveAtCore( index );
     }
 
-    public object this[ int index ]
-    {
-      get
-      {
-        if( ( index < 0 ) || ( index >= this.Count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        Debug.Assert( m_items != null );
-
-        return m_items[ index ];
-      }
-      set
-      {
-        int count = this.Count;
-        if( ( index < 0 ) || ( index > count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( index == count )
-        {
-          this.InsertCore( index, value );
-        }
-        else
-        {
-          this.ReplaceCore( index, value );
-        }
-      }
-    }
-
     #endregion
 
     #region ICollection Members
@@ -157,9 +147,6 @@ namespace Xceed.Utils.Collections
     {
       get
       {
-        if( m_items == null )
-          return 0;
-
         return m_items.Count;
       }
     }
@@ -176,22 +163,13 @@ namespace Xceed.Utils.Collections
     {
       get
       {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange<object>( ref m_syncRoot, new object(), null );
-        }
-
-        return m_syncRoot;
+        return ( ( ICollection )m_items ).SyncRoot;
       }
     }
 
     public void CopyTo( Array array, int index )
     {
-      if( m_items == null )
-        return;
-
-      IList items = m_items;
-      items.CopyTo( array, index );
+      ( ( IList )m_items ).CopyTo( array, index );
     }
 
     #endregion
@@ -200,9 +178,6 @@ namespace Xceed.Utils.Collections
 
     public IEnumerator GetEnumerator()
     {
-      if( m_items == null )
-        return Enumerable.Empty<object>().GetEnumerator();
-
       return m_items.GetEnumerator();
     }
 
@@ -212,19 +187,22 @@ namespace Xceed.Utils.Collections
 
     public event NotifyCollectionChangedEventHandler CollectionChanged;
 
-    private void FireCollectionChanged( NotifyCollectionChangedEventArgs args )
+    private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
     {
-      if( m_deferOperationCount == 0 )
+      var handler = this.CollectionChanged;
+      if( handler == null )
+        return;
+
+      if( m_deferCount == 0 )
       {
-        var handler = this.CollectionChanged;
-        if( handler == null )
-          return;
+        this.OnPropertyChanged( "Item[]" );
+        this.OnPropertyChanged( "Count" );
 
-        handler.Invoke( this, args );
+        handler.Invoke( this, e );
       }
       else
       {
-        m_deferOperationCount = m_deferOperationCount.DeferOperation();
+        m_hasDeferredNotifications = true;
       }
     }
 
@@ -236,26 +214,18 @@ namespace Xceed.Utils.Collections
 
     private void OnPropertyChanged( string propertyName )
     {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    private void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      if( m_deferOperationCount != 0 )
-        return;
-
       var handler = this.PropertyChanged;
       if( handler == null )
         return;
 
-      handler.Invoke( this, e );
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
     }
 
     #endregion
 
     public IDisposable DeferINotifyCollectionChanged()
     {
-      return new ObservableHashList.DeferOperationNotifications( this );
+      return new DeferDisposable( this );
     }
 
     public void Sort()
@@ -265,73 +235,49 @@ namespace Xceed.Utils.Collections
 
     public void Sort( IComparer comparer )
     {
-      if( m_items == null )
-        return;
-
       var comparerWrapper = new ComparerWrapper( ( comparer != null ) ? comparer : ObjectComparer.Singleton );
       m_items.Sort( comparerWrapper );
 
-      this.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
     }
 
     private void InsertCore( int index, object value )
     {
-      int count = this.Count;
+      var count = this.Count;
       if( ( index < 0 ) || ( index > count ) )
         throw new ArgumentOutOfRangeException( "index" );
 
-      if( m_items == null )
+      this.EnsureNotIn( value );
+
+      if( ( m_set == null ) && ( count >= ObservableHashList.UseHashSetThreshold ) )
       {
-        Debug.Assert( count == 0 );
-        m_items = new List<object>() { value };
+        m_set = new HashSet<object>( m_items );
       }
-      else
-      {
-        if( ( m_set == null ) && ( count >= ObservableHashList.UseHashSetThreshold ) )
-          m_set = new HashSet<object>( m_items );
 
-        if( this.Contains( value ) )
-          throw new ArgumentException( string.Format( "Item has already been added. (Key being added: '{0}')", "value", ( value == null ) ? "null" : value.ToString() ) );
+      m_items.Insert( index, value );
 
-        m_items.Insert( index, value );
-
-        if( m_set != null )
-        {
-          var result = m_set.Add( value );
-          Debug.Assert( result );
-        }
+      if( m_set != null )
+      {
+        m_set.Add( value );
       }
 
-      this.OnPropertyChanged( "Item[]" );
-      this.OnPropertyChanged( "Count" );
-      this.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, value, index ) );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, value, index ) );
     }
 
     private void RemoveAtCore( int index )
     {
-      int count = this.Count;
+      var count = this.Count;
       if( ( index < 0 ) || ( index >= count ) )
         throw new ArgumentOutOfRangeException( "index" );
 
-      Debug.Assert( m_items != null );
-
-      object value = m_items[ index ];
+      var value = m_items[ index ];
 
-      if( count > 1 )
-      {
-        m_items.RemoveAt( index );
-      }
-      else
-      {
-        m_items = null;
-      }
+      m_items.RemoveAt( index );
 
       if( m_set != null )
       {
-        if( count > ObservableHashList.UseHashSetThreshold )
+        if( count > ObservableHashList.UseListThreshold )
         {
-          Debug.Assert( m_items != null );
-
           m_set.Remove( value );
         }
         else
@@ -340,21 +286,17 @@ namespace Xceed.Utils.Collections
         }
       }
 
-      this.OnPropertyChanged( "Item[]" );
-      this.OnPropertyChanged( "Count" );
-      this.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, value, index ) );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, value, index ) );
     }
 
     private void ReplaceCore( int index, object value )
     {
       Debug.Assert( ( index >= 0 ) && ( index < this.Count ) );
-      Debug.Assert( m_items != null );
 
       if( m_items[ index ] == value )
         return;
 
-      if( this.Contains( value ) )
-        throw new ArgumentException( string.Format( "Item has already been added. (Key being added: '{0}')", "value", ( value == null ) ? "null" : value.ToString() ) );
+      this.EnsureNotIn( value );
 
       var oldValue = m_items[ index ];
       m_items[ index ] = value;
@@ -365,30 +307,34 @@ namespace Xceed.Utils.Collections
         m_set.Add( value );
       }
 
-      this.OnPropertyChanged( "Item[]" );
-      this.OnPropertyChanged( "Count" );
-      this.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, value, oldValue, index ) );
+      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, value, oldValue, index ) );
+    }
+
+    private void EnsureNotIn( object value )
+    {
+      if( this.Contains( value ) )
+        throw new ArgumentException( string.Format( "Item has already been added. (Key being added: '{0}')", "value", ( value == null ) ? "null" : value.ToString() ) );
     }
 
     #region Private Fields
 
-    private List<object> m_items; // = null
-    private HashSet<object> m_set; // = null
-    private DeferCount m_deferOperationCount;
-    private object m_syncRoot; // = null
+    private readonly List<object> m_items = new List<object>();
+    private HashSet<object> m_set; //null
+    private int m_deferCount;
+    private bool m_hasDeferredNotifications; //false
 
     #endregion
 
-    #region DeferOperationNotifications Class
+    #region DeferDisposable Private Class
 
-    private class DeferOperationNotifications : IDisposable
+    private sealed class DeferDisposable : IDisposable
     {
-      public DeferOperationNotifications( ObservableHashList owner )
+      internal DeferDisposable( ObservableHashList owner )
       {
         Debug.Assert( owner != null );
 
         m_owner = owner;
-        m_owner.m_deferOperationCount++;
+        m_owner.m_deferCount++;
       }
 
       public void Dispose()
@@ -399,27 +345,22 @@ namespace Xceed.Utils.Collections
 
       private void Dispose( bool disposing )
       {
-        var target = m_owner;
+        var target = Interlocked.Exchange( ref m_owner, null );
         if( target == null )
           return;
 
-        target = Interlocked.CompareExchange( ref m_owner, null, target );
-        if( target == null )
+        target.m_deferCount--;
+        if( target.m_deferCount != 0 )
           return;
 
-        target.m_deferOperationCount--;
-
-        if( target.m_deferOperationCount.HasDeferredOperation && ( target.m_deferOperationCount == 0 ) )
+        if( target.m_hasDeferredNotifications )
         {
-          // We always force a Reset after any deferred operation
-          target.m_deferOperationCount = new DeferCount();
-          target.OnPropertyChanged( "Item[]" );
-          target.OnPropertyChanged( "Count" );
-          target.FireCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+          target.m_hasDeferredNotifications = false;
+          target.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
         }
       }
 
-      ~DeferOperationNotifications()
+      ~DeferDisposable()
       {
         this.Dispose( false );
       }
@@ -429,35 +370,6 @@ namespace Xceed.Utils.Collections
 
     #endregion
 
-    #region Debugger Helper Class
-
-    internal class ObservableHashListDebugView
-    {
-      public ObservableHashListDebugView( ObservableHashList list )
-      {
-        if( list == null )
-          throw new ArgumentNullException( "list" );
-
-        m_list = list;
-      }
-
-      public object[] Values
-      {
-        get
-        {
-          var items = m_list.m_items;
-          if( items == null )
-            return new object[ 0 ];
-
-          return items.ToArray();
-        }
-      }
-
-      private readonly ObservableHashList m_list;
-    }
-
-    #endregion
-
     #region ComparerWrapper Private Class
 
     private sealed class ComparerWrapper : IComparer<object>
@@ -479,85 +391,31 @@ namespace Xceed.Utils.Collections
 
     #endregion
 
-    #region DeferCount Private Nested Type
+    #region ObservableHashListDebugView Private Class
 
-    private struct DeferCount
+    private sealed class ObservableHashListDebugView
     {
-      private const uint DeferredOperationMask = 1u << 31;
-      private const uint CountMask = ~DeferCount.DeferredOperationMask;
-
-      private DeferCount( int count, bool hasDeferredOperation )
+      internal ObservableHashListDebugView( ObservableHashList owner )
       {
-        if( count < 0 )
-          throw new ArgumentException( "count" );
-
-        uint data = ( uint )count;
-        if( hasDeferredOperation )
-        {
-          data |= DeferCount.DeferredOperationMask;
-        }
+        if( owner == null )
+          throw new ArgumentNullException( "list" );
 
-        this.Data = data;
+        m_owner = owner;
       }
 
-      public int Count
+      public object[] Values
       {
         get
         {
-          return Convert.ToInt32( this.Data & DeferCount.CountMask );
-        }
-      }
+          var items = m_owner.m_items;
+          if( items == null )
+            return new object[ 0 ];
 
-      public bool HasDeferredOperation
-      {
-        get
-        {
-          return ( this.Data & DeferCount.DeferredOperationMask ) != 0u;
+          return items.ToArray();
         }
       }
 
-      public DeferCount DeferOperation()
-      {
-        if( this.HasDeferredOperation )
-          return this;
-
-        return new DeferCount( this.Count, true );
-      }
-
-      public static DeferCount operator ++( DeferCount source )
-      {
-        return source + 1;
-      }
-
-      public static DeferCount operator --( DeferCount source )
-      {
-        return source - 1;
-      }
-
-      public static DeferCount operator +( DeferCount source, int value )
-      {
-        if( value == 0 )
-          return source;
-
-        return new DeferCount( source.Count + value, source.HasDeferredOperation );
-      }
-
-      public static DeferCount operator -( DeferCount source, int value )
-      {
-        return source + ( -value );
-      }
-
-      public static implicit operator int( DeferCount source )
-      {
-        return source.Count;
-      }
-
-      public static implicit operator DeferCount( int count )
-      {
-        return new DeferCount( count, false );
-      }
-
-      private readonly uint Data;
+      private readonly ObservableHashList m_owner;
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs
new file mode 100644
index 00000000..48c2d88a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs
@@ -0,0 +1,2087 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace Xceed.Utils.Collections
+{
+  internal class RSTree<TRegion, TItem> : ICollection<RSTree<TRegion, TItem>.Entry>, ICollection
+  {
+    #region Static Fields
+
+    private const double OverflowReInsertionRatio = 0.3d;
+
+    #endregion
+
+    internal RSTree( RSTreeHelper<TRegion> helper )
+      : this( helper, 3, 8 )
+    {
+    }
+
+    internal RSTree( RSTreeHelper<TRegion> helper, int minNodeSize, int maxNodeSize )
+    {
+      if( helper == null )
+        throw new ArgumentNullException( "helper" );
+
+      var dimensions = helper.GetDimensions();
+      if( dimensions < 1 )
+        throw new ArgumentException( "The number of dimensions must be greater than or equal to one.", "helper" );
+
+      if( minNodeSize < 2 )
+        throw new ArgumentOutOfRangeException( "minNodeSize", minNodeSize, "minNodeSize must be greater than or equal to 2." );
+
+      if( maxNodeSize < minNodeSize * 2 )
+        throw new ArgumentException( "maxNodeSize must be greater than or equal to minNodeSize * 2.", "maxNodeSize" );
+
+      m_helper = helper;
+      m_minNodeSize = minNodeSize;
+      m_maxNodeSize = maxNodeSize;
+    }
+
+    #region Count Property
+
+    public int Count
+    {
+      get
+      {
+        return m_count;
+      }
+    }
+
+    #endregion
+
+    public void Add( TRegion region, TItem item )
+    {
+      this.Add( new Entry( region, item ) );
+    }
+
+    public bool Remove( TRegion region, TItem item )
+    {
+      return this.Remove( new Entry( region, item ) );
+    }
+
+    public bool Contains( TRegion region, TItem item )
+    {
+      return this.Contains( new Entry( region, item ) );
+    }
+
+    public bool Overlaps( TRegion region )
+    {
+      return this.Overlaps( m_rootNode, region );
+    }
+
+    public IEnumerable<RSTree<TRegion, TItem>.Entry> GetEntriesWithin( TRegion region )
+    {
+      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( region ) )
+        return Enumerable.Empty<RSTree<TRegion, TItem>.Entry>();
+
+      return new EntryEnumerable( this, region );
+    }
+
+    private static int FindLevel( Node node )
+    {
+      Debug.Assert( node != null );
+
+      if( node.Parent == null )
+        return 0;
+
+      return RSTree<TRegion, TItem>.FindLevel( node.Parent ) + 1;
+    }
+
+    private void Insert( Entry entry )
+    {
+      Debug.Assert( !m_helper.IsEmptyRegion( entry.Region ) );
+
+      if( m_rootNode == null )
+      {
+        m_rootNode = new LeafNode( m_helper, m_maxNodeSize );
+      }
+
+      var leafNode = ( LeafNode )m_rootNode.FindNearest( entry.Region );
+      Debug.Assert( leafNode != null );
+
+      leafNode.Add( entry );
+
+      if( leafNode.Count > m_maxNodeSize )
+      {
+        this.ManageOverflow( leafNode );
+      }
+    }
+
+    private bool Overlaps( Node node, TRegion region )
+    {
+      if( ( node == null ) || !m_helper.IsOverlapping( node.Region, region ) )
+        return false;
+
+      var leafNode = node as LeafNode;
+      if( leafNode != null )
+      {
+        var count = leafNode.Count;
+        for( int i = 0; i < count; i++ )
+        {
+          var entry = leafNode[ i ];
+          if( m_helper.IsOverlapping( entry.Region, region ) )
+            return true;
+        }
+      }
+      else
+      {
+        var internalNode = ( InternalNode )node;
+        var count = internalNode.Count;
+
+        for( int i = 0; i < count; i++ )
+        {
+          if( this.Overlaps( internalNode[ i ], region ) )
+            return true;
+        }
+      }
+
+      return false;
+    }
+
+    private void Insert( Node node, int level )
+    {
+      Debug.Assert( ( node != null ) && ( level > 0 ) );
+      Debug.Assert( m_rootNode != null );
+
+      var internalNode = ( InternalNode )m_rootNode.FindNearest( node.Region, level - 1 );
+      Debug.Assert( internalNode != null );
+
+      internalNode.Add( node );
+
+      if( internalNode.Count > m_maxNodeSize )
+      {
+        this.ManageOverflow( internalNode );
+      }
+    }
+
+    private IEnumerable<Node> FindNodes( TRegion region, int level )
+    {
+      Debug.Assert( !m_helper.IsEmptyRegion( region ) );
+
+      if( m_rootNode == null )
+        yield break;
+
+      var nodeInfos = new Queue<NodeInfo>();
+      nodeInfos.Enqueue( new NodeInfo( m_rootNode, 0 ) );
+
+      while( nodeInfos.Count > 0 )
+      {
+        var nodeInfo = nodeInfos.Dequeue();
+        var node = nodeInfo.Node;
+        var nodeLevel = nodeInfo.Level;
+
+        if( !m_helper.IsOverlapping( node.Region, region ) )
+          continue;
+
+        if( nodeLevel == level )
+        {
+          yield return node;
+        }
+        else if( ( level < 0 ) || ( nodeLevel < level ) )
+        {
+          var leafNode = node as LeafNode;
+          if( leafNode != null )
+          {
+            if( level < 0 )
+              yield return leafNode;
+          }
+          else
+          {
+            foreach( var child in ( InternalNode )node )
+            {
+              nodeInfos.Enqueue( new NodeInfo( child, nodeLevel + 1 ) );
+            }
+          }
+        }
+      }
+    }
+
+    private void ManageOverflow( Node node )
+    {
+      while( node != null )
+      {
+        node = ( node is LeafNode )
+                 ? this.ManageOverflowCore( ( LeafNode )node )
+                 : this.ManageOverflowCore( ( InternalNode )node );
+      }
+    }
+
+    private Node ManageOverflowCore( LeafNode node )
+    {
+      Debug.Assert( node.Count > m_maxNodeSize );
+
+      // It makes no sense to reinsert the entry in the root node.
+      if( node.Parent != null )
+      {
+        node = this.Reinsert( node );
+        if( node == null )
+          return null;
+      }
+
+      // We have no choice but to split the node.
+      var newNode = node.Split( m_minNodeSize );
+      Debug.Assert( newNode != null );
+
+      // We have splited the root node.  A new root is required.
+      if( node == m_rootNode )
+      {
+        var newRootNode = new InternalNode( m_helper, m_maxNodeSize );
+        newRootNode.Add( node );
+        newRootNode.Add( newNode );
+
+        m_rootNode = newRootNode;
+      }
+      // Add the new node to the same parent node.
+      else
+      {
+        var parentNode = ( InternalNode )node.Parent;
+        Debug.Assert( parentNode != null );
+
+        parentNode.Add( newNode );
+
+        // Return the parent node if it is overflowing to process it.
+        if( parentNode.Count > m_maxNodeSize )
+          return parentNode;
+      }
+
+      return null;
+    }
+
+    private Node ManageOverflowCore( InternalNode node )
+    {
+      Debug.Assert( node.Count > m_maxNodeSize );
+
+      // It makes no sense to reinsert child nodes in the root node.
+      if( node.Parent != null )
+      {
+        node = this.Reinsert( node );
+        if( node == null )
+          return null;
+      }
+
+      // We have no choice but to split the node.
+      var newNode = node.Split( m_minNodeSize );
+      Debug.Assert( newNode != null );
+
+      // We have splited the root node.  A new root is required.
+      if( node == m_rootNode )
+      {
+        var newRootNode = new InternalNode( m_helper, m_maxNodeSize );
+        newRootNode.Add( node );
+        newRootNode.Add( newNode );
+
+        m_rootNode = newRootNode;
+      }
+      // Add the new node to the same parent node.
+      else
+      {
+        var parentNode = ( InternalNode )node.Parent;
+        Debug.Assert( parentNode != null );
+
+        parentNode.Add( newNode );
+
+        // Return the parent node if it is overflowing to process it.
+        if( parentNode.Count > m_maxNodeSize )
+          return parentNode;
+      }
+
+      return null;
+    }
+
+    private LeafNode Reinsert( LeafNode node )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( node.Count > m_maxNodeSize );
+
+      var reinsertCount = System.Math.Min( node.Count - m_minNodeSize, ( int )System.Math.Ceiling( m_maxNodeSize * RSTree<TRegion, TItem>.OverflowReInsertionRatio ) );
+      if( reinsertCount <= 0 )
+        return node;
+
+      Debug.Assert( ( m_minNodeSize <= node.Count - reinsertCount ) && ( reinsertCount <= m_maxNodeSize ) );
+
+      // Identify the entries that are at the "edge" of current region.
+      var center = new KPoint( m_helper.CenterOf( node.Region ) );
+      var candidates = node.Select( ( entry, entryIndex ) => new
+                             {
+                               Entry = entry,
+                               Index = entryIndex,
+                               Distance = KPoint.Distance( center, new KPoint( m_helper.CenterOf( entry.Region ) ) )
+                             } )
+                           .OrderByDescending( item => item.Distance )
+                           .ThenBy( item => item.Index )
+                           .Take( reinsertCount ).ToList();
+
+      // The entries must be removed from last to first to prevent an index shift.
+      foreach( var item in candidates.OrderByDescending( x => x.Index ) )
+      {
+        node.RemoveAt( item.Index );
+      }
+
+      var splitNode = node;
+      var reinsert = 0;
+
+      while( reinsert < candidates.Count )
+      {
+        var entry = candidates[ reinsert ].Entry;
+        var newLeafNode = ( LeafNode )m_rootNode.FindNearest( entry.Region );
+        Debug.Assert( newLeafNode != null );
+
+        newLeafNode.Add( entry );
+        reinsert++;
+
+        // If a new overflow occur while reinserting entries, stop reinserting in order to split the node.
+        if( newLeafNode.Count > m_maxNodeSize )
+        {
+          splitNode = newLeafNode;
+          break;
+        }
+        // If the best leaf node for this entry is the original node, so does the remaining entries.
+        else if( newLeafNode == node )
+        {
+          break;
+        }
+      }
+
+      Debug.Assert( ( ( candidates.Count - reinsert ) + node.Count <= m_maxNodeSize )
+                 || ( ( ( candidates.Count - reinsert ) + node.Count > m_maxNodeSize ) && ( splitNode == node ) ) );
+
+      // Reinsert the remaining entries in the original node.
+      for( ; reinsert < candidates.Count; reinsert++ )
+      {
+        node.Add( candidates[ reinsert ].Entry );
+      }
+
+      if( splitNode.Count > m_maxNodeSize )
+        return splitNode;
+
+      return null;
+    }
+
+    private InternalNode Reinsert( InternalNode node )
+    {
+      Debug.Assert( node != null );
+      Debug.Assert( node.Count > m_maxNodeSize );
+
+      var reinsertCount = System.Math.Min( node.Count - m_minNodeSize, ( int )System.Math.Ceiling( m_maxNodeSize * RSTree<TRegion, TItem>.OverflowReInsertionRatio ) );
+      if( reinsertCount <= 0 )
+        return node;
+
+      Debug.Assert( ( m_minNodeSize <= node.Count - reinsertCount ) && ( reinsertCount <= m_maxNodeSize ) );
+
+      // Identify the child nodes that are at the "edge" of current region.
+      var center = new KPoint( m_helper.CenterOf( node.Region ) );
+      var candidates = node.Select( ( childNode, childNodeIndex ) => new
+                             {
+                               Node = childNode,
+                               Index = childNodeIndex,
+                               Distance = KPoint.Distance( center, new KPoint( m_helper.CenterOf( childNode.Region ) ) )
+                             } )
+                           .OrderByDescending( item => item.Distance )
+                           .ThenBy( item => item.Index )
+                           .Take( reinsertCount ).ToList();
+
+      // The child nodes must be removed from last to first to prevent an index shift.
+      foreach( var item in candidates.OrderByDescending( x => x.Index ) )
+      {
+        node.RemoveAt( item.Index );
+      }
+
+      var splitNode = node;
+      var nodeLevel = RSTree<TRegion, TItem>.FindLevel( node );
+      var reinsert = 0;
+
+      while( reinsert < candidates.Count )
+      {
+        var childNode = candidates[ reinsert ].Node;
+        var newInternalNode = ( InternalNode )m_rootNode.FindNearest( childNode.Region, nodeLevel );
+        Debug.Assert( newInternalNode != null );
+
+        newInternalNode.Add( childNode );
+        reinsert++;
+
+        // If a new overflow occur while reinserting child nodes, stop reinserting in order to split the node.
+        if( newInternalNode.Count > m_maxNodeSize )
+        {
+          splitNode = newInternalNode;
+          break;
+        }
+        // If the best internal node for this child node is the original node, so does the remaining child nodes.
+        else if( newInternalNode == node )
+        {
+          break;
+        }
+      }
+
+      Debug.Assert( ( ( candidates.Count - reinsert ) + node.Count <= m_maxNodeSize )
+                 || ( ( ( candidates.Count - reinsert ) + node.Count > m_maxNodeSize ) && ( splitNode == node ) ) );
+
+      // Reinsert the remaining child nodes in the original node.
+      for( ; reinsert < candidates.Count; reinsert++ )
+      {
+        node.Add( candidates[ reinsert ].Node );
+      }
+
+      if( splitNode.Count > m_maxNodeSize )
+        return splitNode;
+
+      return null;
+    }
+
+    private void ManageUnderflow( Node node )
+    {
+      while( node != null )
+      {
+        node = ( node is LeafNode )
+                 ? this.ManageUnderflowCore( ( LeafNode )node )
+                 : this.ManageUnderflowCore( ( InternalNode )node );
+      }
+    }
+
+    private Node ManageUnderflowCore( LeafNode node )
+    {
+      Debug.Assert( node.Count < m_minNodeSize );
+
+      if( node == m_rootNode )
+      {
+        if( node.Count == 0 )
+        {
+          m_rootNode = null;
+        }
+      }
+      else
+      {
+        var parent = ( InternalNode )node.Parent;
+        Debug.Assert( parent != null );
+
+        // Remove the current node from the parent node to prevent entries to
+        // be reinserted within it.
+        var removed = parent.Remove( node );
+        Debug.Assert( removed );
+
+        // Reinsert the entries in the remaining nodes.
+        for( int i = node.Count - 1; i >= 0; i-- )
+        {
+          var entry = node[ i ];
+          node.RemoveAt( i );
+
+          this.Insert( entry );
+        }
+
+        // Return the parent node if it is underflowing to process it.
+        if( parent.Count < m_minNodeSize )
+          return parent;
+      }
+
+      return null;
+    }
+
+    private Node ManageUnderflowCore( InternalNode node )
+    {
+      Debug.Assert( node.Count < m_minNodeSize );
+
+      if( node == m_rootNode )
+      {
+        Debug.Assert( node.Count > 0 );
+
+        // Remove an entire level.
+        if( node.Count == 1 )
+        {
+          var child = node[ 0 ];
+          node.RemoveAt( 0 );
+
+          m_rootNode = child;
+        }
+      }
+      else
+      {
+        var level = RSTree<TRegion, TItem>.FindLevel( node );
+        var parent = ( InternalNode )node.Parent;
+        Debug.Assert( ( parent != null ) && ( level > 0 ) );
+
+        // Remove the current node from the parent node to prevent child nodes to
+        // be reinserted within it.
+        var removed = parent.Remove( node );
+        Debug.Assert( removed );
+
+        // Reinsert the child nodes in the remaining nodes of the same level.
+        for( int i = node.Count - 1; i >= 0; i-- )
+        {
+          var child = node[ i ];
+          node.RemoveAt( i );
+
+          this.Insert( child, level + 1 );
+        }
+
+        // Return the parent node if it is underflowing to process it.
+        if( parent.Count < m_minNodeSize )
+          return parent;
+      }
+
+      return null;
+    }
+
+    private void IncrementVersion()
+    {
+      unchecked
+      {
+        m_version++;
+      }
+    }
+
+    #region ICollection<> Members
+
+    int ICollection<RSTree<TRegion, TItem>.Entry>.Count
+    {
+      get
+      {
+        return this.Count;
+      }
+    }
+
+    bool ICollection<RSTree<TRegion, TItem>.Entry>.IsReadOnly
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    public void Add( Entry entry )
+    {
+      if( m_helper.IsEmptyRegion( entry.Region ) )
+        throw new ArgumentException( "The region must not be empty.", "entry" );
+
+      this.Insert( entry );
+
+      m_count++;
+      this.IncrementVersion();
+    }
+
+    public void Clear()
+    {
+      m_count = 0;
+      m_rootNode = null;
+
+      this.IncrementVersion();
+    }
+
+    public bool Contains( Entry entry )
+    {
+      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( entry.Region ) )
+        return false;
+
+      return ( from candidate in this.GetEntriesWithin( entry.Region )
+               where ( m_helper.AreEquivalent( entry.Region, candidate.Region ) )
+                  && ( object.Equals( entry.Item, candidate.Item ) )
+               select candidate ).Any();
+    }
+
+    public bool Remove( Entry entry )
+    {
+      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( entry.Region ) )
+        return false;
+
+      // Get the first LeafNode where the entry was found.
+      var leafNode = ( from candidate in this.FindNodes( entry.Region, -1 ).Cast<LeafNode>()
+                       where candidate.Remove( entry )
+                       select candidate ).FirstOrDefault();
+      if( leafNode == null )
+        return false;
+
+      if( leafNode.Count < m_minNodeSize )
+      {
+        this.ManageUnderflow( leafNode );
+      }
+
+      m_count--;
+      this.IncrementVersion();
+
+      return true;
+    }
+
+    void ICollection<RSTree<TRegion, TItem>.Entry>.CopyTo( Entry[] array, int index )
+    {
+      ( ( ICollection )this ).CopyTo( array, index );
+    }
+
+    #endregion
+
+    #region ICollection Members
+
+    int ICollection.Count
+    {
+      get
+      {
+        return this.Count;
+      }
+    }
+
+    bool ICollection.IsSynchronized
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    object ICollection.SyncRoot
+    {
+      get
+      {
+        if( m_syncRoot == null )
+        {
+          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
+        }
+
+        return m_syncRoot;
+      }
+    }
+
+    void ICollection.CopyTo( Array array, int index )
+    {
+      if( array == null )
+        throw new ArgumentNullException( "array" );
+
+      if( index < 0 )
+        throw new ArgumentOutOfRangeException( "index" );
+
+      if( array.Rank != 1 )
+        throw new ArgumentException( "Multi-dimensional array is not supported.", "array" );
+
+      if( ( array.Length - index ) < this.Count )
+        throw new ArgumentException( "The number of elements is greater than the available space from index to the end of the destination array.", "array" );
+
+      foreach( var entry in this )
+      {
+        array.SetValue( entry, index++ );
+      }
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<Entry> GetEnumerator()
+    {
+      return new EntryEnumerator( this );
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    private readonly RSTreeHelper<TRegion> m_helper;
+    private readonly int m_minNodeSize;
+    private readonly int m_maxNodeSize;
+
+    private Node m_rootNode; //null
+    private int m_count; //0
+    private int m_version; //0
+    private object m_syncRoot; //null
+
+    #region Entry Internal Struct
+
+    internal struct Entry
+    {
+      public Entry( TRegion region, TItem item )
+      {
+        m_region = region;
+        m_item = item;
+      }
+
+      public TRegion Region
+      {
+        get
+        {
+          return m_region;
+        }
+      }
+
+      public TItem Item
+      {
+        get
+        {
+          return m_item;
+        }
+      }
+
+      public override int GetHashCode()
+      {
+        return ( !object.ReferenceEquals( m_item, null ) ) ? m_item.GetHashCode() : 0;
+      }
+
+      public override bool Equals( object obj )
+      {
+        if( !( obj is Entry ) )
+          return false;
+
+        var target = ( Entry )obj;
+
+        return ( object.Equals( target.m_region, m_region ) )
+            && ( object.Equals( target.m_item, m_item ) );
+      }
+
+      private readonly TRegion m_region;
+      private readonly TItem m_item;
+    }
+
+    #endregion
+
+    #region EntryEnumerable Private Class
+
+    private sealed class EntryEnumerable : IEnumerable<RSTree<TRegion, TItem>.Entry>
+    {
+      internal EntryEnumerable( RSTree<TRegion, TItem> owner, TRegion region )
+      {
+        Debug.Assert( owner != null );
+
+        m_owner = owner;
+        m_region = region;
+      }
+
+      public IEnumerator<RSTree<TRegion, TItem>.Entry> GetEnumerator()
+      {
+        return new EntryEnumerator( m_owner, m_region );
+      }
+
+      IEnumerator IEnumerable.GetEnumerator()
+      {
+        return this.GetEnumerator();
+      }
+
+      private readonly RSTree<TRegion, TItem> m_owner;
+      private readonly TRegion m_region;
+    }
+
+    #endregion
+
+    #region EntryEnumerator Private Class
+
+    private sealed class EntryEnumerator : IEnumerator<RSTree<TRegion, TItem>.Entry>
+    {
+      internal EntryEnumerator( RSTree<TRegion, TItem> owner, TRegion region )
+        : this( owner )
+      {
+        Debug.Assert( !owner.m_helper.IsEmptyRegion( region ) );
+
+        m_filter = ( TRegion r ) => m_owner.m_helper.IsOverlapping( region, r );
+      }
+
+      internal EntryEnumerator( RSTree<TRegion, TItem> owner )
+      {
+        Debug.Assert( owner != null );
+
+        m_owner = owner;
+        m_version = owner.m_version;
+
+        if( owner.m_rootNode != null )
+        {
+          m_nodes.Enqueue( owner.m_rootNode );
+        }
+      }
+
+      public Entry Current
+      {
+        get
+        {
+          if( m_entries.Count == 0 )
+            throw new InvalidOperationException();
+
+          return m_entries.Peek();
+        }
+      }
+
+      object IEnumerator.Current
+      {
+        get
+        {
+          return this.Current;
+        }
+      }
+
+      public bool MoveNext()
+      {
+        this.CheckVersion();
+
+        if( m_entries.Count > 0 )
+        {
+          m_entries.Dequeue();
+
+          if( m_entries.Count > 0 )
+            return true;
+        }
+
+        Debug.Assert( m_entries.Count == 0 );
+
+        while( m_nodes.Count > 0 )
+        {
+          var node = m_nodes.Dequeue();
+          if( ( m_filter != null ) && !m_filter.Invoke( node.Region ) )
+            continue;
+
+          var leafNode = node as LeafNode;
+          if( leafNode != null )
+          {
+            var count = leafNode.Count;
+
+            for( int i = 0; i < count; i++ )
+            {
+              var entry = leafNode[ i ];
+              if( ( m_filter != null ) && !m_filter.Invoke( entry.Region ) )
+                continue;
+
+              m_entries.Enqueue( entry );
+            }
+
+            if( m_entries.Count > 0 )
+              return true;
+          }
+          else
+          {
+            var internalNode = ( InternalNode )node;
+            var count = internalNode.Count;
+
+            for( int i = 0; i < count; i++ )
+            {
+              m_nodes.Enqueue( internalNode[ i ] );
+            }
+          }
+        }
+
+        Debug.Assert( m_nodes.Count == 0 );
+        Debug.Assert( m_entries.Count == 0 );
+
+        return false;
+      }
+
+      public void Reset()
+      {
+        this.CheckVersion();
+
+        m_entries.Clear();
+        m_nodes.Clear();
+
+        if( m_owner.m_rootNode != null )
+        {
+          m_nodes.Enqueue( m_owner.m_rootNode );
+        }
+      }
+
+      void IDisposable.Dispose()
+      {
+      }
+
+      private void CheckVersion()
+      {
+        if( m_version != m_owner.m_version )
+          throw new InvalidOperationException();
+      }
+
+      private readonly RSTree<TRegion, TItem> m_owner;
+      private readonly Queue<Node> m_nodes = new Queue<Node>();
+      private readonly Queue<Entry> m_entries = new Queue<Entry>();
+      private readonly Func<TRegion, bool> m_filter; //null
+      private int m_version;
+    }
+
+    #endregion
+
+    #region Node Private Class
+
+    protected abstract class Node : ICollection
+    {
+      public abstract int Count
+      {
+        get;
+      }
+
+      internal abstract TRegion Region
+      {
+        get;
+      }
+
+      internal Node Parent
+      {
+        get
+        {
+          return m_parent;
+        }
+      }
+
+      bool ICollection.IsSynchronized
+      {
+        get
+        {
+          return false;
+        }
+      }
+
+      object ICollection.SyncRoot
+      {
+        get
+        {
+          throw new NotSupportedException();
+        }
+      }
+
+      protected abstract void CopyToCore( Array array, int index );
+      protected abstract IEnumerator GetEnumeratorCore();
+
+      protected void SetParent( Node child, Node parent )
+      {
+        if( ( child == null ) || ( child.m_parent == parent ) )
+          return;
+
+        if( child.m_parent != null )
+        {
+          child.m_parent.SliceRegion( child.Region );
+        }
+
+        child.m_parent = parent;
+
+        if( parent != null )
+        {
+          parent.MergeRegion( child.Region );
+        }
+      }
+
+      protected internal abstract void MergeRegion( TRegion region );
+      protected internal abstract void SliceRegion( TRegion region );
+      protected internal abstract void InvalidateRegion();
+
+      internal abstract Node FindNearest( TRegion region, int level );
+
+      internal Node FindNearest( TRegion region )
+      {
+        return this.FindNearest( region, -1 );
+      }
+
+      internal abstract Node Split( int minNodeSize );
+
+      void ICollection.CopyTo( Array array, int index )
+      {
+        this.CopyToCore( array, index );
+      }
+
+      IEnumerator IEnumerable.GetEnumerator()
+      {
+        return this.GetEnumeratorCore();
+      }
+
+      private Node m_parent;
+    }
+
+    #endregion
+
+    #region InternalNode Private Class
+
+    [DebuggerDisplay( "Internal (Count = {Count})" )]
+    private sealed class InternalNode : Node, IList<Node>
+    {
+      internal InternalNode( RSTreeHelper<TRegion> helper, int size )
+      {
+        Debug.Assert( helper != null );
+        Debug.Assert( size > 0 );
+
+        m_helper = helper;
+        m_nodes = new Node[ size + 1 ]; // We reserve one extra space for overflow.
+      }
+
+      public override int Count
+      {
+        get
+        {
+          return m_count;
+        }
+      }
+
+      internal override TRegion Region
+      {
+        get
+        {
+          if( !m_regionValid )
+          {
+            m_region = m_helper.GetEmptyRegion();
+
+            for( int i = 0; i < m_count; i++ )
+            {
+              m_region = m_helper.Union( m_region, m_nodes[ i ].Region );
+            }
+
+            m_regionValid = true;
+          }
+
+          return m_region;
+        }
+      }
+
+      public Node this[ int index ]
+      {
+        get
+        {
+          if( ( index < 0 ) || ( index >= m_count ) )
+            throw new ArgumentOutOfRangeException( "index" );
+
+          return m_nodes[ index ];
+        }
+        set
+        {
+          this.SetAt( index, value );
+        }
+      }
+
+      bool ICollection<Node>.IsReadOnly
+      {
+        get
+        {
+          return false;
+        }
+      }
+
+      public void Add( Node node )
+      {
+        this.InsertAt( m_count, node );
+      }
+
+      public void Insert( int index, Node node )
+      {
+        this.InsertAt( index, node );
+      }
+
+      public void RemoveAt( int index )
+      {
+        if( ( index < 0 ) || ( index >= m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        var node = m_nodes[ index ];
+
+        for( int i = index; i < m_count - 1; i++ )
+        {
+          m_nodes[ i ] = m_nodes[ i + 1 ];
+        }
+
+        m_nodes[ m_count - 1 ] = null;
+        m_count--;
+
+        this.SetParent( node, null );
+      }
+
+      public bool Remove( Node node )
+      {
+        var index = this.IndexOf( node );
+        if( index < 0 )
+          return false;
+
+        this.RemoveAt( index );
+        return true;
+      }
+
+      public void Clear()
+      {
+        var count = m_count;
+        var nodes = new Node[ m_nodes.Length ];
+
+        Array.Copy( m_nodes, 0, nodes, 0, m_count );
+        Array.Clear( m_nodes, 0, m_count );
+        m_count = 0;
+        m_regionValid = false;
+
+        for( int i = 0; i < count; i++ )
+        {
+          this.SetParent( nodes[ i ], null );
+        }
+      }
+
+      public int IndexOf( Node node )
+      {
+        if( node == null )
+          return -1;
+
+        return Array.IndexOf( m_nodes, node, 0, m_count );
+      }
+
+      public bool Contains( Node node )
+      {
+        return ( this.IndexOf( node ) >= 0 );
+      }
+
+      public IEnumerator<Node> GetEnumerator()
+      {
+        for( int i = 0; i < m_count; i++ )
+        {
+          yield return m_nodes[ i ];
+        }
+      }
+
+      protected override void CopyToCore( Array array, int index )
+      {
+        Array.Copy( m_nodes, 0, array, index, m_count );
+      }
+
+      protected override IEnumerator GetEnumeratorCore()
+      {
+        return this.GetEnumerator();
+      }
+
+      protected internal override void MergeRegion( TRegion region )
+      {
+        if( !m_regionValid )
+          return;
+
+        var newRegion = m_helper.Union( m_region, region );
+        if( m_helper.AreEquivalent( m_region, newRegion ) )
+          return;
+
+        m_region = newRegion;
+        this.InvalidateParentRegion();
+      }
+
+      protected internal override void SliceRegion( TRegion region )
+      {
+        if( !m_regionValid || m_helper.IsWithinBounds( m_region, region ) )
+          return;
+
+        m_regionValid = false;
+        this.InvalidateParentRegion();
+      }
+
+      protected internal override void InvalidateRegion()
+      {
+        if( !m_regionValid )
+          return;
+
+        m_regionValid = false;
+        this.InvalidateParentRegion();
+      }
+
+      internal override Node FindNearest( TRegion region, int level )
+      {
+        if( m_count <= 0 )
+          throw new InvalidOperationException( "An internal node must have children." );
+
+        this.CheckChildNodesOfSameType();
+
+        if( level == 0 )
+          return this;
+
+        var childNode = ( m_nodes[ 0 ] is LeafNode )
+                          ? this.FindLeastOverlapEnlargement( m_nodes, m_count, region )
+                          : this.FindLeastAreaEnlargement( m_nodes, m_count, region );
+
+        Debug.Assert( childNode != null );
+
+        return childNode.FindNearest( region, ( level < 0 ) ? level : level - 1 );
+      }
+
+      internal override Node Split( int minNodeSize )
+      {
+        Debug.Assert( m_count == m_nodes.Length );
+
+        var nodes = ( Node[] )m_nodes.Clone();
+        var axis = this.FindSplitAxis( nodes, minNodeSize );
+        var index = this.FindSplitIndex( nodes, minNodeSize, axis );
+
+        this.Clear();
+
+        for( int i = 0; i < index; i++ )
+        {
+          this.Add( nodes[ i ] );
+        }
+
+        var newNode = new InternalNode( m_helper, m_nodes.Length - 1 );
+        Debug.Assert( newNode.m_nodes.Length == m_nodes.Length );
+
+        for( int i = index; i < nodes.Length; i++ )
+        {
+          newNode.Add( nodes[ i ] );
+        }
+
+        return newNode;
+      }
+
+      [Conditional( "DEBUG" )]
+      private void CheckChildNodesOfSameType()
+      {
+        if( m_count <= 0 )
+          return;
+
+        var isLeaf = m_nodes[ 0 ] is LeafNode;
+
+        for( int i = 1; i < m_count; i++ )
+        {
+          Debug.Assert( ( m_nodes[ i ] is LeafNode ) == isLeaf );
+        }
+      }
+
+      private void SetAt( int index, Node node )
+      {
+        if( node == null )
+          throw new ArgumentNullException( "node" );
+
+        if( ( index < 0 ) || ( index >= m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        if( m_count >= m_nodes.Length )
+          throw new InvalidOperationException();
+
+        var oldNode = m_nodes[ index ];
+        m_nodes[ index ] = node;
+
+        this.SetParent( node, this );
+        this.SetParent( oldNode, null );
+      }
+
+      private void InsertAt( int index, Node node )
+      {
+        if( node == null )
+          throw new ArgumentNullException( "node" );
+
+        if( ( index < 0 ) || ( index > m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        if( m_count >= m_nodes.Length )
+          throw new InvalidOperationException();
+
+        for( int i = m_count; i > index; i-- )
+        {
+          m_nodes[ i ] = m_nodes[ i - 1 ];
+        }
+
+        m_nodes[ index ] = node;
+        m_count++;
+
+        this.SetParent( node, this );
+      }
+
+      private void InvalidateParentRegion()
+      {
+        var parent = this.Parent;
+        if( parent == null )
+          return;
+
+        parent.InvalidateRegion();
+      }
+
+      private Node FindLeastOverlapEnlargement( IList<Node> nodes, int count, TRegion region )
+      {
+        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
+        Debug.Assert( nodes.Count >= count );
+
+        if( count == 1 )
+          return nodes[ 0 ];
+
+        var candidates = new List<Node>( 1 );
+        var minimum = double.PositiveInfinity;
+
+        for( int i = 0; i < count; i++ )
+        {
+          var candidate = nodes[ i ];
+          var newRegion = m_helper.Union( candidate.Region, region );
+          var value = 0d;
+
+          for( int j = 0; j < count; j++ )
+          {
+            if( i == j )
+              continue;
+
+            value += m_helper.CalculateOverlapEnlargement( newRegion, nodes[ j ].Region );
+          }
+
+          if( value < minimum )
+          {
+            candidates.Clear();
+            candidates.Add( candidate );
+            minimum = value;
+          }
+          else if( value == minimum )
+          {
+            candidates.Add( candidate );
+          }
+        }
+
+        if( candidates.Count > 1 )
+          return this.FindLeastAreaEnlargement( candidates, candidates.Count, region );
+
+        return candidates[ 0 ];
+      }
+
+      private Node FindLeastAreaEnlargement( IList<Node> nodes, int count, TRegion region )
+      {
+        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
+        Debug.Assert( nodes.Count >= count );
+
+        if( count == 1 )
+          return nodes[ 0 ];
+
+        var candidates = new List<Node>( 1 );
+        var minimum = double.PositiveInfinity;
+
+        for( int i = 0; i < count; i++ )
+        {
+          var candidate = nodes[ i ];
+          var value = m_helper.CalculateAreaEnlargement( candidate.Region, region );
+
+          if( value < minimum )
+          {
+            candidates.Clear();
+            candidates.Add( candidate );
+            minimum = value;
+          }
+          else if( value == minimum )
+          {
+            candidates.Add( candidate );
+          }
+        }
+
+        if( candidates.Count > 1 )
+          return this.FindSmallestArea( candidates, candidates.Count );
+
+        return candidates[ 0 ];
+      }
+
+      private Node FindSmallestArea( IList<Node> nodes, int count )
+      {
+        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
+        Debug.Assert( nodes.Count >= count );
+
+        if( count == 1 )
+          return nodes[ 0 ];
+
+        var index = 0;
+        var minimum = double.PositiveInfinity;
+
+        for( int i = 0; i < count; i++ )
+        {
+          var value = m_helper.CalculateArea( nodes[ i ].Region );
+          if( value < minimum )
+          {
+            index = i;
+            minimum = value;
+          }
+        }
+
+        return nodes[ index ];
+      }
+
+      private int FindSplitAxis( Node[] nodes, int minNodeSize )
+      {
+        Debug.Assert( ( nodes != null ) && ( nodes.Length == m_count ) );
+
+        var axis = 0;
+        var minimum = double.PositiveInfinity;
+        var dimensions = m_helper.GetDimensions();
+
+        for( int i = 0; i < dimensions; i++ )
+        {
+          Array.Sort( nodes, new LowerBoundComparer( m_helper, i ) );
+
+          var value = this.CalculateMargin( nodes, minNodeSize );
+          if( value < minimum )
+          {
+            minimum = value;
+            axis = i;
+          }
+
+          Array.Sort( nodes, new UpperBoundComparer( m_helper, i ) );
+
+          value = this.CalculateMargin( nodes, minNodeSize );
+          if( value < minimum )
+          {
+            minimum = value;
+            axis = i;
+          }
+        }
+
+        return axis;
+      }
+
+      private int FindSplitIndex( Node[] nodes, int minNodeSize, int dimension )
+      {
+        Array.Sort( nodes, new LowerBoundComparer( m_helper, dimension ) );
+
+        var lowerOverlap = double.PositiveInfinity;
+        var lowerArea = double.PositiveInfinity;
+        var lowerIndex = this.FindSplitIndex( nodes, minNodeSize, out lowerOverlap, out lowerArea );
+
+        Array.Sort( nodes, new UpperBoundComparer( m_helper, dimension ) );
+
+        var upperOverlap = double.PositiveInfinity;
+        var upperArea = double.PositiveInfinity;
+        var upperIndex = this.FindSplitIndex( nodes, minNodeSize, out upperOverlap, out upperArea );
+
+        if( ( upperOverlap < lowerOverlap ) || ( ( upperOverlap == lowerOverlap ) && ( upperArea < lowerArea ) ) )
+          return upperIndex;
+
+        Array.Sort( nodes, new LowerBoundComparer( m_helper, dimension ) );
+        return lowerIndex;
+      }
+
+      private int FindSplitIndex( Node[] nodes, int minSize, out double overlap, out double area )
+      {
+        var splitIndex = 0;
+
+        overlap = double.PositiveInfinity;
+        area = double.PositiveInfinity;
+
+        var maxSize = nodes.Length - minSize;
+
+        for( int i = minSize; i < maxSize; i++ )
+        {
+          var firstRegion = m_helper.GetEmptyRegion();
+          for( int j = 0; j < i; j++ )
+          {
+            firstRegion = m_helper.Union( firstRegion, nodes[ j ].Region );
+          }
+
+          var secondRegion = m_helper.GetEmptyRegion();
+          for( int j = i; j < nodes.Length; j++ )
+          {
+            secondRegion = m_helper.Union( secondRegion, nodes[ j ].Region );
+          }
+
+          var currentOverlap = m_helper.CalculateArea( m_helper.Intersect( firstRegion, secondRegion ) );
+          var currentArea = m_helper.CalculateArea( firstRegion ) + m_helper.CalculateArea( secondRegion );
+
+          if( ( currentOverlap < overlap ) || ( ( currentOverlap == overlap ) && ( currentArea < area ) ) )
+          {
+            overlap = currentOverlap;
+            area = currentArea;
+            splitIndex = i;
+          }
+        }
+
+        return splitIndex;
+      }
+
+      private double CalculateMargin( IList<Node> nodes, int minSize )
+      {
+        var maxSize = nodes.Count - minSize;
+        var margin = 0d;
+
+        for( int i = minSize; i < maxSize; i++ )
+        {
+          var region = m_helper.GetEmptyRegion();
+          for( int j = 0; j < i; j++ )
+          {
+            region = m_helper.Union( region, nodes[ j ].Region );
+          }
+
+          margin += m_helper.CalculateMargin( region );
+
+          region = m_helper.GetEmptyRegion();
+          for( int j = i; j < nodes.Count; j++ )
+          {
+            region = m_helper.Union( region, nodes[ j ].Region );
+          }
+
+          margin += m_helper.CalculateMargin( region );
+        }
+
+        return margin;
+      }
+
+      void ICollection<Node>.CopyTo( Node[] array, int index )
+      {
+        this.CopyToCore( array, index );
+      }
+
+      private readonly RSTreeHelper<TRegion> m_helper;
+      private readonly Node[] m_nodes;
+      private int m_count;
+      private TRegion m_region;
+      private bool m_regionValid; //false
+    }
+
+    #endregion
+
+    #region LeafNode Private Class
+
+    [DebuggerDisplay( "Leaf (Count = {Count})" )]
+    private sealed class LeafNode : Node, IList<Entry>
+    {
+      internal LeafNode( RSTreeHelper<TRegion> helper, int size )
+      {
+        Debug.Assert( helper != null );
+        Debug.Assert( size > 0 );
+
+        m_helper = helper;
+        m_values = new Entry[ size + 1 ]; // We reserve one extra space for overflow.
+      }
+
+      public override int Count
+      {
+        get
+        {
+          return m_count;
+        }
+      }
+
+      internal override TRegion Region
+      {
+        get
+        {
+          if( !m_regionValid )
+          {
+            m_region = m_helper.GetEmptyRegion();
+
+            for( int i = 0; i < m_count; i++ )
+            {
+              m_region = m_helper.Union( m_region, m_values[ i ].Region );
+            }
+
+            m_regionValid = true;
+          }
+
+          return m_region;
+        }
+      }
+
+      public Entry this[ int index ]
+      {
+        get
+        {
+          if( ( index < 0 ) || ( index >= m_count ) )
+            throw new ArgumentOutOfRangeException( "index" );
+
+          return m_values[ index ];
+        }
+        set
+        {
+          this.SetAt( index, value );
+        }
+      }
+
+      bool ICollection<Entry>.IsReadOnly
+      {
+        get
+        {
+          return false;
+        }
+      }
+
+      public void Add( Entry value )
+      {
+        this.InsertAt( m_count, value );
+      }
+
+      public void Insert( int index, Entry value )
+      {
+        this.InsertAt( index, value );
+      }
+
+      public void RemoveAt( int index )
+      {
+        if( ( index < 0 ) || ( index >= m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        var value = m_values[ index ];
+
+        for( int i = index; i < m_count - 1; i++ )
+        {
+          m_values[ i ] = m_values[ i + 1 ];
+        }
+
+        m_values[ m_count - 1 ] = default( Entry );
+        m_count--;
+
+        this.PostRemove( value );
+      }
+
+      public bool Remove( Entry value )
+      {
+        var index = this.IndexOf( value );
+        if( index < 0 )
+          return false;
+
+        this.RemoveAt( index );
+        return true;
+      }
+
+      public void Clear()
+      {
+        Array.Clear( m_values, 0, m_count );
+        m_count = 0;
+        m_regionValid = false;
+      }
+
+      public int IndexOf( Entry value )
+      {
+        return Array.IndexOf( m_values, value, 0, m_count );
+      }
+
+      public bool Contains( Entry value )
+      {
+        return ( this.IndexOf( value ) >= 0 );
+      }
+
+      public IEnumerator<Entry> GetEnumerator()
+      {
+        for( int i = 0; i < m_count; i++ )
+        {
+          yield return m_values[ i ];
+        }
+      }
+
+      protected override void CopyToCore( Array array, int index )
+      {
+        Array.Copy( m_values, 0, array, index, m_count );
+      }
+
+      protected override IEnumerator GetEnumeratorCore()
+      {
+        return this.GetEnumerator();
+      }
+
+      protected internal override void MergeRegion( TRegion region )
+      {
+        if( !m_regionValid )
+          return;
+
+        var newRegion = m_helper.Union( m_region, region );
+        if( m_helper.AreEquivalent( m_region, newRegion ) )
+          return;
+
+        m_region = newRegion;
+        this.InvalidateParentRegion();
+      }
+
+      protected internal override void SliceRegion( TRegion region )
+      {
+        if( !m_regionValid || m_helper.IsWithinBounds( m_region, region ) )
+          return;
+
+        m_regionValid = false;
+        this.InvalidateParentRegion();
+      }
+
+      protected internal override void InvalidateRegion()
+      {
+        if( !m_regionValid )
+          return;
+
+        m_regionValid = false;
+        this.InvalidateParentRegion();
+      }
+
+      internal override Node FindNearest( TRegion region, int level )
+      {
+        return this;
+      }
+
+      internal override Node Split( int minNodeSize )
+      {
+        Debug.Assert( m_count == m_values.Length );
+
+        var entries = ( Entry[] )m_values.Clone();
+        var axis = this.FindSplitAxis( entries, minNodeSize );
+        var index = this.FindSplitIndex( entries, minNodeSize, axis );
+
+        this.Clear();
+
+        for( int i = 0; i < index; i++ )
+        {
+          this.Add( entries[ i ] );
+        }
+
+        var newNode = new LeafNode( m_helper, m_values.Length - 1 );
+        Debug.Assert( newNode.m_values.Length == m_values.Length );
+
+        for( int i = index; i < entries.Length; i++ )
+        {
+          newNode.Add( entries[ i ] );
+        }
+
+        return newNode;
+      }
+
+      private void SetAt( int index, Entry value )
+      {
+        if( ( index < 0 ) || ( index >= m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        if( m_count >= m_values.Length )
+          throw new InvalidOperationException();
+
+        var oldValue = m_values[ index ];
+        m_values[ index ] = value;
+
+        this.PostAdd( value );
+        this.PostRemove( oldValue );
+      }
+
+      private void InsertAt( int index, Entry value )
+      {
+        if( ( index < 0 ) || ( index > m_count ) )
+          throw new ArgumentOutOfRangeException( "index" );
+
+        if( m_count >= m_values.Length )
+          throw new InvalidOperationException();
+
+        for( int i = m_count; i > index; i-- )
+        {
+          m_values[ i ] = m_values[ i - 1 ];
+        }
+
+        m_values[ index ] = value;
+        m_count++;
+
+        this.PostAdd( value );
+      }
+
+      private void PostAdd( Entry entry )
+      {
+        this.MergeRegion( entry.Region );
+      }
+
+      private void PostRemove( Entry entry )
+      {
+        this.SliceRegion( entry.Region );
+      }
+
+      private void InvalidateParentRegion()
+      {
+        var parent = this.Parent;
+        if( parent == null )
+          return;
+
+        parent.InvalidateRegion();
+      }
+
+      private int FindSplitAxis( Entry[] entries, int minNodeSize )
+      {
+        Debug.Assert( ( entries != null ) && ( entries.Length == m_count ) );
+
+        var axis = 0;
+        var minimum = double.PositiveInfinity;
+        var dimensions = m_helper.GetDimensions();
+
+        for( int i = 0; i < dimensions; i++ )
+        {
+          Array.Sort( entries, new LowerBoundComparer( m_helper, i ) );
+
+          var value = this.CalculateMargin( entries, minNodeSize );
+          if( value < minimum )
+          {
+            minimum = value;
+            axis = i;
+          }
+
+          Array.Sort( entries, new UpperBoundComparer( m_helper, i ) );
+
+          value = this.CalculateMargin( entries, minNodeSize );
+          if( value < minimum )
+          {
+            minimum = value;
+            axis = i;
+          }
+        }
+
+        return axis;
+      }
+
+      private int FindSplitIndex( Entry[] entries, int minNodeSize, int dimension )
+      {
+        Array.Sort( entries, new LowerBoundComparer( m_helper, dimension ) );
+
+        var lowerOverlap = double.PositiveInfinity;
+        var lowerArea = double.PositiveInfinity;
+        var lowerIndex = this.FindSplitIndex( entries, minNodeSize, out lowerOverlap, out lowerArea );
+
+        Array.Sort( entries, new UpperBoundComparer( m_helper, dimension ) );
+
+        var upperOverlap = double.PositiveInfinity;
+        var upperArea = double.PositiveInfinity;
+        var upperIndex = this.FindSplitIndex( entries, minNodeSize, out upperOverlap, out upperArea );
+
+        if( ( upperOverlap < lowerOverlap ) || ( ( upperOverlap == lowerOverlap ) && ( upperArea < lowerArea ) ) )
+          return upperIndex;
+
+        Array.Sort( entries, new LowerBoundComparer( m_helper, dimension ) );
+        return lowerIndex;
+      }
+
+      private int FindSplitIndex( Entry[] entries, int minSize, out double overlap, out double area )
+      {
+        var splitIndex = 0;
+
+        overlap = double.PositiveInfinity;
+        area = double.PositiveInfinity;
+
+        var maxSize = entries.Length - minSize;
+
+        for( int i = minSize; i < maxSize; i++ )
+        {
+          var firstRegion = m_helper.GetEmptyRegion();
+          for( int j = 0; j < i; j++ )
+          {
+            firstRegion = m_helper.Union( firstRegion, entries[ j ].Region );
+          }
+
+          var secondRegion = m_helper.GetEmptyRegion();
+          for( int j = i; j < entries.Length; j++ )
+          {
+            secondRegion = m_helper.Union( secondRegion, entries[ j ].Region );
+          }
+
+          var currentOverlap = m_helper.CalculateArea( m_helper.Intersect( firstRegion, secondRegion ) );
+          var currentArea = m_helper.CalculateArea( firstRegion ) + m_helper.CalculateArea( secondRegion );
+
+          if( ( currentOverlap < overlap ) || ( ( currentOverlap == overlap ) && ( currentArea < area ) ) )
+          {
+            overlap = currentOverlap;
+            area = currentArea;
+            splitIndex = i;
+          }
+        }
+
+        return splitIndex;
+      }
+
+      private double CalculateMargin( IList<Entry> entries, int minSize )
+      {
+        var maxSize = entries.Count - minSize;
+        var margin = 0d;
+
+        for( int i = minSize; i < maxSize; i++ )
+        {
+          var region = m_helper.GetEmptyRegion();
+          for( int j = 0; j < i; j++ )
+          {
+            region = m_helper.Union( region, entries[ j ].Region );
+          }
+
+          margin += m_helper.CalculateMargin( region );
+
+          region = m_helper.GetEmptyRegion();
+          for( int j = i; j < entries.Count; j++ )
+          {
+            region = m_helper.Union( region, entries[ j ].Region );
+          }
+
+          margin += m_helper.CalculateMargin( region );
+        }
+
+        return margin;
+      }
+
+      void ICollection<Entry>.CopyTo( Entry[] array, int index )
+      {
+        this.CopyToCore( array, index );
+      }
+
+      private readonly RSTreeHelper<TRegion> m_helper;
+      private readonly Entry[] m_values;
+      private int m_count;
+      private TRegion m_region;
+      private bool m_regionValid; //false
+    }
+
+    #endregion
+
+    #region NodeInfo Private Struct
+
+    private struct NodeInfo
+    {
+      internal NodeInfo( Node node, int level )
+      {
+        this.Node = node;
+        this.Level = level;
+      }
+
+      internal readonly Node Node;
+      internal readonly int Level;
+    }
+
+    #endregion
+
+    #region KPoint Private Struct
+
+    private struct KPoint
+    {
+      internal KPoint( params double[] values )
+      {
+        if( values == null )
+          throw new ArgumentNullException( "values" );
+
+        m_values = values;
+      }
+
+      public int Count
+      {
+        get
+        {
+          return m_values.Length;
+        }
+      }
+
+      public double this[ int index ]
+      {
+        get
+        {
+          if( ( index < 0 ) || ( index >= m_values.Length ) )
+            throw new ArgumentOutOfRangeException( "index" );
+
+          return m_values[ index ];
+        }
+      }
+
+      public static double Distance( KPoint x, KPoint y )
+      {
+        var xs = x.m_values;
+        var ys = y.m_values;
+
+        if( xs.Length != ys.Length )
+          throw new ArgumentException( "The points must have the same number of values.", "y" );
+
+        if( ( xs == ys ) || ( xs.Length == 0 ) )
+          return 0d;
+
+        if( xs.Length == 1 )
+          return System.Math.Abs( xs[ 0 ] - ys[ 0 ] );
+
+        var squareSum = 0d;
+        for( int i = 0; i < xs.Length; i++ )
+        {
+          var delta = xs[ i ] - ys[ i ];
+          squareSum += delta * delta;
+        }
+
+        return System.Math.Sqrt( squareSum );
+      }
+
+      public override int GetHashCode()
+      {
+        var hashCode = 0;
+
+        foreach( var value in m_values )
+        {
+          hashCode *= 13;
+          hashCode += value.GetHashCode();
+        }
+
+        return hashCode;
+      }
+
+      public override bool Equals( object obj )
+      {
+        if( !( obj is KPoint ) )
+          return false;
+
+        var values = ( ( KPoint )obj ).m_values;
+        if( values == m_values )
+          return true;
+
+        if( values.Length != m_values.Length )
+          return false;
+
+        for( int i = 0; i < m_values.Length; i++ )
+        {
+          if( values[ i ] != m_values[ i ] )
+            return false;
+        }
+
+        return true;
+      }
+
+      private readonly double[] m_values;
+    }
+
+    #endregion
+
+    #region LowerBoundComparer Private Class
+
+    private sealed class LowerBoundComparer : IComparer<Node>, IComparer<Entry>
+    {
+      internal LowerBoundComparer( RSTreeHelper<TRegion> helper, int dimension )
+      {
+        Debug.Assert( helper != null );
+
+        m_helper = helper;
+        m_dimension = dimension;
+      }
+
+      int IComparer<Node>.Compare( Node x, Node y )
+      {
+        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
+      }
+
+      int IComparer<Entry>.Compare( Entry x, Entry y )
+      {
+        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
+      }
+
+      private double GetValue( TRegion region )
+      {
+        Debug.Assert( !m_helper.IsEmptyRegion( region ) );
+
+        return m_helper.GetValueOf( region, m_dimension );
+      }
+
+      private readonly RSTreeHelper<TRegion> m_helper;
+      private readonly int m_dimension;
+    }
+
+    #endregion
+
+    #region UpperBoundComparer Private Class
+
+    private sealed class UpperBoundComparer : IComparer<Node>, IComparer<Entry>
+    {
+      internal UpperBoundComparer( RSTreeHelper<TRegion> helper, int dimension )
+      {
+        Debug.Assert( helper != null );
+
+        m_helper = helper;
+        m_dimension = dimension;
+      }
+
+      int IComparer<Node>.Compare( Node x, Node y )
+      {
+        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
+      }
+
+      int IComparer<Entry>.Compare( Entry x, Entry y )
+      {
+        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
+      }
+
+      private double GetValue( TRegion region )
+      {
+        Debug.Assert( !m_helper.IsEmptyRegion( region ) );
+
+        return m_helper.GetValueOf( region, m_dimension ) + m_helper.GetSizeOf( region, m_dimension );
+      }
+
+      private readonly RSTreeHelper<TRegion> m_helper;
+      private readonly int m_dimension;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs
new file mode 100644
index 00000000..c6efc0e5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs
@@ -0,0 +1,171 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Xceed.Utils.Collections
+{
+  internal sealed class RSTree1D<T> : RSTree<RSTree1D<T>.Area, T>
+  {
+    internal RSTree1D()
+      : base( new Helper() )
+    {
+    }
+
+    internal RSTree1D( int minNodeSize, int maxNodeSize )
+      : base( new Helper(), minNodeSize, maxNodeSize )
+    {
+    }
+
+    #region Area Internal Struct
+
+    internal struct Area
+    {
+      internal static readonly Area Empty = new Area( 0, 0 );
+
+      internal Area( int index, int length )
+      {
+        Debug.Assert( length >= 0 );
+
+        this.Index = index;
+        this.Length = length;
+      }
+
+      internal bool IsEmpty
+      {
+        get
+        {
+          return ( this.Length <= 0 );
+        }
+      }
+
+      public override string ToString()
+      {
+        if( this.IsEmpty )
+          return "Empty";
+
+        var startIndex = this.Index;
+        var endIndex = this.Index + this.Length - 1;
+
+        return string.Format( CultureInfo.InvariantCulture, "[{0},{1}]", startIndex, endIndex );
+      }
+
+      internal readonly int Index;
+      internal readonly int Length;
+    }
+
+    #endregion
+
+    #region Helper Private Class
+
+    private sealed class Helper : RSTreeHelper<Area>
+    {
+      protected override int Dimensions
+      {
+        get
+        {
+          return 1;
+        }
+      }
+
+      protected override bool AreEqual( Area x, Area y )
+      {
+        return ( x.Index == y.Index )
+            && ( x.Length == y.Length );
+      }
+
+      protected override bool AreOverlapping( Area x, Area y )
+      {
+        return !this.Intersect( x, y ).IsEmpty;
+      }
+
+      protected override bool IsWithin( Area source, Area region )
+      {
+        return ( source.Index < region.Index )
+            && ( source.Index + source.Length ) > ( region.Index + region.Length );
+      }
+
+      protected override bool IsEmpty( Area region )
+      {
+        return region.IsEmpty;
+      }
+
+      protected override Area CreateEmptyRegion()
+      {
+        return Area.Empty;
+      }
+
+      protected override double GetValue( Area region, int dimension )
+      {
+        return region.Index;
+      }
+
+      protected override double GetSize( Area region, int dimension )
+      {
+        return region.Length;
+      }
+
+      protected override double GetArea( Area region )
+      {
+        return region.Length;
+      }
+
+      protected override double GetMargin( Area region )
+      {
+        return region.Length;
+      }
+
+      protected override double[] GetCenter( Area region )
+      {
+        return new double[] { region.Index + ( region.Length - 1 ) / 2d };
+      }
+
+      protected override Area UnionWith( Area x, Area y )
+      {
+        var index = System.Math.Min( x.Index, y.Index );
+        var length = System.Math.Max( x.Index + x.Length, y.Index + y.Length ) - index;
+
+        return new Area( index, length );
+      }
+
+      protected override Area IntersectWith( Area x, Area y )
+      {
+        var xs = x.Index;
+        var xe = xs + x.Length;
+        var ys = y.Index;
+        var ye = ys + y.Length;
+
+        if( xs <= ys )
+        {
+          if( xe <= ys )
+            return Area.Empty;
+
+          return new Area( ys, System.Math.Min( xe, ye ) - ys );
+        }
+        else
+        {
+          if( ye <= xs )
+            return Area.Empty;
+
+          return new Area( xs, System.Math.Min( xe, ye ) - xs );
+        }
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs
new file mode 100644
index 00000000..4814d4ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs
@@ -0,0 +1,255 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Xceed.Utils.Collections
+{
+  internal sealed class RSTree2D<T> : RSTree<RSTree2D<T>.Area, T>
+  {
+    internal RSTree2D()
+      : base( new Helper() )
+    {
+    }
+
+    internal RSTree2D( int minNodeSize, int maxNodeSize )
+      : base( new Helper(), minNodeSize, maxNodeSize )
+    {
+    }
+
+    #region Area Internal Struct
+
+    internal struct Area
+    {
+      internal static readonly Area Empty = new Area( 0, 0, 0, 0 );
+
+      internal Area( int row, int rowLength, int column, int columnLength )
+      {
+        Debug.Assert( ( rowLength >= 0 ) && ( columnLength >= 0 ) );
+
+        this.Row = row;
+        this.RowLength = rowLength;
+        this.Column = column;
+        this.ColumnLength = columnLength;
+      }
+
+      internal bool IsEmpty
+      {
+        get
+        {
+          return ( this.RowLength <= 0 )
+              || ( this.ColumnLength <= 0 );
+        }
+      }
+
+      public override string ToString()
+      {
+        if( this.IsEmpty )
+          return "Empty";
+
+        var rs = this.Row;
+        var re = this.Row + this.RowLength - 1;
+        var cs = this.Column;
+        var ce = this.Column + this.ColumnLength - 1;
+
+        return string.Format( CultureInfo.InvariantCulture, "[R({0},{1}),C({2},{3})]", rs, re, cs, ce );
+      }
+
+      internal readonly int Row;
+      internal readonly int RowLength;
+      internal readonly int Column;
+      internal readonly int ColumnLength;
+    }
+
+    #endregion
+
+    #region Helper Private Class
+
+    private sealed class Helper : RSTreeHelper<Area>
+    {
+      protected override int Dimensions
+      {
+        get
+        {
+          return 2;
+        }
+      }
+
+      protected override bool AreEqual( Area x, Area y )
+      {
+        return ( x.Row == y.Row )
+            && ( x.RowLength == y.RowLength )
+            && ( x.Column == y.Column )
+            && ( x.ColumnLength == y.ColumnLength );
+      }
+
+      protected override bool AreOverlapping( Area x, Area y )
+      {
+        return !this.Intersect( x, y ).IsEmpty;
+      }
+
+      protected override bool IsWithin( Area source, Area region )
+      {
+        return ( source.Row < region.Row )
+            && ( source.Column < region.Column )
+            && ( ( source.Row + source.RowLength ) > ( region.Row + region.RowLength ) )
+            && ( ( source.Column + source.ColumnLength ) > ( region.Column + region.ColumnLength ) );
+      }
+
+      protected override bool IsEmpty( Area region )
+      {
+        return region.IsEmpty;
+      }
+
+      protected override Area CreateEmptyRegion()
+      {
+        return Area.Empty;
+      }
+
+      protected override double GetValue( Area region, int dimension )
+      {
+        switch( dimension )
+        {
+          case 0:
+            return region.Row;
+
+          case 1:
+            return region.Column;
+
+          default:
+            throw new InvalidOperationException();
+        }
+      }
+
+      protected override double GetSize( Area region, int dimension )
+      {
+        switch( dimension )
+        {
+          case 0:
+            return region.RowLength;
+
+          case 1:
+            return region.ColumnLength;
+
+          default:
+            throw new InvalidOperationException();
+        }
+      }
+
+      protected override double GetArea( Area region )
+      {
+        return ( region.RowLength * region.ColumnLength );
+      }
+
+      protected override double GetMargin( Area region )
+      {
+        return ( region.RowLength + region.ColumnLength );
+      }
+
+      protected override double[] GetCenter( Area region )
+      {
+        return new double[] { region.Row + ( region.RowLength - 1 ) / 2d, region.Column + ( region.ColumnLength - 1 ) / 2d };
+      }
+
+      protected override Area UnionWith( Area x, Area y )
+      {
+        var xrs = x.Row;
+        var xrl = x.RowLength;
+        var xcs = x.Column;
+        var xcl = x.ColumnLength;
+        var yrs = y.Row;
+        var yrl = y.RowLength;
+        var ycs = y.Column;
+        var ycl = y.ColumnLength;
+
+        var rs = System.Math.Min( xrs, yrs );
+        var cs = System.Math.Min( xcs, ycs );
+        var rl = System.Math.Max( xrs + xrl, yrs + yrl ) - rs;
+        var cl = System.Math.Max( xcs + xcl, ycs + ycl ) - cs;
+
+        return new Area( rs, rl, cs, cl );
+      }
+
+      protected override Area IntersectWith( Area x, Area y )
+      {
+        var xrs = x.Row;
+        var xre = xrs + x.RowLength;
+        var xcs = x.Column;
+        var xce = xcs + x.ColumnLength;
+        var yrs = y.Row;
+        var yre = yrs + y.RowLength;
+        var ycs = y.Column;
+        var yce = ycs + y.ColumnLength;
+
+        int rs, rl, cs, cl;
+
+        if( xrs <= yrs )
+        {
+          if( xre <= yrs )
+            return Area.Empty;
+
+          rs = yrs;
+
+          if( xcs <= ycs )
+          {
+            if( xce <= ycs )
+              return Area.Empty;
+
+            cs = ycs;
+          }
+          else
+          {
+            if( yce <= xcs )
+              return Area.Empty;
+
+            cs = xcs;
+          }
+        }
+        else
+        {
+          if( yre <= xrs )
+            return Area.Empty;
+
+          rs = xrs;
+
+          if( xcs <= ycs )
+          {
+            if( xce <= ycs )
+              return Area.Empty;
+
+            cs = ycs;
+          }
+          else
+          {
+            if( yce <= xcs )
+              return Area.Empty;
+
+            cs = xcs;
+          }
+        }
+
+        rl = System.Math.Min( xre, yre ) - rs;
+        cl = System.Math.Min( xce, yce ) - cs;
+
+        return new Area( rs, rl, cs, cl );
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs
new file mode 100644
index 00000000..b4db49cb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs
@@ -0,0 +1,180 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Diagnostics;
+
+namespace Xceed.Utils.Collections
+{
+  internal abstract class RSTreeHelper<T>
+  {
+    protected abstract int Dimensions
+    {
+      get;
+    }
+
+    protected abstract double GetArea( T region );
+    protected abstract double GetMargin( T region );
+    protected abstract double[] GetCenter( T region );
+
+    protected abstract T UnionWith( T x, T y );
+    protected abstract T IntersectWith( T x, T y );
+
+    protected abstract bool AreEqual( T x, T y );
+    protected abstract bool AreOverlapping( T x, T y );
+
+    protected abstract bool IsWithin( T source, T region );
+    protected abstract bool IsEmpty( T region );
+
+    protected abstract T CreateEmptyRegion();
+
+    protected abstract double GetValue( T region, int dimension );
+    protected abstract double GetSize( T region, int dimension );
+
+    internal int GetDimensions()
+    {
+      return this.Dimensions;
+    }
+
+    internal bool IsEmptyRegion( T region )
+    {
+      return this.IsEmpty( region );
+    }
+
+    internal T GetEmptyRegion()
+    {
+      return this.CreateEmptyRegion();
+    }
+
+    internal double GetValueOf( T region, int dimension )
+    {
+      Debug.Assert( ( dimension >= 0 ) && ( dimension < this.Dimensions ) );
+      return this.GetValue( region, dimension );
+    }
+
+    internal double GetSizeOf( T region, int dimension )
+    {
+      Debug.Assert( ( dimension >= 0 ) && ( dimension < this.Dimensions ) );
+      return this.GetSize( region, dimension );
+    }
+
+    internal bool AreEquivalent( T x, T y )
+    {
+      if( this.IsEmpty( x ) )
+      {
+        return this.IsEmpty( y );
+      }
+      else if( this.IsEmpty( y ) )
+      {
+        return this.IsEmpty( x );
+      }
+      else
+      {
+        return this.AreEqual( x, y );
+      }
+    }
+
+    internal bool IsOverlapping( T source, T region )
+    {
+      if( this.IsEmpty( source ) || this.IsEmpty( region ) )
+        return false;
+
+      return this.AreOverlapping( source, region );
+    }
+
+    internal bool IsWithinBounds( T source, T region )
+    {
+      if( this.IsEmpty( source ) || this.IsEmpty( region ) )
+        return false;
+
+      return this.IsWithin( source, region );
+    }
+
+    internal double[] CenterOf( T region )
+    {
+      if( this.IsEmpty( region ) )
+        throw new InvalidOperationException();
+
+      var center = this.GetCenter( region );
+      Debug.Assert( ( center != null ) && ( center.Length == this.Dimensions ) );
+
+      return center;
+    }
+
+    internal T Union( T source, T region )
+    {
+      if( this.IsEmpty( source ) )
+      {
+        return region;
+      }
+      else if( this.IsEmpty( region ) )
+      {
+        return source;
+      }
+      else
+      {
+        return this.UnionWith( source, region );
+      }
+    }
+
+    internal T Intersect( T source, T region )
+    {
+      if( this.IsEmpty( source ) )
+      {
+        return source;
+      }
+      else if( this.IsEmpty( region ) )
+      {
+        return region;
+      }
+      else
+      {
+        return this.IntersectWith( source, region );
+      }
+    }
+
+    internal double CalculateOverlapEnlargement( T source, T region )
+    {
+      return this.CalculateArea( this.Intersect( source, region ) );
+    }
+
+    internal double CalculateAreaEnlargement( T source, T region )
+    {
+      var finalArea = this.CalculateArea( this.Union( source, region ) );
+      var sourceArea = this.CalculateArea( source );
+
+      Debug.Assert( finalArea >= sourceArea );
+
+      return finalArea - sourceArea;
+    }
+
+    internal double CalculateArea( T region )
+    {
+      if( this.IsEmpty( region ) )
+        return 0d;
+
+      return this.GetArea( region );
+    }
+
+    internal double CalculateMargin( T region )
+    {
+      if( this.IsEmpty( region ) )
+        return 0d;
+
+      return this.GetMargin( region );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs
new file mode 100644
index 00000000..0b50b58f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs
@@ -0,0 +1,987 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace Xceed.Utils.Collections
+{
+  internal sealed class WeakDictionary<TKey, TValue> : IDictionary<TKey, TValue>, ICollection
+  {
+    internal WeakDictionary()
+      : this( 0, null )
+    {
+    }
+
+    internal WeakDictionary( int capacity )
+      : this( capacity, null )
+    {
+    }
+
+    internal WeakDictionary( IEqualityComparer<TKey> comparer )
+      : this( 0, comparer )
+    {
+    }
+
+    internal WeakDictionary( int capacity, IEqualityComparer<TKey> comparer )
+    {
+      if( capacity < 0 )
+        throw new ArgumentOutOfRangeException( "capacity" );
+
+      if( capacity > 0 )
+      {
+        this.EnsureCapacity( capacity );
+      }
+
+      m_comparer = comparer ?? EqualityComparer<TKey>.Default;
+      m_creator = WeakDictionary<TKey, TValue>.GetCreator();
+
+      Debug.Assert( m_comparer != null );
+      Debug.Assert( m_creator != null );
+    }
+
+    #region Count Property
+
+    public int Count
+    {
+      get
+      {
+        return m_size;
+      }
+    }
+
+    #endregion
+
+    #region Keys Property
+
+    public ICollection<TKey> Keys
+    {
+      get
+      {
+        if( m_keys == null )
+        {
+          m_keys = new KeyCollection( this );
+        }
+
+        return m_keys;
+      }
+    }
+
+    #endregion
+
+    #region Values Property
+
+    public ICollection<TValue> Values
+    {
+      get
+      {
+        if( m_values == null )
+        {
+          m_values = new ValueCollection( this );
+        }
+
+        return m_values;
+      }
+    }
+
+    #endregion
+
+    public void Add( TKey key, TValue value )
+    {
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentNullException( "key" );
+
+      if( this.ContainsKey( key ) )
+        throw new ArgumentException();
+
+      this.AddCore( key, value );
+    }
+
+    public bool ContainsKey( TKey key )
+    {
+      TValue unused;
+
+      return this.TryGetValue( key, out unused );
+    }
+
+    public bool Remove( TKey key )
+    {
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentNullException( "key" );
+
+      return this.Remove( key, default( TValue ), false );
+    }
+
+    public void Clear()
+    {
+      if( m_size <= 0 )
+        return;
+
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_entries != null );
+      Debug.Assert( m_entriesInfo != null );
+      Debug.Assert( m_entries.Length == m_entriesInfo.Length );
+
+      for( int i = 0; i < m_buckets.Length; i++ )
+      {
+        m_buckets[ i ] = -1;
+      }
+
+      for( int i = 0; i < m_entries.Length; i++ )
+      {
+        m_entries[ i ] = null;
+        m_entriesInfo[ i ] = new EntryInfo( ( i < m_entries.Length - 1 ) ? i + 1 : -1 );
+      }
+
+      m_size = 0;
+      m_free = 0;
+
+      unchecked
+      {
+        m_version++;
+      }
+    }
+
+    public bool TryGetValue( TKey key, out TValue value )
+    {
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentNullException( "key" );
+
+      value = default( TValue );
+
+      var bucket = default( int );
+      var index = default( int );
+      var previous = default( int );
+
+      return this.FindKey( key, out bucket, out index, out previous, out value );
+    }
+
+    private bool FindKey( TKey key, out int bucket, out int index, out int previous, out TValue value )
+    {
+      Debug.Assert( !object.ReferenceEquals( key, null ) );
+
+      bucket = -1;
+      index = -1;
+      previous = -1;
+      value = default( TValue );
+
+      if( m_size <= 0 )
+        return false;
+
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_entries != null );
+      Debug.Assert( m_entriesInfo != null );
+
+      var hashCode = m_comparer.GetHashCode( key );
+
+      bucket = this.GetBucket( hashCode );
+      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
+
+      index = m_buckets[ bucket ];
+      previous = -1;
+
+      while( index >= 0 )
+      {
+        var entryInfo = m_entriesInfo[ index ];
+        if( entryInfo.HashCode == hashCode )
+        {
+          TKey targetKey;
+          var entry = m_entries[ index ];
+
+          Debug.Assert( !WeakDictionary<TKey, TValue>.IsFree( entry ) );
+
+          if( entry.TryGetKeyValue( out targetKey, out value ) && m_comparer.Equals( targetKey, key ) )
+            return true;
+        }
+
+        previous = index;
+        index = entryInfo.Next;
+      }
+
+      bucket = -1;
+      index = -1;
+      previous = -1;
+
+      return false;
+    }
+
+    private bool ContainsValue( TValue value )
+    {
+      if( m_size <= 0 )
+        return false;
+
+      Debug.Assert( m_entries != null );
+
+      var comparer = EqualityComparer<TValue>.Default;
+
+      for( int i = 0; i < m_entries.Length; i++ )
+      {
+        var entry = m_entries[ i ];
+        if( WeakDictionary<TKey, TValue>.IsFree( entry ) )
+          continue;
+
+        TKey targetKey;
+        TValue targetValue;
+        if( !entry.TryGetKeyValue( out targetKey, out targetValue ) )
+          continue;
+
+        if( comparer.Equals( targetValue, value ) )
+          return true;
+      }
+
+      return false;
+    }
+
+    private bool Remove( TKey key, TValue value, bool compareValue )
+    {
+      Debug.Assert( !object.ReferenceEquals( key, null ) );
+
+      var bucket = default( int );
+      var index = default( int );
+      var previous = default( int );
+      var targetValue = default( TValue );
+
+      if( !this.FindKey( key, out bucket, out index, out previous, out targetValue ) )
+        return false;
+
+      if( compareValue && !EqualityComparer<TValue>.Default.Equals( value, targetValue ) )
+        return false;
+
+      this.RemoveCore( bucket, index, previous );
+
+      return true;
+    }
+
+    private void AddCore( TKey key, TValue value )
+    {
+      Debug.Assert( !object.ReferenceEquals( key, null ) );
+
+      this.EnsureCapacity();
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_entries != null );
+      Debug.Assert( m_entriesInfo != null );
+      Debug.Assert( m_free >= 0 );
+
+      var index = m_free;
+      var hashCode = m_comparer.GetHashCode( key );
+      var bucket = this.GetBucket( hashCode );
+
+      m_free = m_entriesInfo[ index ].Next;
+      m_entries[ index ] = m_creator.Invoke( key, value );
+      m_entriesInfo[ index ] = new EntryInfo( hashCode, m_buckets[ bucket ] );
+      m_buckets[ bucket ] = index;
+      m_size++;
+
+      unchecked
+      {
+        m_version++;
+      }
+    }
+
+    private void RemoveCore( int bucket, int index, int previous )
+    {
+      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
+      Debug.Assert( ( index >= 0 ) && ( index < m_entries.Length ) );
+      Debug.Assert( previous < m_entries.Length );
+
+      var next = m_entriesInfo[ index ].Next;
+
+      if( m_buckets[ bucket ] == index )
+      {
+        Debug.Assert( previous < 0 );
+
+        m_buckets[ bucket ] = next;
+      }
+      else
+      {
+        Debug.Assert( previous >= 0 );
+        Debug.Assert( m_entriesInfo[ previous ].Next == index );
+
+        m_entriesInfo[ previous ] = m_entriesInfo[ previous ].SetNext( next );
+      }
+
+      m_entries[ index ] = null;
+      m_entriesInfo[ index ] = new EntryInfo( m_free );
+      m_free = index;
+      m_size--;
+
+      unchecked
+      {
+        m_version++;
+      }
+    }
+
+    private int GetBucket( int hashCode )
+    {
+      return WeakDictionary<TKey, TValue>.GetBucket( hashCode, m_capacity );
+    }
+
+    private void EnsureCapacity()
+    {
+      // Make sure the collection is not full.
+      if( m_size != m_capacity )
+        return;
+
+      this.EnsureCapacity( m_capacity * 2L );
+      Debug.Assert( m_free >= 0 );
+      Debug.Assert( m_size != m_capacity );
+    }
+
+    private void EnsureCapacity( long min )
+    {
+      if( ( m_capacity >= min ) && ( m_capacity > 0 ) )
+        return;
+
+      this.RemoveDeadEntries();
+
+      if( m_size * 2L < m_capacity )
+        return;
+
+      var capacity = WeakDictionary<TKey, TValue>.FindNextSize( min );
+      Debug.Assert( capacity > 0 );
+
+      m_buckets = new int[ capacity ];
+
+      Array.Resize( ref m_entries, capacity );
+      Array.Resize( ref m_entriesInfo, capacity );
+
+      for( int i = 0; i < m_buckets.Length; i++ )
+      {
+        m_buckets[ i ] = -1;
+      }
+
+      for( int i = m_capacity; i < capacity; i++ )
+      {
+        m_entries[ i ] = null;
+        m_entriesInfo[ i ] = new EntryInfo( ( i < capacity - 1 ) ? i + 1 : -1 );
+      }
+
+      // Rehash the elements to initialize the buckets.
+      for( int i = 0; i < m_capacity; i++ )
+      {
+        // Do not rehash free entries.
+        if( WeakDictionary<TKey, TValue>.IsFree( m_entries[ i ] ) )
+          continue;
+
+        var entryInfo = m_entriesInfo[ i ];
+        var bucket = WeakDictionary<TKey, TValue>.GetBucket( entryInfo.HashCode, capacity );
+        Debug.Assert( ( bucket >= 0 ) && ( bucket < capacity ) );
+
+        var index = m_buckets[ bucket ];
+
+        m_buckets[ bucket ] = i;
+        m_entriesInfo[ i ] = entryInfo.SetNext( index );
+      }
+
+      // Link the remaining free entries to the newly created free entries.
+      if( m_free >= 0 )
+      {
+        var index = m_free;
+
+        while( true )
+        {
+          var next = m_entriesInfo[ index ].Next;
+          if( next < 0 )
+          {
+            m_entriesInfo[ index ] = new EntryInfo( m_capacity );
+            break;
+          }
+
+          index = next;
+        }
+      }
+      else
+      {
+        m_free = m_capacity;
+      }
+
+      m_capacity = capacity;
+
+      unchecked
+      {
+        m_version++;
+      }
+    }
+
+    private void RemoveDeadEntries()
+    {
+      if( m_capacity <= 0 )
+        return;
+
+      Debug.Assert( m_buckets != null );
+      Debug.Assert( m_entries != null );
+      Debug.Assert( m_entriesInfo != null );
+
+      for( int bucket = 0; bucket < m_buckets.Length; bucket++ )
+      {
+        var index = m_buckets[ bucket ];
+        var previous = -1;
+
+        while( index >= 0 )
+        {
+          var entry = m_entries[ index ];
+          var entryInfo = m_entriesInfo[ index ];
+          var next = entryInfo.Next;
+
+          Debug.Assert( !WeakDictionary<TKey, TValue>.IsFree( entry ) );
+
+          TKey targetKey;
+          TValue targetValue;
+
+          if( !entry.TryGetKeyValue( out targetKey, out targetValue ) )
+          {
+            this.RemoveCore( bucket, index, previous );
+          }
+          else
+          {
+            previous = index;
+          }
+
+          index = next;
+        }
+      }
+    }
+
+    private static int FindNextSize( long min )
+    {
+      var sizes = ArrayHelper.Sizes;
+
+      for( int i = 0; i < sizes.Length; i++ )
+      {
+        var size = sizes[ i ];
+
+        if( size >= min )
+          return size;
+      }
+
+      throw new InvalidOperationException( "Cannot find a larger size." );
+    }
+
+    private static int GetBucket( int hashCode, int capacity )
+    {
+      Debug.Assert( capacity > 0 );
+
+      // Remove the negative sign without using Math.Abs to handle the case of int.MinValue.
+      return ( hashCode & 0x7fffffff ) % capacity;
+    }
+
+    private static bool IsFree( Entry entry )
+    {
+      return ( entry == null );
+    }
+
+    private static Func<TKey, TValue, Entry> GetCreator()
+    {
+      var isKeyRef = !typeof( TKey ).IsValueType;
+      var isValueRef = !typeof( TValue ).IsValueType;
+
+      if( isKeyRef && isValueRef )
+        return ( k, v ) => new WWEntry( k, v );
+
+      if( isKeyRef )
+        return ( k, v ) => new WHEntry( k, v );
+
+      if( isValueRef )
+        return ( k, v ) => new HWEntry( k, v );
+
+      return ( k, v ) => new HHEntry( k, v );
+    }
+
+    #region IDictionary<> Members
+
+    TValue IDictionary<TKey, TValue>.this[ TKey key ]
+    {
+      get
+      {
+        throw new NotSupportedException();
+      }
+      set
+      {
+        throw new NotSupportedException();
+      }
+    }
+
+    #endregion
+
+    #region ICollection<> Members
+
+    bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    void ICollection<KeyValuePair<TKey, TValue>>.Add( KeyValuePair<TKey, TValue> item )
+    {
+      var key = item.Key;
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentException( "item" );
+
+      this.Add( key, item.Value );
+    }
+
+    bool ICollection<KeyValuePair<TKey, TValue>>.Contains( KeyValuePair<TKey, TValue> item )
+    {
+      var key = item.Key;
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentException( "item" );
+
+      TValue value;
+
+      if( !this.TryGetValue( key, out value ) )
+        return false;
+
+      return EqualityComparer<TValue>.Default.Equals( item.Value, value );
+    }
+
+    void ICollection<KeyValuePair<TKey, TValue>>.CopyTo( KeyValuePair<TKey, TValue>[] array, int index )
+    {
+      throw new NotSupportedException();
+    }
+
+    bool ICollection<KeyValuePair<TKey, TValue>>.Remove( KeyValuePair<TKey, TValue> item )
+    {
+      var key = item.Key;
+      if( object.ReferenceEquals( key, null ) )
+        throw new ArgumentException( "item" );
+
+      return this.Remove( key, item.Value, true );
+    }
+
+    #endregion
+
+    #region ICollection Members
+
+    bool ICollection.IsSynchronized
+    {
+      get
+      {
+        return false;
+      }
+    }
+
+    object ICollection.SyncRoot
+    {
+      get
+      {
+        if( m_syncRoot == null )
+        {
+          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
+          Debug.Assert( m_syncRoot != null );
+        }
+
+        return m_syncRoot;
+      }
+    }
+
+    void ICollection.CopyTo( Array array, int index )
+    {
+      throw new NotSupportedException();
+    }
+
+    #endregion
+
+    #region IEnumerable<> Members
+
+    public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+    {
+      if( m_capacity <= 0 )
+        yield break;
+
+      Debug.Assert( m_entries != null );
+
+      var version = m_version;
+
+      for( int i = 0; i < m_entries.Length; i++ )
+      {
+        var entry = m_entries[ i ];
+
+        if( !WeakDictionary<TKey, TValue>.IsFree( entry ) )
+        {
+          TKey key;
+          TValue value;
+
+          if( entry.TryGetKeyValue( out key, out value ) )
+            yield return new KeyValuePair<TKey, TValue>( key, value );
+        }
+
+        if( version != m_version )
+          throw new InvalidOperationException();
+      }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return this.GetEnumerator();
+    }
+
+    #endregion
+
+    private readonly IEqualityComparer<TKey> m_comparer;
+    private readonly Func<TKey, TValue, Entry> m_creator;
+    private ICollection<TKey> m_keys; //null
+    private ICollection<TValue> m_values; //null
+    private object m_syncRoot;
+    private int[] m_buckets;
+    private Entry[] m_entries;
+    private EntryInfo[] m_entriesInfo;
+    private int m_capacity; //0
+    private int m_size; //0
+    private int m_free = -1;
+    private int m_version; //0
+
+    #region Entry Private Class
+
+    private abstract class Entry
+    {
+      internal abstract bool TryGetKey( out TKey value );
+      internal abstract bool TryGetValue( out TValue value );
+
+      internal bool TryGetKeyValue( out TKey key, out TValue value )
+      {
+        if( this.TryGetKey( out key ) )
+          return this.TryGetValue( out value );
+
+        value = default( TValue );
+
+        return false;
+      }
+    }
+
+    #endregion
+
+    #region WWEntry Private Class
+
+    private sealed class WWEntry : Entry
+    {
+      internal WWEntry( TKey key, TValue value )
+      {
+        Debug.Assert( !object.ReferenceEquals( key, null ) );
+
+        m_key = new WeakReference( key );
+        m_value = ( object.ReferenceEquals( value, null ) )
+                    ? null
+                    : new WeakReference( value );
+      }
+
+      internal override bool TryGetKey( out TKey value )
+      {
+        value = ( TKey )m_key.Target;
+
+        return !object.ReferenceEquals( value, null );
+      }
+
+      internal override bool TryGetValue( out TValue value )
+      {
+        if( m_value != null )
+        {
+          value = ( TValue )m_value.Target;
+
+          return !object.ReferenceEquals( value, null );
+        }
+
+        value = default( TValue );
+        return true;
+      }
+
+      private readonly WeakReference m_key;
+      private readonly WeakReference m_value;
+    }
+
+    #endregion
+
+    #region WHEntry Private Class
+
+    private sealed class WHEntry : Entry
+    {
+      internal WHEntry( TKey key, TValue value )
+      {
+        Debug.Assert( !object.ReferenceEquals( key, null ) );
+
+        m_key = new WeakReference( key );
+        m_value = value;
+      }
+
+      internal override bool TryGetKey( out TKey value )
+      {
+        value = ( TKey )m_key.Target;
+
+        return !object.ReferenceEquals( value, null );
+      }
+
+      internal override bool TryGetValue( out TValue value )
+      {
+        value = m_value;
+        return true;
+      }
+
+      private readonly WeakReference m_key;
+      private readonly TValue m_value;
+    }
+
+    #endregion
+
+    #region HWEntry Private Class
+
+    private sealed class HWEntry : Entry
+    {
+      internal HWEntry( TKey key, TValue value )
+      {
+        m_key = key;
+        m_value = ( object.ReferenceEquals( value, null ) )
+                    ? null
+                    : new WeakReference( value );
+      }
+
+      internal override bool TryGetKey( out TKey value )
+      {
+        value = m_key;
+        return true;
+      }
+
+      internal override bool TryGetValue( out TValue value )
+      {
+        if( m_value != null )
+        {
+          value = ( TValue )m_value.Target;
+
+          return !object.ReferenceEquals( value, null );
+        }
+
+        value = default( TValue );
+        return true;
+      }
+
+      private readonly TKey m_key;
+      private readonly WeakReference m_value;
+    }
+
+    #endregion
+
+    #region HHEntry Private Class
+
+    private sealed class HHEntry : Entry
+    {
+      internal HHEntry( TKey key, TValue value )
+      {
+        m_key = key;
+        m_value = value;
+      }
+
+      internal override bool TryGetKey( out TKey value )
+      {
+        value = m_key;
+        return true;
+      }
+
+      internal override bool TryGetValue( out TValue value )
+      {
+        value = m_value;
+        return true;
+      }
+
+      private readonly TKey m_key;
+      private readonly TValue m_value;
+    }
+
+    #endregion
+
+    #region EntryInfo Private Struct
+
+    [DebuggerDisplay( "HashCode = {HashCode}, Next = {Next}" )]
+    private struct EntryInfo
+    {
+      internal EntryInfo( int hashCode, int next )
+      {
+        m_hashCode = hashCode;
+        m_next = next;
+      }
+
+      internal EntryInfo( int next )
+        : this( 0, next )
+      {
+      }
+
+      internal int HashCode
+      {
+        get
+        {
+          return m_hashCode;
+        }
+      }
+
+      internal int Next
+      {
+        get
+        {
+          return m_next;
+        }
+      }
+
+      internal EntryInfo SetNext( int next )
+      {
+        return new EntryInfo( m_hashCode, next );
+      }
+
+      private readonly int m_hashCode;
+      private readonly int m_next;
+    }
+
+    #endregion
+
+    #region KeyCollection Private Class
+
+    private sealed class KeyCollection : ICollection<TKey>
+    {
+      internal KeyCollection( WeakDictionary<TKey, TValue> owner )
+      {
+        Debug.Assert( owner != null );
+        m_owner = owner;
+      }
+
+      public int Count
+      {
+        get
+        {
+          return m_owner.Count;
+        }
+      }
+
+      bool ICollection<TKey>.IsReadOnly
+      {
+        get
+        {
+          return true;
+        }
+      }
+
+      void ICollection<TKey>.Add( TKey item )
+      {
+        throw new NotSupportedException();
+      }
+
+      void ICollection<TKey>.Clear()
+      {
+        throw new NotSupportedException();
+      }
+
+      public bool Contains( TKey item )
+      {
+        return m_owner.ContainsKey( item );
+      }
+
+      void ICollection<TKey>.CopyTo( TKey[] array, int index )
+      {
+        throw new NotSupportedException();
+      }
+
+      bool ICollection<TKey>.Remove( TKey item )
+      {
+        throw new NotSupportedException();
+      }
+
+      public IEnumerator<TKey> GetEnumerator()
+      {
+        return m_owner.Select( item => item.Key ).GetEnumerator();
+      }
+
+      IEnumerator IEnumerable.GetEnumerator()
+      {
+        return this.GetEnumerator();
+      }
+
+      private readonly WeakDictionary<TKey, TValue> m_owner;
+    }
+
+    #endregion
+
+    #region ValueCollection Private Class
+
+    private sealed class ValueCollection : ICollection<TValue>
+    {
+      internal ValueCollection( WeakDictionary<TKey, TValue> owner )
+      {
+        Debug.Assert( owner != null );
+        m_owner = owner;
+      }
+
+      public int Count
+      {
+        get
+        {
+          return m_owner.Count;
+        }
+      }
+
+      bool ICollection<TValue>.IsReadOnly
+      {
+        get
+        {
+          return true;
+        }
+      }
+
+      void ICollection<TValue>.Add( TValue item )
+      {
+        throw new NotSupportedException();
+      }
+
+      void ICollection<TValue>.Clear()
+      {
+        throw new NotSupportedException();
+      }
+
+      public bool Contains( TValue item )
+      {
+        return m_owner.ContainsValue( item );
+      }
+
+      void ICollection<TValue>.CopyTo( TValue[] array, int arrayIndex )
+      {
+        throw new NotSupportedException();
+      }
+
+      bool ICollection<TValue>.Remove( TValue item )
+      {
+        throw new NotSupportedException();
+      }
+
+      public IEnumerator<TValue> GetEnumerator()
+      {
+        return m_owner.Select( item => item.Value ).GetEnumerator();
+      }
+
+      IEnumerator IEnumerable.GetEnumerator()
+      {
+        return this.GetEnumerator();
+      }
+
+      private readonly WeakDictionary<TKey, TValue> m_owner;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
index 262b4d50..79c0340f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
@@ -27,7 +27,7 @@ using System.Reflection;
 
 namespace Xceed.Wpf.DataGrid.Utils
 {
-  [Obsolete( "TODODOC: This class is inefficient.  You should derive from System.Windows.WeakEventManager instead." )]
+  [Obsolete( "This class is inefficient. You should derive from System.Windows.WeakEventManager instead." )]
   [Browsable( false )]
   [EditorBrowsable( EditorBrowsableState.Never )]
   public sealed class WeakEventHandler<TEventArgs>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs
new file mode 100644
index 00000000..a9f033b1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs
@@ -0,0 +1,53 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows.Threading;
+
+namespace Xceed.Utils.Wpf
+{
+  internal sealed class DeferredDisposable : DispatcherDisposable
+  {
+    internal DeferredDisposable( DeferredDisposableState state )
+    {
+      if( state == null )
+        throw new ArgumentNullException( "state" );
+
+      m_state = state;
+      m_state.Initialize();
+    }
+
+    protected override Dispatcher GetDisposeDispatcher()
+    {
+      var dispatcher = m_state.GetDispatcher();
+      if( dispatcher != null )
+        return dispatcher;
+
+      return base.GetDisposeDispatcher();
+    }
+
+    protected override Action<bool> GetDisposeDelegate()
+    {
+      // We store the member in a local variable to create a closure.
+      // We do not want the returned delegate to target the current object.
+      var state = m_state;
+
+      return ( disposing ) => state.Dispose( disposing );
+    }
+
+    private readonly DeferredDisposableState m_state;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs
new file mode 100644
index 00000000..01fb8393
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs
@@ -0,0 +1,108 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Threading;
+using System.Windows.Threading;
+
+namespace Xceed.Utils.Wpf
+{
+  internal abstract class DeferredDisposableState
+  {
+    protected virtual object SyncRoot
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    protected virtual Dispatcher Dispatcher
+    {
+      get
+      {
+        return null;
+      }
+    }
+
+    protected abstract bool IsDeferred
+    {
+      get;
+    }
+
+    protected abstract void Increment();
+    protected abstract void Decrement();
+
+    protected virtual void OnDeferEnding( bool disposing )
+    {
+    }
+
+    protected abstract void OnDeferEnded( bool disposing );
+
+    internal Dispatcher GetDispatcher()
+    {
+      return this.Dispatcher;
+    }
+
+    internal void Initialize()
+    {
+      var syncRoot = this.SyncRoot;
+      if( syncRoot != null )
+      {
+        Monitor.Enter( syncRoot );
+      }
+
+      try
+      {
+        this.Increment();
+      }
+      finally
+      {
+        if( syncRoot != null )
+        {
+          Monitor.Exit( syncRoot );
+        }
+      }
+    }
+
+    internal void Dispose( bool disposing )
+    {
+      var syncRoot = this.SyncRoot;
+      if( syncRoot != null )
+      {
+        Monitor.Enter( syncRoot );
+      }
+
+      try
+      {
+        this.Decrement();
+
+        if( this.IsDeferred )
+          return;
+
+        this.OnDeferEnding( disposing );
+      }
+      finally
+      {
+        if( syncRoot != null )
+        {
+          Monitor.Exit( syncRoot );
+        }
+      }
+
+      this.OnDeferEnded( disposing );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs
new file mode 100644
index 00000000..af6454f0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs
@@ -0,0 +1,90 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace Xceed.Utils.Wpf
+{
+  internal abstract class DispatcherDisposable : DependencyObject, IDisposable
+  {
+    #region Static Fields
+
+    private static readonly object IsAlive = new object();
+
+    #endregion
+
+    public void Dispose()
+    {
+      this.Dispose( true );
+      GC.SuppressFinalize( this );
+    }
+
+    protected void Dispose( bool disposing )
+    {
+      // Make sure we are only disposing once.
+      if( Interlocked.Exchange( ref m_isAlive, null ) == null )
+        return;
+
+      // We must not try to use managed objects since we have no clue whatever they have been
+      // garbage collected before the current object or not.
+      if( !disposing )
+        return;
+
+      // We ask the derived class for a delegate instead of calling a protected method directly
+      // because the current object could be garbage collected before the dispatcher calls the delegate.
+      // We want to avoid calling a method on a object that is no longer valid.  Instead, we ask
+      // the derived class to generate a delegate that will do the dispose.  For example, the delegate
+      // could be a lambda that encapsulate the fields in a closure.
+      var d = this.GetDisposeDelegate();
+      if( d == null )
+        return;
+
+      if( object.ReferenceEquals( d.Target, this ) )
+        throw new InvalidOperationException( "The dispose delegate must not target the disposable object." );
+
+      var dispatcher = this.GetDisposeDispatcher() ?? this.Dispatcher;
+      if( ( dispatcher == null ) || dispatcher.HasShutdownStarted || dispatcher.HasShutdownFinished )
+        return;
+
+      if( dispatcher.CheckAccess() )
+      {
+        d.Invoke( disposing );
+      }
+      else
+      {
+        dispatcher.BeginInvoke( d, DispatcherPriority.Send, disposing );
+      }
+    }
+
+    protected abstract Action<bool> GetDisposeDelegate();
+
+    protected virtual Dispatcher GetDisposeDispatcher()
+    {
+      return this.Dispatcher;
+    }
+
+    // This class does not cleanup unmanaged resource, so it does not need a finalizer.
+    //~DispatcherDisposable()
+    //{
+    //  this.Dispose( false );
+    //}
+
+    private object m_isAlive = DispatcherDisposable.IsAlive;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs
index 73ff4283..f086d803 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs
@@ -15,10 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -27,28 +23,33 @@ using System.Windows.Threading;
 
 namespace Xceed.Utils.Wpf.DragDrop
 {
-  internal class AutoScrollManager : DependencyObject
+  internal sealed class AutoScrollManager : DependencyObject
   {
-    public const int AutoScrollInterval_DefaultValue = 50;
-    public const int AutoScrollTreshold_DefaultValue = 5;
+    #region Static Fields
 
-    public AutoScrollManager(ScrollViewer scrollViewer)
+    internal static readonly TimeSpan AutoScrollInterval_DefaultValue = TimeSpan.FromMilliseconds( 50d );
+    internal const int AutoScrollThreshold_DefaultValue = 5;
+
+    #endregion
+
+    internal AutoScrollManager( ScrollViewer scrollViewer )
     {
       if( scrollViewer == null )
         throw new ArgumentNullException( "scrollViewer" );
 
       m_scrollViewer = scrollViewer;
+
       m_timer = new System.Windows.Threading.DispatcherTimer();
-      m_timer.Interval = new TimeSpan( 0, 0, 0, 0, 0 );
+      m_timer.Interval = AutoScrollManager.AutoScrollInterval_DefaultValue;
       m_timer.Tick += new EventHandler( this.OnAutoScrollTimer_Tick );
 
-      this.AutoScrollInterval = AutoScrollInterval_DefaultValue;
-      this.AutoScrollTreshold = AutoScrollTreshold_DefaultValue;
+      this.AutoScrollInterval = AutoScrollManager.AutoScrollInterval_DefaultValue;
+      this.AutoScrollThreshold = AutoScrollManager.AutoScrollThreshold_DefaultValue;
     }
 
     #region AutoScrollInterval Property
 
-    public int AutoScrollInterval
+    internal TimeSpan AutoScrollInterval
     {
       get;
       set;
@@ -56,9 +57,9 @@ namespace Xceed.Utils.Wpf.DragDrop
 
     #endregion
 
-    #region AutoScrollTreshold Property
+    #region AutoScrollThreshold Property
 
-    public int AutoScrollTreshold
+    internal int AutoScrollThreshold
     {
       get;
       set;
@@ -66,74 +67,110 @@ namespace Xceed.Utils.Wpf.DragDrop
 
     #endregion
 
-    #region property ScrollViewer Property
+    #region ScrollViewer Internal Property
 
-    public ScrollViewer ScrollViewer
+    internal ScrollViewer ScrollViewer
     {
-      get { return m_scrollViewer; }
+      get
+      {
+        return m_scrollViewer;
+      }
     }
 
     #endregion
 
-    public event EventHandler AutoScrolled;
+    #region AutoScrolled Internal Event
 
-    private void OnAutoScrollTimer_Tick( object sender, EventArgs e )
+    internal event EventHandler AutoScrolled;
+
+    private void OnAutoScrolled()
     {
-      this.PerformAutoScroll();
+      var handler = this.AutoScrolled;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, EventArgs.Empty );
     }
 
-    public void StopAutoScroll()
+    #endregion
+
+    internal void Start()
+    {
+      m_isStarted = true;
+    }
+
+    internal void Stop()
     {
+      m_isStarted = false;
       m_timer.Stop();
     }
 
-    internal void ProcessMouseMove( MouseEventArgs e )
+    internal void HandleMouseMove( MouseEventArgs e )
     {
-      Point clientMousePosition = e.GetPosition( m_scrollViewer );
+      if( !m_isStarted )
+        return;
+
+      this.HandleMove( e.GetPosition );
+    }
 
-      Size scrollViewerRenderSize = m_scrollViewer.RenderSize;
+    internal void HandleMove( Func<IInputElement, Point> getCursorPosition )
+    {
+      if( !m_isStarted )
+        return;
+
+      var position = getCursorPosition.Invoke( m_scrollViewer );
+      var renderSize = m_scrollViewer.RenderSize;
+      var treshold = this.AutoScrollThreshold;
+      var horizontalSpeed = 0d;
+      var verticalSpeed = 0d;
 
       m_autoScrollDirection = AutoScrollDirection.None;
-      if( m_scrollViewer.ScrollableWidth > 0 && scrollViewerRenderSize.Width > 0)
+
+      if( ( m_scrollViewer.ScrollableWidth > 0d ) && ( m_scrollViewer.ViewportWidth > 0d ) )
       {
-        double mouseEdgeDistance = 0d;
-        if( ( clientMousePosition.X < AutoScrollTreshold ) && ( m_scrollViewer.HorizontalOffset > 0 ) )
+        var distance = 0d;
+
+        if( ( position.X < treshold ) && ( m_scrollViewer.HorizontalOffset > 0d ) )
         {
           m_autoScrollDirection |= AutoScrollDirection.Left;
-          mouseEdgeDistance = clientMousePosition.X - AutoScrollTreshold;
+          distance = position.X - treshold;
         }
-        //Scrolling right
-        else if( ( clientMousePosition.X > scrollViewerRenderSize.Width - AutoScrollTreshold ) && ( m_scrollViewer.HorizontalOffset < m_scrollViewer.ScrollableWidth ) )
+        else if( ( position.X > renderSize.Width - treshold ) && ( m_scrollViewer.HorizontalOffset < m_scrollViewer.ScrollableWidth ) )
         {
           m_autoScrollDirection |= AutoScrollDirection.Right;
-          mouseEdgeDistance = ( clientMousePosition.X - ( scrollViewerRenderSize.Width - AutoScrollTreshold ) );
+          distance = position.X - ( renderSize.Width - treshold );
         }
 
-        //We need a scroll value in units that can be pixels or units (eg. rows)
-        //Store a distance ratio based mouse edge distance in relation to the view width
-        m_horizontalPageScrollRatio = mouseEdgeDistance / scrollViewerRenderSize.Width;
+        horizontalSpeed = distance / m_scrollViewer.ViewportWidth;
       }
 
-      if( m_scrollViewer.ScrollableHeight > 0 )
+      if( ( m_scrollViewer.ScrollableHeight > 0d ) && ( m_scrollViewer.ViewportHeight > 0d ) )
       {
-        if( ( clientMousePosition.Y < AutoScrollTreshold ) && ( m_scrollViewer.VerticalOffset > 0 ) )
+        var distance = 0d;
+
+        if( ( position.Y < treshold ) && ( m_scrollViewer.VerticalOffset > 0d ) )
         {
           m_autoScrollDirection |= AutoScrollDirection.Up;
+          distance = position.Y - treshold;
         }
-        else if( ( clientMousePosition.Y > scrollViewerRenderSize.Height - AutoScrollTreshold )
-            && ( m_scrollViewer.VerticalOffset < m_scrollViewer.ScrollableHeight ) )
+        else if( ( position.Y > renderSize.Height - treshold ) && ( m_scrollViewer.VerticalOffset < m_scrollViewer.ScrollableHeight ) )
         {
           m_autoScrollDirection |= AutoScrollDirection.Down;
+          distance = position.Y - ( renderSize.Height - treshold );
         }
+
+        verticalSpeed = distance / m_scrollViewer.ViewportHeight;
       }
 
+      m_scrollSpeed = new Vector( horizontalSpeed, verticalSpeed );
+
       if( m_autoScrollDirection == AutoScrollDirection.None )
       {
-        this.StopAutoScroll();
+        m_timer.Stop();
       }
       else
       {
-        // The DispatcherTimer is not a priority event. The Tick event won't fire while  the user moves the mouse pointer. That's why we manually call the 
+        // The DispatcherTimer is not a priority event. The Tick event won't fire while the user moves the mouse pointer. That's why we manually call the 
         // PerformAutoScroll method (on each MouseMove, i.e. Drag). When the user doesn't move the mouse pointer, the timer will take over to do the AutoScroll.
         if( !m_timer.IsEnabled )
         {
@@ -146,82 +183,101 @@ namespace Xceed.Utils.Wpf.DragDrop
 
     private void PerformAutoScroll()
     {
-      if(  m_timer.IsEnabled )
+      if( !m_timer.IsEnabled )
+        return;
+
+      var elapsedTime = DateTime.UtcNow - m_timestamp;
+      if( elapsedTime < this.AutoScrollInterval )
+        return;
+
+      var scaleFactor = Matrix.Identity;
+      scaleFactor.Scale( m_scrollViewer.ViewportWidth, m_scrollViewer.ViewportHeight );
+
+      var scrollUnits = m_scrollSpeed * scaleFactor;
+
+      if( ( m_autoScrollDirection & AutoScrollDirection.Left ) == AutoScrollDirection.Left )
       {
-        TimeSpan timeSpanSinceLastScroll = ( TimeSpan )( DateTime.UtcNow - m_lastAutoScrollTime );
+        if( m_scrollSpeed.X <= -1d )
+        {
+          m_scrollViewer.PageLeft();
+        }
+        else
+        {
+          var unit = System.Math.Min( -1d, scrollUnits.X );
+          var offset = System.Math.Max( 0d, m_scrollViewer.HorizontalOffset + unit );
 
-        // This method may be called before its time (on the MouseMove event). We make sure that the AutoScroll is not performed before the desired time span has elapsed.
-        if( timeSpanSinceLastScroll.Milliseconds >= AutoScrollInterval )
+          m_scrollViewer.ScrollToHorizontalOffset( offset );
+        }
+      }
+      else if( ( m_autoScrollDirection & AutoScrollDirection.Right ) == AutoScrollDirection.Right )
+      {
+        if( m_scrollSpeed.X >= 1d )
         {
-          double scrollUnits = ( m_horizontalPageScrollRatio * m_scrollViewer.ViewportWidth );
-
-          if( ( m_autoScrollDirection & AutoScrollDirection.Left ) == AutoScrollDirection.Left )
-          {
-            //Minimum 1 unit
-            scrollUnits = System.Math.Min( -1d, scrollUnits );
-            double scrollOffset = m_scrollViewer.HorizontalOffset + scrollUnits;
-
-            //Maximum 1 page
-            if(m_horizontalPageScrollRatio <= -1d)
-            {
-              m_scrollViewer.PageLeft();
-            }
-            else
-            {
-              //Make sure the grid stops scrolling.
-              if( scrollOffset < 0 )
-              {
-                scrollOffset = 0;
-              }
-              m_scrollViewer.ScrollToHorizontalOffset( scrollOffset );
-            }
-          }
-          else if( ( m_autoScrollDirection & AutoScrollDirection.Right ) == AutoScrollDirection.Right )
-          {
-            //Minimum 1 unit
-            scrollUnits = System.Math.Max( 1d, scrollUnits );
-            double scrollOffset = m_scrollViewer.HorizontalOffset + scrollUnits;
-
-            //Maxium 1 page
-            if( m_horizontalPageScrollRatio >= 1d )
-            {
-              m_scrollViewer.PageRight();
-            }
-            else
-            {
-              //Make sure the grid does not scroll pass the last right column.
-              if( scrollOffset > m_scrollViewer.ScrollableWidth )
-              {
-                scrollOffset = m_scrollViewer.ScrollableWidth;
-              }
-              m_scrollViewer.ScrollToHorizontalOffset( scrollOffset );
-            }
-          }
-          else if( ( m_autoScrollDirection & AutoScrollDirection.Up ) == AutoScrollDirection.Up )
-          {
-            m_scrollViewer.LineUp();
-          }
-          else if( ( m_autoScrollDirection & AutoScrollDirection.Down ) == AutoScrollDirection.Down )
-          {
-            m_scrollViewer.LineDown();
-          }
-
-          m_lastAutoScrollTime = DateTime.UtcNow;
-
-          if( this.AutoScrolled != null )
-          {
-            this.AutoScrolled( this, EventArgs.Empty );
-          }
+          m_scrollViewer.PageRight();
+        }
+        else
+        {
+          var unit = System.Math.Max( 1d, scrollUnits.X );
+          var offset = System.Math.Min( m_scrollViewer.ScrollableWidth, m_scrollViewer.HorizontalOffset + unit );
+
+          m_scrollViewer.ScrollToHorizontalOffset( offset );
+        }
+      }
+
+      if( ( m_autoScrollDirection & AutoScrollDirection.Up ) == AutoScrollDirection.Up )
+      {
+        if( m_scrollSpeed.Y <= -1d )
+        {
+          m_scrollViewer.PageUp();
+        }
+        else
+        {
+          var unit = System.Math.Min( -1d, scrollUnits.Y );
+          var offset = System.Math.Max( 0d, m_scrollViewer.VerticalOffset + unit );
+
+          m_scrollViewer.ScrollToVerticalOffset( offset );
+        }
+      }
+      else if( ( m_autoScrollDirection & AutoScrollDirection.Down ) == AutoScrollDirection.Down )
+      {
+        if( m_scrollSpeed.Y >= 1d )
+        {
+          m_scrollViewer.PageDown();
+        }
+        else
+        {
+          var unit = System.Math.Max( 1d, scrollUnits.Y );
+          var offset = System.Math.Min( m_scrollViewer.ScrollableHeight, m_scrollViewer.VerticalOffset + unit );
 
+          m_scrollViewer.ScrollToVerticalOffset( offset );
         }
       }
+
+      m_timestamp = DateTime.UtcNow;
+
+      this.OnAutoScrolled();
+    }
+
+    private void OnAutoScrollTimer_Tick( object sender, EventArgs e )
+    {
+      if( m_isStarted )
+      {
+        this.PerformAutoScroll();
+      }
+      else
+      {
+        ( ( DispatcherTimer )sender ).Stop();
+      }
     }
 
     private AutoScrollDirection m_autoScrollDirection = AutoScrollDirection.None;
-    private ScrollViewer m_scrollViewer;
-    private DispatcherTimer m_timer = null;
-    private DateTime m_lastAutoScrollTime;
-    private double m_horizontalPageScrollRatio;
+    private readonly ScrollViewer m_scrollViewer;
+    private readonly DispatcherTimer m_timer;
+    private DateTime m_timestamp;
+    private Vector m_scrollSpeed = new Vector( 0d, 0d );
+    private bool m_isStarted; //false
+
+    #region AutoScrollManager Private Enum
 
     [Flags()]
     private enum AutoScrollDirection
@@ -232,5 +288,7 @@ namespace Xceed.Utils.Wpf.DragDrop
       Up = 4,
       Down = 8
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
index 9e7b9955..28d23454 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
@@ -16,18 +16,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Input;
+using Xceed.Wpf.DataGrid;
 
 namespace Xceed.Utils.Wpf.DragDrop
 {
-  internal class DragDropHelper
+  internal static class DragDropHelper
   {
-    public static bool IsMouseMoveDrag( Point initialPosition, Point currentPosition )
+    internal static bool IsMouseMoveDrag( Point initialPosition, Point currentPosition )
     {
-      Rect dragRect = new Rect(
+      var dragRect = new Rect(
         initialPosition.X - SystemParameters.MinimumHorizontalDragDistance,
         initialPosition.Y - SystemParameters.MinimumVerticalDragDistance,
         SystemParameters.MinimumHorizontalDragDistance * 2,
@@ -36,48 +35,46 @@ namespace Xceed.Utils.Wpf.DragDrop
       return !dragRect.Contains( currentPosition );
     }
 
-    public static IDropTarget GetDropTargetAtPoint(
+    internal static IEnumerable<DropTargetInfo> GetDropTargetAtPoint(
       UIElement draggedElement,
-      UIElement dragContainer,
-      MouseEventArgs e,
-      out Nullable<Point> dropTargetPosition,
-      out IDropTarget lastFoundDropTarget )
+      UIElement container,
+      MouseEventArgs e )
     {
-      dropTargetPosition = null;
-      lastFoundDropTarget = null;
-
-      if( dragContainer == null )
-        return null;
+      return DragDropHelper.GetDropTargetAtPoint( draggedElement, container, e.GetPosition );
+    }
 
-      IDropTarget dropTarget = null;
+    internal static IEnumerable<DropTargetInfo> GetDropTargetAtPoint(
+      UIElement draggedElement,
+      UIElement container,
+      Func<IInputElement, Point> getPosition )
+    {
+      if( container == null )
+        yield break;
 
-      Point pointToDragContainer = e.GetPosition( dragContainer );
+      var mousePosition = new RelativePoint( container, getPosition.Invoke( container ) );
+      var hitTest = container.InputHitTest( mousePosition.GetPoint( container ) );
+      if( hitTest == null )
+        yield break;
 
-      IInputElement hitTest = dragContainer.InputHitTest( pointToDragContainer );
+      var parent = hitTest as DependencyObject;
 
-      if( hitTest != null )
+      while( parent != null )
       {
-        DependencyObject parent = hitTest as DependencyObject;
-
-        while( parent != null )
+        var dropTarget = parent as IDropTarget;
+        if( dropTarget != null )
         {
-          dropTarget = parent as IDropTarget;
-          if( dropTarget != null )
+          var element = parent as UIElement;
+          if( element != null )
           {
-            lastFoundDropTarget = dropTarget;
+            var dropTargetPosition = mousePosition.TranslateTo( element );
+            var canDrop = dropTarget.CanDropElement( draggedElement, dropTargetPosition );
 
-            if( dropTarget.CanDropElement( draggedElement ) )
-            {
-              dropTargetPosition = pointToDragContainer;
-              break;
-            }
+            yield return new DropTargetInfo( dropTarget, dropTargetPosition, canDrop );
           }
-          dropTarget = null;
-          parent = Xceed.Utils.Wpf.TreeHelper.GetParent( parent );
         }
-      }
 
-      return dropTarget;
+        parent = Xceed.Utils.Wpf.TreeHelper.GetParent( parent );
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
index 6ee40888..a99b3e70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
@@ -15,757 +15,290 @@
   ***********************************************************************************/
 
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interop;
 using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 using Xceed.Wpf.DataGrid;
 
 namespace Xceed.Utils.Wpf.DragDrop
 {
-  internal class DragSourceManager : DependencyObject, INotifyPropertyChanged
+  internal class DragSourceManager : DragSourceManagerBase
   {
-    public DragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer )
-      : this( draggedElement, adornerLayerInsideDragContainer, dragContainer, true )
+    internal DragSourceManager( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container )
+      : base( draggedElement, adornerLayer, container )
     {
     }
 
-    public DragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer, bool enableAutoScroll )
-      : this( draggedElement, adornerLayerInsideDragContainer, dragContainer, enableAutoScroll, true )
+    #region CurrentDropTarget Protected Property
+
+    protected IDropTarget CurrentDropTarget
     {
+      get
+      {
+        return m_currentDropTarget;
+      }
     }
 
-    public DragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer, bool enableAutoScroll, bool showDraggedElementGhost )
+    private void SetCurrentDropTarget( IDropTarget value, RelativePoint mousePosition, bool raiseDragEvents )
     {
-      if( draggedElement == null )
-        throw new ArgumentNullException( "draggedElement" );
-
-      if( dragContainer == null )
-        throw new ArgumentNullException( "dragContainer" );
+      if( value == m_currentDropTarget )
+        return;
 
-      this.SetDraggedElement( draggedElement );
-      this.DragContainer = dragContainer;
-      this.ShowDraggedElementGhost = showDraggedElementGhost;
+      var element = this.DraggedElement;
 
-      // If the AdornerLayer was not provided to the DragSourceManager
-      if( adornerLayerInsideDragContainer == null )
+      if( m_currentDropTarget != null )
       {
-        // Get the first AdornerLayer up the VisualTree of the dragContainer
-        this.AdornerLayerInsideDragContainer = AdornerLayer.GetAdornerLayer( this.DragContainer );
-      }
-      else
-      {
-        this.AdornerLayerInsideDragContainer = adornerLayerInsideDragContainer;
+        if( raiseDragEvents )
+        {
+          m_currentDropTarget.DragLeave( element );
+        }
+
+        m_currentDropTarget = null;
       }
 
-      if( enableAutoScroll )
+      if( ( value != null ) && value.CanDropElement( element, mousePosition ) )
       {
-        DependencyObject element = draggedElement;
-        ScrollViewer scrollViewer = null;
-
-        while( element != null )
-        {
-          element = VisualTreeHelper.GetParent( element );
-          scrollViewer = element as ScrollViewer;
-
-          if( scrollViewer != null )
-            break;
-        }
+        m_currentDropTarget = value;
 
-        if( scrollViewer != null )
+        if( raiseDragEvents )
         {
-          m_autoScrollManager = new AutoScrollManager( scrollViewer );
+          m_currentDropTarget.DragEnter( element );
         }
       }
-    }
-
-    #region AdornerLayerInsideDragContainer Read-Only Public Property
 
-    public AdornerLayer AdornerLayerInsideDragContainer
-    {
-      get;
-      private set;
+      this.OnPropertyChanged( "CurrentDropTarget" );
     }
 
-    #endregion
-
-    #region DraggedElement Read-Only Public Property
-
-    public UIElement DraggedElement
-    {
-      get;
-      private set;
-    }
+    private IDropTarget m_currentDropTarget; //null
 
     #endregion
 
-    #region DraggedElementGhost Read-Only Internal Property
+    #region CurrentDropTargetToContainerPosition Protected Property
 
-    internal Window DraggedElementGhost
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region DragContainer Read-Only Public Property
-
-    public UIElement DragContainer
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsDragging Read-Only Public Property
-
-    public bool IsDragging
+    protected RelativePoint? CurrentDropTargetToContainerPosition
     {
       get
       {
-        return m_isDragging;
+        return m_currentDropTargetToContainerPosition;
       }
       private set
       {
-        if( m_isDragging == value )
+        if( value == m_currentDropTargetToContainerPosition )
           return;
 
-        m_isDragging = value;
+        m_currentDropTargetToContainerPosition = value;
 
-        this.NotifyPropertyChanged( "IsDragging" );
+        this.OnPropertyChanged( "CurrentDropTargetToContainerPosition" );
       }
     }
 
-    private bool m_isDragging;
+    private RelativePoint? m_currentDropTargetToContainerPosition; //null
 
     #endregion
 
-    #region InitialMousePositionToDraggedElement Read-Only Public Property
+    #region DropOutsideCursor Internal Property
 
-    internal Nullable<Point> InitialMousePositionToDraggedElement
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region InitialMousePositionToDragContainerAdorner Read-Only Public Property
-
-    public Nullable<Point> InitialMousePositionToDragContainerAdorner
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region MouseToScreenPositionFactor Read-Only Public Property
-
-    internal Vector MouseToScreenPositionFactor
+    internal Cursor DropOutsideCursor
     {
       get
       {
-        return m_mouseToScreenPositionFactor;
+        return m_dropOutsideCursor;
       }
-      private set
+      set
       {
-        m_mouseToScreenPositionFactor = value;
-      }
-    }
-
-    private Vector m_mouseToScreenPositionFactor = new Vector( 1d, 1d );
-
-    #endregion
+        if( value == m_dropOutsideCursor )
+          return;
 
-    #region ShowDraggedElementGhost Public Property
+        m_dropOutsideCursor = value;
 
-    public bool ShowDraggedElementGhost
-    {
-      get;
-      set;
+        this.OnPropertyChanged( "DropOutsideCursor" );
+      }
     }
 
-    #endregion
-
-    #region CurrentDropTarget Protected Property
-
-    protected IDropTarget CurrentDropTarget
-    {
-      get;
-      set;
-    }
+    private Cursor m_dropOutsideCursor; //null
 
     #endregion
 
-    #region CurrentDropTargetPosition
+    #region DragOutsideQueryCursor Internal Event
 
-    protected Nullable<Point> CurrentDropTargetToDragContainerPosition
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ParentScrollViewer Protected Property
+    internal event QueryCursorEventHandler DragOutsideQueryCursor;
 
-    protected ScrollViewer ParentScrollViewer
+    private void OnDragOutsideQueryCursor( QueryCursorEventArgs e )
     {
-      get
-      {
-        return ( m_autoScrollManager != null ) ? m_autoScrollManager.ScrollViewer : null;
-      }
-    }
-
-    #endregion
-
-    #region AutoScrollInterval Property
+      if( e.Handled )
+        return;
 
-    public static readonly DependencyProperty AutoScrollIntervalProperty = DependencyProperty.Register(
-      "AutoScrollInterval",
-      typeof( int ),
-      typeof( DragSourceManager ),
-      new FrameworkPropertyMetadata( AutoScrollManager.AutoScrollInterval_DefaultValue, OnAutoScrollIntervalChanged ) );
+      e.Handled = true;
 
-    public int AutoScrollInterval
-    {
-      get
-      {
-        return ( int )this.GetValue( DragSourceManager.AutoScrollIntervalProperty );
-      }
-      set
-      {
-        this.SetValue( DragSourceManager.AutoScrollIntervalProperty, value );
-      }
-    }
+      e.Cursor = m_dropOutsideCursor ?? Cursors.No;
 
-    private static void OnAutoScrollIntervalChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-    {
-      var autoScrollManager = ( ( DragSourceManager )sender ).m_autoScrollManager;
-      if( autoScrollManager != null )
+      var handler = this.DragOutsideQueryCursor;
+      if( handler != null )
       {
-        autoScrollManager.AutoScrollInterval = ( int )args.NewValue;
+        handler.Invoke( this, e );
       }
     }
 
     #endregion
 
-    #region TimerInterval Property
+    #region DroppedOutside Internal Event
 
-    internal int TimerInterval
-    {
-      get;
-      set;
-    }
+    internal event EventHandler DroppedOutside;
 
-    #endregion
-
-    #region AutoScrollTreshold Property
-
-    public static readonly DependencyProperty AutoScrollTresholdProperty = DependencyProperty.Register(
-      "AutoScrollTreshold",
-      typeof( int ),
-      typeof( DragSourceManager ),
-      new FrameworkPropertyMetadata( AutoScrollManager.AutoScrollTreshold_DefaultValue, OnAutoScrollTresholdChanged ) );
-
-    public int AutoScrollTreshold
+    protected virtual void OnDroppedOutside()
     {
-      get
-      {
-        return ( int )this.GetValue( DragSourceManager.AutoScrollTresholdProperty );
-      }
-      set
-      {
-        this.SetValue( DragSourceManager.AutoScrollTresholdProperty, value );
-      }
-    }
+      var handler = this.DroppedOutside;
+      if( handler == null )
+        return;
 
-    private static void OnAutoScrollTresholdChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      var autoScrollManager = ( ( DragSourceManager )sender ).m_autoScrollManager;
-      if( autoScrollManager != null )
-      {
-        autoScrollManager.AutoScrollTreshold = ( int )args.NewValue;
-      }
+      handler.Invoke( this, EventArgs.Empty );
     }
 
     #endregion
 
-    #region DropOutsideCursor Property
-
-    public Cursor DropOutsideCursor
+    protected override void OnDragStart( Func<IInputElement, Point> getPosition )
     {
-      get;
-      set;
-    }
+      base.OnDragStart( getPosition );
 
-    #endregion
-
-    #region ParentIsPopup Property
+      var element = this.DraggedElement;
+      element.QueryCursor += new QueryCursorEventHandler( this.OnDraggedElementQueryCursor );
 
-    internal bool ParentWindowIsPopup
-    {
-      get;
-      private set;
+      Debug.Assert( element.IsMouseCaptured, "The mouse should have be captured by the dragged element." );
     }
 
-    #endregion
-
-    public event QueryCursorEventHandler DragOutsideQueryCursor;
-
-    public event EventHandler DroppedOutside;
-
-    public virtual void SetDraggedElement( UIElement newDraggedElement )
+    protected override void OnDragEnd( Func<IInputElement, Point> getPosition, bool drop )
     {
-      if( newDraggedElement != this.DraggedElement )
-      {
-        if( this.DraggedElement != null )
-        {
-          this.DraggedElement.QueryCursor -= this.OnDraggedElement_QueryCursor;
-        }
+      var element = this.DraggedElement;
+      element.QueryCursor -= new QueryCursorEventHandler( this.OnDraggedElementQueryCursor );
 
-        if( newDraggedElement != null )
-        {
-          this.DraggedElement = newDraggedElement;
-          newDraggedElement.QueryCursor += this.OnDraggedElement_QueryCursor;
-        }
-      }
+      base.OnDragEnd( getPosition, drop );
     }
 
-    public virtual void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
+    protected override void OnDragMove( Func<IInputElement, Point> getPosition )
     {
-      if( e.Handled )
-        return;
-
-#if DEBUG
-      this.CheckMouseEventArgs( e );
-#endif
+      base.OnDragMove( getPosition );
 
-      if( !this.DraggedElement.CaptureMouse() )
-      {
-        Debug.Fail( "The DragSourceManager was unable to capture the mouse on the dragged element." );
-        return;
-      }
-
-      //Get the current window (which can be a popup) on which the drag is happening
-      var parent = this.GetDraggedElementWindow();
+      var dropTargetInfo = this.GetDropTarget( getPosition );
 
-      this.InitialMousePositionToDragContainerAdorner = e.GetPosition( this.AdornerLayerInsideDragContainer );
-      this.InitialMousePositionToDraggedElement = e.GetPosition( this.DraggedElement );
-      this.MouseToScreenPositionFactor = DragSourceManager.CalculateMouseToScreenPositionFactor( parent );
-      this.ParentWindowIsPopup = ( parent is Popup );
+      this.CurrentDropTargetToContainerPosition = dropTargetInfo.Position;
+      this.SetCurrentDropTarget( dropTargetInfo.Target, dropTargetInfo.Position.GetValueOrDefault(), true );
 
-      var draggedElementMousePosition = e.GetPosition( this.DraggedElement );
-      m_draggedElementMouseOffset = new Vector( draggedElementMousePosition.X, draggedElementMousePosition.Y );
-    }
-
-    public virtual void ProcessPreviewMouseRightButtonDown( MouseButtonEventArgs e )
-    {
-    }
-
-    public virtual void ProcessMouseMove( MouseEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-#if DEBUG
-      this.CheckMouseEventArgs( e );
-#endif
-
-      if( ( this.InitialMousePositionToDragContainerAdorner.HasValue ) && ( e.LeftButton == MouseButtonState.Pressed ) )
-      {
-        if( !this.IsDragging )
-        {
-          Point currentPosition = e.GetPosition( this.AdornerLayerInsideDragContainer );
-
-          if( DragDropHelper.IsMouseMoveDrag( this.InitialMousePositionToDraggedElement.Value, currentPosition ) )
-          {
-            this.BeginDrag();
-          }
-        }
-
-        if( this.IsDragging )
-        {
-          this.Drag( e );
-        }
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "e" )]
-    public virtual void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-#if DEBUG
-      this.CheckMouseEventArgs( e );
-#endif
-      this.EndDrag( true );
-      this.DraggedElement.ReleaseMouseCapture();
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "e" )]
-    public virtual void ProcessLostMouseCapture( MouseEventArgs e )
-    {
-#if DEBUG
-      this.CheckMouseEventArgs( e );
-#endif
-      if( this.IsDragging )
+      var dropTarget = this.CurrentDropTarget;
+      if( dropTarget != null )
       {
-        this.EndDrag( false );
+        this.OnDragOver( dropTarget, getPosition );
       }
     }
 
-    protected virtual void UpdateDraggedElementGhostOnDrag( MouseEventArgs e )
+    protected override void OnDragCancel( Func<IInputElement, Point> getPosition )
     {
-      //DraggedElementGhost is not used in the case of a popup window.
-      if( this.ParentWindowIsPopup )
-        return;
-
-      var ghost = this.DraggedElementGhost;
-      if( ghost == null )
-        return;
-
-      if( this.ShowDraggedElementGhost && !ghost.IsVisible )
-      {
-        ghost.Show();
-      }
-      else if( !this.ShowDraggedElementGhost && ghost.IsVisible )
+      var dropTarget = this.CurrentDropTarget;
+      if( dropTarget != null )
       {
-        ghost.Hide();
+        dropTarget.DragLeave( this.DraggedElement );
+        this.SetCurrentDropTarget( null, default( RelativePoint ), false );
       }
-
-      //Find the new ghost position based on the current mouse position.
-      var mousePosition = e.GetPosition( this.DragContainer );
-      var draggedElementPosition = Point.Subtract( mousePosition, m_draggedElementMouseOffset );
-
-      if( FrameworkElement.GetFlowDirection( this.DragContainer ) != FlowDirection.LeftToRight )
-      {
-        draggedElementPosition.X += this.DraggedElement.RenderSize.Width;
-      }
-
-      var draggedElementPositionOnScreen = this.DragContainer.PointToScreen( draggedElementPosition );
-
-      var ghostPosition = new Point( draggedElementPositionOnScreen.X * m_mouseToScreenPositionFactor.X,
-                                     draggedElementPositionOnScreen.Y * m_mouseToScreenPositionFactor.Y );
-
-      ghost.Left = ghostPosition.X;
-      ghost.Top = ghostPosition.Y;
-    }
-
-    protected virtual IDropTarget GetDropTargetOnDrag( MouseEventArgs e, out Nullable<Point> dropTargetPosition, out IDropTarget lastFoundDropTarget )
-    {
-      IDropTarget dropTarget = DragDropHelper.GetDropTargetAtPoint( this.DraggedElement, this.DragContainer, e, out dropTargetPosition, out lastFoundDropTarget );
-
-      // ColumnManagerRow was defined as IDropTarget only because Animated Column Reordering required it, ignore it in base class
-      if( dropTarget is ColumnManagerRow )
+      else
       {
-        dropTarget = null;
-        dropTargetPosition = null;
+        this.OnDroppedOutside();
       }
 
-      return dropTarget;
+      base.OnDragCancel( getPosition );
     }
 
-    protected virtual void ProcessDragOnCurrentDropTarget( IDropTarget dropTarget )
+    protected override void OnDrop( Func<IInputElement, Point> getPosition )
     {
-      if( dropTarget != this.CurrentDropTarget )
+      var dropTarget = this.CurrentDropTarget;
+      if( dropTarget != null )
       {
-        if( this.CurrentDropTarget != null )
+        var element = dropTarget as UIElement;
+        if( element != null )
         {
-          this.CurrentDropTarget.DragLeave( this.DraggedElement );
-          this.CurrentDropTarget = null;
-        }
+          var mousePosition = new RelativePoint( element, getPosition.Invoke( element ) );
 
-        if( dropTarget != null )
-        {
-          if( dropTarget.CanDropElement( this.DraggedElement ) )
-          {
-            this.CurrentDropTarget = dropTarget;
-            this.CurrentDropTarget.DragEnter( this.DraggedElement );
-          }
+          dropTarget.Drop( this.DraggedElement, mousePosition );
         }
-      }
 
-      if( this.CurrentDropTarget != null )
-      {
-        // Always use the Mouse Position relative to DraggedElement and not the DraggedContainer
-        this.CurrentDropTarget.DragOver( this.DraggedElement, Mouse.GetPosition( this.CurrentDropTarget as IInputElement ) );
+        this.SetCurrentDropTarget( null, default( RelativePoint ), false );
       }
-    }
-
-    protected virtual void ProcessCurrentDropTargetDrop( bool wasDragging, bool drop )
-    {
-      if( this.CurrentDropTarget != null )
-      {
-        if( drop )
-        {
-          this.CurrentDropTarget.Drop( this.DraggedElement );
-        }
-        else
-        {
-          this.CurrentDropTarget.DragLeave( this.DraggedElement );
-        }
-
-        this.CurrentDropTarget = null;
-      }
-      else if( wasDragging )
-      {
-        this.NotifyDropOuside();
-      }
-    }
-
-    protected virtual void StopAutoScroll()
-    {
-      if( m_autoScrollManager != null )
-      {
-        m_autoScrollManager.StopAutoScroll();
-      }
-    }
-
-    protected virtual void NotifyDragOutsideQueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      e.Cursor = ( this.DropOutsideCursor != null ) ? this.DropOutsideCursor : Cursors.No;
-
-      if( this.DragOutsideQueryCursor != null )
-      {
-        this.DragOutsideQueryCursor( sender, e );
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void NotifyDropOuside()
-    {
-      if( this.DroppedOutside != null )
-      {
-        this.DroppedOutside( this, EventArgs.Empty );
-      }
-    }
-
-    protected virtual void BeginDrag()
-    {
-      this.IsDragging = true;
-
-      this.DraggedElementGhost = this.CreateDraggedElementGhost( this.DraggedElement );
-    }
-
-    protected virtual Window CreateDraggedElementGhost( UIElement draggedElement )
-    {
-      VisualBrush brush = new VisualBrush( draggedElement );
-      brush.Opacity = 0.75;
-      brush.Stretch = Stretch.None;
-      brush.AlignmentX = AlignmentX.Left;
-      brush.AlignmentY = AlignmentY.Top;
-
-      Rectangle rectangle = new Rectangle();
-      rectangle.Width = draggedElement.DesiredSize.Width;
-      rectangle.Height = draggedElement.DesiredSize.Height;
-      rectangle.Fill = brush;
-
-      Window draggedWindow = new Window();
-      //Make sure it stay on top of all other windows.
-      draggedWindow.Topmost = true;
-      //This will hide borders
-      draggedWindow.WindowStyle = WindowStyle.None;
-      //This will hide everything except what is explicitly set as content, that is, the rectangle defined up here.
-      draggedWindow.AllowsTransparency = true;
-      draggedWindow.Background = null;
-      draggedWindow.SizeToContent = SizeToContent.WidthAndHeight;
-      draggedWindow.ShowInTaskbar = false;
-      draggedWindow.IsHitTestVisible = false;
-      draggedWindow.ShowActivated = false;
-      draggedWindow.Focusable = false;
-      draggedWindow.Left = 0;
-      draggedWindow.Top = 0;
-      draggedWindow.Content = rectangle;
-      //This will make sure the window follows what has been set on the parent grid.
-      DataGridContext context = DataGridControl.GetDataGridContext( draggedElement );
-      if( context != null )
+      else
       {
-        draggedWindow.FlowDirection = context.DataGridControl.FlowDirection;
+        this.OnDroppedOutside();
       }
 
-      return draggedWindow;
+      base.OnDrop( getPosition );
     }
 
-    protected virtual void Drag( MouseEventArgs e )
+    protected virtual void OnDragOver( IDropTarget target, Func<IInputElement, Point> getPosition )
     {
-      Nullable<Point> currentDropTarget = null;
-      IDropTarget lastFoundDropTarget = null;
-      IDropTarget dropTarget = this.GetDropTargetOnDrag( e, out currentDropTarget, out lastFoundDropTarget );
+      if( target == null )
+        throw new ArgumentNullException( "target" );
 
-      this.CurrentDropTargetToDragContainerPosition = currentDropTarget;
+      if( getPosition == null )
+        throw new ArgumentNullException( "getPosition" );
 
-      this.ProcessDragOnCurrentDropTarget( dropTarget );
-
-      // Call this method after the drag is processed in case the ShowDraggedElementGhost property was modified by the GetDropTargetOnDrag
-      this.UpdateDraggedElementGhostOnDrag( e );
+      var element = target as UIElement;
+      if( element == null )
+        return;
 
-      if( m_autoScrollManager != null )
-      {
-        m_autoScrollManager.ProcessMouseMove( e );
-      }
+      target.DragOver( this.DraggedElement, new RelativePoint( element, getPosition.Invoke( element ) ) );
     }
 
-    protected virtual void EndDrag( bool drop )
+    protected override void ValidateMouseEventArgs( MouseEventArgs e )
     {
-      bool wasDragging = this.IsDragging;
-
-      this.IsDragging = false;
-      this.InitialMousePositionToDragContainerAdorner = null;
-      this.InitialMousePositionToDraggedElement = null;
-      this.StopAutoScroll();
-
-      this.ProcessCurrentDropTargetDrop( wasDragging, drop );
-
-      //Hide the ghost only after doing the drop, so it will be visible if the operation takes a while.
-      if( this.DraggedElementGhost != null )
-      {
-        this.DraggedElementGhost.Hide();
-        this.DraggedElementGhost.Content = null;
-        this.DraggedElementGhost.Close();
-        this.DraggedElementGhost = null;
-      }
-    }
+      base.ValidateMouseEventArgs( e );
 
-    private static Vector CalculateMouseToScreenPositionFactor( FrameworkElement element )
-    {
-      if( element == null )
-        return new Vector( 1d, 1d );
+      var element = this.DraggedElement;
+      var source = e.Source as DependencyObject;
 
-      var source = PresentationSource.FromVisual( element );
-      if( source == null )
+      while( source != null )
       {
-        var parent = DragSourceManager.GetPopupParent( element );
-        while( parent != null )
-        {
-          source = PresentationSource.FromDependencyObject( parent );
-          if( source != null )
-            break;
-
-          parent = DragSourceManager.GetPopupParent( parent );
-        }
-      }
-
-      double x, y;
+        if( source == element )
+          break;
 
-      if( source != null )
-      {
-        var deviceUnits = source.CompositionTarget.TransformToDevice;
-        x = deviceUnits.M11;
-        y = deviceUnits.M22;
-      }
-      else
-      {
-        using( var hwnd = new HwndSource( new HwndSourceParameters() ) )
-        {
-          var deviceUnits = hwnd.CompositionTarget.TransformToDevice;
-          x = deviceUnits.M11;
-          y = deviceUnits.M22;
-        }
+        source = VisualTreeHelper.GetParent( source );
       }
 
-      return new Vector( ( x == 0d ) ? 1d : 1d / x, ( y == 0d ) ? 1d : 1d / y );
+      Debug.Assert( ( source != null ), "The Source of the " + e.RoutedEvent.Name + " event is NOT the UIElement that was passed to the ctor of this DragSourceManager OR one of its children." );
     }
 
-    private static DependencyObject GetPopupParent( DependencyObject element )
+    protected virtual DropTargetInfo GetDropTarget( Func<IInputElement, Point> getPosition )
     {
-      while( element != null )
+      foreach( var info in DragDropHelper.GetDropTargetAtPoint( this.DraggedElement, this.Container, getPosition ) )
       {
-        var popup = element as Popup;
-        if( popup != null )
-        {
-          var parent = popup.Parent;
-          if( parent != null )
-            return parent;
+        if( !info.CanDrop )
+          continue;
 
-          var target = popup.PlacementTarget;
-          if( target != null )
-            return target;
-        }
+        // ColumnManagerRow was defined as IDropTarget only because Animated Column Reordering required it, ignore it in base class
+        if( info.Target is ColumnManagerRow )
+          break;
 
-        element = VisualTreeHelper.GetParent( element );
+        return info;
       }
 
-      return null;
+      return new DropTargetInfo( null, null, false );
     }
 
-    private FrameworkElement GetDraggedElementWindow()
+    private void OnDraggedElementQueryCursor( object sender, QueryCursorEventArgs e )
     {
-      DependencyObject current = this.DraggedElement;
-      while( current != null )
-      {
-        //If the grid is in a popup, this becomes the owning window, so return it.
-        var popup = current as Popup;
-        if( popup != null )
-          return popup;
-
-        var window = current as Window;
-        if( window != null )
-          return window;
-
-        current = TreeHelper.GetParent( current );
-      }
-
-      // The dragged element's window was not found.
-      return null;
-    }
-
+      if( !this.IsDragging )
+        return;
 
-    private void OnDraggedElement_QueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      if( this.IsDragging )
+      var dropTarget = this.CurrentDropTarget;
+      if( dropTarget != null )
       {
-        if( ( this.CurrentDropTarget == null ) || ( !this.CurrentDropTarget.CanDropElement( this.DraggedElement ) ) )
+        var element = dropTarget as UIElement;
+        if( element != null )
         {
-          this.NotifyDragOutsideQueryCursor( sender, e );
+          var dropPoint = e.GetPosition( element );
+          if( dropTarget.CanDropElement( this.DraggedElement, new RelativePoint( element, dropPoint ) ) )
+            return;
         }
       }
-    }
 
-#if DEBUG
-    private void CheckMouseEventArgs( MouseEventArgs e )
-    {
-      UIElement sourceElement = e.Source as UIElement;
-
-      while( ( sourceElement != null ) && ( sourceElement != this.DraggedElement ) )
-      {
-        sourceElement = VisualTreeHelper.GetParent( sourceElement ) as UIElement;
-      }
-
-      if( sourceElement == null )
-        Debug.Fail( "The Source of the " + e.RoutedEvent.Name + " event is NOT the UIElement that was passed to the ctor of this DragSourceManager OR one of its children." );
-    }
-#endif
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected void NotifyPropertyChanged( string propertyName )
-    {
-      if( string.IsNullOrEmpty( propertyName ) )
-        throw new ArgumentException( "The property name cannot be null (Nothing in Visual Basic) or an empty string.", "propertyName" );
-
-      if( this.PropertyChanged != null )
-      {
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-      }
+      this.OnDragOutsideQueryCursor( e );
     }
-
-    #endregion
-
-    //This is used to position the DraggedElementGhost as such.
-    private Vector m_draggedElementMouseOffset;
-
-    private AutoScrollManager m_autoScrollManager;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs
new file mode 100644
index 00000000..3ae1951b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs
@@ -0,0 +1,710 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Xceed.Wpf.DataGrid;
+
+namespace Xceed.Utils.Wpf.DragDrop
+{
+  internal class DragSourceManagerBase : DependencyObject, INotifyPropertyChanged
+  {
+    internal DragSourceManagerBase( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container )
+      : this( draggedElement, adornerLayer, container, true )
+    {
+    }
+
+    internal DragSourceManagerBase( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, bool enableAutoScroll )
+      : this( draggedElement, adornerLayer, container, enableAutoScroll, true )
+    {
+    }
+
+    internal DragSourceManagerBase( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, bool enableAutoScroll, bool showGhost )
+    {
+      if( draggedElement == null )
+        throw new ArgumentNullException( "draggedElement" );
+
+      if( container == null )
+        throw new ArgumentNullException( "container" );
+
+      m_draggedElement = draggedElement;
+      m_container = container;
+      m_adornerLayer = ( adornerLayer != null ) ? adornerLayer : AdornerLayer.GetAdornerLayer( container );
+      m_showGhost = showGhost;
+
+      if( enableAutoScroll )
+      {
+        var scrollViewer = DragSourceManagerBase.GetScrollViewer( draggedElement );
+        if( scrollViewer != null )
+        {
+          m_autoScrollManager = new AutoScrollManager( scrollViewer );
+        }
+      }
+    }
+
+    #region IsDragging Property
+
+    internal bool IsDragging
+    {
+      get
+      {
+        return m_isDragging;
+      }
+      private set
+      {
+        if( value == m_isDragging )
+          return;
+
+        m_isDragging = value;
+
+        this.OnPropertyChanged( "IsDragging" );
+      }
+    }
+
+    private bool m_isDragging;
+
+    #endregion
+
+    #region IsDragStarted Property
+
+    internal bool IsDragStarted
+    {
+      get
+      {
+        return m_isDragStarted;
+      }
+      private set
+      {
+        if( value == m_isDragStarted )
+          return;
+
+        m_isDragStarted = value;
+
+        this.OnPropertyChanged( "IsDragStarted" );
+      }
+    }
+
+    private bool m_isDragStarted;
+
+    #endregion
+
+    #region ShowGhost Property
+
+    internal bool ShowGhost
+    {
+      get
+      {
+        return m_showGhost;
+      }
+      set
+      {
+        if( value == m_showGhost )
+          return;
+
+        m_showGhost = value;
+
+        this.OnPropertyChanged( "ShowGhost" );
+      }
+    }
+
+    private bool m_showGhost;
+
+    #endregion
+
+    #region AutoScrollInterval Property
+
+    internal static readonly DependencyProperty AutoScrollIntervalProperty = DependencyProperty.Register(
+      "AutoScrollInterval",
+      typeof( TimeSpan ),
+      typeof( DragSourceManagerBase ),
+      new FrameworkPropertyMetadata( AutoScrollManager.AutoScrollInterval_DefaultValue, DragSourceManagerBase.OnAutoScrollIntervalChanged ) );
+
+    internal TimeSpan AutoScrollInterval
+    {
+      get
+      {
+        return ( TimeSpan )this.GetValue( DragSourceManagerBase.AutoScrollIntervalProperty );
+      }
+      set
+      {
+        this.SetValue( DragSourceManagerBase.AutoScrollIntervalProperty, value );
+      }
+    }
+
+    private void OnAutoScrollIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( m_autoScrollManager == null )
+        return;
+
+      m_autoScrollManager.AutoScrollInterval = newValue;
+    }
+
+    private static void OnAutoScrollIntervalChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as DragSourceManagerBase;
+      if( self == null )
+        return;
+
+      self.OnAutoScrollIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    #endregion
+
+    #region AutoScrollThreshold Property
+
+    public static readonly DependencyProperty AutoScrollThresholdProperty = DependencyProperty.Register(
+      "AutoScrollThreshold",
+      typeof( int ),
+      typeof( DragSourceManagerBase ),
+      new FrameworkPropertyMetadata( AutoScrollManager.AutoScrollThreshold_DefaultValue, DragSourceManagerBase.OnAutoScrollThresholdChanged ) );
+
+    public int AutoScrollThreshold
+    {
+      get
+      {
+        return ( int )this.GetValue( DragSourceManagerBase.AutoScrollThresholdProperty );
+      }
+      set
+      {
+        this.SetValue( DragSourceManagerBase.AutoScrollThresholdProperty, value );
+      }
+    }
+
+    private void OnAutoScrollThresholdChanged( int oldValue, int newValue )
+    {
+      if( m_autoScrollManager == null )
+        return;
+
+      m_autoScrollManager.AutoScrollThreshold = newValue;
+    }
+
+    private static void OnAutoScrollThresholdChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as DragSourceManagerBase;
+      if( self == null )
+        return;
+
+      self.OnAutoScrollThresholdChanged( ( int )e.OldValue, ( int )e.NewValue );
+    }
+
+    #endregion
+
+    #region AdornerLayer Protected Property
+
+    protected AdornerLayer AdornerLayer
+    {
+      get
+      {
+        return m_adornerLayer;
+      }
+    }
+
+    private readonly AdornerLayer m_adornerLayer;
+
+    #endregion
+
+    #region DraggedElement Protected Property
+
+    protected UIElement DraggedElement
+    {
+      get
+      {
+        return m_draggedElement;
+      }
+    }
+
+    private readonly UIElement m_draggedElement;
+
+    #endregion
+
+    #region Container Protected Property
+
+    protected UIElement Container
+    {
+      get
+      {
+        return m_container;
+      }
+    }
+
+    private readonly UIElement m_container;
+
+    #endregion
+
+    #region IsPopup Protected Property
+
+    protected bool IsPopup
+    {
+      get
+      {
+        return m_isPopup;
+      }
+    }
+
+    private bool m_isPopup;
+
+    #endregion
+
+    #region InitialMousePositionToDraggedElement Protected Property
+
+    protected Point? InitialMousePositionToDraggedElement
+    {
+      get
+      {
+        return m_initialMousePositionToDraggedElement;
+      }
+    }
+
+    private Point? m_initialMousePositionToDraggedElement;
+
+    #endregion
+
+    #region InitialMousePositionToAdorner Protected Property
+
+    protected Point? InitialMousePositionToAdorner
+    {
+      get
+      {
+        return m_initialMousePositionToAdorner;
+      }
+    }
+
+    private Point? m_initialMousePositionToAdorner;
+
+    #endregion
+
+    protected virtual void OnDragStart( Func<IInputElement, Point> getPosition )
+    {
+    }
+
+    protected virtual void OnDragEnd( Func<IInputElement, Point> getPosition, bool drop )
+    {
+      if( drop )
+      {
+        this.OnDrop( getPosition );
+      }
+      else
+      {
+        this.OnDragCancel( getPosition );
+      }
+    }
+
+    protected virtual void OnDragCancel( Func<IInputElement, Point> getPosition )
+    {
+    }
+
+    protected virtual void OnDragMove( Func<IInputElement, Point> getPosition )
+    {
+    }
+
+    protected virtual void OnDrop( Func<IInputElement, Point> getPosition )
+    {
+    }
+
+    protected virtual void UpdateGhost( Func<IInputElement, Point> getPosition )
+    {
+      if( m_isPopup || ( m_draggedElementGhost == null ) )
+        return;
+
+      if( m_showGhost != m_draggedElementGhost.IsVisible )
+      {
+        if( m_showGhost )
+        {
+          m_draggedElementGhost.Show();
+        }
+        else
+        {
+          m_draggedElementGhost.Hide();
+        }
+      }
+
+      //Find the new ghost position based on the current mouse position.
+      var mousePosition = getPosition.Invoke( m_container );
+      var draggedElementPosition = Point.Subtract( mousePosition, m_draggedElementMouseOffset );
+
+      if( FrameworkElement.GetFlowDirection( m_container ) != FlowDirection.LeftToRight )
+      {
+        draggedElementPosition.X += m_draggedElement.RenderSize.Width;
+      }
+
+      var draggedElementPositionOnScreen = m_container.PointToScreen( draggedElementPosition );
+
+      // When Windows fonts are magnified (via the Control Panel), the position returned by PointToScreen doesn't match perfectly to the coordinate used
+      // to translate a Window object.  We need to multiply the result by a zoom factor in order to place the Window at the mouse location.
+      var ghostPosition = new Point( draggedElementPositionOnScreen.X * m_mouseToScreenPositionFactor.X,
+                                     draggedElementPositionOnScreen.Y * m_mouseToScreenPositionFactor.Y );
+
+      m_draggedElementGhost.Left = ghostPosition.X;
+      m_draggedElementGhost.Top = ghostPosition.Y;
+    }
+
+    [Conditional( "DEBUG" )]
+    protected virtual void ValidateMouseEventArgs( MouseEventArgs e )
+    {
+    }
+
+    internal void DragStart( MouseEventArgs e )
+    {
+      if( e.Handled || m_isDragStarted || m_isReentrant || ( e.LeftButton != MouseButtonState.Pressed ) )
+        return;
+
+      m_isReentrant = true;
+
+      try
+      {
+        this.ValidateMouseEventArgs( e );
+        this.DragStart( e.GetPosition );
+      }
+      finally
+      {
+        m_isReentrant = false;
+      }
+    }
+
+    internal void DragCancel( MouseEventArgs e )
+    {
+      if( e.Handled || !m_isDragStarted || m_isReentrant )
+        return;
+
+      m_isReentrant = true;
+
+      try
+      {
+        this.ValidateMouseEventArgs( e );
+        this.DragEnd( e.GetPosition, false );
+      }
+      finally
+      {
+        m_isReentrant = false;
+      }
+    }
+
+    internal void Drop( MouseEventArgs e )
+    {
+      if( e.Handled || !m_isDragStarted || m_isReentrant )
+        return;
+
+      m_isReentrant = true;
+
+      try
+      {
+        this.ValidateMouseEventArgs( e );
+        this.DragEnd( e.GetPosition, true );
+      }
+      finally
+      {
+        m_isReentrant = false;
+      }
+    }
+
+    internal void DragMove( MouseEventArgs e )
+    {
+      this.DragMove( e, false );
+    }
+
+    internal void DragMove( MouseEventArgs e, bool isCreatingCopy )
+    {
+      if( e.Handled || !m_isDragStarted || m_isReentrant || ( e.LeftButton != MouseButtonState.Pressed ) )
+        return;
+
+      m_isReentrant = true;
+
+      try
+      {
+        this.ValidateMouseEventArgs( e );
+        this.DragMove( e.GetPosition, isCreatingCopy );
+
+        if( m_autoScrollManager != null )
+        {
+          m_autoScrollManager.HandleMouseMove( e );
+        }
+      }
+      finally
+      {
+        m_isReentrant = false;
+      }
+    }
+
+    private static ScrollViewer GetScrollViewer( DependencyObject from )
+    {
+      while( from != null )
+      {
+        var scrollViewer = from as ScrollViewer;
+        if( scrollViewer != null )
+          return scrollViewer;
+
+        from = VisualTreeHelper.GetParent( from );
+      }
+
+      return null;
+    }
+
+    private static FrameworkElement GetPopupOrWindow( DependencyObject from )
+    {
+      while( from != null )
+      {
+        var popup = from as Popup;
+        if( popup != null )
+          return popup;
+
+        var window = from as Window;
+        if( window != null )
+          return window;
+
+        from = TreeHelper.GetParent( from );
+      }
+
+      return null;
+    }
+
+    private static DependencyObject GetPopupParent( DependencyObject from )
+    {
+      while( from != null )
+      {
+        var popup = from as Popup;
+        if( popup != null )
+        {
+          var parent = popup.Parent;
+          if( parent != null )
+            return parent;
+
+          var target = popup.PlacementTarget;
+          if( target != null )
+            return target;
+        }
+
+        from = VisualTreeHelper.GetParent( from );
+      }
+
+      return null;
+    }
+
+    private static Vector CalculateMouseToScreenPositionFactor( FrameworkElement element )
+    {
+      if( element == null )
+        return new Vector( 1d, 1d );
+
+      var source = PresentationSource.FromVisual( element );
+      if( source == null )
+      {
+        var parent = DragSourceManagerBase.GetPopupParent( element );
+        while( parent != null )
+        {
+          source = PresentationSource.FromDependencyObject( parent );
+          if( source != null )
+            break;
+
+          parent = DragSourceManagerBase.GetPopupParent( parent );
+        }
+      }
+
+      double x, y;
+
+      if( source != null )
+      {
+        var deviceUnits = source.CompositionTarget.TransformToDevice;
+        x = deviceUnits.M11;
+        y = deviceUnits.M22;
+      }
+      else
+      {
+        using( var hwnd = new HwndSource( new HwndSourceParameters() ) )
+        {
+          var deviceUnits = hwnd.CompositionTarget.TransformToDevice;
+          x = deviceUnits.M11;
+          y = deviceUnits.M22;
+        }
+      }
+
+      return new Vector( ( x == 0d ) ? 1d : 1d / x, ( y == 0d ) ? 1d : 1d / y );
+    }
+
+    private static Window CreateDraggedElementGhost( UIElement element, bool isCreatingCopy )
+    {
+      if( element == null )
+        return null;
+
+      TileBrush brush = null;
+
+      // Draw a copy of the element to make sure it won't be modified. 
+      // Used in MergedColumnEditor when recycling is active while dragging a cell far away.
+      if( isCreatingCopy )
+      {
+        var drawingVisual = new DrawingVisual();
+        using( var drawingContext = drawingVisual.RenderOpen() )
+        {
+          var visualBrush = new VisualBrush( element );
+          drawingContext.DrawRectangle( visualBrush, null, new Rect( new Point(), new Size( element.RenderSize.Width, element.RenderSize.Height ) ) );
+        }
+
+        float dpiX, dpiY;
+        using( System.Drawing.Graphics graphics = System.Drawing.Graphics.FromHwnd( IntPtr.Zero ) )
+        {
+          dpiX = graphics.DpiX;
+          dpiY = graphics.DpiY;
+        }
+        var bitmapTarget = new RenderTargetBitmap( (int)element.RenderSize.Width, (int)element.RenderSize.Height, dpiX, dpiY, PixelFormats.Default );
+        bitmapTarget.Render( drawingVisual );
+        brush = new ImageBrush( bitmapTarget );
+      }
+      else
+      {
+        brush = new VisualBrush( element );
+      }
+
+      brush.Opacity = 0.75d;
+      brush.Stretch = Stretch.None;
+      brush.AlignmentX = AlignmentX.Left;
+      brush.AlignmentY = AlignmentY.Top;
+
+      var rectangle = new Rectangle();
+      rectangle.Width = element.DesiredSize.Width;
+      rectangle.Height = element.DesiredSize.Height;
+      rectangle.Fill = brush;
+
+      var window = new Window();
+      window.Topmost = true;
+      window.WindowStyle = WindowStyle.None;
+      window.AllowsTransparency = true;
+      window.Background = null;
+      window.SizeToContent = SizeToContent.WidthAndHeight;
+      window.ShowInTaskbar = false;
+      window.IsHitTestVisible = false;
+      window.ShowActivated = false;
+      window.Focusable = false;
+      window.Left = 0;
+      window.Top = 0;
+      window.Content = rectangle;
+
+      //This will make sure the window follows what has been set on the parent grid.
+      var dataGridContext = DataGridControl.GetDataGridContext( element );
+      if( dataGridContext != null )
+      {
+        window.FlowDirection = dataGridContext.DataGridControl.FlowDirection;
+      }
+
+      return window;
+    }
+
+    private void DragStart( Func<IInputElement, Point> getPosition )
+    {
+      var parent = DragSourceManagerBase.GetPopupOrWindow( m_draggedElement );
+      var draggedElementPosition = getPosition.Invoke( m_draggedElement );
+
+      m_isPopup = ( parent is Popup );
+      m_initialMousePositionToAdorner = ( m_adornerLayer != null ) ? getPosition.Invoke( m_adornerLayer ) : default( Point? );
+      m_initialMousePositionToDraggedElement = draggedElementPosition;
+      m_mouseToScreenPositionFactor = DragSourceManagerBase.CalculateMouseToScreenPositionFactor( parent );
+      m_draggedElementMouseOffset = new Vector( draggedElementPosition.X, draggedElementPosition.Y );
+
+      if( m_autoScrollManager != null )
+      {
+        m_autoScrollManager.Start();
+      }
+
+      this.IsDragStarted = true;
+    }
+
+    private void DragEnd( Func<IInputElement, Point> getPosition, bool drop )
+    {
+      if( m_isDragging )
+      {
+        this.OnDragEnd( getPosition, drop );
+        this.IsDragging = false;
+      }
+
+      if( m_draggedElementGhost != null )
+      {
+        m_draggedElementGhost.Hide();
+        m_draggedElementGhost.Content = null;
+        m_draggedElementGhost.Close();
+        m_draggedElementGhost = null;
+      }
+
+      if( m_autoScrollManager != null )
+      {
+        m_autoScrollManager.Stop();
+      }
+
+      m_initialMousePositionToAdorner = default( Point? );
+      m_initialMousePositionToDraggedElement = default( Point? );
+
+      this.IsDragStarted = false;
+    }
+
+    private void DragMove( Func<IInputElement, Point> getPosition, bool isCreatingCopy )
+    {
+      if( !m_initialMousePositionToAdorner.HasValue )
+        return;
+
+      if( !m_isDragging )
+      {
+        var position = getPosition.Invoke( m_adornerLayer );
+
+        if( DragDropHelper.IsMouseMoveDrag( m_initialMousePositionToAdorner.Value, position ) )
+        {
+          m_draggedElementGhost = DragSourceManagerBase.CreateDraggedElementGhost( m_draggedElement, isCreatingCopy );
+
+          this.OnDragStart( getPosition );
+          this.IsDragging = true;
+        }
+      }
+
+      if( m_isDragging )
+      {
+        this.OnDragMove( getPosition );
+        this.UpdateGhost( getPosition );
+      }
+    }
+
+    #region INotifyPropertyChanged Members
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged( string propertyName )
+    {
+      var handler = this.PropertyChanged;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+
+    protected sealed override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+      this.OnPropertyChanged( e.Property.Name );
+    }
+
+    #endregion
+
+    private readonly AutoScrollManager m_autoScrollManager;
+    private Window m_draggedElementGhost; //null
+    private Vector m_mouseToScreenPositionFactor = new Vector( 1d, 1d );
+    private Vector m_draggedElementMouseOffset;
+    private bool m_isReentrant; //false
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs
new file mode 100644
index 00000000..4aedcab9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs
@@ -0,0 +1,34 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using Xceed.Wpf.DataGrid;
+
+namespace Xceed.Utils.Wpf.DragDrop
+{
+  internal struct DropTargetInfo
+  {
+    public DropTargetInfo( IDropTarget target, RelativePoint? position, bool canDrop )
+    {
+      this.Target = target;
+      this.Position = position;
+      this.CanDrop = canDrop;
+    }
+
+    internal readonly IDropTarget Target;
+    internal readonly RelativePoint? Position;
+    internal readonly bool CanDrop;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
index cb2d7a23..ac3a1b05 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
@@ -14,23 +14,21 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows;
+using Xceed.Wpf.DataGrid;
 
 namespace Xceed.Utils.Wpf.DragDrop
 {
   internal interface IDropTarget
   {
-    bool CanDropElement( UIElement draggedElement );
+    bool CanDropElement( UIElement draggedElement, RelativePoint mousePosition );
 
     void DragEnter( UIElement draggedElement );
 
-    void DragOver( UIElement draggedElement, Point mousePosition );
+    void DragOver( UIElement draggedElement, RelativePoint mousePosition );
 
     void DragLeave( UIElement draggedElement );
 
-    void Drop( UIElement draggedElement );
+    void Drop( UIElement draggedElement, RelativePoint mousePosition );
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
deleted file mode 100644
index 8934baca..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Core;
-using System.Windows.Media;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Reflection;
-using Xceed.Wpf.Toolkit.Core.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ValidateInputWrapper : Border
-  {
-    #region Base Class Overrides
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-
-      if( visualAdded != null )
-      {
-        IValidateInput validateInput = ValidateNewChild( visualAdded );
-        RegisterValidationErrorEvent( validateInput, true );
-        this.Child.AddHandler( UIElement.KeyDownEvent, new KeyEventHandler( HandleKeyDown ), true ); 
-      }
-      if( visualRemoved != null )
-      {
-        RegisterValidationErrorEvent( visualRemoved as IValidateInput, false );
-        this.Child.RemoveHandler( UIElement.KeyDownEvent, new KeyEventHandler( HandleKeyDown ) );
-      }
-    }
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      base.OnPreviewGotKeyboardFocus( e );
-
-      if( this.Child != null )
-      {
-        CellEditor.SetHasError( ( DependencyObject )this.Child, false );
-      }
-    }
-
-    #endregion
-
-    #region Methods
-
-    private IValidateInput ValidateNewChild( DependencyObject newChild )
-    {
-      IValidateInput validateInput = newChild as IValidateInput;
-      if( newChild != null && validateInput == null )
-        throw new InvalidOperationException( string.Format( "Child of ValidateInputWrapper should be a {0} instance", typeof( IValidateInput ) ) );
-
-      return validateInput;
-    }
-
-    private void OnInputValidationError( object sender, InputValidationErrorEventArgs e )
-    {
-      if( this.Child != null )
-      {
-        CellEditor.SetHasError( ( DependencyObject )this.Child, true );
-      }
-    }
-
-    private void RegisterValidationErrorEvent( IValidateInput validationElement, bool isRegistering )
-    {
-      if( validationElement != null )
-      {
-        if( isRegistering )
-        {
-          validationElement.InputValidationError += new InputValidationErrorEventHandler( this.OnInputValidationError );
-        }
-        else
-        {
-          validationElement.InputValidationError -= new InputValidationErrorEventHandler( this.OnInputValidationError );
-        }
-      }
-    }
-
-    private void HandleKeyDown( object sender, KeyEventArgs e )
-    {
-      if( e.Key == Key.Enter )
-      {
-        // The DatePicker (and UpDownBase<T> OnValidationError) sets this as handled, which breaks the DataGrid commit.
-        e.Handled = false;
-      }
-      if( e.Key == Key.Tab )
-      {
-        // We must commit the value before the tab is handled by the 
-        // DataGrid, or the ValidationError event won't be triggered.
-        IValidateInput validationElement = this.Child as IValidateInput;
-        if( validationElement != null )
-        {
-          validationElement.CommitInput();
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs
new file mode 100644
index 00000000..c41c0b71
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs
@@ -0,0 +1,221 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.DataGrid
+{
+  internal sealed class ValueChangeDataItemIndexerDescriptor : DataItemIndexerDescriptor
+  {
+    internal ValueChangeDataItemIndexerDescriptor(
+      DataItemTypeDescriptor owner,
+      IndexerDescriptor parent,
+      EventDescriptor eventDescriptor )
+      : base( owner, parent )
+    {
+      if( eventDescriptor == null )
+        throw new ArgumentNullException( "eventDescriptor" );
+
+      m_eventDescriptor = eventDescriptor;
+      m_eventProxy = new EventProxy( this, eventDescriptor );
+
+      var indexerName = parent.IndexerName;
+      var indexerParameters = parent.IndexerParameters;
+
+      m_propertyChangedNames = new string[]
+        {
+          Binding.IndexerName,
+          string.Format( "{0}[]", indexerName ),
+          string.Format( "{0}[{1}]", indexerName, indexerParameters )
+        };
+    }
+
+    #region SupportsChangeEvents Property
+
+    public override bool SupportsChangeEvents
+    {
+      get
+      {
+        return true;
+      }
+    }
+
+    #endregion
+
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
+    public override bool Equals( object obj )
+    {
+      var descriptor = obj as ValueChangeDataItemIndexerDescriptor;
+      if( object.ReferenceEquals( descriptor, null ) )
+        return false;
+
+      return ( object.Equals( descriptor.m_eventDescriptor, m_eventDescriptor ) )
+          && ( base.Equals( descriptor ) );
+    }
+
+    protected override void AddValueChangedCore( object component )
+    {
+      if( component == null )
+        return;
+
+      m_eventProxy.AddValueChanged( component );
+    }
+
+    protected override void RemoveValueChangedCore( object component )
+    {
+      if( component == null )
+        return;
+
+      m_eventProxy.RemoveValueChanged( component );
+    }
+
+    protected override bool MustInhibitValueChanged( object component )
+    {
+      return ( ( m_inhibitValueChanged == null ) || !m_inhibitValueChanged.Contains( component ) )
+          && ( this.GetValueChangedHandler( component ) != null );
+    }
+
+    protected override bool IsValueChangedInhibited( object component )
+    {
+      return ( m_inhibitValueChanged != null )
+          && ( m_inhibitValueChanged.Contains( component ) );
+    }
+
+    protected override void InhibitValueChanged( object component )
+    {
+      if( m_inhibitValueChanged == null )
+      {
+        m_inhibitValueChanged = new HashSet<object>();
+      }
+
+      m_inhibitValueChanged.Add( component );
+    }
+
+    protected override void ResetInhibitValueChanged( object component )
+    {
+      Debug.Assert( m_inhibitValueChanged != null );
+
+      m_inhibitValueChanged.Remove( component );
+
+      if( m_inhibitValueChanged.Count == 0 )
+      {
+        m_inhibitValueChanged = null;
+      }
+    }
+
+    private void OnPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      var propertyName = e.PropertyName;
+
+      if( string.IsNullOrEmpty( propertyName ) || m_propertyChangedNames.Contains( propertyName ) )
+      {
+        this.OnValueChanged( sender, e );
+      }
+    }
+
+    #region Private Fields
+
+    private readonly string[] m_propertyChangedNames;
+    private readonly EventProxy m_eventProxy;
+    private readonly EventDescriptor m_eventDescriptor;
+    private HashSet<object> m_inhibitValueChanged;
+
+    #endregion
+
+    #region EventProxy Private Class
+
+    private sealed class EventProxy
+    {
+      internal EventProxy( ValueChangeDataItemIndexerDescriptor propertyDescriptor, EventDescriptor eventDescriptor )
+      {
+        m_propertyDescriptor = new WeakReference( propertyDescriptor );
+        m_eventDescriptor = new WeakReference( eventDescriptor );
+      }
+
+      private ValueChangeDataItemIndexerDescriptor PropertyDescriptor
+      {
+        get
+        {
+          return m_propertyDescriptor.Target as ValueChangeDataItemIndexerDescriptor;
+        }
+      }
+
+      private EventDescriptor EventDescriptor
+      {
+        get
+        {
+          return m_eventDescriptor.Target as EventDescriptor;
+        }
+      }
+
+      internal void AddValueChanged( object component )
+      {
+        var descriptor = this.EventDescriptor;
+        if( descriptor == null )
+          return;
+
+        var handlerType = descriptor.EventType;
+
+        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
+        {
+          descriptor.AddEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
+        }
+      }
+
+      internal void RemoveValueChanged( object component )
+      {
+        var descriptor = this.EventDescriptor;
+        if( descriptor == null )
+          return;
+
+        var handlerType = descriptor.EventType;
+
+        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
+        {
+          descriptor.RemoveEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
+        }
+      }
+
+      private void OnPropertyChanged( object sender, PropertyChangedEventArgs e )
+      {
+        var propertyDescriptor = this.PropertyDescriptor;
+        if( propertyDescriptor != null )
+        {
+          propertyDescriptor.OnPropertyChanged( sender, e );
+        }
+        else
+        {
+          // Since the real listener is no longer available, try to unregister the handler.
+          this.RemoveValueChanged( sender );
+        }
+      }
+
+      private readonly WeakReference m_propertyDescriptor;
+      private readonly WeakReference m_eventDescriptor;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs
index 38fc1bd6..4fdec3b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs
@@ -24,8 +24,6 @@ namespace Xceed.Wpf.DataGrid
 {
   internal sealed class ValueChangeDataItemPropertyDescriptor : DataItemPropertyDescriptor
   {
-    #region Constructor
-
     internal ValueChangeDataItemPropertyDescriptor(
       DataItemTypeDescriptor owner,
       PropertyDescriptor parent,
@@ -44,8 +42,6 @@ namespace Xceed.Wpf.DataGrid
       m_eventProxy = new EventProxy( this, eventDescriptor );
     }
 
-    #endregion
-
     #region SupportsChangeEvents Property
 
     public override bool SupportsChangeEvents
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
index aa2c071f..a0a47d2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
@@ -15,14 +15,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.ComponentModel;
 using System.Diagnostics;
-using System.Windows.Controls;
 using System.Windows;
-using Xceed.Utils.Math;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -51,8 +46,11 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #region ColumnVirtualizationManager Property
 
-    private static readonly DependencyPropertyKey ColumnVirtualizationManagerPropertyKey =
-        DependencyProperty.RegisterAttachedReadOnly( "ColumnVirtualizationManager", typeof( ColumnVirtualizationManager ), typeof( ColumnVirtualizationManager ), new UIPropertyMetadata( null ) );
+    private static readonly DependencyPropertyKey ColumnVirtualizationManagerPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
+      "ColumnVirtualizationManager",
+      typeof( ColumnVirtualizationManager ),
+      typeof( ColumnVirtualizationManager ),
+      new UIPropertyMetadata( null, new PropertyChangedCallback( ColumnVirtualizationManager.OnColumnVirtualizationManagerChanged ) ) );
 
     public static readonly DependencyProperty ColumnVirtualizationManagerProperty;
 
@@ -71,6 +69,23 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.ClearValue( ColumnVirtualizationManager.ColumnVirtualizationManagerPropertyKey );
     }
 
+    private static void OnColumnVirtualizationManagerChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as ColumnVirtualizationManager;
+      if( self == null )
+        return;
+
+      var dataGridContext = self.DataGridContext;
+      if( dataGridContext == null )
+        return;
+
+      var column = dataGridContext.Columns.MainColumn;
+      if( column == null )
+        return;
+
+      column.RefreshDraggableStatus();
+    }
+
     #endregion
 
     #region NeedsUpdate Property
@@ -95,6 +110,8 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    private DataGridContext m_dataGridContext; //null;
+
     #endregion
 
     #region Version Proptety
@@ -107,19 +124,18 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    private int m_version; //0;
+
     #endregion
 
-    public virtual void Update()
+    public void Update()
     {
-      if( this.NeedsUpdate == false )
+      if( !this.NeedsUpdate )
         return;
 
       this.PreUpdate();
-
       this.ResetInternalState();
-
       this.DoUpdate();
-
       this.PostUpdate();
     }
 
@@ -151,11 +167,12 @@ namespace Xceed.Wpf.DataGrid.Views
     // Called after attaching ColumnVirtualizationManager to DataGridContext
     protected virtual void Initialize()
     {
-      m_dataGridContext.PropertyChanged += new PropertyChangedEventHandler( this.DataGridContext_PropertyChanged );
+      PropertyChangedEventManager.AddListener( m_dataGridContext, this, string.Empty );
       ItemsSourceChangeCompletedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
       ViewChangedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
       ThemeChangedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
-      VisibleColumnsUpdatedEventManager.AddListener( m_dataGridContext.Columns, this );
+      ColumnsLayoutChangingEventManager.AddListener( m_dataGridContext.ColumnManager, this );
+      ColumnsLayoutChangedEventManager.AddListener( m_dataGridContext.ColumnManager, this );
     }
 
     // Called before detaching ColumnVirtualizationManager from DataGridContext
@@ -163,16 +180,17 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       this.ResetInternalState();
 
-      m_dataGridContext.PropertyChanged -= new PropertyChangedEventHandler( this.DataGridContext_PropertyChanged );
+      PropertyChangedEventManager.RemoveListener( m_dataGridContext, this, string.Empty );
       ItemsSourceChangeCompletedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
       ViewChangedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
       ThemeChangedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
-      VisibleColumnsUpdatedEventManager.RemoveListener( m_dataGridContext.Columns, this );
+      ColumnsLayoutChangingEventManager.RemoveListener( m_dataGridContext.ColumnManager, this );
+      ColumnsLayoutChangedEventManager.RemoveListener( m_dataGridContext.ColumnManager, this );
 
       m_dataGridContext = null;
     }
 
-    protected virtual void IncrementVersion( object parameters )
+    protected virtual void IncrementVersion( UpdateMeasureRequiredEventArgs e )
     {
       unchecked
       {
@@ -180,11 +198,11 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    protected virtual void DataGridContext_PropertyChanged( object sender, PropertyChangedEventArgs e )
+    protected virtual void OnDataGridContextPropertyChanged( PropertyChangedEventArgs e )
     {
-      Debug.Assert( string.IsNullOrEmpty( e.PropertyName ) == false );
+      Debug.Assert( !string.IsNullOrEmpty( e.PropertyName ) );
 
-      if( string.IsNullOrEmpty( e.PropertyName ) == true )
+      if( string.IsNullOrEmpty( e.PropertyName ) )
         return;
 
       switch( e.PropertyName )
@@ -195,61 +213,86 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private int m_version; // = 0;
-    private int m_currentVersion; // = 0;
+    protected virtual void OnColumnsLayoutChanging()
+    {
+    }
 
-    private DataGridContext m_dataGridContext; // = null;
+    protected virtual void OnColumnsLayoutChanged()
+    {
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
+    }
+
+    protected virtual void OnDataGridControlViewChanged()
+    {
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
+    }
+
+    protected virtual void OnDataGridControlThemeChanged()
+    {
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
+    }
+
+    protected virtual void OnDataGridControlItemsSourceChanged()
+    {
+    }
+
+    private int m_currentVersion; //0;
 
     #region IWeakEventListener Members
 
     bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      return this.OnReceivedWeakEvent( managerType, sender, e );
+      return this.OnReceiveWeakEvent( managerType, sender, e );
     }
 
-    protected virtual bool OnReceivedWeakEvent( Type managerType, object sender, EventArgs e )
+    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      bool handled = false;
-      bool detachFromDataGridContext = false;
+      var detach = false;
 
-      if( managerType == typeof( VisibleColumnsUpdatedEventManager ) )
+      if( managerType == typeof( PropertyChangedEventManager ) )
       {
-        this.IncrementVersion( null );
-
-        handled = true;
+        if( sender == m_dataGridContext )
+        {
+          this.OnDataGridContextPropertyChanged( ( PropertyChangedEventArgs )e );
+        }
+      }
+      else if( managerType == typeof( ColumnsLayoutChangingEventManager ) )
+      {
+        this.OnColumnsLayoutChanging();
+      }
+      else if( managerType == typeof( ColumnsLayoutChangedEventManager ) )
+      {
+        this.OnColumnsLayoutChanged();
       }
       else if( managerType == typeof( ViewChangedEventManager ) )
       {
-        detachFromDataGridContext = true;
-        this.IncrementVersion( null );
-
-        handled = true;
+        this.OnDataGridControlViewChanged();
+        detach = true;
       }
       else if( managerType == typeof( ThemeChangedEventManager ) )
       {
-        detachFromDataGridContext = true;
-        this.IncrementVersion( null );
-
-        handled = true;
+        this.OnDataGridControlThemeChanged();
+        detach = true;
       }
       else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
       {
-        detachFromDataGridContext = true;
-        handled = true;
+        this.OnDataGridControlItemsSourceChanged();
+        detach = true;
+      }
+      else
+      {
+        return false;
       }
 
-      if( detachFromDataGridContext == true )
+      if( detach && ( m_dataGridContext != null ) )
       {
-        if( m_dataGridContext != null )
-        {
-          // Detach the ColumnVirtualizationManager from the DataGridContext and detach from the DataGridContext
-          ColumnVirtualizationManager.SetColumnVirtualizationManager( m_dataGridContext, null );
+        // Detach the ColumnVirtualizationManager from the DataGridContext and detach from the DataGridContext
+        ColumnVirtualizationManager.SetColumnVirtualizationManager( m_dataGridContext, null );
 
-          this.Uninitialize();
-        }
+        this.Uninitialize();
       }
 
-      return handled;
+      return true;
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountChangedEventArgs.cs
deleted file mode 100644
index c5aed0f1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountChangedEventArgs.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class FixedColumnCountInfoEventArgs : EventArgs
-  {
-    internal FixedColumnCountInfoEventArgs( ColumnBase triggeringColumn, FixedColumnUpdateType updateType, int level = 0 )
-    {
-      this.TriggeringColumn = triggeringColumn;
-      this.UpdateType = updateType;
-      this.Level = level;
-    }
-
-    internal ColumnBase TriggeringColumn
-    {
-      get;
-      private set;
-    }
-
-    internal FixedColumnUpdateType UpdateType
-    {
-      get;
-      private set;
-    }
-
-    internal int Level
-    {
-      get;
-      private set;
-    }
-  }
-
-  internal enum FixedColumnUpdateType
-  {
-    Hide,  //Column.Visible is set to false
-    Remove, //The column is removed from a MergedColumnCollection
-    Show, //Column.Visible is set to true
-    Update //Simply update the FixedColumnCount property after a change in a ChildColumns collection.
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
index 2a6f5678..3255ac45 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
@@ -124,6 +124,48 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
+    #region MergedNameToOffset Property
+
+    internal override IList<IColumnInfoCollection<double>> MergedNameToOffset
+    {
+      get
+      {
+        return m_mergedNameToOffset;
+      }
+    }
+
+    private readonly IList<IColumnInfoCollection<double>> m_mergedNameToOffset = new List<IColumnInfoCollection<double>>();
+
+    #endregion
+
+    #region MergedNameToWidth Property
+
+    internal override IList<IColumnInfoCollection<double>> MergedNameToWidth
+    {
+      get
+      {
+        return m_mergedNameToWidth;
+      }
+    }
+
+    private readonly IList<IColumnInfoCollection<double>> m_mergedNameToWidth = new List<IColumnInfoCollection<double>>();
+
+    #endregion
+
+    #region MergedNameToPostion Property
+
+    internal override IList<IColumnInfoCollection<int>> MergedNameToPostion
+    {
+      get
+      {
+        return m_mergedNameToPostion;
+      }
+    }
+
+    private readonly IList<IColumnInfoCollection<int>> m_mergedNameToPostion = new List<IColumnInfoCollection<int>>();
+
+    #endregion
+
     #region FixedFieldNames Internal Property
 
     internal override IColumnNameCollection FixedFieldNames
@@ -152,24 +194,32 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region FirstViewportColumnFieldNameIndex Internal Property
+    #region FixedMergedNames Internal Property
 
-    internal override int FirstViewportColumnFieldNameIndex
+    internal override IList<IColumnNameCollection> FixedMergedNames
     {
       get
       {
-        return m_firstViewportColumnFieldNameIndex;
+        return m_fixedMergedNames;
       }
     }
 
-    protected override void SetFirstViewportColumnFieldNameIndex( int value )
+    private readonly List<IColumnNameCollection> m_fixedMergedNames = new List<IColumnNameCollection>();
+
+    #endregion
+
+    #region ScrollingMergedNames Internal Property
+
+    internal override IList<IColumnNameCollection> ScrollingMergedNames
     {
-      m_firstViewportColumnFieldNameIndex = value;
+      get
+      {
+        return m_scrollingMergedNames;
+      }
     }
 
-    private int m_firstViewportColumnFieldNameIndex;
+    private readonly List<IColumnNameCollection> m_scrollingMergedNames = new List<IColumnNameCollection>();
 
     #endregion
   }
 }
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs
index 136e8e3e..682e7176 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs
@@ -21,12 +21,10 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -35,43 +33,41 @@ namespace Xceed.Wpf.DataGrid.Views
     protected TableViewColumnVirtualizationManagerBase( DataGridContext dataGridContext )
       : base( dataGridContext )
     {
-      RoutedEventManager.Instance.Register();
     }
 
-    #region IsVirtualizing Property
+    #region VirtualizationMode Property
 
-    protected static readonly DependencyProperty IsVirtualizingProperty = DependencyProperty.Register(
-      "IsVirtualizing",
-      typeof( bool ),
+    protected static readonly DependencyProperty VirtualizationModeProperty = DependencyProperty.Register(
+      "VirtualizationMode",
+      typeof( ColumnVirtualizationMode ),
       typeof( TableViewColumnVirtualizationManagerBase ),
-      new UIPropertyMetadata(
-        true,
-        new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnIsVirtualizingChanged ) ) );
+      new UIPropertyMetadata( ColumnVirtualizationMode.Recycling, new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnVirtualizationModeChanged ) ) );
 
-    public bool IsVirtualizing
+    public ColumnVirtualizationMode VirtualizationMode
     {
       get
       {
-        return ( bool )this.GetValue( TableViewColumnVirtualizationManagerBase.IsVirtualizingProperty );
+        return ( ColumnVirtualizationMode )this.GetValue( TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty );
       }
       set
       {
-        this.SetValue( TableViewColumnVirtualizationManagerBase.IsVirtualizingProperty, value );
+        this.SetValue( TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty, value );
       }
     }
 
-    protected virtual void OnIsVirtualizingChanged( bool oldValue, bool newValue )
+    protected virtual void OnVirtualizationModeChanged( ColumnVirtualizationMode oldValue, ColumnVirtualizationMode newValue )
     {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.VirtualizationStateChanged ) );
+      this.OnVirtualizingCellCollectionUpdateRequired(
+             new VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction.VirtualizationModeChanged ) );
     }
 
-    private static void OnIsVirtualizingChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    private static void OnVirtualizationModeChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
       var manager = sender as TableViewColumnVirtualizationManagerBase;
       if( manager == null )
         return;
 
-      manager.OnIsVirtualizingChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+      manager.OnVirtualizationModeChanged( ( ColumnVirtualizationMode )e.OldValue, ( ColumnVirtualizationMode )e.NewValue );
     }
 
     #endregion
@@ -122,10 +118,10 @@ namespace Xceed.Wpf.DataGrid.Views
       typeof( int ),
       typeof( TableViewColumnVirtualizationManagerBase ),
       new UIPropertyMetadata( 0, new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnFixedColumnCountChanged ),
-                                 new CoerceValueCallback( TableViewColumnVirtualizationManagerBase.FixedColumnCountCoerceCallback ) ) );
+                                 new CoerceValueCallback( TableViewColumnVirtualizationManagerBase.CoerceFixedColumnCount ) ) );
 
     // Only used to back the dp.  The dp itself is used as the API for the user to change the fixed column count (through TableView binding),
-    // and the PropertyChangedCallback redirect the value to the top most manager row.  FixedColumnCountInternal reflects the value for the regular CMR (-1 level).
+    // and the PropertyChangedCallback redirect the value to the top most manager row.
     protected int FixedColumnCount
     {
       get
@@ -138,79 +134,49 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private void OnFixedColumnCountChanged( int oldValue, int newValue )
+    private static void OnFixedColumnCountChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
-      // To prevent reentrance
-      if( !m_updatingFixedColumnCount.IsSet )
-      {
-        using( m_updatingFixedColumnCount.Set() )
-        {
-          int level = -1;
-          int correctionValue = ( newValue > 0 ) ? 1 : 0;
-
-          this.SetFixedColumnCount( level, newValue, correctionValue );
-        }
-      }
+      var self = sender as TableViewColumnVirtualizationManagerBase;
+      if( self == null )
+        return;
 
-      // We want to be sure the cells won't be inserted in ScrollingPanel, but added to it
-      if( m_incrementVersionDispatcherOperation == null )
-      {
-        m_incrementVersionDispatcherOperation = this.Dispatcher.BeginInvoke(
-                                                  DispatcherPriority.Render,
-                                                  new Action<UpdateMeasureRequiredEventArgs>( this.IncrementVersion ),
-                                                  new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnReordering ) );
-      }
+      self.OnFixedColumnCountChanged( ( int )e.OldValue, ( int )e.NewValue );
     }
 
-    private static void OnFixedColumnCountChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    private static object CoerceFixedColumnCount( DependencyObject sender, object value )
     {
-      var manager = ( TableViewColumnVirtualizationManagerBase )sender;
+      var self = sender as TableViewColumnVirtualizationManagerBase;
+      var count = ( int )value;
 
-      manager.OnFixedColumnCountChanged( ( int )e.OldValue, ( int )e.NewValue );
-    }
+      if( ( count == 0 ) || ( self == null ) )
+        return value;
 
-    private static object FixedColumnCountCoerceCallback( DependencyObject sender, object value )
-    {
-      var fixedColumnCount = ( int )value;
-      if( fixedColumnCount == 0 )
+      var dataGridContext = self.DataGridContext;
+      if( dataGridContext == null )
         return value;
 
-      if( fixedColumnCount < 0 )
+      if( count < 0 )
         return 0;
 
-      var manager = ( TableViewColumnVirtualizationManagerBase )sender;
-      var dataGridContext = manager.DataGridContext;
-      int maxValue = 0;
+      var columns = dataGridContext.VisibleColumns;
+      var max = columns.Count;
 
-      if( dataGridContext != null )
-      {
-        var columns = dataGridContext.VisibleColumns;
-        if( columns.Any() )
-        {
-          maxValue = columns.Count;
-        }
-      }
-
-      if( fixedColumnCount > maxValue )
-        return maxValue;
+      if( count > max )
+        return max;
 
       return value;
     }
 
-    private int FixedColumnCountInternal
+    private void OnFixedColumnCountChanged( int oldValue, int newValue )
     {
-      get;
-      set;
-    }
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext == null )
+        return;
 
-    private void UpdateFixedColumnCount()
-    {
-      this.CoerceValue( TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
+      var columnManager = dataGridContext.ColumnManager;
+      columnManager.SetFixedColumnCount( newValue );
     }
 
-    private readonly AutoResetFlag m_updatingFixedColumnCount = AutoResetFlagFactory.Create();
-    private DispatcherOperation m_incrementVersionDispatcherOperation;
-
     #endregion
 
     #region FixedColumnsWidth Internal Property
@@ -275,6 +241,33 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
+    #region MergedNameToOffset Internal Property
+
+    internal abstract IList<IColumnInfoCollection<double>> MergedNameToOffset
+    {
+      get;
+    }
+
+    #endregion
+
+    #region MergedNameToWidth Internal Property
+
+    internal abstract IList<IColumnInfoCollection<double>> MergedNameToWidth
+    {
+      get;
+    }
+
+    #endregion
+
+    #region MergedNameToPostion Internal Property
+
+    internal abstract IList<IColumnInfoCollection<int>> MergedNameToPostion
+    {
+      get;
+    }
+
+    #endregion
+
     #region FixedFieldNames Internal Property
 
     internal abstract IColumnNameCollection FixedFieldNames
@@ -305,14 +298,48 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region FirstViewportColumnFieldNameIndex Internal Property
+    #region FixedMergedNames Internal Property
+
+    internal abstract IList<IColumnNameCollection> FixedMergedNames
+    {
+      get;
+    }
+
+    #endregion
+
+    #region ScrollingMergedNames Internal Property
 
-    internal abstract int FirstViewportColumnFieldNameIndex
+    internal abstract IList<IColumnNameCollection> ScrollingMergedNames
     {
       get;
     }
 
-    protected abstract void SetFirstViewportColumnFieldNameIndex( int value );
+    #endregion
+
+    #region VisibleMergedFieldNames Internal Property
+
+    internal IList<IColumnNameCollection> VisibleMergedFieldNames
+    {
+      get
+      {
+        var fixedFieldNames = this.FixedMergedNames;
+        var scrollingFieldNames = this.ScrollingMergedNames;
+
+        Debug.Assert( fixedFieldNames != null );
+        Debug.Assert( scrollingFieldNames != null );
+        Debug.Assert( fixedFieldNames.Count == scrollingFieldNames.Count );
+
+        var count = fixedFieldNames.Count;
+        var retval = new List<IColumnNameCollection>( count );
+
+        for( int i = 0; i < count; i++ )
+        {
+          retval.Add( new ColumnNameLookup( new IColumnNameCollection[] { fixedFieldNames[ i ], scrollingFieldNames[ i ] } ) );
+        }
+
+        return retval.AsReadOnly();
+      }
+    }
 
     #endregion
 
@@ -345,6 +372,14 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void ScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
     {
+      //If only scrolling vertically, there is no changes to columns in view, thus no need to update this manager, and therefore no need to make FixedCellPanels update.
+      if( e.VerticalChange != 0 )
+      {
+        if( ( e.ExtentHeightChange == 0 ) && ( e.ExtentWidthChange == 0 ) && ( e.HorizontalChange == 0 ) &&
+            ( e.ViewportHeightChange == 0 ) && ( e.ViewportWidthChange == 0 ) )
+          return;
+      }
+
       var dataGridContext = this.DataGridContext;
       if( dataGridContext == null )
         return;
@@ -361,20 +396,9 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void UpdateScrollViewer()
     {
-      DataGridContext dataGridContext = this.DataGridContext;
-
-      if( dataGridContext == null )
-      {
-        this.ScrollViewer = null;
-      }
-      else
-      {
-        var scrollViewer = dataGridContext.DataGridControl.ScrollViewer;
-
-        Debug.Assert( ( scrollViewer != null ) || ( DesignerProperties.GetIsInDesignMode( this ) ) );
+      var dataGridContext = this.DataGridContext;
 
-        this.ScrollViewer = scrollViewer;
-      }
+      this.ScrollViewer = ( dataGridContext != null ) ? dataGridContext.DataGridControl.ScrollViewer : null;
     }
 
     private ScrollViewer m_scrollViewer; //null;
@@ -386,12 +410,37 @@ namespace Xceed.Wpf.DataGrid.Views
     // This event will be use to notify every listener that the DataGridControl's layout has changed and they must at least call MeasureOverride
     public event EventHandler UpdateMeasureRequired;
 
-    protected void RaiseUpdateMeasureRequired( UpdateMeasureRequiredEventArgs args )
+    protected void OnUpdateMeasureRequired( UpdateMeasureRequiredEventArgs e )
     {
-      if( this.UpdateMeasureRequired != null )
-      {
-        this.UpdateMeasureRequired( this, args );
-      }
+      // If the manager is detached, it means it will be soon collected, thus don't send update notifications to FixedCellPanels that can still be hook to it (but being recycled).
+      if( this.DataGridContext == null )
+        return;
+
+      var handler = this.UpdateMeasureRequired;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
+    }
+
+    #endregion
+
+    #region VirtualizingCellCollectionUpdateRequired Public Event
+
+    // This event is raised so FixedCellPanels can update their cell collections accordingly to changes in columns in the ColumnVirtualizingMode they are currently in.
+    public event EventHandler VirtualizingCellCollectionUpdateRequired;
+
+    protected void OnVirtualizingCellCollectionUpdateRequired( VirtualizingCellCollectionUpdateRequiredEventArgs e )
+    {
+      // If the manager is detached, it means it will be soon collected, thus don't send update notifications to FixedCellPanels that can still be hook to it (but being recycled).
+      if( this.DataGridContext == null )
+        return;
+
+      var handler = this.VirtualizingCellCollectionUpdateRequired;
+      if( handler == null )
+        return;
+
+      handler.Invoke( this, e );
     }
 
     #endregion
@@ -404,37 +453,32 @@ namespace Xceed.Wpf.DataGrid.Views
       CollectionChangedEventManager.AddListener( this.DataGridContext.Items.GroupDescriptions, this );
       ColumnActualWidthEventManager.AddListener( this.DataGridContext.Columns, this );
       DataGridControlTemplateChangedEventManager.AddListener( this.DataGridContext.DataGridControl, this );
-      if( this.DataGridContext.SourceDetailConfiguration != null )
-      {
-        FixedColumnCountInfoEventManager.AddListener( this.DataGridContext.SourceDetailConfiguration, this );
-      }
 
       this.UpdateScrollViewer();
 
-      Binding fixedColumnCountBindingBase = new Binding( "FixedColumnCount" );
+      var fixedColumnCountBindingBase = new Binding( TableView.FixedColumnCountProperty.Name );
       fixedColumnCountBindingBase.Source = this.DataGridContext;
       fixedColumnCountBindingBase.Mode = BindingMode.TwoWay;
       BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty, fixedColumnCountBindingBase );
 
-      Binding isColumnVirtualizingEnabledBindingBase = new Binding();
-      isColumnVirtualizingEnabledBindingBase.Source = this.DataGridContext;
-      isColumnVirtualizingEnabledBindingBase.Path = new PropertyPath( TableView.IsColumnVirtualizationEnabledProperty );
-      isColumnVirtualizingEnabledBindingBase.Mode = BindingMode.OneWay;
-      BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.IsVirtualizingProperty, isColumnVirtualizingEnabledBindingBase );
-
-      Binding compensationOffsetBinding = new Binding();
+      var compensationOffsetBinding = new Binding();
       compensationOffsetBinding.Path = new PropertyPath( TableView.CompensationOffsetProperty );
       compensationOffsetBinding.Source = this.DataGridContext;
       compensationOffsetBinding.Mode = BindingMode.OneWay;
       BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty, compensationOffsetBinding );
+
+      var columnVirtualizationModeBindingBase = new Binding();
+      columnVirtualizationModeBindingBase.Source = this.DataGridContext;
+      columnVirtualizationModeBindingBase.Path = new PropertyPath( TableView.ColumnVirtualizationModeProperty.Name );
+      columnVirtualizationModeBindingBase.Mode = BindingMode.OneWay;
+      BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty, columnVirtualizationModeBindingBase );
     }
 
     protected override void Uninitialize()
     {
-      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
-
-      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.IsVirtualizingProperty );
+      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty );
       BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty );
+      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
 
       this.ScrollViewer = null;
 
@@ -443,11 +487,6 @@ namespace Xceed.Wpf.DataGrid.Views
       ColumnActualWidthEventManager.RemoveListener( this.DataGridContext.Columns, this );
       DataGridControlTemplateChangedEventManager.RemoveListener( this.DataGridContext.DataGridControl, this );
 
-      if( this.DataGridContext.SourceDetailConfiguration != null )
-      {
-        FixedColumnCountInfoEventManager.RemoveListener( this.DataGridContext.SourceDetailConfiguration, this );
-      }
-
       base.Uninitialize();
     }
 
@@ -456,182 +495,156 @@ namespace Xceed.Wpf.DataGrid.Views
       this.SetFixedColumnsWidth( 0d );
       this.SetScrollingColumnsWidth( 0d );
       this.SetVisibleColumnsWidth( 0d );
-      this.SetFirstViewportColumnFieldNameIndex( -1 );
 
       this.FieldNameToOffset.Clear();
       this.FieldNameToWidth.Clear();
       this.FieldNameToPosition.Clear();
+      this.MergedNameToOffset.Clear();
+      this.MergedNameToPostion.Clear();
+      this.MergedNameToWidth.Clear();
 
       this.FixedFieldNames.Clear();
       this.ScrollingFieldNames.Clear();
+      this.FixedMergedNames.Clear();
+      this.ScrollingMergedNames.Clear();
     }
 
     protected override void DoUpdate()
     {
-      this.UpdateFixedColumnCount();
-
       var dataGridContext = this.DataGridContext;
-      var columnsByVisiblePosition = dataGridContext.ColumnsByVisiblePosition;
+      Debug.Assert( dataGridContext != null );
 
-      // We can't compute any values if Colums are not yet added to DataGrid
-      if( columnsByVisiblePosition.Count == 0 )
-        return;
+      var columnManager = dataGridContext.ColumnManager;
+      Debug.Assert( columnManager != null );
+
+      // Make sure the fixed column count is up-to-date.
+      this.CoerceValue( TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
 
-      LinkedListNode<ColumnBase> currentColumnNode = columnsByVisiblePosition.First;
-      int currentColumnIndex = 0;
-      double currentTotalWidth = 0d;
-      double currentColumnActualWidth = 0d;
+      //It can happen that the columnManager has not been initialized yet (e.g. when creating a grid in code behind), so make sure markers are not null.
+      var levelMarkers = columnManager.GetLevelMarkersFor( dataGridContext.Columns );
+      if( levelMarkers == null )
+        return;
 
-      int currentFixedColumnCount = 0;
-      ColumnBase currentColumnDataGridContext = dataGridContext.CurrentColumn;
+      var currentLocation = levelMarkers.Start;
+      Debug.Assert( currentLocation != null );
+      Debug.Assert( currentLocation.Type == LocationType.Start );
 
-      double fixedFieldNamesWidth = 0d;
-      double fixedColumnsWidth = 0d;
+      var columnPosition = 0;
+      var visibleColumnsTotalWidth = 0d;
 
-      if( this.FixedColumnCountInternal > 0 )
+      // Fill the data structures for the fixed columns.
+      while( currentLocation.Type != LocationType.Splitter )
       {
-        while( currentColumnNode != null )
+        var columnLocation = currentLocation as ColumnHierarchyManager.IColumnLocation;
+        if( columnLocation != null )
         {
-          // If all Fixed Columns were found
-          if( this.FixedColumnCountInternal == currentFixedColumnCount )
-            break;
-
-          ColumnBase column = currentColumnNode.Value;
+          var column = columnLocation.Column;
+          Debug.Assert( column != null );
 
-          // Ensure we keep the correct visible offset for every columns even if they are Collpased
-          this.FieldNameToOffset[ column ] = currentTotalWidth;
+          // Ensure we keep the correct visible offset for all columns even if they are collpased
+          this.FieldNameToOffset[ column ] = visibleColumnsTotalWidth;
 
-          // The Column is not visible
-          if( !column.Visible )
-          {
-            // Move next
-            currentColumnNode = currentColumnNode.Next;
-            currentColumnIndex++;
-          }
-          else
+          if( column.Visible )
           {
-            this.FieldNameToPosition[ column ] = currentColumnIndex;
-
-            currentColumnActualWidth = column.ActualWidth;
-
-            fixedFieldNamesWidth += currentColumnActualWidth;
-            currentTotalWidth += currentColumnActualWidth;
-
-            this.FieldNameToWidth[ column ] = currentColumnActualWidth;
-
-            // We found a FixedCell
-            if( this.FixedColumnCountInternal > currentFixedColumnCount )
-            {
-              fixedColumnsWidth += currentColumnActualWidth;
+            var width = column.ActualWidth;
 
-              this.FixedFieldNames.Add( column );
+            this.FixedFieldNames.Add( column );
+            this.FieldNameToPosition[ column ] = columnPosition;
+            this.FieldNameToWidth[ column ] = width;
 
-              currentColumnNode = currentColumnNode.Next;
-              currentColumnIndex++;
-              currentFixedColumnCount++;
-            }
-            else
-            {
-              Debug.Assert( this.FixedColumnCount == currentFixedColumnCount );
-            }
+            visibleColumnsTotalWidth += width;
           }
+
+          columnPosition++;
         }
+        else
+        {
+          Debug.Assert( currentLocation.Type != LocationType.Column );
+        }
+
+        currentLocation = currentLocation.GetNextSiblingOrCousin();
+        Debug.Assert( currentLocation != null );
       }
 
-      this.SetFixedColumnsWidth( fixedColumnsWidth );
+      this.SetFixedColumnsWidth( visibleColumnsTotalWidth );
 
-      double horizontalOffset = this.GetHorizontalOffset();
-      double viewportWidth = this.GetViewportWidth();
+      var horizontalOffset = this.GetHorizontalOffset();
+      var viewportWidth = this.GetViewportWidth();
 
-      if( this.IsVirtualizing )
+      if( this.VirtualizationMode != ColumnVirtualizationMode.None )
       {
         // We increment the horizontalOffset to take the fixed columns width into consideration.
-        horizontalOffset += fixedFieldNamesWidth;
-        viewportWidth = Math.Max( 0d, viewportWidth - fixedFieldNamesWidth );
+        horizontalOffset += visibleColumnsTotalWidth;
+        viewportWidth = Math.Max( 0d, viewportWidth - visibleColumnsTotalWidth );
       }
 
-      // We must consider the fixedFieldNamesWidth width when calculating visible indexes in Viewport
-      double viewportMaximumOffset = horizontalOffset + viewportWidth;
-      double scrollingColumnsWidth = 0d;
+      // We must consider the fixed columns width when calculating visible indexes in viewport
+      var viewportMaximumOffset = horizontalOffset + viewportWidth;
+      var visibleScrollingColumnsTotalWidth = 0d;
 
-      while( currentColumnNode != null )
+      // Fill the data structures for the scrolling columns.
+      while( currentLocation.Type != LocationType.Orphan )
       {
-        ColumnBase column = currentColumnNode.Value;
-
-        // Ensure we keep the correct visible offset for every columns even if they are collapsed
-        this.FieldNameToOffset[ column ] = currentTotalWidth;
-
-        if( column.Visible )
+        var columnLocation = currentLocation as ColumnHierarchyManager.IColumnLocation;
+        if( columnLocation != null )
         {
-          bool visibleColumnFieldNameMustBeAdded = false;
-
-          this.FieldNameToPosition[ column ] = currentColumnIndex;
-          currentColumnActualWidth = column.ActualWidth;
-
-          double columnLeftEdgeOffset = currentTotalWidth;
-          double columnRightEdgeOffset = columnLeftEdgeOffset + currentColumnActualWidth;
+          var column = columnLocation.Column;
+          Debug.Assert( column != null );
 
-          currentTotalWidth += currentColumnActualWidth;
-          scrollingColumnsWidth += currentColumnActualWidth;
+          // Ensure we keep the correct visible offset for all columns even if they are collapsed
+          this.FieldNameToOffset[ column ] = visibleColumnsTotalWidth;
 
-          this.FieldNameToWidth[ column ] = currentColumnActualWidth;
-
-          if( this.IsVirtualizing )
+          if( column.Visible )
           {
-            // The cell is before the ViewPort
-            // Cell .... | --- ViewPort --- |
-            bool beforeViewPort = ( horizontalOffset >= columnRightEdgeOffset );
+            var width = column.ActualWidth;
+            var leftEdgeOffset = visibleColumnsTotalWidth;
+            var rightEdgeOffset = leftEdgeOffset + width;
+
+            this.FieldNameToPosition[ column ] = columnPosition;
+            this.FieldNameToWidth[ column ] = width;
 
-            // The cell is after the ViewPort
-            // | --- ViewPort --- | .... Cell
-            bool afterViewPort = ( viewportMaximumOffset <= columnLeftEdgeOffset );
+            visibleColumnsTotalWidth += width;
+            visibleScrollingColumnsTotalWidth += width;
 
-            // Columns are in the ViewPort
-            if( !beforeViewPort && !afterViewPort )
+            if( this.VirtualizationMode != ColumnVirtualizationMode.None )
             {
-              // We keep the index of the first viewport column index to ease the FixedColumn splitter change
-              if( this.FirstViewportColumnFieldNameIndex == -1 )
+              // The column is in the viewport.
+              if( ( leftEdgeOffset < viewportMaximumOffset ) && ( rightEdgeOffset > horizontalOffset ) )
               {
-                this.SetFirstViewportColumnFieldNameIndex( this.ScrollingFieldNames.Count );
+                this.ScrollingFieldNames.Add( column );
               }
-
-              visibleColumnFieldNameMustBeAdded = true;
             }
-          }
-          else
-          {
-            visibleColumnFieldNameMustBeAdded = true;
+            else
+            {
+              this.ScrollingFieldNames.Add( column );
+            }
           }
 
-          if( visibleColumnFieldNameMustBeAdded && ( !this.FixedFieldNames.Contains( column ) ) && ( !this.ScrollingFieldNames.Contains( column ) ) )
-          {
-            this.ScrollingFieldNames.Add( column );
-          }
+          columnPosition++;
+        }
+        else
+        {
+          Debug.Assert( currentLocation.Type != LocationType.Column );
         }
 
-        currentColumnNode = currentColumnNode.Next;
-        currentColumnIndex++;
+        currentLocation = currentLocation.GetNextSiblingOrCousin();
+        Debug.Assert( currentLocation != null );
       }
 
-      this.SetScrollingColumnsWidth( scrollingColumnsWidth );
-      this.SetVisibleColumnsWidth( currentTotalWidth );
+      this.SetScrollingColumnsWidth( visibleScrollingColumnsTotalWidth );
+      this.SetVisibleColumnsWidth( visibleColumnsTotalWidth );
     }
 
-    protected override void IncrementVersion( object parameters )
+    protected override void IncrementVersion( UpdateMeasureRequiredEventArgs e )
     {
-      // If the manager is detached, it means it will be soon collected, thus don't send update notifications to FixedCellPanels that can still be hook to it (but being recycled).
-      if( !m_detached )
-      {
-        base.IncrementVersion( parameters );
-        this.RaiseUpdateMeasureRequired( parameters as UpdateMeasureRequiredEventArgs );
-      }
+      base.IncrementVersion( e );
 
-      m_incrementVersionDispatcherOperation = null;
+      this.OnUpdateMeasureRequired( e );
     }
 
-    protected override void DataGridContext_PropertyChanged( object sender, PropertyChangedEventArgs e )
+    protected override void OnDataGridContextPropertyChanged( PropertyChangedEventArgs e )
     {
-      base.DataGridContext_PropertyChanged( sender, e );
+      base.OnDataGridContextPropertyChanged( e );
 
       Debug.Assert( !string.IsNullOrEmpty( e.PropertyName ) );
 
@@ -646,23 +659,120 @@ namespace Xceed.Wpf.DataGrid.Views
 
         case "CurrentItem":
           // No need to increment version, only notify the current item to invalidate measure
-          this.RaiseUpdateMeasureRequired( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.CurrentItemChanged ) );
+          this.OnUpdateMeasureRequired( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.CurrentItemChanged ) );
           break;
       }
     }
 
-    internal int GetFixedColumnCount()
+    protected override void OnColumnsLayoutChanging()
     {
-      return this.GetFixedColumnCount( -1 );
+      m_columnsVisibilitySnapshot.Clear();
+
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext != null )
+      {
+        // We consult the VisibleColumns collection to figure if a column was visible or not instead
+        // of the ColumnBase.Visible property because the property may already be tainted by a change
+        // at this step.
+        var visibleColumns = ( ReadOnlyColumnCollection )dataGridContext.VisibleColumns;
+
+        foreach( var column in dataGridContext.Columns )
+        {
+          // This line of code is equivalent to
+          //   m_columnsVisibilitySnapshot[ column ] = visibleColumns.Contains( column );
+          // However, the result is found in O(1) instead of O(n).
+          m_columnsVisibilitySnapshot[ column ] = ( visibleColumns[ column.FieldName ] == column );
+        }
+      }
+
+      base.OnColumnsLayoutChanging();
     }
 
-    internal int GetFixedColumnCount( int level )
+    protected override void OnColumnsLayoutChanged()
     {
-      if( level < 0 )
-        return this.FixedColumnCountInternal;
+      var columnsVisibilitySnapshot = new Dictionary<ColumnBase, bool>( m_columnsVisibilitySnapshot );
+      m_columnsVisibilitySnapshot.Clear();
+
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext != null )
+      {
+        // When details are flatten, the detail DataGridContext's FixedColumnCount property is bound to the 
+        // DataGridControl's FixedColumnCount property.  Allowing the value to be changed here would destroy the binding.
+        if( !dataGridContext.IsAFlattenDetail )
+        {
+          var columnManager = dataGridContext.ColumnManager;
+          var fixedColumnCount = columnManager.GetFixedColumnCount();
+
+          Debug.Assert( fixedColumnCount >= 0 );
+
+          this.FixedColumnCount = fixedColumnCount;
+        }
+
+        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnReordering ) );
+
+        var columns = dataGridContext.Columns;
+
+        if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
+        {
+          // Notify the FixedCellPanel that some cells need to be created for new columns.
+          if( ( columnsVisibilitySnapshot.Count < columns.Count ) || ( columns.Any( c => !columnsVisibilitySnapshot.ContainsKey( c ) ) ) )
+          {
+            this.OnVirtualizingCellCollectionUpdateRequired( new VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsAdded ) );
+          }
+        }
 
-      //If the list is empty, it means there is no column in the grid right now, so return 0.
-      return 0;
+        // Figure out the columns that have changed visibility
+        if( columnsVisibilitySnapshot.Count > 0 )
+        {
+          var columnChanges = new List<ColumnBase>();
+
+          foreach( var column in columns )
+          {
+            bool visible;
+
+            if( columnsVisibilitySnapshot.TryGetValue( column, out visible ) && ( column.Visible != visible ) )
+            {
+              columnChanges.Add( column );
+            }
+          }
+
+          if( columnChanges.Count > 0 )
+          {
+            this.OnVirtualizingCellCollectionUpdateRequired( new VirtualizingCellCollectionUpdateRequiredEventArgs( columnChanges ) );
+          }
+        }
+      }
+
+      base.OnColumnsLayoutChanged();
+    }
+
+    protected virtual void OnSortDescriptionsChanged( NotifyCollectionChangedEventArgs e )
+    {
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.SortingChanged ) );
+    }
+
+    protected virtual void OnGroupDescriptionsChanged( NotifyCollectionChangedEventArgs e )
+    {
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.GroupingChanged ) );
+    }
+
+    protected virtual void OnColumnActualWidthChanged( ColumnActualWidthChangedEventArgs e )
+    {
+      // We pass the delta between the old and new value to tell the Panel to reduce the horizontal offset when a column is auto-resized to a smaller value
+      if( e != null )
+      {
+        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged, e.OldValue - e.NewValue ) );
+      }
+      else
+      {
+        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged ) );
+      }
+    }
+
+    protected virtual void OnDataGridControlTemplateChanged()
+    {
+      this.UpdateScrollViewer();
+      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
     }
 
     internal IColumnInfoCollection<double> GetFieldNameToOffset()
@@ -675,6 +785,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.FieldNameToOffset;
 
+      var collection = this.MergedNameToOffset;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToOffset property.
       return new ColumnInfoCollection<double>();
     }
@@ -689,6 +803,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.FieldNameToWidth;
 
+      var collection = this.MergedNameToWidth;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToWidth property.
       return new ColumnInfoCollection<double>();
     }
@@ -703,6 +821,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.FieldNameToPosition;
 
+      var collection = this.MergedNameToPostion;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToPosition property.
       return new ColumnInfoCollection<int>();
     }
@@ -717,6 +839,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.FixedFieldNames;
 
+      var collection = this.FixedMergedNames;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FixedFieldNames property.
       return new ColumnNameCollection();
     }
@@ -731,6 +857,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.ScrollingFieldNames;
 
+      var collection = this.ScrollingMergedNames;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the ScrollingFieldNames property.
       return new ColumnNameCollection();
     }
@@ -745,91 +875,14 @@ namespace Xceed.Wpf.DataGrid.Views
       if( level < 0 )
         return this.VisibleFieldNames;
 
+      var collection = this.VisibleMergedFieldNames;
+      if( collection.Count > 0 )
+        return collection[ level ];
+
       //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the VisibleFieldNames property.
       return new ColumnNameCollection();
     }
 
-    internal void SetFixedColumnCount( int level, int fixedColumnCount, int correctionValue )
-    {
-      var dataGridContext = this.DataGridContext;
-
-      // When details are flatten, the detail DataGridContext's FixedColumnCount property is bound to the 
-      // DataGridControl's FixedColumnCount property.  Allowing the value to be changed here would destroy the binding.
-      if( dataGridContext.IsAFlattenDetail )
-        return;
-
-      if( level == -1 )
-      {
-        this.FixedColumnCountInternal = fixedColumnCount;
-      }
-
-      //Set the top level FixedColumnCount property (at this point, either there is no MergedHeaders so level = -1, or fixedColumnCount has been calculated for level 0).
-      if( !m_updatingFixedColumnCount.IsSet )
-      {
-        using( m_updatingFixedColumnCount.Set() )
-        {
-          this.FixedColumnCount = fixedColumnCount;
-        }
-      }
-    }
-
-    internal int GetFirstViewportColumnFieldNameIndex()
-    {
-      return this.GetFirstViewportColumnFieldNameIndex( -1 );
-    }
-
-    internal int GetFirstViewportColumnFieldNameIndex( int level )
-    {
-      if( level < 0 )
-        return this.FirstViewportColumnFieldNameIndex;
-
-      //If the list is empty, it means there is no merged column in the grid right now, so return 0.
-      return 0;
-    }
-
-    internal void UpdateFixedColumnCountInfo( FixedColumnCountInfoEventArgs e )
-    {
-      this.DataGridContext.IsSettingFixedColumnCount = true;
-
-      //Gather the necessary info to update the FixedColumnCount at each MergedHeader level.
-      m_fixedColumnCountInfo = new FixedColumnCountInfo();
-
-      ColumnBase triggeringColumn = e.TriggeringColumn;
-      if( triggeringColumn == null )
-      {
-        m_fixedColumnCountInfo.Level = e.Level;
-      }
-      else
-      {
-        m_fixedColumnCountInfo.Level = -1;
-      }
-
-      switch( e.UpdateType )
-      {
-        case FixedColumnUpdateType.Hide:
-        case FixedColumnUpdateType.Remove:
-          {
-            m_fixedColumnCountInfo.FixedColumnCount = this.GetFixedColumnCount( m_fixedColumnCountInfo.Level ) - 1;
-            m_fixedColumnCountInfo.CorrectionValue = m_fixedColumnCountInfo.FixedColumnCount >= ( this.GetVisibleColumns( m_fixedColumnCountInfo.Level ).Count - 1 ) ? 1 : 0;
-            break;
-          }
-
-        case FixedColumnUpdateType.Show:
-          {
-            m_fixedColumnCountInfo.FixedColumnCount = this.GetFixedColumnCount( m_fixedColumnCountInfo.Level ) + 1;
-            m_fixedColumnCountInfo.CorrectionValue = m_fixedColumnCountInfo.FixedColumnCount > 0 ? 1 : 0;
-            break;
-          }
-
-        case FixedColumnUpdateType.Update:
-          {
-            m_fixedColumnCountInfo.FixedColumnCount = this.GetFixedColumnCount( m_fixedColumnCountInfo.Level );
-            m_fixedColumnCountInfo.CorrectionValue = m_fixedColumnCountInfo.FixedColumnCount >= ( this.GetVisibleColumns( m_fixedColumnCountInfo.Level ).Count - 1 ) ? 1 : 0;
-            break;
-          }
-      }
-    }
-
     private string FindFirstVisibleFocusableColumnFieldName( LinkedListNode<ColumnBase> startNode, Func<LinkedListNode<ColumnBase>, LinkedListNode<ColumnBase>> getNextNodeHandler )
     {
       if( getNextNodeHandler == null )
@@ -887,7 +940,7 @@ namespace Xceed.Wpf.DataGrid.Views
     private double GetViewportWidth()
     {
       // Viewport is only required when UI Virtualization is on.
-      if( !this.IsVirtualizing )
+      if( this.VirtualizationMode == ColumnVirtualizationMode.None )
         return 0d;
 
       IScrollInfo scrollInfo = null;
@@ -913,170 +966,103 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private IList<ColumnBase> GetVisibleColumns( int level )
     {
-
-      if( level != -1 )
-        throw new ArgumentException( "Not expecting merged headers in this version of the datagrid" );
-
       return this.DataGridContext.VisibleColumns;
     }
 
-    private void OnColumnReordering( FixedCellPanel panel, ColumnReorderingEventArgs e )
+    private ColumnCollection GetColumnCollectionForLevel( int level )
     {
-      // We must be sure the VisiblePosition is converted to visible index since some Columns can be Visible = false
-      int oldVisiblePosition = FixedCellPanel.CalculateVisibleIndex( e.OldVisiblePosition, panel.ColumnsByVisiblePosition );
-      int newVisiblePosition = FixedCellPanel.CalculateVisibleIndex( e.NewVisiblePosition, panel.ColumnsByVisiblePosition );
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext == null )
+        return null;
 
-      int correctionValue = 0;
-      int level = panel.ParentRow.LevelCache;
-      int columnCount = this.GetFixedColumnCount( level );
+      if( level < 0 )
+        return dataGridContext.Columns;
 
-      if( ( oldVisiblePosition < columnCount ) && ( newVisiblePosition >= columnCount ) )
-      {
-        // A column has moved from the fixedPanel to the scrollingPanel.  Do not increment version, it will be done by the FixedColumnCount changed
-        columnCount--;
-        if( columnCount > 0 )
-        {
-          correctionValue = 1;
-        }
+      return null;
+    }
 
-        //Set fixed column count at all merged header levels.
-        this.SetFixedColumnCount( level, columnCount, correctionValue );
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetChildLocations( ColumnHierarchyManager.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      }
-      else if( ( oldVisiblePosition >= columnCount ) && ( newVisiblePosition < columnCount ) )
-      {
-        // A column has moved from the scrollingPanel to the fixedPanel.  Do not increment version, it will be done by the FixedColumnCount changed
-        columnCount++;
-        if( columnCount == this.GetVisibleColumns( level ).Count )
-        {
-          correctionValue = 1;
-        }
+      location = location.GetFirstChild();
 
-        //Set fixed column count at all merged header levels.
-        this.SetFixedColumnCount( level, columnCount, correctionValue );
-      }
-      else
+      while( location != null )
       {
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnReordering ) );
-      }
+        yield return location;
 
-      // This must be done to stop progation of the event even if only one ColumnManagerCell will raise it.
-      e.Handled = true;
+        location = location.GetNextSibling();
+      }
     }
 
-    #region IWeakEventListener Members
+    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
+    {
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
 
-    protected override bool OnReceivedWeakEvent( Type managerType, object sender, EventArgs e )
+      return ( from location in locations
+               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
+               where ( columnLocation != null )
+               select columnLocation );
+    }
+
+    private double GetVisibleChildColumnsWidth( ColumnHierarchyManager.ILocation parentLocation )
     {
-      bool handled = true;
-      bool detach = false;
-      DataGridContext dataGridContext = this.DataGridContext;
+      var width = 0d;
 
-      if( managerType == typeof( VisibleColumnsUpdatedEventManager ) )
+      foreach( var columnLocation in this.GetColumnLocations( this.GetChildLocations( parentLocation ) ) )
       {
-        var eventArgs = e as VisibleColumnsUpdatedEventArgs;
-
-        //If flag is true, no need to update all the FixedCellPanel's at this time, but make sure it will be update before it is used again.
-        if( eventArgs != null && eventArgs.OnlyIncrementFlag )
+        var column = columnLocation.Column;
+        if( column.Visible )
         {
-          base.IncrementVersion( null );
+          width += column.ActualWidth;
         }
-        else
-        {
-          var detailConfig = this.DataGridContext.SourceDetailConfiguration;
+      }
 
-          //Make sure the FixedColumnCount is valid at each MergedHeader level
-          if( this.FixedColumnCount != 0 && ( this.DataGridContext.IsSettingFixedColumnCount || ( detailConfig != null && detailConfig.IsSettingFixedColumnCount ) ) )
-          {
-            if( m_fixedColumnCountInfo != null )
-            {
-              this.SetFixedColumnCount( m_fixedColumnCountInfo.Level, m_fixedColumnCountInfo.FixedColumnCount, m_fixedColumnCountInfo.CorrectionValue );
-              m_fixedColumnCountInfo = null;
-            }
+      return width;
+    }
 
-            this.DataGridContext.IsSettingFixedColumnCount = false;
-            if( detailConfig != null )
-            {
-              detailConfig.IsSettingFixedColumnCount = false;
-            }
-          }
+    #region IWeakEventListener Members
 
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnReordering ) );
-        }
-      }
-      else if( managerType == typeof( CollectionChangedEventManager ) )
+    protected override bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      var handled = true;
+      var dataGridContext = this.DataGridContext;
+
+      if( managerType == typeof( CollectionChangedEventManager ) )
       {
         if( sender == dataGridContext.Items.SortDescriptions )
         {
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.SortingChanged ) );
+          this.OnSortDescriptionsChanged( ( NotifyCollectionChangedEventArgs )e );
         }
         else if( sender == dataGridContext.Items.GroupDescriptions )
         {
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.GroupingChanged ) );
+          this.OnGroupDescriptionsChanged( ( NotifyCollectionChangedEventArgs )e );
         }
       }
       else if( managerType == typeof( ColumnActualWidthEventManager ) )
       {
-        var args = e as ColumnActualWidthChangedEventArgs;
-
-        // We pass the delta between the old and new value to tell the Panel to reduce the horizontal offset when a column is auto-resized to a smaller value
-        if( args != null )
-        {
-          double delta = args.OldValue - args.NewValue;
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged, delta ) );
-        }
-        else
-        {
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged ) );
-        }
-      }
-      else if( managerType == typeof( FixedColumnCountInfoEventManager ) )
-      {
-        var infoEventArgs = e as FixedColumnCountInfoEventArgs;
-        this.UpdateFixedColumnCountInfo( infoEventArgs );
-      }
-      else if( managerType == typeof( ViewChangedEventManager ) )
-      {
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-
-        detach = true;
-      }
-      else if( managerType == typeof( ThemeChangedEventManager ) )
-      {
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-
-        detach = true;
+        this.OnColumnActualWidthChanged( e as ColumnActualWidthChangedEventArgs );
       }
       else if( managerType == typeof( DataGridControlTemplateChangedEventManager ) )
       {
-        this.UpdateScrollViewer();
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-      }
-      else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
-      {
-        detach = true;
+        this.OnDataGridControlTemplateChanged();
       }
       else
       {
         handled = false;
       }
 
-      if( detach && ( dataGridContext != null ) )
-      {
-        // Detach the ColumnVirtualizationManager from the DataGridContext.
-        ColumnVirtualizationManager.SetColumnVirtualizationManager( dataGridContext, null );
-        m_detached = true;
-
-        this.Uninitialize();
-      }
+      if( !base.OnReceiveWeakEvent( managerType, sender, e ) )
+        return handled;
 
-      return handled;
+      return true;
     }
 
     #endregion
 
-    private FixedColumnCountInfo m_fixedColumnCountInfo;
-    private bool m_detached;
+    private readonly Dictionary<ColumnBase, bool> m_columnsVisibilitySnapshot = new Dictionary<ColumnBase, bool>();
 
     internal sealed class ColumnNameCollection : IColumnNameCollection
     {
@@ -1362,79 +1348,5 @@ namespace Xceed.Wpf.DataGrid.Views
 
       private readonly List<IColumnNameCollection> m_collection;
     }
-
-    private sealed class RoutedEventManager
-    {
-      private static RoutedEventManager Singleton;
-      private static int Registered; //0
-
-      private RoutedEventManager()
-      {
-      }
-
-      internal static RoutedEventManager Instance
-      {
-        get
-        {
-          if( RoutedEventManager.Singleton == null )
-          {
-            Interlocked.CompareExchange<RoutedEventManager>( ref RoutedEventManager.Singleton, new RoutedEventManager(), null );
-          }
-
-          return RoutedEventManager.Singleton;
-        }
-      }
-
-      internal void Register()
-      {
-        if( Interlocked.CompareExchange( ref RoutedEventManager.Registered, 1, 0 ) == 1 )
-          return;
-
-        // Register to ColumnManagerCell.ColumnReorderingEvent on FixedCellPanel type
-        // to be notified the corret DataGridContext level
-        EventManager.RegisterClassHandler(
-          typeof( FixedCellPanel ),
-          ColumnManagerCell.ColumnReorderingEvent,
-          new ColumnReorderingEventHandler( RoutedEventManager.OnColumnReordering ) );
-      }
-
-      private static void OnColumnReordering( object sender, ColumnReorderingEventArgs e )
-      {
-        var panel = sender as FixedCellPanel;
-        if( panel == null )
-          return;
-
-        var dataGridContext = DataGridControl.GetDataGridContext( panel );
-        if( dataGridContext == null )
-          return;
-
-        var manager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-        if( manager == null )
-          return;
-
-        manager.OnColumnReordering( panel, e );
-      }
-    }
-
-    private class FixedColumnCountInfo
-    {
-      internal int Level
-      {
-        get;
-        set;
-      }
-
-      internal int FixedColumnCount
-      {
-        get;
-        set;
-      }
-
-      internal int CorrectionValue
-      {
-        get;
-        set;
-      }
-    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
index 2754eece..b61610da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -56,7 +53,6 @@ namespace Xceed.Wpf.DataGrid.Views
     GroupingChanged,
     ScrollViewerChanged,
     SortingChanged,
-    VirtualizationStateChanged, // On / Off Virtualization
-    ViewPortWidthChanged, // Parent viewport resized
+    ViewPortWidthChanged // Parent viewport resized
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs
new file mode 100644
index 00000000..fb8daa4f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs
@@ -0,0 +1,63 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.DataGrid.Views
+{
+  internal sealed class VirtualizingCellCollectionUpdateRequiredEventArgs : EventArgs
+  {
+    internal VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction action )
+    {
+      if( action == VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged )
+        throw new ArgumentException( "The action must be anything but VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged.", "action" );
+
+      this.TriggeredAction = action;
+    }
+
+    internal VirtualizingCellCollectionUpdateRequiredEventArgs( IList<ColumnBase> columns )
+    {
+      if( columns == null )
+        throw new ArgumentNullException( "columns" );
+
+      if( columns.Count <= 0 )
+        throw new ArgumentException( "The column count must be greater than zero.", "columns" );
+
+      this.TriggeredAction = VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged;
+      this.Columns = columns;
+    }
+
+    internal VirtualizingCellCollectionUpdateTriggeredAction TriggeredAction
+    {
+      get;
+      private set;
+    }
+
+    internal IList<ColumnBase> Columns
+    {
+      get;
+      private set;
+    }
+  }
+
+  internal enum VirtualizingCellCollectionUpdateTriggeredAction
+  {
+    VirtualizationModeChanged, //Virtualizing and recycling cells.
+    VisibleColumnsAdded,
+    VisibleColumnsChanged
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs
similarity index 53%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountEventManager.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs
index e13d4114..7fdcf9e4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/FixedColumnCountEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs
@@ -1,78 +1,78 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class FixedColumnCountInfoEventManager : WeakEventManager
-  {
-    private FixedColumnCountInfoEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a DetailConfiguration." );
-
-      detailConfiguration.FixedColumnCountChanged += this.OnFixedColumnCountChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      var detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a DetailConfiguration." );
-
-      detailConfiguration.FixedColumnCountChanged -= this.OnFixedColumnCountChanged;
-    }
-
-    private static FixedColumnCountInfoEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( FixedColumnCountInfoEventManager );
-        FixedColumnCountInfoEventManager currentManager = ( FixedColumnCountInfoEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new FixedColumnCountInfoEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnFixedColumnCountChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.DataGrid.Views
+{
+  internal class VirtualizingCellCollectionUpdateRequiredEventManager : WeakEventManager
+  {
+    private VirtualizingCellCollectionUpdateRequiredEventManager()
+    {
+    }
+
+    public static void AddListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedAddListener( source, listener );
+    }
+
+    public static void RemoveListener( object source, IWeakEventListener listener )
+    {
+      CurrentManager.ProtectedRemoveListener( source, listener );
+    }
+
+    protected override void StartListening( object source )
+    {
+      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
+      if( columnVirtualizationManager == null )
+        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
+
+      columnVirtualizationManager.VirtualizingCellCollectionUpdateRequired += this.OnVirtualizingCellCollectionUpdateRequired;
+    }
+
+    protected override void StopListening( object source )
+    {
+      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
+      if( columnVirtualizationManager == null )
+        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
+
+      columnVirtualizationManager.VirtualizingCellCollectionUpdateRequired -= this.OnVirtualizingCellCollectionUpdateRequired;
+    }
+
+    private static VirtualizingCellCollectionUpdateRequiredEventManager CurrentManager
+    {
+      get
+      {
+        Type managerType = typeof( VirtualizingCellCollectionUpdateRequiredEventManager );
+        VirtualizingCellCollectionUpdateRequiredEventManager currentManager = ( VirtualizingCellCollectionUpdateRequiredEventManager )WeakEventManager.GetCurrentManager( managerType );
+
+        if( currentManager == null )
+        {
+          currentManager = new VirtualizingCellCollectionUpdateRequiredEventManager();
+          WeakEventManager.SetCurrentManager( managerType, currentManager );
+        }
+
+        return currentManager;
+      }
+    }
+
+    private void OnVirtualizingCellCollectionUpdateRequired( object sender, EventArgs args )
+    {
+      this.DeliverEvent( sender, args );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
index 7afa1935..2d310342 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
@@ -19,7 +19,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -36,28 +35,36 @@ namespace Xceed.Wpf.DataGrid.Views
       // This can be null when the parent Row is not prepared yet.
       var columnVirtualizationManager = this.ColumnVirtualizationManager;
       if( columnVirtualizationManager == null )
-        return this.DesiredSize;
+        return new Size();
+
+      var parentRow = this.ParentPanel.ParentRow;
+      if( parentRow == null )
+        return new Size();
 
       var desiredSize = new Size();
-      var columnToVisibleWidth = columnVirtualizationManager.GetFieldNameToWidth( this.ParentPanel.ParentRow.LevelCache );
+      var columnToVisibleWidth = columnVirtualizationManager.GetFieldNameToWidth( parentRow.LevelCache );
 
-      foreach( var cell in this.GetCellsToLayout() )
+      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
+      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
       {
-        double width;
-
-        if( columnToVisibleWidth.TryGetValue( cell.FieldName, out width ) )
-        {
-          cell.Measure( new Size( width, constraint.Height ) );
-        }
-        else
-        {
-          // The cell will be hidden.
-          cell.Measure( new Size() );
-        }
-
-        if( cell.DesiredSize.Height > desiredSize.Height )
+        foreach( var cell in this.GetCellsToLayout() )
         {
-          desiredSize.Height = cell.DesiredSize.Height;
+          double width;
+
+          if( columnToVisibleWidth.TryGetValue( cell.FieldName, out width ) )
+          {
+            cell.Measure( new Size( width, constraint.Height ) );
+          }
+          else
+          {
+            // The cell will be hidden.
+            cell.Measure( new Size() );
+          }
+
+          if( cell.DesiredSize.Height > desiredSize.Height )
+          {
+            desiredSize.Height = cell.DesiredSize.Height;
+          }
         }
       }
 
@@ -72,31 +79,34 @@ namespace Xceed.Wpf.DataGrid.Views
       // This can be null when the parent Row is not prepared yet.
       var columnVirtualizationManager = this.ColumnVirtualizationManager;
       if( columnVirtualizationManager == null )
-        return this.DesiredSize;
+        return new Size();
 
-      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( this.ParentPanel.ParentRow.LevelCache );
+      var parentRow = this.ParentPanel.ParentRow;
+      if( parentRow == null )
+        return new Size();
 
-      ScrollViewer parentScrollViewer = this.DataGridContext.DataGridControl.ScrollViewer;
-      double horizontalOffset = parentScrollViewer.HorizontalOffset;
-      double fixedColumnVisibleWidth = columnVirtualizationManager.FixedColumnsWidth;
-      double firstColumnCompensationOffset = columnVirtualizationManager.FirstColumnCompensationOffset;
-      Rect finalRect = new Rect( arrangeSize );
+      var dataGridContext = this.DataGridContext;
+      var scrollViewer = ( dataGridContext != null ) ? dataGridContext.DataGridControl.ScrollViewer : null;
 
-      foreach( var cell in this.GetCellsToLayout() )
-      {
-        // Calculate the offset of the Cell:
-        //    The original offset of the Column
-        //    - the horizontal offset of the ScrollViewer to scroll to the right
-        //    - the width of the fixed columns since we are in the Scrolling FixedCellSubPanel
-        //    + the compensation offset used in master detail to avoid scrolling when not required 
+      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( parentRow.LevelCache );
+      var horizontalOffset = ( scrollViewer != null ) ? scrollViewer.HorizontalOffset : 0d;
+      var fixedColumnsWidth = columnVirtualizationManager.FixedColumnsWidth;
+      var compensationOffset = columnVirtualizationManager.FirstColumnCompensationOffset;
+      var finalRect = new Rect( arrangeSize );
 
-        double cellOffset = columnToVisibleOffset[ cell.FieldName ] - horizontalOffset - fixedColumnVisibleWidth + firstColumnCompensationOffset;
+      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
+      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
+      {
+        foreach( var cell in this.GetCellsToLayout() )
+        {
+          var offset = this.CalculateCellOffset( cell.ParentColumn, columnToVisibleOffset, horizontalOffset, fixedColumnsWidth, compensationOffset );
 
-        finalRect.X = cellOffset;
-        finalRect.Width = cell.DesiredSize.Width;
-        finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
+          finalRect.X = offset.X;
+          finalRect.Width = cell.DesiredSize.Width;
+          finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
 
-        cell.Arrange( finalRect );
+          cell.Arrange( finalRect );
+        }
       }
 
       return arrangeSize;
@@ -111,6 +121,49 @@ namespace Xceed.Wpf.DataGrid.Views
       return columnVirtualizationManager.GetScrollingFieldNames( this.ParentPanel.ParentRow.LevelCache );
     }
 
+    internal override Point CalculateCellOffset( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+      var row = this.ParentPanel.ParentRow;
+
+      if( ( column != null ) && ( row != null ) )
+      {
+        var dataGridContext = this.DataGridContext;
+        var columnVirtualizationManager = this.ColumnVirtualizationManager;
+
+        if( ( dataGridContext != null ) && ( columnVirtualizationManager != null ) )
+        {
+          var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( row.LevelCache );
+          var scrollViewer = dataGridContext.DataGridControl.ScrollViewer;
+          var horizontalOffset = ( scrollViewer != null ) ? scrollViewer.HorizontalOffset : 0d;
+          var fixedColumnsWidth = columnVirtualizationManager.FixedColumnsWidth;
+          var compensationOffset = columnVirtualizationManager.FirstColumnCompensationOffset;
+
+          return this.CalculateCellOffset( column, columnToVisibleOffset, horizontalOffset, fixedColumnsWidth, compensationOffset );
+        }
+      }
+
+      return new Point();
+    }
+
+    private Point CalculateCellOffset( ColumnBase column, IColumnInfoCollection<double> columnsOffset, double horizontalOffset, double fixedColumnsWidth, double compensationOffset )
+    {
+      if( column == null )
+        return new Point();
+
+      Debug.Assert( columnsOffset != null );
+      Debug.Assert( columnsOffset.Contains( column ) );
+
+      var columnOffset = columnsOffset[ column ];
+
+      // Calculate the offset of the cell's parent column:
+      //    The original offset of the Column
+      //    - the horizontal offset of the ScrollViewer to scroll to the right
+      //    - the width of the fixed columns since we are in the Scrolling FixedCellSubPanel
+      //    + the compensation offset used in master detail to avoid scrolling when not required 
+      return new Point( columnOffset - horizontalOffset - fixedColumnsWidth + compensationOffset, 0d );
+    }
+
     private IEnumerable<Cell> GetCellsToLayout()
     {
       var visibleCells = this.GetVisibleCells();
@@ -122,11 +175,11 @@ namespace Xceed.Wpf.DataGrid.Views
         return visibleCells;
 
       // Make sure we have access to the collection containing the additional cells to be layouted.
-      var cellsCollection = this.ParentPanel.ParentRowCells;
-      if( cellsCollection == null )
+      var parentRowCells = this.ParentPanel.ParentRowCells;
+      if( parentRowCells == null )
         return visibleCells;
 
-      return this.GetCellsToLayout( visibleCells, permanentScrollingFieldNames, cellsCollection );
+      return this.GetCellsToLayout( visibleCells, permanentScrollingFieldNames, parentRowCells );
     }
 
     private IEnumerable<Cell> GetCellsToLayout( IEnumerable<Cell> visibleCells, IEnumerable<string> permanentScrollingFieldNames, VirtualizingCellCollection cellsCollection )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
index de11e6e8..e40406d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
@@ -50,14 +50,16 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       if( fixedPanel == null )
         throw new ArgumentNullException( "fixedPanel" );
+
       if( scrollingPanel == null )
         throw new ArgumentNullException( "scrollingPanel" );
+
       if( parentFixedCellPanel == null )
         throw new ArgumentNullException( "parentFixedCellPanel" );
 
       m_fixedPanel = fixedPanel;
       m_scrollingPanel = scrollingPanel;
-      m_parentFixedCellPanel = parentFixedCellPanel;
+      m_parentVirtualizingCellsHost = parentFixedCellPanel as IVirtualizingCellsHost;
     }
 
     public override int Capacity
@@ -185,6 +187,7 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           return m_fixedPanel.Children[ index ];
         }
+
         return m_scrollingPanel.Children[ index - fixedCount ];
       }
       set
@@ -193,12 +196,20 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    public void SetCellLogicalParent( UIElement targetElement )
+    public void ClearCellLogicalParent( UIElement targetElement )
     {
-      IVirtualizingCellsHost virtualizingCellsHost = m_parentFixedCellPanel as IVirtualizingCellsHost;
+      if( ( m_parentVirtualizingCellsHost != null ) && ( m_parentVirtualizingCellsHost.CanModifyLogicalParent == false ) )
+      {
+        this.ClearLogicalParent( targetElement );
+      }
+    }
 
-      if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent == false ) )
+    public void SetCellLogicalParent( UIElement targetElement )
+    {
+      if( ( m_parentVirtualizingCellsHost != null ) && ( m_parentVirtualizingCellsHost.CanModifyLogicalParent == false ) )
+      {
         this.SetLogicalParent( targetElement );
+      }
     }
 
     private void IncrementVersion()
@@ -211,7 +222,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private Panel m_fixedPanel;
     private Panel m_scrollingPanel;
-    private FixedCellPanel m_parentFixedCellPanel;
+    private IVirtualizingCellsHost m_parentVirtualizingCellsHost;
     private int m_version;
 
     private class CombinedEnumerator : IEnumerator
@@ -232,15 +243,11 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           //Enumerator not started.
           if( m_fixedEnumerator == null )
-          {
             throw new InvalidOperationException();
-          }
 
           //If enumerating through fixed panel
           if( m_fixed == true )
-          {
             return m_fixedEnumerator.Current;
-          }
 
           //otherwise, use the scrolling enumerator
           return m_scrollingEnumerator.Current;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs
new file mode 100644
index 00000000..b57795de
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs
@@ -0,0 +1,25 @@
+/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.DataGrid.Views
+{
+  public enum ColumnVirtualizationMode
+  {
+    None,
+    Recycling,
+    Virtualizing
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
index 3c1f85fc..476dac4c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
@@ -16,46 +16,62 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using Xceed.Utils.Wpf.DragDrop;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
-  internal class ColumnReorderingDragSourceManager : DragSourceManager
+  internal sealed class ColumnReorderingDragSourceManager : DragSourceManager
   {
-    public ColumnReorderingDragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer, int level )
-      : this( draggedElement, adornerLayerInsideDragContainer, dragContainer, true )
+    #region Private Fields
+
+    private static readonly Duration s_columnAnimationDuration = new Duration( TimeSpan.FromMilliseconds( 500d ) );
+    private static readonly Duration s_draggedElementFadeInDuration = new Duration( TimeSpan.FromMilliseconds( 250d ) );
+    private static readonly Duration s_returnToOriginalPositionDuration = new Duration( TimeSpan.FromMilliseconds( 250d ) );
+
+    private static readonly Point s_origin = new Point();
+
+    #endregion
+
+    internal ColumnReorderingDragSourceManager( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, int level )
+      : base( draggedElement, adornerLayer, container )
     {
       m_level = level;
-    }
+      m_dataGridContext = DataGridControl.GetDataGridContext( draggedElement );
 
-    public ColumnReorderingDragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer, bool enableAutoScroll )
-      : this( draggedElement, adornerLayerInsideDragContainer, dragContainer, enableAutoScroll, true )
-    {
-    }
+      Debug.Assert( m_dataGridContext != null );
 
-    public ColumnReorderingDragSourceManager( UIElement draggedElement, AdornerLayer adornerLayerInsideDragContainer, UIElement dragContainer, bool enableAutoScroll,
-                                              bool showDraggedElementGhost )
-      : base( draggedElement, adornerLayerInsideDragContainer, dragContainer, enableAutoScroll, showDraggedElementGhost )
-    {
+      m_splitterTranslation = TableflowView.GetFixedColumnSplitterTranslation( m_dataGridContext );
+      m_columnVirtualizationManager = m_dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
+      m_reorderCancelled = false;
     }
 
-    #region IsAnimatedColumnReorderingEnabled Public Property
+    #region IsAnimatedColumnReorderingEnabled Internal Property
 
-    public bool IsAnimatedColumnReorderingEnabled
+    internal bool IsAnimatedColumnReorderingEnabled
     {
-      get;
-      set;
+      get
+      {
+        return m_isAnimatedColumnReorderingEnabled;
+      }
+      private set
+      {
+        if( value == m_isAnimatedColumnReorderingEnabled )
+          return;
+
+        m_isAnimatedColumnReorderingEnabled = value;
+
+        this.OnPropertyChanged( "IsAnimatedColumnReorderingEnabled" );
+      }
     }
 
+    private bool m_isAnimatedColumnReorderingEnabled;
+
     #endregion
 
     #region AnimatedColumnReorderingTranslation Attached Property
@@ -73,424 +89,301 @@ namespace Xceed.Wpf.DataGrid.Views
       return ( TransformGroup )obj.GetValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
     }
 
-    internal static void SetAnimatedColumnReorderingTranslation( DependencyObject obj, TransformGroup value )
+    private static void SetAnimatedColumnReorderingTranslation( DependencyObject obj, TransformGroup value )
     {
       obj.SetValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty, value );
     }
 
-    private static TranslateTransform GetAnimatedColumnReorderingPositionTransform( DependencyObject obj )
-    {
-      TransformGroup transformGroup = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( obj );
-      if( transformGroup == null )
-      {
-        transformGroup = ColumnReorderingDragSourceManager.CreateTransformGroup( obj );
-      }
-      return transformGroup.Children[ 0 ] as TranslateTransform;
-    }
-
-    private static TransformGroup GetAnimatedColumnReorderingTransformGroup( DependencyObject obj )
+    private static void ClearAnimatedColumnReorderingTranslation( DependencyObject obj )
     {
-      TransformGroup transformGroup = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( obj );
-      if( transformGroup == null )
+      var group = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( obj );
+      if( group != null )
       {
-        transformGroup = ColumnReorderingDragSourceManager.CreateTransformGroup( obj );
+        ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( ColumnReorderingDragSourceManager.GetColumnPositionTransform( group ) );
+        ColumnReorderingDragSourceManager.ClearScaleTransformAnimation( ColumnReorderingDragSourceManager.GetColumnSizeTransform( group ) );
       }
 
-      return transformGroup;
+      obj.ClearValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
     }
 
-    private static TransformGroup CreateTransformGroup( DependencyObject obj )
+    private static TransformGroup CreateColumnTransformGroup()
     {
-      TransformGroup transformGroup = new TransformGroup();
-      transformGroup.Children.Add( new TranslateTransform() );
-      transformGroup.Children.Add( new ScaleTransform() );
-      ColumnReorderingDragSourceManager.SetAnimatedColumnReorderingTranslation( obj, transformGroup );
+      var group = new TransformGroup();
+      group.Children.Add( new TranslateTransform() );
+      group.Children.Add( new ScaleTransform() );
 
-      return transformGroup;
+      return group;
     }
 
-    #endregion
-
-    #region ColumnAnimationDuration Public Property
-
-    public int ColumnAnimationDuration
+    private static TransformGroup GetColumnTransformGroup( ColumnBase column )
     {
-      get
-      {
-        return m_columnAnimationDurationCache;
-      }
-      set
+      if( column == null )
+        return null;
+
+      var group = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( column );
+      if( group == null )
       {
-        if( m_columnAnimationDurationCache != value )
-        {
-          m_columnAnimationDurationCache = value;
-          // Keep a cache of the duration as a Duration struct for performance
-          m_columnAnimationDuration = new Duration( TimeSpan.FromMilliseconds( m_columnAnimationDurationCache ) );
-        }
+        group = ColumnReorderingDragSourceManager.CreateColumnTransformGroup();
+        ColumnReorderingDragSourceManager.SetAnimatedColumnReorderingTranslation( column, group );
       }
-    }
 
-    #endregion
-
-    #region DraggedElementFadeInDuration Public Property
+      Debug.Assert( group != null );
 
-    public int DraggedElementFadeInDuration
-    {
-      get;
-      set;
+      return group;
     }
 
-    #endregion
-
-    #region ReturnToOriginalPositionDuration Public Property
-
-    public int ReturnToOriginalPositionDuration
+    private static TranslateTransform GetColumnPositionTransform( TransformGroup group )
     {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DraggedDataGridContext Private Property
+      if( ( group == null ) || ( group.Children.Count <= 0 ) )
+        return null;
 
-    private DataGridContext DraggedDataGridContext
-    {
-      get;
-      set;
+      return group.Children[ 0 ] as TranslateTransform;
     }
 
-    #endregion
-
-    #region VisibleColumns Property
-
-    private ReadOnlyObservableCollection<ColumnBase> VisibleColumns
+    private static ScaleTransform GetColumnSizeTransform( TransformGroup group )
     {
-      get
-      {
-        return this.DraggedDataGridContext.VisibleColumns;
-      }
+      if( ( group == null ) || ( group.Children.Count <= 1 ) )
+        return null;
+
+      return group.Children[ 1 ] as ScaleTransform;
     }
 
     #endregion
 
-    #region FixedColumnSplitterTranslation Private Property
-
-    private TranslateTransform FixedColumnSplitterTranslation
+    protected override void OnDragStart( Func<IInputElement, Point> getPosition )
     {
-      get;
-      set;
-    }
-
-    #endregion
+      if( m_isDragStarted )
+        throw new InvalidOperationException();
 
-    #region ColumnVirtualizationManager Private Property
+      m_isDragStarted = true;
 
-    private TableViewColumnVirtualizationManagerBase ColumnVirtualizationManager
-    {
-      get;
-      set;
-    }
+      this.StopAnimationsAndRollback();
+      this.UpdateIsAnimatedColumnReorderingEnabled();
 
-    #endregion
+      base.OnDragStart( getPosition );
 
-    #region ReorderingInfoManagerInstance Private Read-Only Singleton Property
+      var draggedElement = this.DraggedElement;
 
-    private ReorderingInfoManager ReorderingInfoManagerInstance
-    {
-      get
+      //When the grid is hosted in a popup window, it is not possible to know the position of the popup in certain scenarios (e.g. fullscreen, popup openning upward).
+      //Thus we must use a regular system adorner instead of the ghost window, so that the dragged adorner will appear correctly under the mouse pointer.
+      if( this.IsPopup )
       {
-        if( m_reorderingInfoManager == null )
-        {
-          m_reorderingInfoManager = new ReorderingInfoManager( m_level );
-        }
-
-        return m_reorderingInfoManager;
+        this.SetPopupDragAdorner( draggedElement as ColumnManagerCell );
       }
-    }
 
-    #endregion
-
-    public void AddDraggedColumnGhost( UIElement element )
-    {
-      if( ( element == null ) || m_elementToDraggedElementAdorner.ContainsKey( element ) )
+      if( !this.IsAnimatedColumnReorderingEnabled )
+      {
+        this.AutoScrollInterval = TimeSpan.FromMilliseconds( 50d );
         return;
+      }
 
-      // Get the Rect for the DataGridControl
-      DataGridControl dataGridControl = this.DraggedDataGridContext.DataGridControl;
-
-      Rect dataGridControlRect = new Rect( 0, 0, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
-
-      Point elementToDataGridControl = element.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, dataGridControl );
+      this.AutoScrollInterval = TimeSpan.Zero;
 
-      // Get the Rect for the element that request a ghost
-      Rect elementRect = new Rect( elementToDataGridControl, element.RenderSize );
+      // Get initial mouse positions
+      m_lastDraggedElementOffset = draggedElement.TranslatePoint( getPosition.Invoke( draggedElement ), this.Container ).X;
 
-      // This is a special case with the current Element that is always layouted, but can be out of view
-      if( !elementRect.IntersectsWith( dataGridControlRect ) )
-        return;
+      var draggedCell = draggedElement as ColumnManagerCell;
+      if( draggedCell != null )
+      {
+        var draggedColumn = draggedCell.ParentColumn;
+        Debug.Assert( draggedColumn != null );
 
-      AnimatedDraggedElementAdorner adorner = new AnimatedDraggedElementAdorner( element, this.AdornerLayerInsideDragContainer, true );
+        this.TakeColumnsLayoutSnapshot();
 
-      this.ApplyContainerClip( adorner );
+        // Affect the column's IsBeingDraggedAnimated to ensure every prepared container calls AddDraggedColumnGhost of this manager.
+        draggedColumn.SetColumnReorderingDragSourceManager( this );
+        draggedColumn.SetIsBeingDraggedAnimated( true );
+      }
 
-      this.AdornerLayerInsideDragContainer.Add( adorner );
+      TableflowView.SetAreColumnsBeingReordered( m_dataGridContext, true );
+      TableflowView.SetColumnReorderingDragSourceManager( m_dataGridContext, this );
 
-      m_elementToDraggedElementAdorner.Add( element, adorner );
+      this.HideDraggedElements();
     }
 
-    public void RemoveDraggedColumnGhost( UIElement element )
+    protected override void OnDragEnd( Func<IInputElement, Point> getPosition, bool drop )
     {
-      if( m_elementToDraggedElementAdorner.Count == 0 )
-        return;
-
-      DraggedElementAdorner adorner;
-      if( !m_elementToDraggedElementAdorner.TryGetValue( element, out adorner ) )
-        return;
-
-      Debug.Assert( adorner != null );
-      this.AdornerLayerInsideDragContainer.Remove( adorner );
-      m_elementToDraggedElementAdorner.Remove( element );
-    }
+      if( !m_isDragStarted )
+        throw new InvalidOperationException();
 
-    public bool ContainsDraggedColumnGhost( UIElement element )
-    {
-      if( ( element == null ) || ( m_elementToDraggedElementAdorner.Count == 0 ) )
-        return false;
+      m_isDragStarted = false;
 
-      return m_elementToDraggedElementAdorner.ContainsKey( element );
-    }
+      base.OnDragEnd( getPosition, drop );
 
-    public override void SetDraggedElement( UIElement newDraggedElement )
-    {
-      // Ensure to remove all ghost previously
-      // registered with the manager
-      this.RemoveAllGhosts();
+      //If in a popup, we are using a system adorner, and we need to hide it when releasing the mouse button.
+      if( this.IsPopup )
+      {
+        m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
+        m_popupDraggedElementAdorner.SetOffset( s_origin );
+      }
 
-      base.SetDraggedElement( newDraggedElement );
+      m_columnsLayout.Clear();
 
-      // No need to initialize if new DraggedElement is null
-      if( newDraggedElement != null )
+      if( !this.IsAnimatedColumnReorderingEnabled )
         return;
 
-      // Must re-initialize the manager before processing the new DraggedElement
-      this.InitializeManager();
+      this.MoveGhostToTargetAndDetach();
+      this.ClearColumnAnimations();
+      this.ClearSplitterAnimation();
     }
 
-    public override void ProcessMouseMove( MouseEventArgs e )
+    protected override void OnDragMove( Func<IInputElement, Point> getPosition )
     {
       if( this.IsAnimatedColumnReorderingEnabled )
       {
-        this.UpdateMouseMoveDirection( e );
+        this.UpdateMouseMoveDirection( getPosition );
       }
 
-      base.ProcessMouseMove( e );
+      base.OnDragMove( getPosition );
     }
 
-    public override void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
+    protected override void OnDragOver( IDropTarget target, Func<IInputElement, Point> getPosition )
     {
-      // Must re-initialize the manager before processing the MouseLeftButtonDown to ensure the internal state is up to date
-      this.InitializeManager();
-
-      this.UpdateIsAnimatedColumnReorderingEnabled();
-
-      base.ProcessMouseLeftButtonDown( e );
-
-      //When the grid is hosted in a popup window, it is not possible to know the position of the popup in certain scenarios (e.g. fullscreen, popup openning upward).
-      //Thus we must use a regular system adorner instead of the ghost window, so that the dragged adorner will appear correctly under the mouse pointer.
-      if( this.ParentWindowIsPopup )
-      {
-        this.SetPopupDragAdorner( e.Source as ColumnManagerCell );
-      }
+      base.OnDragOver( target, getPosition );
 
       if( !this.IsAnimatedColumnReorderingEnabled )
-      {
-        this.AutoScrollInterval = 50;
-        this.TimerInterval = 5;
         return;
-      }
-
-      this.AutoScrollInterval = 0;
-      this.TimerInterval = 0;
-
-      UIElement draggedElement = this.DraggedElement;
-      ReorderingInfoManager reorderingInfoManager = this.ReorderingInfoManagerInstance;
-      DataGridContext dataGridContext = this.DraggedDataGridContext;
-
-      Cell draggedCell = draggedElement as Cell;
-      if( draggedCell != null )
-      {
-        int initialFixedColumnCount = this.ColumnVirtualizationManager.GetFixedColumnCount( m_level );
-        reorderingInfoManager.BeginReordering( dataGridContext, draggedCell.ParentColumn.VisiblePosition, initialFixedColumnCount );
-      }
 
-      // Get initial mouse positions
-      Point draggedElementToMouse = e.GetPosition( draggedElement );
-
-      m_lastDraggedElementOffset = draggedElement.TranslatePoint( draggedElementToMouse, this.DragContainer ).X;
-
-      // Affect the manager on the DataGridContext and DraggedColumn
-      TableflowView.SetAreColumnsBeingReordered( dataGridContext, true );
-
-      if( draggedCell != null )
-      {
-        draggedCell.ParentColumn.SetColumnReorderingDragSourceManager( this );
-      }
-
-      TableflowView.SetColumnReorderingDragSourceManager( dataGridContext, this );
-    }
-
-    public override void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      base.ProcessMouseLeftButtonUp( e );
-
-      //If in a popup, we are using a system adorner, and we need to hide it when releasing the mouse button.
-      if( this.ParentWindowIsPopup )
-      {
-        m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0;
-        m_popupDraggedElementAdorner.SetOffset( ColumnReorderingDragSourceManager.EmptyPoint );
-      }
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
+      // We are reverting every animation before detaching from the manager
+      // so do not update the ghost position
+      if( m_ghostToTargetAndDetachAnimationClock != null )
         return;
 
-      this.ReorderingInfoManagerInstance.EndReordering();
-      this.MoveGhostToTargetAndDetach();
-      this.CleanUpColumnAnimations();
-    }
-
-    public override void ProcessPreviewMouseRightButtonDown( MouseButtonEventArgs e )
-    {
-      base.ProcessPreviewMouseRightButtonDown( e );
+      var draggedCell = this.DraggedElement as ColumnManagerCell;
+      if( draggedCell == null )
+        return;
 
-      if( !this.IsAnimatedColumnReorderingEnabled )
+      var dropTarget = this.CurrentDropTarget as ColumnManagerCell;
+      if( ( dropTarget == null ) || ( dropTarget == draggedCell ) )
         return;
 
-      this.RollbackReordering();
-      this.ReorderingInfoManagerInstance.EndReordering();
+      var draggedOverDataGridContext = DataGridControl.GetDataGridContext( dropTarget );
+      if( ( draggedOverDataGridContext == null ) || ( m_dataGridContext != draggedOverDataGridContext ) || !this.CanReorder( draggedCell, dropTarget, this.CurrentDropTargetToContainerPosition ) )
+        return;
 
-      // Ensure to rollback and detach the manager when a right click 
-      // is detected to ensure the Ghosts are correctly removed
-      // from the VisualTree
-      this.MoveGhostToTargetAndDetach();
+      this.UpdateColumnsLayout();
+      this.ApplyColumnsLayoutAnimations();
+      this.ApplySplitterAnimation();
     }
 
-    protected override IDropTarget GetDropTargetOnDrag( MouseEventArgs e, out Nullable<Point> dropTargetPosition, out IDropTarget lastFoundDropTarget )
+    protected override DropTargetInfo GetDropTarget( Func<IInputElement, Point> getPosition )
     {
-      IDropTarget returnedDropTarget = base.GetDropTargetOnDrag( e, out dropTargetPosition, out lastFoundDropTarget );
-
       if( !this.IsAnimatedColumnReorderingEnabled )
-        return returnedDropTarget;
-
-      ColumnManagerCell cell = e.OriginalSource as ColumnManagerCell;
+        return base.GetDropTarget( getPosition );
 
+      var cell = this.DraggedElement as ColumnManagerCell;
       if( cell == null )
-        return returnedDropTarget;
-
-      Row parentRow = cell.ParentRow;
+        return base.GetDropTarget( getPosition );
 
+      var parentRow = cell.ParentRow as ColumnManagerRow;
       if( parentRow == null )
-        return returnedDropTarget;
-
-      // Rollback reordering only if dragging outside or if the base class found a DropTarget that is not a ColumnManagerCell or ColumnManagerRow at the current mouse position
-      if( ( returnedDropTarget != null ) && !( returnedDropTarget is ColumnManagerCell ) && !( returnedDropTarget is ColumnManagerRow ) )
-      {
-        return returnedDropTarget;
-      }
+        return base.GetDropTarget( getPosition );
 
-      // If there is no IDropTarget currently dragging over but one was found other than ColumnManagerRow or ColumnManagerCell this means this IDropTarget can't receive the drop
-      if( ( lastFoundDropTarget != null ) && !( lastFoundDropTarget is ColumnManagerCell ) && !( lastFoundDropTarget is ColumnManagerRow ) )
+      foreach( var dropTargetInfo in DragDropHelper.GetDropTargetAtPoint( this.DraggedElement, this.Container, getPosition ) )
       {
-        return null;
+        var target = dropTargetInfo.Target;
+        if( !( target is ColumnManagerCell ) && !( target is ColumnManagerRow ) )
+          return dropTargetInfo;
       }
 
-      UIElement dragContainer = this.DragContainer;
-      Debug.Assert( dragContainer != null );
-
-      Cell draggedCell = this.DraggedElement as Cell;
-      Debug.Assert( draggedCell != null );
-
-      Point parentRowToDragContainer = parentRow.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, dragContainer );
+      var dragContainer = this.Container;
+      var dragContainerRect = new Rect( new Point(), dragContainer.RenderSize );
 
-      Rect parentRowRect = new Rect( parentRowToDragContainer.X, parentRowToDragContainer.Y, parentRow.ActualWidth, parentRow.ActualHeight );
+      var draggedElementToMouse = getPosition.Invoke( cell );
+      var draggedElementTopLeftToMouse = new Point( draggedElementToMouse.X - this.InitialMousePositionToDraggedElement.Value.X, draggedElementToMouse.Y - this.InitialMousePositionToDraggedElement.Value.Y );
+      var draggedElementBottomRightToMouse = new Point( draggedElementTopLeftToMouse.X + cell.ActualWidth, draggedElementTopLeftToMouse.Y + cell.ActualHeight );
 
-      Point draggedElementToMouse = e.GetPosition( draggedCell );
-      draggedElementToMouse.X -= this.InitialMousePositionToDraggedElement.Value.X;
+      var draggedElementRectInDragContainer = new Rect( cell.TranslatePoint( draggedElementTopLeftToMouse, dragContainer ),
+                                                        cell.TranslatePoint( draggedElementBottomRightToMouse, dragContainer ) );
+      draggedElementRectInDragContainer.Intersect( dragContainerRect );
 
-      Point draggedElementToDragContainer = draggedCell.TranslatePoint( draggedElementToMouse, dragContainer );
+      // We are not interested by the y-axis.  We set the y-axis value to 0 so the rectangle use to look for overlap on the x-axis
+      // will work no matter where is located the dragged element on the y-axis.
+      var cellRectInDragContainer = new Rect( cell.TranslatePoint( new Point( draggedElementTopLeftToMouse.X, 0d ), dragContainer ),
+                                              cell.TranslatePoint( new Point( draggedElementBottomRightToMouse.X, cell.ActualHeight ), dragContainer ) );
+      var rowRectInDragContainer = parentRow.TransformToVisual( dragContainer ).TransformBounds( VisualTreeHelper.GetDescendantBounds( parentRow ) );
 
-      double draggedElementWidth = draggedCell.RenderSize.Width;
+      var dropTargetRectInDragContainer = rowRectInDragContainer;
+      dropTargetRectInDragContainer.Intersect( cellRectInDragContainer );
 
-      // Get the Rect for the DragContainer
-      Rect dragContainerRect = new Rect( ColumnReorderingDragSourceManager.EmptyPoint, dragContainer.RenderSize );
+      var result = default( DropTargetInfo );
 
-      Point dragContainerToMouse = e.GetPosition( dragContainer );
-
-      // If the mouse cursor is currently over the DragContainer
-      if( dragContainerRect.Contains( dragContainerToMouse ) )
+      // Some part of the dragged element overlaps the container.
+      if( !draggedElementRectInDragContainer.IsEmpty && !dropTargetRectInDragContainer.IsEmpty )
       {
-        // Ensure the DraggedElement is not visible to HitTest
-        draggedCell.IsHitTestVisible = false;
-
-        // Correct the Y coordinate of the 
-        double correctedY = parentRowRect.Y + ( draggedCell.ActualHeight / 2 );
+        var hitTestPosition = new Point();
+        var dropPosition = new Point();
 
-        // Correct the Y part to ensure it is over the ParentRow
-        Point correctedPoint = new Point( draggedElementToDragContainer.X, correctedY );
+        // We are not interested by the y-axis, but we will set a value that will return a positive result for hit testing.
+        hitTestPosition.Y = cellRectInDragContainer.Top + ( cellRectInDragContainer.Height / 2d );
+        dropPosition.Y = hitTestPosition.Y;
 
-        if( m_horizontalMouseDragDirection == HorizontalMouseDragDirection.Left )
+        switch( m_horizontalMouseDragDirection )
         {
-          double rightEdge = draggedElementToDragContainer.X + draggedElementWidth;
+          // Use the dragged element left edge to minimize the size of the blank area during animations.
+          case HorizontalMouseDragDirection.Left:
+            {
+              hitTestPosition.X = dropTargetRectInDragContainer.Left;
+              dropPosition.X = cellRectInDragContainer.Left;
+            }
+            break;
 
-          // When scrolling left, try to find the first IDropTarget from the left edge of the dragged element to the mouse cursor to the mouse cursor over the dragged element
-          while( ( returnedDropTarget == null ) && ( correctedPoint.X < rightEdge ) )
-          {
-            returnedDropTarget = ColumnReorderingDragSourceManager.GetDropTargetAtPoint( dragContainer, draggedCell, correctedPoint );
+          // Use the dragged element right edge to minimize the size of the blank area during animations.
+          case HorizontalMouseDragDirection.Right:
+            {
+              hitTestPosition.X = dropTargetRectInDragContainer.Right;
+              dropPosition.X = cellRectInDragContainer.Right;
+            }
+            break;
 
-            if( returnedDropTarget != null )
-              break;
+          default:
+            {
+              var dragContainerToMouse = getPosition.Invoke( dragContainer );
 
-            correctedPoint.X += 1;
-          }
+              if( dragContainerToMouse.X <= dropTargetRectInDragContainer.Left )
+              {
+                hitTestPosition.X = dropTargetRectInDragContainer.Left;
+                dropPosition.X = cellRectInDragContainer.Left;
+              }
+              else if( dragContainerToMouse.X >= dropTargetRectInDragContainer.Right )
+              {
+                hitTestPosition.X = dropTargetRectInDragContainer.Right;
+                dropPosition.X = cellRectInDragContainer.Right;
+              }
+              else
+              {
+                hitTestPosition.X = dragContainerToMouse.X;
+                dropPosition.X = dragContainerToMouse.X;
+              }
+            }
+            break;
         }
-        else if( m_horizontalMouseDragDirection == HorizontalMouseDragDirection.Right )
-        {
-          // When scrolling right, try to find the first IDropTarget from the right edge of the dragged element to the mouse cursor over the dragged element
-          double leftSide = draggedElementToDragContainer.X;
-
-          correctedPoint.X += draggedCell.ParentColumn.ActualWidth;
-
-          while( ( returnedDropTarget == null ) && ( correctedPoint.X > leftSide ) )
-          {
-            returnedDropTarget = ColumnReorderingDragSourceManager.GetDropTargetAtPoint( dragContainer, draggedCell, correctedPoint );
 
-            if( returnedDropTarget != null )
-              break;
+        // Ensure the DraggedElement is not visible to hit test.
+        cell.IsHitTestVisible = false;
 
-            correctedPoint.X -= 1;
-          }
+        try
+        {
+          result = this.GetDropTargetAtPoint( cell, new RelativePoint( dragContainer, dropPosition ) );
         }
-        else
+        finally
         {
-          returnedDropTarget = ColumnReorderingDragSourceManager.GetDropTargetAtPoint( dragContainer, draggedCell, correctedPoint );
+          cell.ClearValue( UIElement.IsHitTestVisibleProperty );
         }
-
-        dropTargetPosition = ( returnedDropTarget != null ) ? correctedPoint : ( Point? )null;
-
-        draggedCell.ClearValue( UIElement.IsHitTestVisibleProperty );
       }
-      else
+
+      if( !( result.Target is ColumnManagerRow ) && !( result.Target is ColumnManagerCell ) )
       {
-        dropTargetPosition = null;
+        result = default( DropTargetInfo );
       }
 
-      //Flag used to reduce the number of column animations, to speed up the scrolling on ColumnManagerCell dragging.
-      if( returnedDropTarget == null && this.CurrentDropTarget == null )
+      // Flag used to reduce the number of column animations, to speed up the scrolling on ColumnManagerCell dragging.
+      if( ( result.Target == null ) && ( this.CurrentDropTarget == null ) )
       {
         m_noColumnsReorderingNeeded = true;
-        if( this.ParentWindowIsPopup )
+        if( this.IsPopup )
         {
-          m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0;
+          m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
         }
       }
       else
@@ -498,50 +391,29 @@ namespace Xceed.Wpf.DataGrid.Views
         m_noColumnsReorderingNeeded = false;
       }
 
-      return returnedDropTarget;
-    }
-
-    protected override void ProcessDragOnCurrentDropTarget( IDropTarget dropTarget )
-    {
-      base.ProcessDragOnCurrentDropTarget( dropTarget );
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
-        return;
-
-      // We are reverting every animation before detaching from the manager
-      // so do not update the ghost position
-      if( m_ghostToTargetAndDetachAnimationClock != null )
-        return;
-
-      ColumnManagerCell cell = this.CurrentDropTarget as ColumnManagerCell;
-
-      bool dragOverCell = ( cell != null );
-
-      // We can drag over other type of IDropTarget than Cell
-      if( dragOverCell && this.CurrentDropTargetToDragContainerPosition.HasValue )
-      {
-        this.ProcessDragOverColumnManagerCell();
-      }
+      return result;
     }
 
-    protected override void UpdateDraggedElementGhostOnDrag( MouseEventArgs e )
+    protected override void UpdateGhost( Func<IInputElement, Point> getPosition )
     {
       //If in TableView and the grid is hosted in a Popup window.
-      if( !this.IsAnimatedColumnReorderingEnabled && this.ParentWindowIsPopup )
+      if( !this.IsAnimatedColumnReorderingEnabled && this.IsPopup )
       {
-        this.ShowDraggedElementGhost = false;
+        this.ShowGhost = false;
+
+        var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
+        var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
 
-        Point draggedElementToMouse = e.GetPosition( this.DraggedElement );
         // Correct it according to initial mouse position over the dragged element
-        draggedElementToMouse.X -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().X;
-        draggedElementToMouse.Y -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().Y;
+        draggedElementToMouse.X -= initialMousePosition.X;
+        draggedElementToMouse.Y -= initialMousePosition.Y;
 
         this.ApplyContainerClip( m_popupDraggedElementAdorner );
         m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 1d;
         m_popupDraggedElementAdorner.SetOffset( draggedElementToMouse );
       }
       //If no animation, or if the dragged object is beyond the edge of the grid, no need to do anything in this override, simply call base.
-      //This will be suficient to update the DraggedElementGhost positon. The result is a much faster scrolling of the grid via the CheckForAutoScroll() method.
+      //This will be sufficient to update the DraggedElementGhost positon. The result is a much faster scrolling of the grid via the CheckForAutoScroll() method.
       else if( this.IsAnimatedColumnReorderingEnabled && !m_noColumnsReorderingNeeded )
       {
         // We are reverting every animation before detaching from the manager
@@ -549,36 +421,39 @@ namespace Xceed.Wpf.DataGrid.Views
         if( m_ghostToTargetAndDetachAnimationClock != null )
           return;
 
-        bool dragOverRowOrCell = ( this.CurrentDropTarget as ColumnManagerRow ) != null || ( this.CurrentDropTarget as ColumnManagerCell ) != null;
+        var dragOverRowOrCell = ( this.CurrentDropTarget is ColumnManagerRow ) || ( this.CurrentDropTarget is ColumnManagerCell );
 
         // We are dragging over an object that will handle the drop itself
-        if( !dragOverRowOrCell && !this.ParentWindowIsPopup )
+        if( !dragOverRowOrCell && !this.IsPopup )
         {
           // Ensure to pause every other animations before
           this.PauseGhostToMousePositionAnimation();
           this.PauseDraggedElementFadeInAnimation();
 
           this.RollbackReordering();
-          this.ShowDraggedElementGhost = true;
+          this.ShowGhost = true;
 
-          this.MoveGhostToTargetColumn( e.GetPosition( this.DraggedElement ) );
+          this.MoveGhostToTargetColumn( getPosition.Invoke( this.DraggedElement ) );
         }
         //If dragging over an object that will handle the drop itself and the grid is hosted in a Popup window.
-        else if( !dragOverRowOrCell && this.ParentWindowIsPopup )
+        else if( !dragOverRowOrCell && this.IsPopup )
         {
           // Ensure to pause every other animations before
           this.PauseGhostToMousePositionAnimation();
           this.PauseDraggedElementFadeInAnimation();
 
           this.RollbackReordering();
-          this.ShowDraggedElementGhost = false;
+          this.ShowGhost = false;
+
+          var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
 
-          this.MoveGhostToTargetColumn( e.GetPosition( this.DraggedElement ) );
+          this.MoveGhostToTargetColumn( draggedElementToMouse );
+
+          var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
 
-          Point draggedElementToMouse = e.GetPosition( this.DraggedElement );
           // Correct it according to initial mouse position over the dragged element
-          draggedElementToMouse.X -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().X;
-          draggedElementToMouse.Y -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().Y;
+          draggedElementToMouse.X -= initialMousePosition.X;
+          draggedElementToMouse.Y -= initialMousePosition.Y;
 
           this.ApplyContainerClip( m_popupDraggedElementAdorner );
           m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 1d;
@@ -588,24 +463,26 @@ namespace Xceed.Wpf.DataGrid.Views
         else
         {
           //If in a popup, hide the dragged element adorner.
-          if( this.ParentWindowIsPopup )
+          if( this.IsPopup )
           {
             m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
-            m_popupDraggedElementAdorner.SetOffset( ColumnReorderingDragSourceManager.EmptyPoint );
+            m_popupDraggedElementAdorner.SetOffset( s_origin );
           }
 
           // Pause animations that are moving ghosts to target Column
           this.PauseMoveGhostToTargetColumnAnimation();
           this.PauseDraggedElementFadeInAnimation();
 
-          this.ShowDraggedElementGhost = false;
+          this.ShowGhost = false;
           this.ShowDraggedColumnGhosts();
           this.HideDraggedElements();
-          Point draggedElementToMouse = e.GetPosition( this.DraggedElement );
+
+          var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
+          var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
 
           // Correct it according to initial mouse position over the dragged element
-          draggedElementToMouse.X -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().X;
-          draggedElementToMouse.Y -= this.InitialMousePositionToDraggedElement.GetValueOrDefault().Y;
+          draggedElementToMouse.X -= initialMousePosition.X;
+          draggedElementToMouse.Y -= initialMousePosition.Y;
 
           // Wait for the animation to complete before explicitly setting the X and Y offsets on the ghost adorners OR if reordering was canceled
           if( ( m_ghostToMousePositionAnimationClock == null ) && ( m_ghostToTargetColumnAnimationClock == null ) && !m_reorderCancelled )
@@ -624,13 +501,12 @@ namespace Xceed.Wpf.DataGrid.Views
         }
       }
 
-      // Ensure to call base after to correctly update the DraggedElementGhost of the base class correctly
-      base.UpdateDraggedElementGhostOnDrag( e );
+      base.UpdateGhost( getPosition );
     }
 
-    protected override void NotifyDropOuside()
+    protected override void OnDroppedOutside()
     {
-      base.NotifyDropOuside();
+      base.OnDroppedOutside();
 
       if( !this.IsAnimatedColumnReorderingEnabled )
         return;
@@ -638,142 +514,303 @@ namespace Xceed.Wpf.DataGrid.Views
       this.RollbackReordering();
     }
 
-    protected override void BeginDrag()
+    internal void AddDraggedColumnGhost( UIElement element )
     {
-      // Create the DraggedElementGhost in base class
-      base.BeginDrag();
+      if( ( element == null ) || m_elementToDraggedElementAdorner.ContainsKey( element ) )
+        return;
 
-      if( !this.IsAnimatedColumnReorderingEnabled )
+      // Get the Rect for the DataGridControl
+      var dataGridControl = m_dataGridContext.DataGridControl;
+      var dataGridControlRect = new Rect( 0d, 0d, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
+      var elementToDataGridControl = element.TranslatePoint( s_origin, dataGridControl );
+      var elementRect = new Rect( elementToDataGridControl, element.RenderSize );
+
+      // This is a special case with the current element that is always layouted, but can be out of view
+      if( !elementRect.IntersectsWith( dataGridControlRect ) )
         return;
 
-      Cell draggedCell = this.DraggedElement as Cell;
+      var adorner = new AnimatedDraggedElementAdorner( element, this.AdornerLayer, true );
 
-      if( draggedCell != null )
-      {
-        // Affect the IsBeingDraggedAnimated of the ParentColumn to ensure every prepared container calls AddDraggedColumnGhost to this manager
-        draggedCell.ParentColumn.SetIsBeingDraggedAnimated( true );
-      }
+      this.ApplyContainerClip( adorner );
+      this.AdornerLayer.Add( adorner );
 
-      this.HideDraggedElements();
+      m_elementToDraggedElementAdorner.Add( element, adorner );
     }
 
-    internal void CommitReordering()
+    internal void RemoveDraggedColumnGhost( UIElement element )
     {
-      ReorderingInfoManager reorderingInfoManager = this.ReorderingInfoManagerInstance;
-      RequiredAnimationsInfo animationState = reorderingInfoManager.RequiredAnimations;
+      if( m_elementToDraggedElementAdorner.Count == 0 )
+        return;
 
-      // Commiting the reordering will set the new VisiblePosition of the dragged Column.
-      // We need to preserve the old values before commiting to correctly commit the new fixed column count
-      this.CommitColumnReordering( animationState );
+      DraggedElementAdorner adorner;
+      if( !m_elementToDraggedElementAdorner.TryGetValue( element, out adorner ) )
+        return;
 
-      this.CommitSplitterReordering( animationState );
+      Debug.Assert( adorner != null );
+      this.AdornerLayer.Remove( adorner );
+      m_elementToDraggedElementAdorner.Remove( element );
     }
 
-    private void SetPopupDragAdorner( ColumnManagerCell columnManagerCell )
+    internal bool ContainsDraggedColumnGhost( UIElement element )
     {
-      if( columnManagerCell == null )
-        return;
+      if( ( element == null ) || ( m_elementToDraggedElementAdorner.Count == 0 ) )
+        return false;
 
-      if( m_popupDraggedElementAdorner != null )
-      {
-        this.AdornerLayerInsideDragContainer.Remove( m_popupDraggedElementAdorner );
-        m_popupDraggedElementAdorner = null;
-      }
+      return m_elementToDraggedElementAdorner.ContainsKey( element );
+    }
 
-      // Get the Rect for the DataGridControl
-      DataGridControl dataGridControl = this.DraggedDataGridContext.DataGridControl;
+    internal bool CanReorder( ColumnManagerCell draggedCell, ColumnManagerCell dropTarget, RelativePoint? dropPoint )
+    {
+      if( ( draggedCell == null )
+        || ( dropTarget == null )
+        || ( draggedCell == dropTarget )
+        || !dropPoint.HasValue
+        || ( DataGridControl.GetDataGridContext( draggedCell ) != m_dataGridContext )
+        || ( DataGridControl.GetDataGridContext( dropTarget ) != DataGridControl.GetDataGridContext( draggedCell ) ) )
+        return false;
 
-      Rect dataGridControlRect = new Rect( 0d, 0d, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
+      var dropColumn = dropTarget.ParentColumn;
+      if( dropColumn == null )
+        return false;
 
-      Point elementToDataGridControl = columnManagerCell.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, dataGridControl );
+      var sourceLayout = m_dataGridContext.ColumnManager;
+      var dropColumnLocation = sourceLayout.GetColumnLocationFor( dropColumn );
+      if( dropColumnLocation == null )
+        return false;
 
-      // Get the Rect for the element that request a ghost
-      Rect elementRect = new Rect( elementToDataGridControl, columnManagerCell.RenderSize );
+      if( ColumnReorderingDragSourceManager.IsPointLocatedBeforeTarget( dropTarget, dropPoint ) )
+      {
+        if( !draggedCell.CanMoveBefore( dropColumn ) )
+          return false;
 
-      // This is a special case with the current Element that is always be layouted, but can be out of view
-      if( !elementRect.IntersectsWith( dataGridControlRect ) )
-        return;
+        for( var location = dropColumnLocation.GetPreviousSibling(); location != null; location = location.GetPreviousSibling() )
+        {
+          if( location.Type != LocationType.Column )
+            continue;
 
-      AnimatedDraggedElementAdorner adorner = new AnimatedDraggedElementAdorner( columnManagerCell, this.AdornerLayerInsideDragContainer, true );
+          var previousColumn = ( ( ColumnHierarchyManager.IColumnLocation )location ).Column;
+          if( !draggedCell.CanMoveAfter( previousColumn ) )
+            return false;
 
-      adorner.AdornedElementImage.Opacity = 0d;
+          break;
+        }
+      }
+      else if( ColumnReorderingDragSourceManager.IsPointLocatedAfterTarget( dropTarget, dropPoint ) )
+      {
+        if( !draggedCell.CanMoveAfter( dropColumn ) )
+          return false;
 
-      this.ApplyContainerClip( adorner );
+        for( var location = dropColumnLocation.GetNextSibling(); location != null; location = location.GetNextSibling() )
+        {
+          if( location.Type != LocationType.Column )
+            continue;
 
-      this.AdornerLayerInsideDragContainer.Add( adorner );
+          var nextColumn = ( ( ColumnHierarchyManager.IColumnLocation )location ).Column;
+          if( !draggedCell.CanMoveBefore( nextColumn ) )
+            return false;
 
-      m_popupDraggedElementAdorner = adorner;
+          break;
+        }
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
     }
 
-    private static IDropTarget GetDropTargetAtPoint( UIElement dragContainer, UIElement draggedElement, Point point )
+    internal void CommitReordering()
     {
-      IInputElement hitTest = dragContainer.InputHitTest( point );
+      var draggedCell = this.DraggedElement as Cell;
+      if( draggedCell == null )
+        return;
 
-      if( hitTest == null )
-        return null;
+      var draggedColumn = draggedCell.ParentColumn;
+      if( draggedColumn == null )
+        return;
 
-      DependencyObject parent = hitTest as DependencyObject;
+      var draggedColumnReorderLocation = m_columnsLayout[ draggedColumn ];
+      if( draggedColumnReorderLocation == null )
+        return;
 
-      while( parent != null )
-      {
-        IDropTarget dropTarget = parent as IDropTarget;
+      var sourceLayout = m_dataGridContext.ColumnManager;
 
-        ColumnManagerCell cell = dropTarget as ColumnManagerCell;
-        bool isCellHitTestible = true;
+      var draggedColumnSourceLocation = sourceLayout.GetColumnLocationFor( draggedColumn );
+      Debug.Assert( draggedColumnSourceLocation != null );
+      if( draggedColumnSourceLocation == null )
+        return;
 
-        if( cell != null )
+      var previousLocation = draggedColumnReorderLocation.GetPreviousSibling();
+      if( previousLocation != null )
+      {
+        switch( previousLocation.Type )
         {
-          // The Cell could be partially or completely under the fixed region of the FixedCellPanel, so not "really" HitTestible
-          isCellHitTestible = ColumnReorderingDragSourceManager.TryHitTestCell( cell, point, dragContainer );
+          case LocationType.Column:
+            {
+              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )previousLocation ).Column;
+              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
+
+              if( pivotLocation != null )
+              {
+                Debug.Assert( draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) );
+                draggedColumnSourceLocation.MoveAfter( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          case LocationType.Splitter:
+            {
+              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
+              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Splitter : null;
+
+              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) )
+              {
+                draggedColumnSourceLocation.MoveAfter( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          case LocationType.Start:
+            {
+              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
+              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Start : null;
+
+              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) )
+              {
+                draggedColumnSourceLocation.MoveAfter( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          default:
+            throw new NotImplementedException( "Unexpected target location." );
         }
+      }
 
-        if( ( isCellHitTestible ) && ( dropTarget != null ) && ( dropTarget.CanDropElement( draggedElement ) ) )
+      var nextLocation = draggedColumnReorderLocation.GetNextSibling();
+      if( nextLocation != null )
+      {
+        switch( nextLocation.Type )
         {
-          return dropTarget;
+          case LocationType.Column:
+            {
+              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )nextLocation ).Column;
+              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
+
+              if( pivotLocation != null )
+              {
+                Debug.Assert( draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) );
+                draggedColumnSourceLocation.MoveBefore( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          case LocationType.Splitter:
+            {
+              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
+              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Splitter : null;
+
+              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) )
+              {
+                draggedColumnSourceLocation.MoveBefore( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          case LocationType.Orphan:
+            {
+              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
+              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Orphan : null;
+
+              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) )
+              {
+                draggedColumnSourceLocation.MoveBefore( pivotLocation );
+                return;
+              }
+            }
+            break;
+
+          default:
+            throw new NotImplementedException( "Unexpected target location." );
         }
+      }
+
+      var parentLocation = draggedColumnReorderLocation.GetParent();
+      if( parentLocation != null )
+      {
+        switch( parentLocation.Type )
+        {
+          case LocationType.Column:
+            {
+              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )parentLocation ).Column;
+              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
 
-        dropTarget = null;
-        parent = Xceed.Utils.Wpf.TreeHelper.GetParent( parent );
+              if( pivotLocation != null )
+              {
+                Debug.Assert( draggedColumnSourceLocation.CanMoveUnder( pivotLocation ) );
+                draggedColumnSourceLocation.MoveUnder( pivotLocation );
+                return;
+              }
+            }
+            break;
+        }
       }
 
-      return null;
+      this.ClearColumnAnimations();
+      this.ClearSplitterAnimation();
     }
 
-    private static bool TryHitTestCell( ColumnManagerCell cell, Point point, UIElement dragContainer )
+    internal IEnumerable<IDropTarget> GetDropTargetsAtPoint( RelativePoint point )
     {
-      Row parentRow = cell.ParentRow;
-
-      if( parentRow == null )
-        return true;
+      var container = this.Container;
+      if( container == null )
+        yield break;
 
-      FixedCellPanel fixedCellPanel = parentRow.CellsHostPanel as FixedCellPanel;
+      for( var target = container.InputHitTest( point.GetPoint( container ) ) as DependencyObject; target != null; target = Xceed.Utils.Wpf.TreeHelper.GetParent( target ) )
+      {
+        var dropTarget = target as IDropTarget;
+        if( dropTarget == null )
+          continue;
 
-      if( fixedCellPanel == null )
-        return true;
+        yield return dropTarget;
+      }
+    }
 
-      Decorator scrollingCellsDecorator = fixedCellPanel.ScrollingCellsDecorator;
+    private static bool IsPointLocatedBeforeTarget( FrameworkElement target, RelativePoint? point )
+    {
+      if( ( target == null ) || !point.HasValue )
+        return false;
 
-      if( !scrollingCellsDecorator.IsAncestorOf( cell ) )
-        return true;
+      var targetPoint = point.Value.GetPoint( target );
 
-      Point cellPoint = cell.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, dragContainer );
+      return ( targetPoint.X <= target.ActualWidth / 2d );
+    }
 
-      Rect cellRect = new Rect( cellPoint.X, cellPoint.Y, cell.ActualWidth, cell.ActualHeight );
+    private static bool IsPointLocatedAfterTarget( FrameworkElement target, RelativePoint? point )
+    {
+      if( ( target == null ) || !point.HasValue )
+        return false;
 
-      Point scrollingCellsDecoratorPoint = scrollingCellsDecorator.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, dragContainer );
+      var targetPoint = point.Value.GetPoint( target );
 
-      Rect scrollingCellsDecoratorRect = new Rect( scrollingCellsDecoratorPoint.X, scrollingCellsDecoratorPoint.Y, scrollingCellsDecorator.ActualWidth, scrollingCellsDecorator.ActualHeight );
+      return ( targetPoint.X > target.ActualWidth / 2d );
+    }
 
-      if( !cellRect.IntersectsWith( scrollingCellsDecoratorRect ) )
-      {
-        return false;
-      }
-      else if( !scrollingCellsDecoratorRect.Contains( point ) )
+    private DropTargetInfo GetDropTargetAtPoint( UIElement draggedElement, RelativePoint point )
+    {
+      foreach( var dropTarget in this.GetDropTargetsAtPoint( point ) )
       {
-        return false;
+        if( dropTarget.CanDropElement( draggedElement, point ) )
+          return new DropTargetInfo( dropTarget, point, true );
       }
 
-      return true;
+      return default( DropTargetInfo );
     }
 
     private static void ClearTranslateTransformAnimation( TranslateTransform transform )
@@ -797,87 +834,58 @@ namespace Xceed.Wpf.DataGrid.Views
       transform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, null );
     }
 
-    // Gets the index of a Column present in the DataGridContext.ColumnsByVisiblePosition from its index in the DataGridContext.VisibleColumns
-    private static int GetColumnByVisiblePositionIndexFromVisibleColumnIndex( int visibleColumnIndex, List<ColumnBase> columnsByVisiblePosition )
+    private void SetPopupDragAdorner( ColumnManagerCell columnManagerCell )
     {
-      if( columnsByVisiblePosition == null )
-        return -1;
-
-      if( visibleColumnIndex == -1 )
-        return -1;
-
-      int columnsByVisiblePositionCount = columnsByVisiblePosition.Count;
-
-      int visibleColumnIndexCache = visibleColumnIndex;
-      int columnByVisiblePositionIndex = -1;
+      if( columnManagerCell == null )
+        return;
 
-      for( int i = 0; i < columnsByVisiblePositionCount; i++ )
+      if( m_popupDraggedElementAdorner != null )
       {
-        if( visibleColumnIndexCache == 0 )
-          break;
-
-        columnByVisiblePositionIndex++;
-
-        ColumnBase columnBase = columnsByVisiblePosition[ i ];
-
-        if( ( columnBase != null ) && ( !columnBase.Visible ) )
-          continue;
-
-        visibleColumnIndexCache--;
+        this.AdornerLayer.Remove( m_popupDraggedElementAdorner );
+        m_popupDraggedElementAdorner = null;
       }
 
-      return columnByVisiblePositionIndex;
-    }
-
-    // Ensure to get the current ViewProperties values
-    private void InitializeManager()
-    {
-      UIElement draggedElement = this.DraggedElement;
+      var dataGridControl = m_dataGridContext.DataGridControl;
+      var dataGridControlRect = new Rect( 0d, 0d, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
+      var elementToDataGridControl = columnManagerCell.TranslatePoint( s_origin, dataGridControl );
+      var elementRect = new Rect( elementToDataGridControl, columnManagerCell.RenderSize );
 
-      if( draggedElement == null )
+      // This is a special case with the current Element that is always be layouted, but can be out of view
+      if( !elementRect.IntersectsWith( dataGridControlRect ) )
         return;
 
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( draggedElement );
-
-      this.DraggedDataGridContext = dataGridContext;
-
-      this.ColumnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
+      var adorner = new AnimatedDraggedElementAdorner( columnManagerCell, this.AdornerLayer, true );
+      adorner.AdornedElementImage.Opacity = 0d;
 
-      this.ColumnAnimationDuration = 500;
-      this.DraggedElementFadeInDuration = 250;
-      this.ReturnToOriginalPositionDuration = 250;
+      this.ApplyContainerClip( adorner );
+      this.AdornerLayer.Add( adorner );
 
-      // Get ViewProperties using DataGridContext
-      this.FixedColumnSplitterTranslation = TableflowView.GetFixedColumnSplitterTranslation( dataGridContext );
+      m_popupDraggedElementAdorner = adorner;
+    }
 
+    private void StopAnimationsAndRollback()
+    {
       // Ensure to pause any animation that was applied to ghost adorners.
       this.PauseGhostToMousePositionAnimation();
-
       this.PauseMoveGhostToTargetColumnAnimation();
-
       this.PauseMoveGhostToTargetAndDetachAnimation();
 
       m_reorderCancelled = false;
 
-      this.ShowDraggedElementGhost = true;
+      this.ShowGhost = true;
 
-      this.ReorderingInfoManagerInstance.RollbackReorderedColumnsAndFixedColumnCount();
-
-      this.RemoveColumnsPreviousAnimations();
-      this.RemoveFixedColumnSplitterPreviousAnimation( dataGridContext );
+      this.ClearColumnAnimations();
+      this.ClearSplitterAnimation();
     }
 
-    private void UpdateMouseMoveDirection( MouseEventArgs e )
+    private void UpdateMouseMoveDirection( Func<IInputElement, Point> getPosition )
     {
-      UIElement draggedElement = this.DraggedElement;
-
-      Point draggedElementToMouse = e.GetPosition( draggedElement );
-
-      double currentDraggedElementOffset = draggedElement.TranslatePoint( draggedElementToMouse, this.DragContainer ).X;
-
-      // Verify if there is an horizontal change according to the lastchange      
-      Rect dragRect = new Rect( m_lastDraggedElementOffset - SystemParameters.MinimumHorizontalDragDistance, 0d, SystemParameters.MinimumVerticalDragDistance * 2, 0d );
+      var draggedElement = this.DraggedElement;
+      var draggedElementToMouse = getPosition.Invoke( draggedElement );
+      var currentDraggedElementOffset = draggedElement.TranslatePoint( draggedElementToMouse, this.Container ).X;
 
+      // Verify if there is an horizontal change according to the lastchange
+      var dragRect = new Rect( m_lastDraggedElementOffset - SystemParameters.MinimumHorizontalDragDistance, 0d, SystemParameters.MinimumVerticalDragDistance * 2, 0d );
       if( dragRect.Contains( new Point( currentDraggedElementOffset, 0 ) ) )
         return;
 
@@ -895,22 +903,12 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void UpdateIsAnimatedColumnReorderingEnabled()
     {
-      bool isAnimatedColumnReorderingEnabled;
+      var tableflowView = m_dataGridContext.DataGridControl.GetView() as TableflowView;
 
-      var dataGridContext = this.DraggedDataGridContext;
-      if( dataGridContext != null )
-      {
-        var tableflowView = dataGridContext.DataGridControl.GetView() as TableflowView;
-
-        // Column reordering is not allowed in a detail when details are flatten.
-        isAnimatedColumnReorderingEnabled = ( tableflowView != null )
-                                         && ( tableflowView.IsAnimatedColumnReorderingEnabled )
-                                         && ( !dataGridContext.IsAFlattenDetail );
-      }
-      else
-      {
-        isAnimatedColumnReorderingEnabled = false;
-      }
+      // Column reordering is not allowed in a detail when details are flatten.
+      var isAnimatedColumnReorderingEnabled = ( tableflowView != null )
+                                           && ( tableflowView.IsAnimatedColumnReorderingEnabled )
+                                           && ( !m_dataGridContext.IsAFlattenDetail );
 
       // Make sure the dragged cell's parent row allows column reordering.
       if( isAnimatedColumnReorderingEnabled )
@@ -927,12 +925,12 @@ namespace Xceed.Wpf.DataGrid.Views
           }
 
           // The main column is not allowed to be reorder when details are flatten.
-          if( isAnimatedColumnReorderingEnabled && dataGridContext.AreDetailsFlatten )
+          if( isAnimatedColumnReorderingEnabled && m_dataGridContext.AreDetailsFlatten )
           {
-            ColumnBase parentColumn = draggedCell.ParentColumn;
+            var parentColumn = draggedCell.ParentColumn;
             if( parentColumn != null )
             {
-              isAnimatedColumnReorderingEnabled = parentColumn != null && !parentColumn.IsMainColumn;
+              isAnimatedColumnReorderingEnabled = ( parentColumn != null ) && !parentColumn.IsMainColumn;
             }
           }
         }
@@ -946,46 +944,40 @@ namespace Xceed.Wpf.DataGrid.Views
       // Ensure the opacity of the ghost is correctly set
       this.ShowDraggedColumnGhosts();
 
-      Point currentAdornerPosition = mousePosition;
+      var currentAdornerPosition = mousePosition;
 
       if( m_elementToDraggedElementAdorner.Count == 0 )
         return;
 
-      int remainingDuration = this.ReturnToOriginalPositionDuration;
+      var remainingDuration = s_returnToOriginalPositionDuration;
 
       if( m_ghostToMousePositionAnimationClock != null )
       {
-        PointAnimation pointAnimation = m_ghostToMousePositionAnimationClock.Timeline as PointAnimation;
-
-        Point currentValue = pointAnimation.To.GetValueOrDefault();
-
-        double deltaX = currentValue.X - mousePosition.X;
-        double deltaY = currentValue.Y - mousePosition.Y;
+        var pointAnimation = m_ghostToMousePositionAnimationClock.Timeline as PointAnimation;
+        var currentValue = pointAnimation.To.GetValueOrDefault();
+        var deltaX = currentValue.X - mousePosition.X;
+        var deltaY = currentValue.Y - mousePosition.Y;
 
-        bool dragingX = Math.Abs( deltaX ) > SystemParameters.MinimumHorizontalDragDistance;
-        bool dragingY = Math.Abs( deltaY ) > SystemParameters.MinimumVerticalDragDistance;
+        var dragingX = Math.Abs( deltaX ) > SystemParameters.MinimumHorizontalDragDistance;
+        var dragingY = Math.Abs( deltaY ) > SystemParameters.MinimumVerticalDragDistance;
 
         // If the target value is already the correct one, no need to stop animation and create another one
         if( ( pointAnimation != null ) && ( !dragingX && !dragingY ) )
-        {
           return;
-        }
-        else
+
+        if( m_ghostToMousePositionAnimationClock.CurrentState == ClockState.Active )
         {
-          if( m_ghostToMousePositionAnimationClock.CurrentState == ClockState.Active )
-          {
-            // The remaining duration is the Timeline Duration less the elapsed time
-            remainingDuration = pointAnimation.Duration.TimeSpan.Milliseconds - m_ghostToMousePositionAnimationClock.CurrentTime.Value.Milliseconds;
-          }
+          // The remaining duration is the Timeline Duration less the elapsed time
+          remainingDuration = new Duration( pointAnimation.Duration.TimeSpan - m_ghostToMousePositionAnimationClock.CurrentTime.Value );
         }
       }
 
       this.PauseGhostToMousePositionAnimation();
 
-      PointAnimation animation = new PointAnimation( currentAdornerPosition, mousePosition, new Duration( TimeSpan.FromMilliseconds( remainingDuration ) ) );
+      var animation = new PointAnimation( currentAdornerPosition, mousePosition, remainingDuration );
 
       m_ghostToMousePositionAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_ghostToMousePositionAnimationClock.Completed += this.GhostToMousePosition_Completed;
+      m_ghostToMousePositionAnimationClock.Completed += new EventHandler( this.GhostToMousePosition_Completed );
 
       foreach( var adorner in this.GetElementAdorners() )
       {
@@ -1013,7 +1005,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       // Stop the animation, do not simply pause it, so it resets correctly.
       m_ghostToMousePositionAnimationClock.Controller.Stop();
-      m_ghostToMousePositionAnimationClock.Completed -= this.GhostToMousePosition_Completed;
+      m_ghostToMousePositionAnimationClock.Completed -= new EventHandler( this.GhostToMousePosition_Completed );
       m_ghostToMousePositionAnimationClock = null;
     }
 
@@ -1022,36 +1014,31 @@ namespace Xceed.Wpf.DataGrid.Views
       if( m_elementToDraggedElementAdorner.Count == 0 )
         return;
 
-      int remainingDuration = this.ReturnToOriginalPositionDuration;
+      var remainingDuration = s_returnToOriginalPositionDuration;
 
       if( m_ghostToTargetColumnAnimationClock != null )
       {
-        PointAnimation pointAnimation = m_ghostToTargetColumnAnimationClock.Timeline as PointAnimation;
+        var pointAnimation = m_ghostToTargetColumnAnimationClock.Timeline as PointAnimation;
 
         // If the target value is already the correct one, no need to stop animation and create another one
-        if( ( pointAnimation != null ) && ( pointAnimation.To == ColumnReorderingDragSourceManager.EmptyPoint ) )
-        {
+        if( ( pointAnimation != null ) && ( pointAnimation.To == s_origin ) )
           return;
-        }
-        else
+
+        if( m_ghostToTargetColumnAnimationClock.CurrentState == ClockState.Active )
         {
-          if( m_ghostToTargetColumnAnimationClock.CurrentState == ClockState.Active )
-          {
-            // The remaining duration is the Timeline Duration less the elapsed time
-            remainingDuration = pointAnimation.Duration.TimeSpan.Milliseconds - m_ghostToTargetColumnAnimationClock.CurrentTime.Value.Milliseconds;
-          }
+          // The remaining duration is the Timeline Duration less the elapsed time
+          remainingDuration = new Duration( pointAnimation.Duration.TimeSpan - m_ghostToTargetColumnAnimationClock.CurrentTime.Value );
         }
       }
 
       // We must apply the DraggedCell FadeIn animation to let the DraggedCell reappears while the ghosts are moving to their target position
       this.ApplyDraggedElementFadeInAnimation();
-
       this.PauseMoveGhostToTargetColumnAnimation();
 
-      PointAnimation animation = new PointAnimation( mousePostion, ColumnReorderingDragSourceManager.EmptyPoint, new Duration( TimeSpan.FromMilliseconds( remainingDuration ) ) );
+      var animation = new PointAnimation( mousePostion, s_origin, remainingDuration );
 
       m_ghostToTargetColumnAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_ghostToTargetColumnAnimationClock.Completed += this.GhostToTargetAnimation_Completed;
+      m_ghostToTargetColumnAnimationClock.Completed += new EventHandler( this.GhostToTargetAnimation_Completed );
 
       foreach( var adorner in this.GetElementAdorners() )
       {
@@ -1073,7 +1060,7 @@ namespace Xceed.Wpf.DataGrid.Views
       if( ( m_ghostToTargetColumnAnimationClock == null ) && ( m_draggedElementFadeInAnimationClock == null ) )
       {
         // The ghosts were successfully moved to the target position so we hide the ghosts and display the Cells in order
-        // for the DraggedElementGhost, which is a VisulalBrush of the DraggedElement that is transparent during the drag
+        // for the DraggedElementGhost, which is a VisualBrush of the DraggedElement that is transparent during the drag.
         this.HideDraggedColumnGhosts();
         this.ShowDraggedElements();
         m_reorderCancelled = false;
@@ -1087,7 +1074,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       // Stop the animation, do not simply pause it, so it resets correctly.
       m_ghostToTargetColumnAnimationClock.Controller.Stop();
-      m_ghostToTargetColumnAnimationClock.Completed -= this.GhostToTargetAnimation_Completed;
+      m_ghostToTargetColumnAnimationClock.Completed -= new EventHandler( this.GhostToTargetAnimation_Completed );
       m_ghostToTargetColumnAnimationClock = null;
     }
 
@@ -1101,45 +1088,68 @@ namespace Xceed.Wpf.DataGrid.Views
 
       this.PauseMoveGhostToTargetAndDetachAnimation();
 
-      var draggedCell = this.DraggedElement as Cell;
+      var draggedCell = this.DraggedElement as ColumnManagerCell;
       if( draggedCell == null )
         return;
 
+      var parentColumn = draggedCell.ParentColumn;
+      if( parentColumn == null )
+        return;
+
       var parentRow = draggedCell.ParentRow;
       if( ( parentRow == null ) || ( parentRow.CellsHostPanel == null ) )
         return;
 
+      var cellsHostPanel = parentRow.CellsHostPanel as FixedCellPanel;
       var draggedAdorner = m_elementToDraggedElementAdorner[ draggedCell ];
-      var currentDraggedAdornerPosition = ( draggedAdorner != null ) ? draggedAdorner.Offset : default( Point );
-      var fromPoint = currentDraggedAdornerPosition;
+      var fromPoint = default( Point );
 
-      if( draggedAdorner != null )
+      if( ( draggedAdorner != null ) && ( cellsHostPanel != null ) )
       {
-        // Calculate the animation from the current ColumnManagerCell, since it could be a MergedColumnMangerCell dragging any number of columns.
-        // If calculating the animation from a different cell, the animation could be starting from a wrong position and give a bad visual effect.
-        var animations = this.ReorderingInfoManagerInstance.RequiredAnimations;
-        if( animations.AnimateToLeft.Count > 0 )
+        Debug.Assert( m_columnVirtualizationManager != null );
+
+        // Update the column layout in order to have the right offset.
+        m_columnVirtualizationManager.Update();
+
+        var toPoint = default( Point? );
+        var fixedPanel = cellsHostPanel.FixedPanel as FixedCellSubPanel;
+        var scrollingPanel = cellsHostPanel.ScrollingCellsDecorator.Child as VirtualizingFixedCellSubPanel;
+
+        if( m_columnVirtualizationManager.GetScrollingFieldNames( m_level ).Contains( parentColumn ) )
         {
-          var siblingCell = parentRow.Cells[ draggedCell.ParentColumn.PreviousVisibleColumn ];
-          var targetPosition = siblingCell.PointToScreen( new Point( siblingCell.ActualWidth, 0d ) );
-          var relativePosition = draggedAdorner.PointFromScreen( targetPosition );
+          if( scrollingPanel != null )
+          {
+            var targetPosition = scrollingPanel.CalculateCellOffset( parentColumn );
 
-          fromPoint = new Point( -relativePosition.X, -relativePosition.Y );
+            // The position must be adjusted when the dragged cell is moved from the fixed panel to the scrolling panel.
+            targetPosition.Offset( m_columnVirtualizationManager.FixedColumnsWidth - fixedPanel.ActualWidth, 0d );
+
+            toPoint = scrollingPanel.TranslatePoint( targetPosition, draggedAdorner );
+          }
         }
-        else if( animations.AnimateToRight.Count > 0 )
+        else if( m_columnVirtualizationManager.GetFixedFieldNames( m_level ).Contains( parentColumn ) )
         {
-          var siblingCell = parentRow.Cells[ draggedCell.ParentColumn.NextVisibleColumn ];
-          var targetPosition = siblingCell.PointToScreen( new Point( -draggedCell.ActualWidth, 0d ) );
-          var relativePosition = draggedAdorner.PointFromScreen( targetPosition );
+          if( fixedPanel != null )
+          {
+            var targetPosition = fixedPanel.CalculateCellOffset( parentColumn );
+            toPoint = fixedPanel.TranslatePoint( targetPosition, draggedAdorner );
+          }
+        }
 
-          fromPoint = new Point( -relativePosition.X, -relativePosition.Y );
+        if( toPoint.HasValue )
+        {
+          fromPoint = new Point( -toPoint.Value.X, -toPoint.Value.Y );
+        }
+        else
+        {
+          fromPoint = draggedAdorner.Offset;
         }
       }
 
-      PointAnimation animation = new PointAnimation( fromPoint, ColumnReorderingDragSourceManager.EmptyPoint, m_columnAnimationDuration );
+      var animation = new PointAnimation( fromPoint, new Point(), s_columnAnimationDuration );
 
-      m_ghostToTargetAndDetachAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_ghostToTargetAndDetachAnimationClock.Completed += this.MoveGhostToTargetAndDetach_Completed;
+      m_ghostToTargetAndDetachAnimationClock = ( AnimationClock )animation.CreateClock( true );
+      m_ghostToTargetAndDetachAnimationClock.Completed += new EventHandler( this.MoveGhostToTargetAndDetach_Completed );
 
       //Animate all cells of all columns.
       foreach( var entry in this.GetElementAdornerEntries() )
@@ -1172,7 +1182,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       // Stop the animation, do not simply pause it, so it resets correctly.
       m_ghostToTargetAndDetachAnimationClock.Controller.Stop();
-      m_ghostToTargetAndDetachAnimationClock.Completed -= this.MoveGhostToTargetAndDetach_Completed;
+      m_ghostToTargetAndDetachAnimationClock.Completed -= new EventHandler( this.MoveGhostToTargetAndDetach_Completed );
       m_ghostToTargetAndDetachAnimationClock = null;
     }
 
@@ -1181,546 +1191,1065 @@ namespace Xceed.Wpf.DataGrid.Views
       this.ShowDraggedElements();
 
       var draggedCell = this.DraggedElement as Cell;
-      if( ( draggedCell != null ) && this.OwnElement( draggedCell ) )
+      var parentColumn = ( draggedCell != null ) ? draggedCell.ParentColumn : null;
+
+      if( ( parentColumn != null ) && this.OwnElement( draggedCell ) )
       {
-        draggedCell.ParentColumn.SetIsBeingDraggedAnimated( false );
+        parentColumn.SetIsBeingDraggedAnimated( false );
       }
 
       // Clear properties on the manager if it is the one currently in use on for this Detail level. This avoids problem with the FixedColumnSplitter
       // when multiple Cells are moved rapidly:
       // The FixedColumnSplitter listens to TableflowView.AreColumnsBeingReordered internal ViewProperty to bind to the TableflowView.FixedColumnSplitterTranslation internal 
-      // ViewProperty. The internal ViewProeprty ColumnReorderingDragSourceManager is affected when a new Drag begins. The old DragSourceManager is not stopped to allow 
+      // ViewProperty. The internal ViewProperty ColumnReorderingDragSourceManager is affected when a new Drag begins. The old DragSourceManager is not stopped to allow 
       // any pending animations to complete smoothly. If the first manager clears the TableflowView.AreColumnBeingReordered property, the FixedColumnSplitters
       // just clears its binding to the FixedColumnSplitterTranslation and is no more animated.
       //
       // Ensuring that the current manager for this Detail level ensure that no other drag was initialized since this manager started animations.
 
-      if( this.OwnElement( this.DraggedDataGridContext ) )
+      if( this.OwnElement( m_dataGridContext ) )
       {
-        TableflowView.SetAreColumnsBeingReordered( this.DraggedDataGridContext, false );
+        TableflowView.SetAreColumnsBeingReordered( m_dataGridContext, false );
 
-        if( ( draggedCell != null ) && this.OwnElement( draggedCell ) )
+        if( ( parentColumn != null ) && this.OwnElement( draggedCell ) )
         {
-          draggedCell.ParentColumn.ClearColumnReorderingDragSourceManager();
+          parentColumn.ClearColumnReorderingDragSourceManager();
         }
 
-        TableflowView.ClearColumnReorderingDragSourceManager( this.DraggedDataGridContext );
+        TableflowView.ClearColumnReorderingDragSourceManager( m_dataGridContext );
       }
     }
 
-    private void CommitColumnReordering( RequiredAnimationsInfo animationState )
+    private void UpdateColumnsLayout()
     {
-      int newVisiblePosition = ( animationState != null ) ? animationState.DraggedColumnNewVisiblePosition : -1;
+      var targetCell = this.CurrentDropTarget as ColumnManagerCell;
+      var targetPoint = this.CurrentDropTargetToContainerPosition;
+      Debug.Assert( targetCell != null );
+      Debug.Assert( DataGridControl.GetDataGridContext( targetCell ) == m_dataGridContext );
+
+      var targetColumn = targetCell.ParentColumn;
+      Debug.Assert( targetColumn != null );
+
+      var targetLocation = m_columnsLayout[ targetColumn ];
+      Debug.Assert( targetLocation != null );
+      if( targetLocation == null )
+        return;
+
+      var draggedCell = this.DraggedElement as Cell;
+      Debug.Assert( draggedCell != null );
+      var draggedLocation = m_columnsLayout[ draggedCell.ParentColumn ];
+      Debug.Assert( draggedLocation != null );
+      if( draggedLocation == null )
+        return;
 
-      // Affect the new VisiblePosition to the DraggedColumn to allow the Grid to reflect the change
-      if( newVisiblePosition > -1 )
+      // Drop before target cell.
+      if( ColumnReorderingDragSourceManager.IsPointLocatedBeforeTarget( targetCell, targetPoint ) )
       {
-        // There is a ReorderVisiblePosition assigned only when a ColumnReordering is processed, not when a FixedColumnSplitter is moved
-        ColumnManagerCell draggedCell = this.DraggedElement as ColumnManagerCell;
-        Debug.Assert( draggedCell != null );
-        if( draggedCell != null )
-        {
-          ColumnBase draggedColumn = draggedCell.ParentColumn;
+        if( !draggedLocation.CanMoveBefore( targetLocation ) || object.Equals( draggedLocation, targetLocation.GetPreviousSibling() ) )
+          return;
 
-          // Affect the new VisiblePosition of the DraggedColumn - this will automatically update all child columns when dealing with merged columns
-          draggedColumn.VisiblePosition = newVisiblePosition;
-        }
+        draggedLocation.MoveBefore( targetLocation );
+      }
+      // Drop after target cell.
+      else if( ColumnReorderingDragSourceManager.IsPointLocatedAfterTarget( targetCell, targetPoint ) )
+      {
+        if( !draggedLocation.CanMoveAfter( targetLocation ) || object.Equals( draggedLocation, targetLocation.GetNextSibling() ) )
+          return;
+
+        draggedLocation.MoveAfter( targetLocation );
+      }
+      else
+      {
+        return;
       }
 
-      this.CleanUpColumnAnimations();
+      this.UpdateColumnsLayoutAnimations();
     }
 
-    private void CommitSplitterReordering( RequiredAnimationsInfo animationState )
+    private void UpdateColumnsLayoutAnimations()
     {
-      if( m_splitterAnimationClock == null )
+      this.ResetColumnsLayoutAnimations();
+
+      var draggedCell = ( Cell )this.DraggedElement;
+      var draggedColumn = draggedCell.ParentColumn;
+
+      var draggedColumnReorderLocation = m_columnsLayout[ draggedColumn ];
+      Debug.Assert( draggedColumnReorderLocation != null );
+      if( draggedColumnReorderLocation == null )
         return;
 
-      double fixedColumnTranslation = this.FixedColumnSplitterTranslation.X;
+      var draggedColumnSourceLocation = m_dataGridContext.ColumnManager.GetColumnLocationFor( draggedColumn );
+      Debug.Assert( draggedColumnSourceLocation != null );
+      if( draggedColumnSourceLocation == null )
+        return;
 
-      // Try to get the TargetOffset of the FixedColumnSplitter AnimationClock if available to ensure to commit the correct fixed column count
-      if( m_splitterAnimationClock != null )
+      Debug.Assert( m_columnVirtualizationManager != null );
+
+      var indexOfDraggedColumnInReorderedColumns = this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnReorderLocation ) ).Count();
+      var indexOfDraggedColumnInSourceColumns = this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnSourceLocation ) ).Count();
+      var columnsInView = m_columnVirtualizationManager.GetVisibleFieldNames( m_level );
+      var isDraggingLeft = ( indexOfDraggedColumnInReorderedColumns < indexOfDraggedColumnInSourceColumns );
+      var isDraggingRight = ( indexOfDraggedColumnInReorderedColumns > indexOfDraggedColumnInSourceColumns );
+
+      if( isDraggingLeft )
       {
-        OffsetAnimation animation = m_splitterAnimationClock.Timeline as OffsetAnimation;
+        var remaining = indexOfDraggedColumnInSourceColumns - indexOfDraggedColumnInReorderedColumns;
 
-        if( animation != null )
+        foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( draggedColumnReorderLocation ) ) )
         {
-          if( ( animation.To != null ) && ( animation.To.HasValue ) )
+          if( remaining <= 0 )
+            break;
+
+          if( columnsInView.Contains( columnLocation.Column ) )
           {
-            fixedColumnTranslation = animation.To.Value;
+            this.AnimateColumn( columnLocation, AnimationType.MoveRight );
+            this.AnimateColumnDescendants( columnLocation, AnimationType.MoveRight );
+            this.AnimateColumnAncestors( columnLocation, AnimationType.MoveRight );
           }
+
+          remaining--;
         }
       }
-
-      if( fixedColumnTranslation != 0 )
+      else if( isDraggingRight )
       {
-        int fixedColumnCount = animationState.NewFixedColumnCount;
-        int correctionValue = animationState.CorrectionValue;
-
-        // Update the FixedColumnCount on the DataGridContext in order to correctly represent the value modified during animated reordering
-        DataGridContext dataGridContext = this.DraggedDataGridContext;
+        var remaining = indexOfDraggedColumnInReorderedColumns - indexOfDraggedColumnInSourceColumns;
 
-        if( dataGridContext.ParentDataGridContext != null )
+        foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnReorderLocation ) ) )
         {
-          foreach( DataGridContext childDataGridContext in dataGridContext.ParentDataGridContext.GetChildContexts() )
+          if( remaining <= 0 )
+            break;
+
+          if( columnsInView.Contains( columnLocation.Column ) )
           {
-            this.ColumnVirtualizationManager.SetFixedColumnCount( m_level, fixedColumnCount, correctionValue );
+            this.AnimateColumn( columnLocation, AnimationType.MoveLeft );
+            this.AnimateColumnDescendants( columnLocation, AnimationType.MoveLeft );
+            this.AnimateColumnAncestors( columnLocation, AnimationType.MoveLeft );
           }
-        }
-        else
-        {
-          this.ColumnVirtualizationManager.SetFixedColumnCount( m_level, fixedColumnCount, correctionValue );
+
+          remaining--;
         }
       }
 
-      m_splitterAnimationClock.Controller.Remove();
+      var commonAncestor = this.GetCommonAncestor( draggedColumnSourceLocation, draggedColumnReorderLocation );
 
-      // Ensure 0 to move to original position
-      this.FixedColumnSplitterTranslation.X = 0;
-    }
+      // Adjust the animation type on the ancestors.
+      for( var childLocation = draggedColumnSourceLocation; childLocation != null; )
+      {
+        var parentLocation = childLocation.GetParent() as ColumnHierarchyManager.IColumnLocation;
+        if( ( parentLocation == null ) || ( parentLocation.Column == commonAncestor ) )
+          break;
 
-    private void ComputeReorderingParameters()
-    {
-      ColumnManagerCell draggedOverCell = this.CurrentDropTarget as ColumnManagerCell;
-      Nullable<Point> mousePosition = this.CurrentDropTargetToDragContainerPosition;
-      ColumnManagerCell draggedCell = this.DraggedElement as ColumnManagerCell;
-      Debug.Assert( draggedCell != null );
+        var columnLocation = m_columnsLayout[ parentLocation.Column ];
+        Debug.Assert( columnLocation != null );
 
-      int initialVisiblePosition = draggedCell.ParentColumn.VisiblePosition;
-      int draggedOverCellVisiblePosition = draggedOverCell.ParentColumn.VisiblePosition;
-      int newTargetVisiblePosition = -1;
-      int newFixedColumnCount;
-      int correctionValue;
+        switch( columnLocation.Status )
+        {
+          case AnimationType.MoveLeft:
+            this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
+            break;
 
-      Point draggedOverCellToDragContainer = draggedOverCell.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, this.DragContainer );
-      Rect hitTestRect = new Rect( draggedOverCellToDragContainer.X, draggedOverCellToDragContainer.Y, draggedOverCell.RenderSize.Width / 2, draggedOverCell.RenderSize.Height );
+          case AnimationType.MoveRight:
+            this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
+            break;
 
-      if( mousePosition.HasValue && ( mousePosition.Value.X < ( hitTestRect.X + hitTestRect.Width ) ) )
-      {
-        newTargetVisiblePosition = ( initialVisiblePosition >= draggedOverCellVisiblePosition ) ? draggedOverCellVisiblePosition : draggedOverCellVisiblePosition - 1;
+          default:
+            {
+              if( isDraggingLeft )
+              {
+                this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
+              }
+              else if( isDraggingRight )
+              {
+                this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
+              }
+              else
+              {
+                var wasFirstVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousSiblingLocationsOf( childLocation ) ) ).Any();
+                var wasLastVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetNextSiblingLocationsOf( childLocation ) ) ).Any();
+
+                // We must check for last first since we want to apply the "last" animation if the column is both
+                // the first and last child.
+                if( wasLastVisibleChildColumn )
+                {
+                  this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
+                }
+                else if( wasFirstVisibleChildColumn )
+                {
+                  this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
+                }
+              }
+            }
+            break;
+        }
+
+        childLocation = parentLocation;
       }
-      else
+
+      for( var childLocation = draggedColumnReorderLocation; childLocation != null; )
       {
-        newTargetVisiblePosition = ( initialVisiblePosition <= draggedOverCellVisiblePosition ) ? draggedOverCellVisiblePosition : draggedOverCellVisiblePosition + 1;
-      }
+        var parentLocation = childLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
+        if( ( parentLocation == null ) || ( parentLocation.Column == commonAncestor ) )
+          break;
 
-      this.CalculateAnimatedFixedColumnCount( initialVisiblePosition, newTargetVisiblePosition, out newFixedColumnCount, out correctionValue );
+        switch( parentLocation.Status )
+        {
+          case AnimationType.MoveLeft:
+            this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
+            break;
 
-      // Update the VisiblePositions, DraggedOverCellRegion and FixedColumnCount of the ReorderingInfoManager
-      ReorderingInfoManager reorderingInfoManager = this.ReorderingInfoManagerInstance;
+          case AnimationType.MoveRight:
+            this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
+            break;
 
-      reorderingInfoManager.InitializeInfoManager( newFixedColumnCount, correctionValue );
-      reorderingInfoManager.UpdateDraggedColumnVisiblePosition( newTargetVisiblePosition );
-      reorderingInfoManager.UpdateReorderingInfo( this.ColumnVirtualizationManager );
-    }
+          default:
+            {
+              if( isDraggingLeft )
+              {
+                this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
+              }
+              else if( isDraggingRight )
+              {
+                this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
+              }
+              else
+              {
+                var isFirstVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousSiblingLocationsOf( childLocation ) ) ).Any();
+                var isLastVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetNextSiblingLocationsOf( childLocation ) ) ).Any();
 
-    private void CalculateAnimatedFixedColumnCount( int initialVisiblePosition, int newTargetVisiblePosition, out int newFixedColumnCount, out int correctionValue )
-    {
-      ReadOnlyObservableCollection<ColumnBase> visibleColumns = this.VisibleColumns;
+                // We must check for last first since we want to apply the "last" animation if the column is both
+                // the first and last child.
+                if( isLastVisibleChildColumn )
+                {
+                  this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
+                }
+                else if( isFirstVisibleChildColumn )
+                {
+                  this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
+                }
+              }
+            }
+            break;
+        }
 
-      int initialFixedColumnCount = this.ColumnVirtualizationManager.GetFixedColumnCount( m_level );
-      int lastFixedColumnVisiblePosition = visibleColumns[ Math.Max( 0, Math.Min( initialFixedColumnCount, visibleColumns.Count ) - 1 ) ].VisiblePosition;
-      int firstScrollingColumnVisiblePosition = visibleColumns[ Math.Min( initialFixedColumnCount, visibleColumns.Count - 1 ) ].VisiblePosition;
-      newFixedColumnCount = initialFixedColumnCount;
-      correctionValue = initialFixedColumnCount == visibleColumns.Count ? 1 : 0;
+        childLocation = parentLocation;
+      }
 
-      // Ensure we have fixed and/or scrolling columns
-      if( lastFixedColumnVisiblePosition != firstScrollingColumnVisiblePosition )
+      // Since the column is staying under the same ancestor, no animation needs to be done.
+      if( commonAncestor != null )
       {
-        // Initially at the left of the splitter and moving after the first column after the splitter
-        if( ( initialVisiblePosition <= lastFixedColumnVisiblePosition ) && ( newTargetVisiblePosition > lastFixedColumnVisiblePosition ) )
-        {
-          newFixedColumnCount--;
-          if( newFixedColumnCount > 0 )
-          {
-            correctionValue = 1;
-          }
-        }
-        // Initially at the right of the splitter and moving before the first column before the splitter
-        else if( ( initialVisiblePosition >= firstScrollingColumnVisiblePosition ) && ( newTargetVisiblePosition < firstScrollingColumnVisiblePosition ) )
-        {
-          newFixedColumnCount++;
-          if( newFixedColumnCount == visibleColumns.Count )
-          {
-            correctionValue = 1;
-          }
-        }
+        var columnLocation = m_columnsLayout[ commonAncestor ];
+        Debug.Assert( columnLocation != null );
+
+        this.AnimateColumn( columnLocation, AnimationType.Rollback );
+        this.AnimateColumnAncestors( columnLocation, AnimationType.Rollback );
       }
     }
 
-    private void ProcessDragOverColumnManagerCell()
+    private void ResetColumnsLayoutAnimations()
     {
-      ColumnManagerCell draggedCell = this.DraggedElement as ColumnManagerCell;
+      for( int i = 0; i < m_columnsLayout.LevelCount; i++ )
+      {
+        foreach( var location in this.GetColumnLocations( this.GetNextLocationsOf( m_columnsLayout.GetLevelMarkers( i ).Start ) ) )
+        {
+          location.Status = AnimationType.Rollback;
+        }
+      }
+    }
 
-      if( draggedCell == null )
-        return;
+    private ColumnHierarchyManager.ILevelMarkers GetTopLevelMarkers()
+    {
+      return m_dataGridContext.ColumnManager.GetLevelMarkersFor(  m_dataGridContext.Columns );
+    }
 
-      IDropTarget currentDropTarget = this.CurrentDropTarget;
+    private ColumnHierarchyManager.ILocation GetTopLevelStartLocation()
+    {
+      var levelMarkers = this.GetTopLevelMarkers();
 
-      if( currentDropTarget == null )
-        return;
+      Debug.Assert( levelMarkers != null );
+      if( levelMarkers == null )
+        return null;
 
-      if( currentDropTarget == draggedCell )
-        return;
+      return levelMarkers.Start;
+    }
 
-      DataGridContext draggedOverDataGridContext = DataGridControl.GetDataGridContext( currentDropTarget as DependencyObject );
+    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
+    {
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
 
-      if( ( draggedOverDataGridContext == null ) || ( this.DraggedDataGridContext != draggedOverDataGridContext ) )
-        return;
+      return ( from location in locations
+               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
+               where ( columnLocation != null )
+               select columnLocation );
+    }
 
-      this.ComputeReorderingParameters();
+    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyModel.ILocation> locations )
+    {
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyModel.IColumnLocation>();
 
-      this.ApplyColumnReorderingAnimations();
+      return ( from location in locations
+               let columnLocation = location as ColumnHierarchyModel.IColumnLocation
+               where ( columnLocation != null )
+               select columnLocation );
     }
 
-    private void ApplyColumnReorderingAnimations()
+    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetVisibleLocations( IEnumerable<ColumnHierarchyManager.IColumnLocation> locations )
     {
-      Cell draggedCell = this.DraggedElement as Cell;
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
 
-      if( draggedCell == null )
-        return;
+      return ( from location in locations
+               where location.Column.Visible
+               select location );
+    }
 
-      ReorderingInfoManager reorderingInfoManager = this.ReorderingInfoManagerInstance;
-      RequiredAnimationsInfo animationState = reorderingInfoManager.RequiredAnimations;
+    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetVisibleLocations( IEnumerable<ColumnHierarchyModel.IColumnLocation> locations )
+    {
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyModel.IColumnLocation>();
 
-      double draggedColumnWidth = draggedCell.ParentColumn.ActualWidth;
+      return ( from location in locations
+               where location.Column.Visible
+               select location );
+    }
 
-      if( animationState.AnimateToLeft.Count > 0 )
-      {
-        foreach( ColumnBase column in animationState.AnimateToLeft )
-        {
-          this.DoColumnAnimation( column, -draggedColumnWidth, m_columnAnimationDuration, false );
-        }
-      }
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextLocationsOf( ColumnHierarchyManager.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      if( animationState.AnimateToRight.Count > 0 )
+      var targetLocation = location.GetNextSiblingOrCousin();
+      while( targetLocation != null )
       {
-        foreach( ColumnBase column in animationState.AnimateToRight )
-        {
-          this.DoColumnAnimation( column, draggedColumnWidth, m_columnAnimationDuration, false );
-        }
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSiblingOrCousin();
       }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetNextLocationsOf( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      foreach( ColumnBase column in animationState.RollbackAnimation )
+      var targetLocation = location.GetNextSiblingOrCousin();
+      while( targetLocation != null )
       {
-        this.RollbackColumnAnimation( column );
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSiblingOrCousin();
       }
-
-      this.SetSplitterAnimation( reorderingInfoManager.InitialFixedColumnCount, animationState.NewFixedColumnCount, draggedColumnWidth );
     }
 
-    private void RollbackReordering()
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextSiblingLocationsOf( ColumnHierarchyManager.ILocation location )
     {
-      RequiredAnimationsInfo animationState = this.ReorderingInfoManagerInstance.RequiredAnimations;
+      if( location == null )
+        yield break;
 
-      foreach( ColumnBase column in animationState.AnimateToLeft )
+      var targetLocation = location.GetNextSibling();
+      while( targetLocation != null )
       {
-        this.RollbackColumnAnimation( column );
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSibling();
       }
+    }
+
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetNextSiblingLocationsOf( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      foreach( ColumnBase column in animationState.AnimateToRight )
+      var targetLocation = location.GetNextSibling();
+      while( targetLocation != null )
       {
-        this.RollbackColumnAnimation( column );
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSibling();
       }
+    }
 
-      this.ReorderingInfoManagerInstance.RollbackReorderedColumnsAndFixedColumnCount();
-
-      this.DoSplitterAnimation( 0, true );
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousLocationsOf( ColumnHierarchyManager.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      m_reorderCancelled = true;
+      var targetLocation = location.GetPreviousSiblingOrCousin();
+      while( targetLocation != null )
+      {
+        yield return targetLocation;
+        targetLocation = targetLocation.GetPreviousSiblingOrCousin();
+      }
     }
 
-    private void RollbackColumnAnimation( ColumnBase column )
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetPreviousLocationsOf( ColumnHierarchyModel.ILocation location )
     {
-      this.DoColumnAnimation( column, 0, m_columnAnimationDuration, true );
+      if( location == null )
+        yield break;
+
+      var targetLocation = location.GetPreviousSiblingOrCousin();
+      while( targetLocation != null )
+      {
+        yield return targetLocation;
+        targetLocation = targetLocation.GetPreviousSiblingOrCousin();
+      }
     }
 
-    private void DoColumnAnimation( ColumnBase column, double toValue, Duration duration, bool isReverting )
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousSiblingLocationsOf( ColumnHierarchyManager.ILocation location )
     {
-      if( column == null )
-        return;
+      if( location == null )
+        yield break;
 
-      // Never animate the dragged Column to avoid flickering effects on the ghosts because we compute its position on each MouseMove event
-      Cell draggedCell = this.DraggedElement as Cell;
-      if( ( draggedCell != null ) && ( column == draggedCell.ParentColumn ) )
-        return;
+      var targetLocation = location.GetPreviousSibling();
+      while( targetLocation != null )
+      {
+        yield return targetLocation;
+        targetLocation = targetLocation.GetPreviousSibling();
+      }
+    }
 
-      TranslateTransform positionTransform = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingPositionTransform( column );
-      List<AnimationClock> animationClocks;
-      AnimationClock positionAnimationClock = null;
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetPreviousSiblingLocationsOf( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      // Pause previously applied AnimationClock
-      if( m_fieldNameToClock.TryGetValue( column, out animationClocks ) )
+      var targetLocation = location.GetPreviousSibling();
+      while( targetLocation != null )
       {
-        // If the target value is already the correct one, no need to stop animation and create another one
-        positionAnimationClock = animationClocks[ 0 ];
-        OffsetAnimation positionTimeLine = positionAnimationClock.Timeline as OffsetAnimation;
-        if( ( positionTimeLine != null ) && ( positionTimeLine.To == toValue ) )
-          return;
+        yield return targetLocation;
+        targetLocation = targetLocation.GetPreviousSibling();
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetChildLocationsOf( ColumnHierarchyManager.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-        // Stop the animation, do not simply pause it, so it resets correctly.
-        positionAnimationClock.Controller.Stop();
-        positionAnimationClock.Completed -= this.ColumnAnimationCompleted;
+      var targetLocation = location.GetFirstChild();
 
-        m_fieldNameToClock.Remove( column );
+      while( targetLocation != null )
+      {
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSibling();
       }
+    }
 
-      OffsetAnimation positionAnimation = new OffsetAnimation( toValue, duration );
-      positionAnimationClock = positionAnimation.CreateClock( true ) as AnimationClock;
-      positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionAnimationClock, HandoffBehavior.SnapshotAndReplace );
+    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsOf( ColumnHierarchyModel.ILocation location )
+    {
+      if( location == null )
+        yield break;
 
-      //Since we are dealing with regular Columns (i.e. not MergedColumns), no need for resize animation, so we can simply store a null value for the resize AnimationClock.
-      m_fieldNameToClock.Add( column, new List<AnimationClock>() { positionAnimationClock, null } );
+      var targetLocation = location.GetFirstChild();
 
-      if( isReverting )
+      while( targetLocation != null )
       {
-        positionAnimationClock.Completed += this.ColumnAnimationCompleted;
+        yield return targetLocation;
+        targetLocation = targetLocation.GetNextSibling();
       }
-
-      //Start the animation
-      positionAnimationClock.Controller.Begin();
     }
 
-    private void ColumnAnimationCompleted( object sender, EventArgs e )
+    private void ApplyColumnsLayoutAnimations()
     {
-      AnimationClock animationClock = sender as AnimationClock;
+      var draggedCell = this.DraggedElement as Cell;
+      Debug.Assert( draggedCell != null );
 
-      if( animationClock == null )
-        return;
+      var draggedColumn = draggedCell.ParentColumn;
+      Debug.Assert( draggedColumn != null );
 
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      animationClock.Controller.Stop();
+      var draggedColumnWidth = draggedColumn.ActualWidth;
+
+      var startLocation = this.GetTopLevelStartLocation();
+      Debug.Assert( startLocation != null );
+
+      foreach( var location in this.GetNextLocationsOf( startLocation ) )
+      {
+        this.ApplyColumnsLayoutAnimations( location, draggedColumnWidth, s_columnAnimationDuration );
+      }
     }
 
-    private void CleanUpColumnAnimations()
+    private void ApplyColumnsLayoutAnimations( ColumnHierarchyManager.ILocation location, double draggedColumnWidth, Duration animationDuration )
     {
-      foreach( KeyValuePair<ColumnBase, List<AnimationClock>> animationClocks in m_fieldNameToClock )
+      if( location == null )
+        return;
+
+      var columnLocation = location as ColumnHierarchyManager.IColumnLocation;
+      if( columnLocation != null )
       {
-        foreach( AnimationClock animationClock in animationClocks.Value )
+        var column = columnLocation.Column;
+        var targetLocation = m_columnsLayout[ column ];
+        var animationType = ( targetLocation != null ) ? targetLocation.Status : AnimationType.Rollback;
+
+        switch( animationType )
         {
-          if( animationClock != null )
-          {
-            animationClock.Controller.Remove();
-          }
-        }
+          case AnimationType.MoveLeft:
+            {
+              this.StartColumnPositionAnimation( column, -draggedColumnWidth, animationDuration );
+            }
+            break;
 
-        ColumnBase column = animationClocks.Key;
-        TransformGroup transformGroup = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTransformGroup( column );
+          case AnimationType.MoveRight:
+            {
+              this.StartColumnPositionAnimation( column, draggedColumnWidth, animationDuration );
+            }
+            break;
 
-        TranslateTransform positionTransform = transformGroup.Children[ 0 ] as TranslateTransform;
-        if( positionTransform != null )
-        {
-          positionTransform.X = 0;
-        }
+          case AnimationType.MoveLeftAndIncreaseWidth:
+            {
+            }
+            break;
 
-        ScaleTransform sizeTransform = transformGroup.Children[ 1 ] as ScaleTransform;
-        if( sizeTransform != null )
-        {
-          sizeTransform.CenterX = 0;
-          sizeTransform.ScaleX = 1;
+          case AnimationType.MoveRightAndDecreaseWidth:
+            {
+            }
+            break;
+
+          case AnimationType.IncreaseWidth:
+            {
+            }
+            break;
+
+          case AnimationType.DecreaseWidth:
+            {
+            }
+            break;
+
+          case AnimationType.Rollback:
+            {
+              this.StartColumnPositionAnimation( column, 0d, animationDuration );
+            }
+            break;
+
+          default:
+            throw new NotImplementedException();
         }
       }
 
-      m_fieldNameToClock.Clear();
+      foreach( var childLocation in this.GetChildLocationsOf( location ) )
+      {
+        this.ApplyColumnsLayoutAnimations( childLocation, draggedColumnWidth, animationDuration );
+      }
     }
 
-    private void RemoveColumnsPreviousAnimations()
+    private void RollbackColumnsLayoutAnimations()
     {
-      foreach( ColumnBase column in this.VisibleColumns )
+      var startLocation = this.GetTopLevelStartLocation();
+      Debug.Assert( startLocation != null );
+
+      foreach( var location in this.GetNextLocationsOf( startLocation ) )
       {
-        TranslateTransform transform = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingPositionTransform( column );
-        ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( transform );
+        this.RollbackColumnsLayoutAnimations( location );
       }
     }
 
-    private void SetSplitterAnimation( int oldfixedColumnCount, int newFixedColumnCount, double offset )
+    private void RollbackColumnsLayoutAnimations( ColumnHierarchyManager.ILocation location )
     {
-      if( oldfixedColumnCount < newFixedColumnCount )
+      if( location == null )
+        return;
+
+      var columnLocation = location as ColumnHierarchyManager.IColumnLocation;
+      if( columnLocation != null )
+      {
+        var column = columnLocation.Column;
+
+        this.StartColumnPositionAnimation( column, 0d, s_columnAnimationDuration );
+      }
+
+      foreach( var childLocation in this.GetChildLocationsOf( location ) )
       {
-        this.DoSplitterAnimation( offset, false );
+        this.RollbackColumnsLayoutAnimations( childLocation );
       }
-      else if( oldfixedColumnCount > newFixedColumnCount )
+    }
+
+    private void ApplySplitterAnimation()
+    {
+      var draggedCell = this.DraggedElement as Cell;
+      var draggedColumn = ( draggedCell != null ) ? draggedCell.ParentColumn : null;
+      Debug.Assert( draggedColumn != null );
+
+      var draggedColumnContainingCollection = ( draggedColumn != null ) ? draggedColumn.ContainingCollection : null;
+      Debug.Assert( draggedColumnContainingCollection != null );
+
+      var sourceLevelMarkers = ( draggedColumnContainingCollection != null ) ? m_dataGridContext.ColumnManager.GetLevelMarkersFor( draggedColumnContainingCollection ) : null;
+      var sourceSplitter = ( sourceLevelMarkers != null ) ? sourceLevelMarkers.Splitter : null;
+
+      var draggedColumnLocation = m_columnsLayout[ draggedColumn ];
+      var reorderedLevelMarkers = ( draggedColumnLocation != null ) ? m_columnsLayout.GetLevelMarkers( draggedColumnLocation.Level ) : null;
+      var reorderedSplitter = ( reorderedLevelMarkers != null ) ? reorderedLevelMarkers.Splitter : null;
+
+      int oldFixedColumnCount;
+      int newFixedColumnCount;
+
+      if( ( sourceSplitter != null ) && ( reorderedSplitter != null ) )
       {
-        this.DoSplitterAnimation( -offset, false );
+        oldFixedColumnCount = this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousLocationsOf( sourceSplitter ) ) ).Count();
+        newFixedColumnCount = this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousLocationsOf( reorderedSplitter ) ) ).Count();
       }
       else
       {
-        this.DoSplitterAnimation( 0, true );
+        oldFixedColumnCount = 0;
+        newFixedColumnCount = 0;
       }
-    }
 
-    private void RollbackSplitterAnimationCompleted( object sender, EventArgs e )
-    {
-      if( m_splitterAnimationClock != null )
+      if( newFixedColumnCount > oldFixedColumnCount )
       {
-        m_splitterAnimationClock.Controller.Remove();
+        Debug.Assert( draggedColumn != null );
+
+        this.StartSplitterPositionAnimation( draggedColumn.ActualWidth );
       }
+      else if( newFixedColumnCount < oldFixedColumnCount )
+      {
+        Debug.Assert( draggedColumn != null );
 
-      if( this.FixedColumnSplitterTranslation != null )
+        this.StartSplitterPositionAnimation( -draggedColumn.ActualWidth );
+      }
+      else
       {
-        this.FixedColumnSplitterTranslation.X = 0;
+        this.StartSplitterPositionAnimation( 0d );
       }
     }
 
-    private void DoSplitterAnimation( double offset, bool isReverting )
+    private void RollbackReordering()
     {
-      if( m_splitterAnimationClock != null )
+      m_reorderCancelled = true;
+
+      this.RollbackColumnsLayoutAnimations();
+      this.StartSplitterPositionAnimation( 0d );
+    }
+
+    private void StartColumnPositionAnimation( ColumnBase column, double offset, Duration duration )
+    {
+      if( column == null )
+        return;
+
+      var isMergedColumn = false;
+
+      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
+      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
+      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
+
+      var positionClock = default( AnimationClock );
+      var sizeClock = default( AnimationClock );
+      var clocks = default( ColumnAnimationClocks );
+
+      // Pause any previously started animation.
+      if( m_animationClocks.TryGetValue( column, out clocks ) )
       {
-        OffsetAnimation clockOffsetAnimation = m_splitterAnimationClock.Timeline as OffsetAnimation;
+        positionClock = clocks.Position;
+        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
+        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != offset );
 
-        // If the target value is already the correct one, no need to stop animation and create another one
-        if( ( clockOffsetAnimation != null ) && ( clockOffsetAnimation.To == offset ) )
+        sizeClock = clocks.Size;
+        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
+        var resetSize = ( isMergedColumn && ( ( sizeTimeLine == null ) || ( sizeTimeLine.To != 1d ) ) )
+                     || ( !isMergedColumn && ( sizeClock != null ) );
+
+        // No animation needs to be done.
+        if( !resetPosition && !resetSize )
           return;
+
+        if( resetPosition && ( positionClock != null ) )
+        {
+          var controller = positionClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          positionClock = null;
+        }
+
+        if( resetSize && ( sizeClock != null ) )
+        {
+          var controller = sizeClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          sizeClock = null;
+        }
       }
 
-      this.PauseSplitterAnimation();
+      if( positionClock == null )
+      {
+        var animation = new OffsetAnimation( offset, duration );
+        positionClock = animation.CreateClock( true ) as AnimationClock;
+        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
 
-      OffsetAnimation animation = new OffsetAnimation( offset, m_columnAnimationDuration );
-      m_splitterAnimationClock = ( AnimationClock )animation.CreateClock( true );
+        if( offset == 0d )
+        {
+          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
+        }
 
-      this.FixedColumnSplitterTranslation.ApplyAnimationClock( TranslateTransform.XProperty, m_splitterAnimationClock, HandoffBehavior.SnapshotAndReplace );
+        positionClock.Controller.Begin();
+      }
+
+      Debug.Assert( positionClock != null );
 
-      if( isReverting )
+      if( isMergedColumn && ( sizeClock == null ) )
       {
-        m_splitterAnimationClock.Completed += this.RollbackSplitterAnimationCompleted;
+        var animation = new OffsetAnimation( 1d, duration );
+        sizeClock = animation.CreateClock( true ) as AnimationClock;
+        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
+
+        if( offset == 0d )
+        {
+          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
+        }
+
+        sizeClock.Controller.Begin();
       }
 
-      m_splitterAnimationClock.Controller.Begin();
+      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
     }
 
-    private void PauseSplitterAnimation()
+    private void StartColumnSizeAnimation( ColumnBase column, double enlarge, Duration duration )
     {
-      if( m_splitterAnimationClock == null )
+      if( column == null )
         return;
 
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      m_splitterAnimationClock.Controller.Stop();
-      m_splitterAnimationClock.Completed -= this.RollbackSplitterAnimationCompleted;
-    }
+      Debug.Assert( column.Width != 0d );
 
-    private void RemoveFixedColumnSplitterPreviousAnimation( DataGridContext dataGridContext )
-    {
-      TranslateTransform transform = TableflowView.GetFixedColumnSplitterTranslation( dataGridContext ) as TranslateTransform;
-      ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( transform );
+      //Calculate the resize ratio that needs to be applied to the ScaleTransform (works in %)
+      var resizedWith = column.Width + enlarge;
+      var resizedFactor = resizedWith / column.Width;
+
+      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
+      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
+      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
+
+      var positionClock = default( AnimationClock );
+      var sizeClock = default( AnimationClock );
+      var clocks = default( ColumnAnimationClocks );
+
+      // Pause any previously started animation.
+      if( m_animationClocks.TryGetValue( column, out clocks ) )
+      {
+        positionClock = clocks.Position;
+        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
+        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != 0d );
+
+        sizeClock = clocks.Size;
+        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
+        var resetSize = ( sizeTimeLine == null ) || ( sizeTimeLine.To != resizedFactor );
+
+        // No animation needs to be done.
+        if( !resetPosition && !resetSize )
+          return;
+
+        if( resetPosition && ( positionClock != null ) )
+        {
+          var controller = positionClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          positionClock = null;
+        }
+
+        if( resetSize && ( sizeClock != null ) )
+        {
+          var controller = sizeClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          sizeClock = null;
+        }
+      }
+
+      if( positionClock == null )
+      {
+        var animation = new OffsetAnimation( 0d, duration );
+        positionClock = animation.CreateClock( true ) as AnimationClock;
+        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
+
+        if( enlarge == 0d )
+        {
+          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
+        }
+
+        positionClock.Controller.Begin();
+      }
+
+      Debug.Assert( positionClock != null );
+
+      if( sizeClock == null )
+      {
+        var animation = new OffsetAnimation( resizedFactor, duration );
+        sizeClock = animation.CreateClock( true ) as AnimationClock;
+        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
+
+        if( enlarge == 0d )
+        {
+          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
+        }
+
+        sizeClock.Controller.Begin();
+      }
+
+      Debug.Assert( sizeClock != null );
+
+      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
     }
 
-    private void ApplyContainerClip( DraggedElementAdorner adorner )
+    private void StartColumnPositionAndSizeAnimations( ColumnBase column, double offset, Duration duration )
     {
-      if( adorner == null )
+      if( column == null )
         return;
 
-      var adornedElement = adorner.AdornedElement;
-      if( adornedElement == null )
-        return;
+      Debug.Assert( column.Width != 0d );
 
-      // We only want to clip Cells other than the dragged Cell
-      if( adornedElement == this.DraggedElement )
-        return;
+      //Calculate the resize ratio that needs to be applied to the ScaleTransform (works in %)
+      var resizedWidth = column.Width - offset;
+      var resizedFactor = resizedWidth / column.Width;
 
-      var dataGridContext = DataGridControl.GetDataGridContext( adornedElement );
-      if( dataGridContext == null )
-        return;
+      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
+      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
+      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
 
-      var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( adornedElement );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return;
+      var positionClock = default( AnimationClock );
+      var sizeClock = default( AnimationClock );
+      var clocks = default( ColumnAnimationClocks );
 
-      var dataItem = dataItemStore.Data;
-      if( dataItem == null )
-        return;
+      // Pause any previously started animation.
+      if( m_animationClocks.TryGetValue( column, out clocks ) )
+      {
+        positionClock = clocks.Position;
+        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
+        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != offset );
 
-      var container = dataGridContext.GetContainerFromItem( dataItem ) as UIElement;
-      if( container != null )
+        sizeClock = clocks.Size;
+        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
+        var resetSize = ( sizeTimeLine == null ) || ( sizeTimeLine.To != resizedFactor );
+
+        // No animation needs to be done.
+        if( !resetPosition && !resetSize )
+          return;
+
+        if( resetPosition && ( positionClock != null ) )
+        {
+          var controller = positionClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          positionClock = null;
+        }
+
+        if( resetSize && ( sizeClock != null ) )
+        {
+          var controller = sizeClock.Controller;
+          Debug.Assert( controller != null );
+
+          // Stop the animation, do not simply pause it, so it resets correctly.
+          controller.Stop();
+          controller.Remove();
+
+          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+          sizeClock = null;
+        }
+      }
+
+      if( positionClock == null )
       {
-        RectangleGeometry containerClip = container.Clip as RectangleGeometry;
+        var animation = new OffsetAnimation( offset, duration );
+        positionClock = animation.CreateClock( true ) as AnimationClock;
+        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
 
-        if( containerClip != null )
+        if( offset == 0d )
         {
-          // Transform the bounds of the clip region of the container to fit the bounds of the adornedElement
-          Rect transformedBounds = container.TransformToDescendant( adornedElement ).TransformBounds( containerClip.Bounds );
+          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
+        }
 
-          containerClip = new RectangleGeometry( transformedBounds );
+        positionClock.Controller.Begin();
+      }
+
+      Debug.Assert( positionClock != null );
+
+      if( sizeClock == null )
+      {
+        var animation = new OffsetAnimation( resizedFactor, duration );
+        sizeClock = animation.CreateClock( true ) as AnimationClock;
+
+        // When doing both a position and a resize animation, the CenterX value must be set so the resizing is applied from the new position,
+        // or else the offset at which is starts will be wrong.
+        sizeTransform.CenterX = offset;
+        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
+
+        if( offset == 0d )
+        {
+          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
         }
 
-        adorner.AdornedElementImage.Clip = containerClip;
+        sizeClock.Controller.Begin();
       }
-      else
+
+      Debug.Assert( sizeClock != null );
+
+      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
+    }
+
+    private void StartSplitterPositionAnimation( double offset )
+    {
+      if( m_splitterAnimationClock != null )
       {
-        //This is an item that is in the FixedHeaders/Footers of the gird, do not clip it.
-        adorner.AdornedElementImage.Clip = null;
+        var timeLine = m_splitterAnimationClock.Timeline as OffsetAnimation;
+
+        // No animation needs to be done.
+        if( ( timeLine != null ) && ( timeLine.To == offset ) )
+          return;
+
+        var controller = m_splitterAnimationClock.Controller;
+        Debug.Assert( controller != null );
+
+        controller.Stop();
+        controller.Remove();
+
+        m_splitterAnimationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
+      }
+
+      var animation = new OffsetAnimation( offset, s_columnAnimationDuration );
+      m_splitterAnimationClock = animation.CreateClock( true ) as AnimationClock;
+      m_splitterTranslation.ApplyAnimationClock( TranslateTransform.XProperty, m_splitterAnimationClock, HandoffBehavior.SnapshotAndReplace );
+
+      if( m_splitterAnimationClock != null )
+      {
+        if( offset == 0d )
+        {
+          m_splitterAnimationClock.Completed += new EventHandler( this.OnRollbackSplitterPositionCompleted );
+        }
+
+        m_splitterAnimationClock.Controller.Begin();
       }
     }
 
-    private TableflowViewItemsHost GetTableFlowViewItemsHost()
+    private void OnRollbackColumnAnimationCompleted( object sender, EventArgs e )
     {
-      if( ( this.DraggedDataGridContext != null ) && ( this.DraggedDataGridContext.DataGridControl != null ) && ( this.DraggedDataGridContext.DataGridControl.ItemsHost != null ) )
-        return this.DraggedDataGridContext.DataGridControl.ItemsHost as TableflowViewItemsHost;
+      var animationClock = sender as AnimationClock;
+      if( animationClock == null )
+        return;
 
-      return null;
+      animationClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
+
+      this.ClearAnimationClock( ref animationClock );
     }
 
-    private Rect GetTableflowViewItemsHostToDragContainerRect( TableflowViewItemsHost itemsHost )
+    private void OnRollbackSplitterPositionCompleted( object sender, EventArgs e )
     {
-      Rect tableflowItemsHostToDragContainerRect = new Rect( this.DragContainer.RenderSize );
+      var animationClock = sender as AnimationClock;
+      if( animationClock == null )
+        return;
 
-      if( itemsHost != null )
-      {
-        double stickyHeadersHeight = itemsHost.GetStickyHeadersRegionHeight();
-        double stickyFootersHeight = itemsHost.GetStickyHeadersRegionHeight();
+      animationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
 
-        Point itemsHostToDragContainer = itemsHost.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, this.DragContainer );
+      if( m_splitterAnimationClock == animationClock )
+      {
+        this.ClearAnimationClock( ref m_splitterAnimationClock );
 
-        tableflowItemsHostToDragContainerRect = new Rect( itemsHostToDragContainer.X, itemsHostToDragContainer.Y + stickyHeadersHeight, itemsHost.RenderSize.Width,
-                                                          Math.Max( 0d, itemsHost.RenderSize.Height - stickyHeadersHeight - stickyFootersHeight ) );
+        Debug.Assert( ( m_splitterTranslation == null ) || ( m_splitterTranslation.X == 0d ) );
       }
+      else
+      {
+        this.ClearAnimationClock( ref animationClock );
+      }
+    }
+
+    private void ClearAnimationClock( ref AnimationClock animationClock )
+    {
+      if( animationClock == null )
+        return;
+
+      var controller = animationClock.Controller;
+      Debug.Assert( controller != null );
 
-      return tableflowItemsHostToDragContainerRect;
+      controller.Stop();
+      controller.Remove();
+
+      animationClock = null;
     }
 
-    private Dictionary<DataGridContext, Rect> GetColumnManagerCellGhostRects()
+    private void ClearSplitterAnimationClock()
     {
-      Dictionary<DataGridContext, Rect> dataGridContextToColumnManagerCellRects = new Dictionary<DataGridContext, Rect>();
+      if( m_splitterAnimationClock == null )
+        return;
 
-      foreach( var element in this.GetElements() )
+      m_splitterAnimationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
+
+      this.ClearAnimationClock( ref m_splitterAnimationClock );
+    }
+
+    private void ClearColumnAnimations()
+    {
+      foreach( var column in m_dataGridContext.Columns )
       {
-        var columnManagerCell = element as ColumnManagerCell;
-        if( columnManagerCell == null )
-          continue;
+        ColumnReorderingDragSourceManager.ClearAnimatedColumnReorderingTranslation( column );
+      }
 
-        Point columnManagerCellToDragContainer = columnManagerCell.TranslatePoint( ColumnReorderingDragSourceManager.EmptyPoint, this.DragContainer );
+      m_animationClocks.Clear();
+    }
 
-        Rect columnManagerCellRect = new Rect( columnManagerCellToDragContainer.X, columnManagerCellToDragContainer.Y, columnManagerCell.RenderSize.Width,
-                                               columnManagerCell.RenderSize.Height );
+    private void ClearSplitterAnimation()
+    {
+      this.ClearSplitterAnimationClock();
 
-        DataGridContext columnManagerCellDataGridContext = DataGridControl.GetDataGridContext( columnManagerCell );
+      ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( TableflowView.GetFixedColumnSplitterTranslation( m_dataGridContext ) );
+    }
 
-        // We will only consider the first ColumnManagerRow added to this DataGridContext
-        if( !dataGridContextToColumnManagerCellRects.ContainsKey( columnManagerCellDataGridContext ) )
-        {
-          dataGridContextToColumnManagerCellRects.Add( columnManagerCellDataGridContext, columnManagerCellRect );
-        }
-      }
+    private void ApplyContainerClip( DraggedElementAdorner adorner )
+    {
+      if( adorner == null )
+        return;
+
+      var adornedElement = adorner.AdornedElement;
+      if( adornedElement == null )
+        return;
+
+      // We only want to clip Cells other than the dragged Cell
+      if( adornedElement == this.DraggedElement )
+        return;
+
+      var dataGridContext = DataGridControl.GetDataGridContext( adornedElement );
+      if( dataGridContext == null )
+        return;
 
-      return dataGridContextToColumnManagerCellRects;
-    }
+      var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( adornedElement );
+      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
+        return;
 
-    private void RemoveAllGhosts()
-    {
-      this.PauseDraggedElementFadeInAnimation();
+      var dataItem = dataItemStore.Data;
+      if( dataItem == null )
+        return;
 
-      foreach( var entry in this.GetElementAdornerEntries() )
+      var container = dataGridContext.GetContainerFromItem( dataItem ) as UIElement;
+      if( container != null )
       {
-        Debug.Assert( entry.Value != null );
-        this.AdornerLayerInsideDragContainer.Remove( entry.Value );
-
-        entry.Key.Opacity = 1d;
-      }
+        var containerClip = container.Clip as RectangleGeometry;
+        if( containerClip != null )
+        {
+          // Transform the bounds of the clip region of the container to fit the bounds of the adornedElement
+          var transformedBounds = container.TransformToDescendant( adornedElement ).TransformBounds( containerClip.Bounds );
 
-      m_elementToDraggedElementAdorner.Clear();
+          containerClip = new RectangleGeometry( transformedBounds );
+        }
 
-      if( m_popupDraggedElementAdorner != null )
+        adorner.AdornedElementImage.Clip = containerClip;
+      }
+      else
       {
-        this.AdornerLayerInsideDragContainer.Remove( m_popupDraggedElementAdorner );
-        m_popupDraggedElementAdorner = null;
+        //This is an item that is in the FixedHeaders/Footers of the gird, do not clip it.
+        adorner.AdornedElementImage.Clip = null;
       }
     }
 
@@ -1763,40 +2292,36 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void ApplyDraggedElementFadeInAnimation()
     {
-      int remainingOpacityDuration = this.DraggedElementFadeInDuration;
+      var remainingOpacityDuration = s_draggedElementFadeInDuration;
 
       if( m_draggedElementFadeInAnimationClock != null )
       {
-        OffsetAnimation fadeInAnimation = m_draggedElementFadeInAnimationClock.Timeline as OffsetAnimation;
+        var fadeInAnimation = m_draggedElementFadeInAnimationClock.Timeline as OffsetAnimation;
 
         if( ( fadeInAnimation != null ) && ( fadeInAnimation.To == 1d ) )
-        {
           return;
-        }
-        else
+
+        if( m_draggedElementFadeInAnimationClock.CurrentState == ClockState.Active )
         {
-          if( m_draggedElementFadeInAnimationClock.CurrentState == ClockState.Active )
-          {
-            // The remaining duration is the Timeline Duration less the elapsed time
-            remainingOpacityDuration = fadeInAnimation.Duration.TimeSpan.Milliseconds - m_draggedElementFadeInAnimationClock.CurrentTime.Value.Milliseconds;
-          }
+          // The remaining duration is the Timeline Duration less the elapsed time
+          remainingOpacityDuration = new Duration( fadeInAnimation.Duration.TimeSpan - m_draggedElementFadeInAnimationClock.CurrentTime.Value );
         }
       }
 
       this.PauseDraggedElementFadeInAnimation();
 
-      UIElement draggedElement = this.DraggedElement;
+      var draggedElement = this.DraggedElement;
 
       // Apply an animation on the opacity of the Cell to ensure a nice transition between the ColumnReordering and another IDropTarget that is not handled by this manager
       if( draggedElement != null )
       {
-        OffsetAnimation opacityAnimation = new OffsetAnimation( 1, new Duration( TimeSpan.FromMilliseconds( remainingOpacityDuration ) ) );
+        var opacityAnimation = new OffsetAnimation( 1d, remainingOpacityDuration );
 
         m_draggedElementFadeInAnimationClock = opacityAnimation.CreateClock( true ) as AnimationClock;
 
         // We ust the same completed callback as MoveGhostToTarget animation to  be sure that the DraggedElement
         // FadeIn is completed and the ghosts are correctly positioned before displaying the original UIElements
-        m_draggedElementFadeInAnimationClock.Completed += this.GhostToTargetAnimation_Completed;
+        m_draggedElementFadeInAnimationClock.Completed += new EventHandler( this.GhostToTargetAnimation_Completed );
 
         draggedElement.ApplyAnimationClock( UIElement.OpacityProperty, m_draggedElementFadeInAnimationClock );
 
@@ -1807,8 +2332,7 @@ namespace Xceed.Wpf.DataGrid.Views
     private void PauseDraggedElementFadeInAnimation()
     {
       // Ensure to stop dragged element FadeIn in order to correctly display the DraggedElementGhost
-      UIElement draggedElement = this.DraggedElement;
-
+      var draggedElement = this.DraggedElement;
       if( draggedElement != null )
       {
         draggedElement.ApplyAnimationClock( UIElement.OpacityProperty, null );
@@ -1819,410 +2343,322 @@ namespace Xceed.Wpf.DataGrid.Views
 
       // Stop the animation, do not simply pause it, so it resets correctly.
       m_draggedElementFadeInAnimationClock.Controller.Stop();
-      m_draggedElementFadeInAnimationClock.Completed -= this.GhostToTargetAnimation_Completed;
+      m_draggedElementFadeInAnimationClock.Completed -= new EventHandler( this.GhostToTargetAnimation_Completed );
       m_draggedElementFadeInAnimationClock = null;
     }
 
-    private IEnumerable<UIElement> GetElements()
+    private void TakeColumnsLayoutSnapshot()
     {
-      return this.GetElementAdornerEntries().Select( item => item.Key );
-    }
+      Debug.Assert( !m_dataGridContext.ColumnManager.IsUpdateDeferred );
 
-    private IEnumerable<DraggedElementAdorner> GetElementAdorners()
-    {
-      return this.GetElementAdornerEntries().Select( item => item.Value );
-    }
+      m_columnsLayout.Clear();
 
-    private IEnumerable<KeyValuePair<UIElement, DraggedElementAdorner>> GetElementAdornerEntries()
-    {
-      var entries = m_elementToDraggedElementAdorner.ToList();
+      var levelCount = 1;
 
-      foreach( var entry in entries )
+      for( int i = 0; i < levelCount; i++ )
       {
-        var container = entry.Key;
+        m_columnsLayout.AddLevel( i );
+      }
 
-        if( this.OwnElement( container ) )
-        {
-          Debug.Assert( m_elementToDraggedElementAdorner.ContainsKey( container ) );
+      var sourceLevelMarkers = this.GetTopLevelMarkers();
+      Debug.Assert( sourceLevelMarkers != null );
 
-          yield return entry;
-        }
-        else
-        {
-          this.RemoveDraggedColumnGhost( container );
-        }
+      var pivotLocation = m_columnsLayout.GetLevelMarkers( levelCount - 1 ).Splitter;
+      Debug.Assert( pivotLocation != null );
+
+      // Clone all column locations.
+      for( var currentLocation = sourceLevelMarkers.Start; currentLocation != null; currentLocation = currentLocation.GetNextSibling() )
+      {
+        var cloneLocation = ColumnReorderingDragSourceManager.CloneLocation( m_columnsLayout, currentLocation, levelCount - 1 );
+        if( cloneLocation == null )
+          continue;
+
+        Debug.Assert( cloneLocation.CanMoveAfter( pivotLocation ) );
+        cloneLocation.MoveAfter( pivotLocation );
+
+        pivotLocation = cloneLocation;
       }
-    }
 
-    private bool OwnElement( DependencyObject target )
-    {
-      if( target == null )
-        return false;
+      // Move the splitter to get an exact copy.
+      var sourcePivotLocation = sourceLevelMarkers.Splitter.GetPreviousSibling();
+      Debug.Assert( sourcePivotLocation != null );
 
-      ColumnReorderingDragSourceManager manager;
-      Cell cell = target as Cell;
+      var levelMarkers = m_columnsLayout.GetLevelMarkers( levelCount - 1 );
+      var splitterLocation = levelMarkers.Splitter;
 
-      if( cell != null )
+      if( sourcePivotLocation.Type == LocationType.Column )
       {
-        manager = cell.ParentColumnReorderingDragSourceManager;
+        pivotLocation = m_columnsLayout[ ( ( ColumnHierarchyManager.IColumnLocation )sourcePivotLocation ).Column ];
       }
       else
       {
-        manager = TableflowView.GetColumnReorderingDragSourceManager( target );
+        Debug.Assert( sourcePivotLocation.Type == LocationType.Start );
+        pivotLocation = levelMarkers.Start;
       }
 
-      return ( this == manager );
+      Debug.Assert( splitterLocation != null );
+      Debug.Assert( pivotLocation != null );
+
+      Debug.Assert( splitterLocation.CanMoveAfter( pivotLocation ) );
+      splitterLocation.MoveAfter( pivotLocation );
     }
 
-    private bool m_reorderCancelled; // = false;
-    private bool m_noColumnsReorderingNeeded = false;
+    private static ColumnHierarchyModel.ILocation CloneLocation( ColumnHierarchyModel columnsLayout, ColumnHierarchyManager.ILocation sourceLocation, int level )
+    {
+      Debug.Assert( columnsLayout != null );
+      Debug.Assert( sourceLocation != null );
+      Debug.Assert( level >= 0 );
 
-    private AnimationClock m_draggedElementFadeInAnimationClock; // = null
-    private AnimationClock m_ghostToTargetAndDetachAnimationClock; // = null;
-    private AnimationClock m_ghostToTargetColumnAnimationClock; // = null;
-    private AnimationClock m_ghostToMousePositionAnimationClock; // = null;
+      var parentLocation = default( ColumnHierarchyModel.ILocation );
 
-    private AnimationClock m_splitterAnimationClock; // = null;
+      if( sourceLocation.Type == LocationType.Column )
+      {
+        var columnLocation = columnsLayout.Add( ( ( ColumnHierarchyManager.IColumnLocation )sourceLocation ).Column, level );
+        if( columnLocation == null )
+          throw new InvalidOperationException();
 
-    private Dictionary<ColumnBase, List<AnimationClock>> m_fieldNameToClock = new Dictionary<ColumnBase, List<AnimationClock>>();
+        columnLocation.Status = AnimationType.Rollback;
 
-    private Dictionary<UIElement, DraggedElementAdorner> m_elementToDraggedElementAdorner = new Dictionary<UIElement, DraggedElementAdorner>();
-    private DraggedElementAdorner m_popupDraggedElementAdorner;
+        parentLocation = columnLocation;
+      }
+      else if( sourceLocation.Type == LocationType.Orphan )
+      {
+        parentLocation = columnsLayout.GetLevelMarkers( level ).Orphan;
+        if( parentLocation == null )
+          throw new InvalidOperationException();
+      }
 
-    private HorizontalMouseDragDirection m_horizontalMouseDragDirection = HorizontalMouseDragDirection.None;
+      if( parentLocation != null )
+      {
+        var lastLocation = default( ColumnHierarchyModel.ILocation );
+        var childLocation = sourceLocation.GetFirstChild();
 
-    private double m_lastDraggedElementOffset; // = 0d;
+        while( childLocation != null )
+        {
+          var cloneLocation = ColumnReorderingDragSourceManager.CloneLocation( columnsLayout, childLocation, level - 1 );
+          if( cloneLocation != null )
+          {
+            if( lastLocation != null )
+            {
+              Debug.Assert( cloneLocation.CanMoveAfter( lastLocation ) );
+              cloneLocation.MoveAfter( lastLocation );
+            }
+            else
+            {
+              Debug.Assert( cloneLocation.CanMoveUnder( parentLocation ) );
+              cloneLocation.MoveUnder( parentLocation );
+            }
 
-    private int m_columnAnimationDurationCache;
-    private Duration m_columnAnimationDuration;
+            lastLocation = cloneLocation;
+          }
 
-    private ReorderingInfoManager m_reorderingInfoManager; // = null;
-    private int m_level;
+          childLocation = childLocation.GetNextSibling();
+        }
 
-    private static Point EmptyPoint = new Point();
+        if( parentLocation.Type == LocationType.Column )
+          return parentLocation;
+      }
 
-    private enum HorizontalMouseDragDirection
-    {
-      None,
-      Left,
-      Right
+      return null;
     }
 
-    private class ReorderingInfoManager
+    private ColumnBase GetCommonAncestor( ColumnHierarchyManager.IColumnLocation x, ColumnHierarchyModel.IColumnLocation y )
     {
-      internal ReorderingInfoManager( int level )
-      {
-        m_level = level;
-      }
-
-      internal int InitialColumnVisiblePosition
-      {
-        get;
-        set;
-      }
+      Debug.Assert( x != null );
+      Debug.Assert( y != null );
 
-      internal int InitialFixedColumnCount
-      {
-        get;
-        set;
-      }
+      var ancestors = new HashSet<ColumnBase>();
 
-      internal List<ColumnBase> InitialColumnsByVisiblePosition
+      for( var parentLocation = x.GetParent(); parentLocation != null; parentLocation = parentLocation.GetParent() )
       {
-        get;
-        set;
-      }
+        var columnLocation = parentLocation as ColumnHierarchyManager.IColumnLocation;
+        if( columnLocation == null )
+          break;
 
-      // Contains the ColumnsByVisiblePosition of the DataGridContext in the current reordered order
-      internal List<ColumnBase> ReorderedColumnsByVisiblePosition
-      {
-        get;
-        set;
+        ancestors.Add( columnLocation.Column );
       }
 
-      internal RequiredAnimationsInfo RequiredAnimations
+      for( var parentLocation = y.GetParent(); parentLocation != null; parentLocation = parentLocation.GetParent() )
       {
-        get;
-        set;
-      }
+        var columnLocation = parentLocation as ColumnHierarchyModel.IColumnLocation;
+        if( columnLocation == null )
+          break;
 
-      internal void InitializeInfoManager( int newFixedColumnCount, int correctionValue )
-      {
-        this.RequiredAnimations = new RequiredAnimationsInfo();
-        this.RequiredAnimations.NewFixedColumnCount = newFixedColumnCount;
-        this.RequiredAnimations.CorrectionValue = correctionValue;
+        var column = columnLocation.Column;
+        if( ancestors.Contains( column ) )
+          return column;
       }
 
-      internal void BeginReordering( DataGridContext dataGridContext, int initialColumnVisiblePosition, int initialFixedColumnCount )
-      {
-        if( dataGridContext == null )
-          throw new ArgumentNullException( "dataGridContext" );
-
-        if( m_isProcessingReordering )
-        {
-          Debug.Assert( false, "Already processing Reordering... ensure to call EndReordering" );
-        }
-
-        this.InitialColumnVisiblePosition = initialColumnVisiblePosition;
-        this.InitialFixedColumnCount = initialFixedColumnCount;
-
-        ColumnBase[] columnsByVisiblePosition;
-        HashedLinkedList<ColumnBase> sourceColumnList;
-        sourceColumnList = dataGridContext.ColumnsByVisiblePosition;
-
-        columnsByVisiblePosition = new ColumnBase[ sourceColumnList.Count ];
-        sourceColumnList.CopyTo( columnsByVisiblePosition, 0 );
-
-        this.InitialColumnsByVisiblePosition = new List<ColumnBase>( columnsByVisiblePosition );
-
-        this.ReorderedColumnsByVisiblePosition = new List<ColumnBase>();
+      return null;
+    }
 
-        this.RollbackReorderedColumnsAndFixedColumnCount();
+    private void AnimateColumn( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
+    {
+      Debug.Assert( columnLocation != null );
+      columnLocation.Status = animationType;
+    }
 
-        m_isProcessingReordering = true;
-      }
+    private void AnimateColumnDescendants( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
+    {
+      Debug.Assert( columnLocation != null );
 
-      internal void EndReordering()
+      foreach( var childLocation in this.GetColumnLocations( this.GetChildLocationsOf( columnLocation ) ) )
       {
-        m_isProcessingReordering = false;
+        this.AnimateColumn( childLocation, animationType );
+        this.AnimateColumnDescendants( childLocation, animationType );
       }
+    }
+
+    private void AnimateColumnAncestors( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
+    {
+      Debug.Assert( columnLocation != null );
 
-      internal void UpdateDraggedColumnVisiblePosition( int newPosition )
+      var parentColumnLocation = columnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
+      while( parentColumnLocation != null )
       {
-        // Reinitialize the ReorderedColumns List
-        this.ReorderedColumnsByVisiblePosition = new List<ColumnBase>( this.InitialColumnsByVisiblePosition );
+        this.AnimateColumn( parentColumnLocation, animationType );
 
-        int initialColumnVisiblePosition = this.InitialColumnVisiblePosition;
-        bool fromLeftToRight = initialColumnVisiblePosition < newPosition;
-        bool fromRightToLeft = initialColumnVisiblePosition > newPosition;
+        parentColumnLocation = parentColumnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
+      }
+    }
 
-        if( !fromLeftToRight && !fromRightToLeft )
-          return;
+    private IEnumerable<UIElement> GetElements()
+    {
+      return this.GetElementAdornerEntries().Select( item => item.Key );
+    }
 
-        List<ColumnBase> reorderedColumnsByVisiblePosition = this.ReorderedColumnsByVisiblePosition;
-        List<ColumnBase> columnsByVisiblePosition = this.InitialColumnsByVisiblePosition;
-        int columnsByVisiblePositionCount = columnsByVisiblePosition.Count;
+    private IEnumerable<DraggedElementAdorner> GetElementAdorners()
+    {
+      return this.GetElementAdornerEntries().Select( item => item.Value );
+    }
 
-        ColumnBase reorderedColumn = this.InitialColumnsByVisiblePosition[ initialColumnVisiblePosition ];
+    private IEnumerable<KeyValuePair<UIElement, DraggedElementAdorner>> GetElementAdornerEntries()
+    {
+      var entries = m_elementToDraggedElementAdorner.ToList();
 
-        reorderedColumnsByVisiblePosition.Remove( reorderedColumn );
+      foreach( var entry in entries )
+      {
+        var container = entry.Key;
 
-        for( int i = 0; i < columnsByVisiblePositionCount; i++ )
+        if( this.OwnElement( container ) )
         {
-          ColumnBase column = columnsByVisiblePosition[ i ];
-
-          if( !column.Visible )
-            continue;
-
-          if( column == reorderedColumn )
-            continue;
-
-          int visiblePosition = column.VisiblePosition;
+          Debug.Assert( m_elementToDraggedElementAdorner.ContainsKey( container ) );
 
-          if( fromLeftToRight )
-          {
-            // Insert the draggedCellParentColumn at the position of the first visible Column for which the VisiblePosition is greater than the new VisiblePosition
-            if( visiblePosition > newPosition )
-            {
-              if( i <= reorderedColumnsByVisiblePosition.Count )
-              {
-                // The initial position of the Column in the reordering was after the current insertion point
-                if( i > 0 )
-                {
-                  int insertionIndex = i - 1;
-
-                  // move the reorderedColumn to the first column that doesn't have a hidden column to its left starting at i - 1 and moving backwards. 
-                  while( insertionIndex > 0 && reorderedColumnsByVisiblePosition[ insertionIndex - 1 ].Visible == false )
-                  {
-                    insertionIndex--;
-                  }
-                  reorderedColumnsByVisiblePosition.Insert( insertionIndex, reorderedColumn );
-                }
-                else
-                {
-                  reorderedColumnsByVisiblePosition.Insert( i, reorderedColumn );
-                }
-              }
-              else
-              {
-                reorderedColumnsByVisiblePosition.Add( reorderedColumn );
-              }
-              break;
-            }
-          }
-          else if( fromRightToLeft )
-          {
-            // If a column was already at this position insert it directly at the same position
-            if( visiblePosition == newPosition )
-            {
-              if( i <= reorderedColumnsByVisiblePosition.Count )
-              {
-                reorderedColumnsByVisiblePosition.Insert( i, reorderedColumn );
-              }
-              else
-              {
-                reorderedColumnsByVisiblePosition.Add( reorderedColumn );
-              }
-              break;
-            }
-            // Insert the draggedCellParentColumn at the position of the first visible Column for which the VisiblePosition is greater than the new VisiblePosition
-            else if( visiblePosition > newPosition )
-            {
-              if( i <= reorderedColumnsByVisiblePosition.Count )
-              {
-                // The initial position of the Column in the reordering was after the current insertion point
-                if( initialColumnVisiblePosition > i )
-                {
-                  reorderedColumnsByVisiblePosition.Insert( i, reorderedColumn );
-                }
-                else
-                {
-                  reorderedColumnsByVisiblePosition.Insert( i - 1, reorderedColumn );
-                }
-              }
-              else
-              {
-                reorderedColumnsByVisiblePosition.Add( reorderedColumn );
-              }
-              break;
-            }
-          }
+          yield return entry;
         }
-
-        // Ensure to add the parent Column at the end if there are more Columns in the reordering
-        if( columnsByVisiblePosition.Count > reorderedColumnsByVisiblePosition.Count )
+        else
         {
-          reorderedColumnsByVisiblePosition.Add( reorderedColumn );
+          this.RemoveDraggedColumnGhost( container );
         }
       }
+    }
+
+    private bool OwnElement( DependencyObject target )
+    {
+      if( target == null )
+        return false;
+
+      ColumnReorderingDragSourceManager manager;
 
-      internal void RollbackReorderedColumnsAndFixedColumnCount()
+      var cell = target as Cell;
+      if( cell != null )
       {
-        this.RequiredAnimations = new RequiredAnimationsInfo( this.InitialColumnVisiblePosition, this.InitialFixedColumnCount, 0, this.InitialColumnsByVisiblePosition );
+        manager = cell.ParentColumnReorderingDragSourceManager;
       }
-
-      internal void UpdateReorderingInfo( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
+      else
       {
-        // Do not create another instance since we want to keep the NewFixedColumnCount
-        RequiredAnimationsInfo animationState = this.RequiredAnimations;
-        animationState.AnimateToLeft.Clear();
-        animationState.AnimateToRight.Clear();
-        animationState.RollbackAnimation.Clear();
+        manager = TableflowView.GetColumnReorderingDragSourceManager( target );
+      }
 
-        List<ColumnBase> columnsByVisiblePosition = this.InitialColumnsByVisiblePosition;
-        List<ColumnBase> reorderedColumnsByVisiblePosition = this.ReorderedColumnsByVisiblePosition;
+      return ( this == manager );
+    }
 
-        Debug.Assert( this.InitialColumnVisiblePosition < this.InitialColumnsByVisiblePosition.Count );
+    private readonly int m_level;
+    private readonly DataGridContext m_dataGridContext;
+    private readonly TranslateTransform m_splitterTranslation;
+    private readonly TableViewColumnVirtualizationManagerBase m_columnVirtualizationManager;
+    private readonly ColumnHierarchyModel m_columnsLayout = new ColumnHierarchyModel();
+    private readonly Dictionary<ColumnBase, ColumnAnimationClocks> m_animationClocks = new Dictionary<ColumnBase, ColumnAnimationClocks>();
+    private readonly Dictionary<UIElement, DraggedElementAdorner> m_elementToDraggedElementAdorner = new Dictionary<UIElement, DraggedElementAdorner>();
 
-        ColumnBase draggedColumn = this.InitialColumnsByVisiblePosition[ this.InitialColumnVisiblePosition ];
-        bool draggedColumnReached = false;
-        int visibleColumnCount = columnsByVisiblePosition.Count;
+    private bool m_isDragStarted; //false
+    private bool m_reorderCancelled; //false;
+    private bool m_noColumnsReorderingNeeded; //false
 
-        var columnsInView = columnVirtualizationManager.GetVisibleFieldNames( m_level );
+    private AnimationClock m_draggedElementFadeInAnimationClock; //null
+    private AnimationClock m_ghostToTargetAndDetachAnimationClock; //null;
+    private AnimationClock m_ghostToTargetColumnAnimationClock; //null;
+    private AnimationClock m_ghostToMousePositionAnimationClock; //null;
+    private AnimationClock m_splitterAnimationClock; //null;
 
-        for( int i = 0; i < visibleColumnCount; i++ )
-        {
-          ColumnBase originalColumn = columnsByVisiblePosition[ i ];
+    private DraggedElementAdorner m_popupDraggedElementAdorner; //null
+    private HorizontalMouseDragDirection m_horizontalMouseDragDirection = HorizontalMouseDragDirection.None;
+    private double m_lastDraggedElementOffset; // 0d;
 
-          ColumnBase reorderedColumn = reorderedColumnsByVisiblePosition[ i ];
+    #region HorizontalMouseDragDirection Private Enum
 
-          if( reorderedColumn == draggedColumn )
-          {
-            draggedColumnReached = true;
-            continue;
-          }
+    private enum HorizontalMouseDragDirection
+    {
+      None,
+      Left,
+      Right
+    }
 
-          if( !reorderedColumn.Visible )
-            continue;
+    #endregion
 
-          if( originalColumn == reorderedColumn )
-          {
-            this.ProcessAnimatedCollectionAddition( reorderedColumn, animationState.RollbackAnimation );
-            continue;
-          }
+    #region AnimationType Private Enum
 
-          if( columnsInView.Contains( reorderedColumn.FieldName ) )
-          {
-            if( !draggedColumnReached )
-            {
-              this.ProcessAnimatedCollectionAddition( reorderedColumn, animationState.AnimateToLeft );
-            }
-            else
-            {
-              this.ProcessAnimatedCollectionAddition( reorderedColumn, animationState.AnimateToRight );
-            }
-          }
-        }
+    private enum AnimationType
+    {
+      Rollback = 0,
+      MoveLeft,
+      MoveRight,
+      IncreaseWidth,
+      DecreaseWidth,
+      MoveLeftAndIncreaseWidth,
+      MoveRightAndDecreaseWidth,
+    }
 
-        animationState.DraggedColumnNewVisiblePosition = reorderedColumnsByVisiblePosition.IndexOf( draggedColumn );
-      }
+    #endregion
 
-      private void ProcessAnimatedCollectionAddition( ColumnBase animatedColumn, List<ColumnBase> animatedCollection )
-      {
-        animatedCollection.Add( animatedColumn );
-      }
-      private bool m_isProcessingReordering; // = false;
-      private int m_level;
-    }
+    #region ColumnAnimationClocks Private Struct
 
-    private class RequiredAnimationsInfo
+    private struct ColumnAnimationClocks
     {
-      internal RequiredAnimationsInfo()
-        : this( -1, -1, 0, null )
+      internal ColumnAnimationClocks( AnimationClock position, AnimationClock size )
       {
+        m_position = position;
+        m_size = size;
       }
 
-      internal RequiredAnimationsInfo( int draggedColumnNewVisiblePosition, int newFixedColumnCount, int correctionValue, IList<ColumnBase> initialColumns )
+      internal AnimationClock Position
       {
-        this.AnimateToLeft = new List<ColumnBase>();
-        this.AnimateToRight = new List<ColumnBase>();
-        this.RollbackAnimation = new List<ColumnBase>();
-
-        this.DraggedColumnNewVisiblePosition = draggedColumnNewVisiblePosition;
-        this.NewFixedColumnCount = newFixedColumnCount;
-        this.CorrectionValue = correctionValue;
-
-        if( initialColumns != null )
+        get
         {
-          this.RollbackAnimation.AddRange( initialColumns );
+          return m_position;
         }
       }
 
-      internal int DraggedColumnNewVisiblePosition
-      {
-        get;
-        set;
-      }
-
-      internal int NewFixedColumnCount
+      internal AnimationClock Size
       {
-        get;
-        set;
+        get
+        {
+          return m_size;
+        }
       }
 
-      internal int CorrectionValue
-      {
-        get;
-        set;
-      }
+      private readonly AnimationClock m_position;
+      private readonly AnimationClock m_size;
+    }
 
-      internal List<ColumnBase> AnimateToLeft
-      {
-        get;
-        set;
-      }
+    #endregion
 
-      internal List<ColumnBase> AnimateToRight
-      {
-        get;
-        set;
-      }
+    #region ColumnHierarchyModel Private Class
 
-      internal List<ColumnBase> RollbackAnimation
-      {
-        get;
-        set;
-      }
+    private sealed class ColumnHierarchyModel : ColumnHierarchyModel<ColumnBase, AnimationType>
+    {
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
index d519afb2..ca7f7663 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
@@ -16,10 +16,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -29,16 +29,8 @@ using System.Windows.Media.Animation;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
-  public class TableflowViewItemsHost : DataGridItemsHost, IAnimatedScrollInfo
+  public class TableflowViewItemsHost : DataGridItemsHost, IAnimatedScrollInfo, IDeferableScrollInfoRefresh
   {
-    #region Static Members
-
-    private const int MaxDataRowFailFocusCount = 50;
-
-    #endregion
-
-    #region Constructors
-
     static TableflowViewItemsHost()
     {
       KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(
@@ -149,8 +141,6 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion CONSTRUCTORS
-
 #if DEBUG
     #region RealizedIndex Property
 
@@ -181,7 +171,7 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableflowViewItemsHost.RealizedIndexProperty, value );
     }
 
-    #endregion RealizedIndex Property
+    #endregion
 #endif //DEBUG
 
     #region ShouldDelayDataContext Property (Internal Attached)
@@ -201,7 +191,7 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableflowViewItemsHost.ShouldDelayDataContextProperty, value );
     }
 
-    #endregion ShouldDelayDataContext Property (Internal Attached)
+    #endregion
 
     #region NavigateToGroup Command
 
@@ -247,7 +237,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return false;
     }
 
-    #endregion NavigateToGroup Command
+    #endregion
 
     internal void OnGroupCollapsing( Group group )
     {
@@ -263,8 +253,7 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           double offset = groupOffset - stickyHeadersRegionHeight;
 
-          if( ( offset < m_verticalOffset )
-            || ( offset >= m_verticalOffset + m_viewportHeight ) )
+          if( ( offset < m_verticalOffset ) || ( offset >= m_verticalOffset + m_viewportHeight ) )
           {
             this.PreventOpacityAnimation = true;
             this.ScrollToVerticalOffset( offset, false, ScrollDirection.None );
@@ -302,7 +291,7 @@ namespace Xceed.Wpf.DataGrid.Views
       host.InvalidateScrollInfo();
     }
 
-    #endregion AnimatedVerticalOffset Property
+    #endregion
 
     #region AnimatedVerticalOffset Property
 
@@ -324,24 +313,25 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private static void OnAnimatedVerticalOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    private void OnAnimatedVerticalOffsetChanged( double oldValue, double newValue )
     {
-      TableflowViewItemsHost host = ( TableflowViewItemsHost )sender;
+      this.SetVerticalOffsetCore( newValue );
+      this.InvalidateLayoutFromScrollingHelper();
+    }
 
-      host.SetVerticalOffsetCore( ( double )e.NewValue );
+    private static void OnAnimatedVerticalOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = ( TableflowViewItemsHost )sender;
 
       // Do not generate a page while the changed is due to the unloading 
-      // of the grid. See TableflowViewItemsHost.OnParentDataGridControlChanged
-      if( DataGridControl.GetDataGridContext( host ) != null )
-      {
-        host.GeneratePage( false, host.AnimatedScrollInfo.ViewportHeight );
-      }
+      // of the grid. See TableflowViewItemsHost.OnParentDataGridControlChanged.
+      if( ( self == null ) || ( DataGridControl.GetDataGridContext( self ) == null ) )
+        return;
 
-      host.InvalidateArrange();
-      host.InvalidateScrollInfo();
+      self.OnAnimatedVerticalOffsetChanged( ( double )e.OldValue, ( double )e.NewValue );
     }
 
-    #endregion AnimatedVerticalOffset Property
+    #endregion
 
     #region AnimatedScrollInfo Property
 
@@ -353,7 +343,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion AnimatedScrollInfo Property
+    #endregion
 
     #region PreviousTabNavigationMode ( private attached property )
 
@@ -373,7 +363,7 @@ namespace Xceed.Wpf.DataGrid.Views
       d.SetValue( TableflowViewItemsHost.PreviousTabNavigationModeProperty, value );
     }
 
-    #endregion PreviousTabNavigationMode ( private attached property )
+    #endregion
 
     #region PreviousDirectionalNavigationMode ( private attached property )
 
@@ -393,7 +383,7 @@ namespace Xceed.Wpf.DataGrid.Views
       d.SetValue( TableflowViewItemsHost.PreviousDirectionalNavigationModeProperty, value );
     }
 
-    #endregion PreviousDirectionalNavigationMode ( private attached property )
+    #endregion
 
     #region RowSelectorPane Property
 
@@ -409,7 +399,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion RowSelectorPane Property
+    #endregion
 
     #region IsSticky Internal Attached Property
 
@@ -711,12 +701,14 @@ namespace Xceed.Wpf.DataGrid.Views
       if( ( item == null ) || ( VisualTreeHelper.GetChildrenCount( item ) == 0 ) )
         return null;
 
-      DependencyObject firstChild = VisualTreeHelper.GetChild( item, 0 );
-      PassiveLayoutDecorator decorator = firstChild as PassiveLayoutDecorator;
+      var child = VisualTreeHelper.GetChild( item, 0 );
+      if( child == null )
+        return null;
 
-      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( firstChild ) > 0 ) )
+      var decorator = child as PassiveLayoutDecorator;
+      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( child ) > 0 ) )
       {
-        decorator = VisualTreeHelper.GetChild( firstChild, 0 ) as PassiveLayoutDecorator;
+        decorator = VisualTreeHelper.GetChild( child, 0 ) as PassiveLayoutDecorator;
       }
 
       return decorator;
@@ -834,7 +826,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return maxDesiredWidth;
     }
 
-    #endregion Measure/Arrange Methods
+    #endregion
 
     #region Containers Methods
 
@@ -993,26 +985,26 @@ namespace Xceed.Wpf.DataGrid.Views
 
         if( measureInvalidated || pageChanged )
         {
-          UIElement focusedElement;
+          ICollection<UIElement> nonRecyclableContainers;
 
           if( m_containerHeight > 0d )
           {
             // Recycle the containers we know will not be in the current page.  GenerateContainers will recycle
             // the remaining containers that were uncertain.
-            focusedElement = this.RecycleSafeContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex );
+            nonRecyclableContainers = this.RecycleSafeContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex );
 
-            this.GenerateContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex, measureInvalidated, ref focusedElement );
-            this.GenerateStickyHeaders( generator, measureInvalidated, ref focusedElement );
-            this.GenerateStickyFooters( generator, measureInvalidated, ref focusedElement );
+            this.GenerateContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex, measureInvalidated, nonRecyclableContainers );
+            this.GenerateStickyHeaders( generator, measureInvalidated, nonRecyclableContainers );
+            this.GenerateStickyFooters( generator, measureInvalidated, nonRecyclableContainers );
           }
           else
           {
-            focusedElement = this.RecycleAllContainers( generator );
+            nonRecyclableContainers = this.RecycleAllContainers( generator );
             Debug.Assert( m_layoutedContainers.Count == 0 );
           }
 
-          // Reuse or recycle the focused element's container.
-          this.GenerateFocusedContainer( generator, measureInvalidated, focusedElement );
+          // Keep alive containers that cannot be recycled (i.e. focused element).
+          this.KeepNonRecyclableContainers( generator, measureInvalidated, nonRecyclableContainers );
         }
 
         m_lastVisiblePageIndexes = visiblePageIndexes;
@@ -1020,51 +1012,39 @@ namespace Xceed.Wpf.DataGrid.Views
         this.PreventOpacityAnimation = false;
       }
 
-      this.InvalidateAutomationPeerChildren();
     }
 
-    private UIElement RecycleContainers(
-      ICustomItemContainerGenerator generator,
-      int pageStartIndex,
-      int pageEndIndex )
+    private ICollection<UIElement> RecycleContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex, bool clearContainer = false )
     {
-      UIElement focusedElement = null;
+      var nonRecyclableContainers = new HashSet<UIElement>( m_layoutedContainers.Select( entry => entry.Container ).Where( c => !this.CanRecycleContainer( c ) ) );
 
       for( int i = m_layoutedContainers.Count - 1; i >= 0; i-- )
       {
         var container = m_layoutedContainers[ i ].Container;
 
-        int index = generator.GetRealizedIndexForContainer( container );
+        var index = generator.GetRealizedIndexForContainer( container );
 
         // If the container's index is now out of view, recycle that container.
         if( ( index < pageStartIndex ) || ( index > pageEndIndex ) )
         {
-          // We do not recycle the focused element!
-          if( container.IsKeyboardFocusWithin )
+          if( !nonRecyclableContainers.Contains( container ) )
           {
-            focusedElement = container;
-          }
-          else
-          {
-            this.RecycleContainer( generator, index, container );
+            this.RecycleContainer( generator, index, container, clearContainer );
           }
 
           m_layoutedContainers.RemoveAt( i );
         }
       }
 
-      return focusedElement;
+      return nonRecyclableContainers;
     }
 
-    private UIElement RecycleAllContainers( ICustomItemContainerGenerator generator )
+    private ICollection<UIElement> RecycleAllContainers( ICustomItemContainerGenerator generator )
     {
-      return this.RecycleContainers( generator, -1, -1 );
+      return this.RecycleContainers( generator, -1, -1, true );
     }
 
-    private UIElement RecycleSafeContainers(
-      ICustomItemContainerGenerator generator,
-      int pageStartIndex,
-      int pageEndIndex )
+    private ICollection<UIElement> RecycleSafeContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex )
     {
       if( m_lastVisiblePageIndexes == PageIndexes.Empty )
         return this.RecycleContainers( generator, pageStartIndex, pageEndIndex );
@@ -1080,9 +1060,7 @@ namespace Xceed.Wpf.DataGrid.Views
                                        pageEndIndex );
 
       int itemCount = generator.ItemCount;
-      int threshold = Math.Max( 0,
-                                ( m_lastVisiblePageIndexes.EndIndex - m_lastVisiblePageIndexes.StartIndex ) -
-                                ( pageEndIndex - pageStartIndex ) );
+      int threshold = Math.Max( 0, ( m_lastVisiblePageIndexes.EndIndex - m_lastVisiblePageIndexes.StartIndex ) - ( pageEndIndex - pageStartIndex ) );
 
       int endIndex = Math.Min( pageEndIndex + threshold, itemCount - 1 );
       if( endIndex < 0 )
@@ -1097,7 +1075,7 @@ namespace Xceed.Wpf.DataGrid.Views
       ICustomItemContainerGenerator generator,
       StickyContainerInfoList stickyContainers,
       StickyContainerInfoList stickyContainersToExclude,
-      ref UIElement focusedElement )
+      ICollection<UIElement> nonRecyclableContainers )
     {
       for( int i = stickyContainers.Count - 1; i >= 0; i-- )
       {
@@ -1110,14 +1088,10 @@ namespace Xceed.Wpf.DataGrid.Views
         if( ( stickyContainersToExclude != null ) && ( stickyContainersToExclude.ContainsContainer( container ) ) )
           continue;
 
-        if( container.IsKeyboardFocusWithin )
-        {
-          Debug.Assert( ( focusedElement == null ) || ( focusedElement == container ) );
-          focusedElement = container;
+        if( ( nonRecyclableContainers != null ) && nonRecyclableContainers.Contains( container ) )
           continue;
-        }
 
-        int index = generator.GetRealizedIndexForContainer( container );
+        var index = generator.GetRealizedIndexForContainer( container );
 
         this.RecycleContainer( generator, index, container );
         stickyContainers.RemoveAt( i );
@@ -1129,8 +1103,21 @@ namespace Xceed.Wpf.DataGrid.Views
       this.RecycleContainer( null, -1, container );
     }
 
-    private void RecycleContainer( ICustomItemContainerGenerator generator, int containerIndex, UIElement container )
+    private void RecycleContainer( ICustomItemContainerGenerator generator, int containerIndex, UIElement container, bool clearContainer = true )
     {
+      if( !clearContainer )
+      {
+        var dataGridItemContainer = container as IDataGridItemContainer;
+        if( dataGridItemContainer != null )
+        {
+          dataGridItemContainer.IsRecyclingCandidate = true;
+        }
+      }
+      else
+      {
+        this.ClearContainer( container );
+      }
+
       if( ( generator != null ) && ( containerIndex != -1 ) )
       {
         try
@@ -1143,25 +1130,15 @@ namespace Xceed.Wpf.DataGrid.Views
           Debug.Fail( "Unable to remove container for containerIndex " + containerIndex );
         }
       }
+    }
 
-#if DEBUG
-      TableflowViewItemsHost.SetRealizedIndex( container, -1 );
-#endif //DEBUG
-      TableflowViewItemsHost.ClearIsSticky( container );
-      container.ClearValue( UIElement.ClipProperty );
-
-      this.DisableElementNavigation( container );
-      this.FreeRowSelector( container );
-
-      m_layoutedContainersToRecycle.Add( container );
+    private void CleanRecyclingCandidates()
+    {
+      var generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
+      generator.CleanRecyclingCandidates();
     }
 
-    private void GenerateContainers(
-      ICustomItemContainerGenerator generator,
-      int pageStartIndex,
-      int pageEndIndex,
-      bool measureInvalidated,
-      ref UIElement focusedElement )
+    private void GenerateContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
     {
       HashSet<UIElement> unusedLayoutedContainers = new HashSet<UIElement>( m_layoutedContainers.Select( item => item.Container ) );
       m_layoutedContainers.Clear();
@@ -1193,19 +1170,14 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         while( ( currentIndex >= pageStartIndex ) && ( currentIndex <= pageEndIndex ) )
         {
-          UIElement container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
+          var container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
           if( container == null )
             break;
 
-          if( focusedElement == container )
-          {
-            focusedElement = null;
-          }
-
           // The container is now part of the page layout. Add it to the list.
           m_layoutedContainers.Add( new LayoutedContainerInfo( currentIndex, container ) );
-          m_layoutedContainersToRecycle.Remove( container );
           unusedLayoutedContainers.Remove( container );
+          nonRecyclableContainers.Remove( container );
 
           currentIndex += step;
         }
@@ -1230,19 +1202,14 @@ namespace Xceed.Wpf.DataGrid.Views
             {
               while( ( remainingItemCount > 0 ) && ( currentIndex >= 0 ) && ( currentIndex < itemCount ) )
               {
-                UIElement container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
+                var container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
                 if( container == null )
                   break;
 
-                if( focusedElement == container )
-                {
-                  focusedElement = null;
-                }
-
                 // The container is now part of the page layout. Add it to the list.
                 m_layoutedContainers.Add( new LayoutedContainerInfo( currentIndex, container ) );
-                m_layoutedContainersToRecycle.Remove( container );
                 unusedLayoutedContainers.Remove( container );
+                nonRecyclableContainers.Remove( container );
 
                 currentIndex += step;
                 remainingItemCount--;
@@ -1257,57 +1224,48 @@ namespace Xceed.Wpf.DataGrid.Views
       // Recycle the containers that have not been reused in the current page.
       foreach( var container in unusedLayoutedContainers )
       {
-        // We do not recycle the focused element!
-        if( container.IsKeyboardFocusWithin )
-        {
-          Debug.Assert( focusedElement == null );
-          focusedElement = container;
-        }
-        else
-        {
-          int index = generator.GetRealizedIndexForContainer( container );
+        if( nonRecyclableContainers.Contains( container ) )
+          continue;
 
-          this.RecycleContainer( generator, index, container );
+        var index = generator.GetRealizedIndexForContainer( container );
 
-          m_layoutedContainersToRecycle.Add( container );
-        }
+        this.RecycleContainer( generator, index, container );
       }
+
+      this.CleanRecyclingCandidates();
     }
 
-    private void GenerateFocusedContainer(
-      ICustomItemContainerGenerator generator,
-      bool measureInvalidated,
-      UIElement focusedElement )
+    private void KeepNonRecyclableContainers( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
     {
-      if( focusedElement == null )
+      if( ( nonRecyclableContainers == null ) || ( nonRecyclableContainers.Count == 0 ) )
         return;
 
-      int index = generator.GetRealizedIndexForContainer( focusedElement );
-
-      if( index >= 0 )
+      foreach( var container in nonRecyclableContainers )
       {
-        if( measureInvalidated )
+        var index = generator.GetRealizedIndexForContainer( container );
+        if( index >= 0 )
         {
-          this.MeasureContainer( focusedElement );
-        }
+          if( measureInvalidated )
+          {
+            this.MeasureContainer( container );
+          }
 
-        m_layoutedContainers.Add( new LayoutedContainerInfo( index, focusedElement ) );
-      }
-      else
-      {
-        this.RecycleContainer( focusedElement );
+          m_layoutedContainers.Add( new LayoutedContainerInfo( index, container ) );
+        }
+        else
+        {
+          this.RecycleContainer( container );
+        }
       }
     }
 
     private int GetStickyHeaderCountForIndex( int desiredIndex )
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
       if( dataGridContext == null )
         return 0;
 
-      CustomItemContainerGenerator customGenerator = dataGridContext.CustomItemContainerGenerator;
-
+      var customGenerator = dataGridContext.CustomItemContainerGenerator;
       if( customGenerator == null )
         return 0;
 
@@ -1319,13 +1277,11 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private int GetStickyFooterCountForIndex( int desiredIndex )
     {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
+      var dataGridContext = DataGridControl.GetDataGridContext( this );
       if( dataGridContext == null )
         return 0;
 
-      CustomItemContainerGenerator customGenerator = dataGridContext.CustomItemContainerGenerator;
-
+      var customGenerator = dataGridContext.CustomItemContainerGenerator;
       if( customGenerator == null )
         return 0;
 
@@ -1334,163 +1290,164 @@ namespace Xceed.Wpf.DataGrid.Views
                                                            this.AreGroupFootersStickyCache );
     }
 
-    private void GenerateStickyHeaders( ICustomItemContainerGenerator generator, bool measureInvalidated, ref UIElement focusedElement )
+    private void GenerateStickyHeaders( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
     {
-      CustomItemContainerGenerator customGenerator = ( CustomItemContainerGenerator )generator;
+      var customGenerator = ( CustomItemContainerGenerator )generator;
+      var newStickyHeaders = new StickyContainerInfoList();
 
-      if( !this.AreHeadersStickyCache && !this.AreGroupHeadersStickyCache && !this.AreParentRowsStickyCache )
+      if( this.AreHeadersStickyCache || this.AreGroupHeadersStickyCache || this.AreParentRowsStickyCache )
       {
-        this.RecycleUnusedStickyContainers( generator, m_stickyHeaders, null, ref focusedElement );
-        m_stickyHeaders.Clear();
-        return;
-      }
-
-      int numberOfContainerChecked = 0;
+        var numberOfContainerChecked = 0;
 
-      StickyContainerInfoList newStickyHeaders = new StickyContainerInfoList();
-
-      foreach( LayoutedContainerInfo layoutedContainerInfo in m_layoutedContainers )
-      {
-        UIElement container = layoutedContainerInfo.Container;
-
-        // For each visible container, we must find what headers should be sticky for it.
-        List<StickyContainerGenerated> stickyHeaders =
-          customGenerator.GenerateStickyHeaders( container, this.AreHeadersStickyCache, this.AreGroupHeadersStickyCache, this.AreParentRowsStickyCache );
-
-        stickyHeaders.Sort( StickyContainerGeneratedComparer.Singleton );
-
-        // For each sticky headers returned, we must get the index of the last container
-        // that could need that container to be sticky. 
-        foreach( StickyContainerGenerated stickyHeaderInfo in stickyHeaders )
+        foreach( var layoutedContainerInfo in m_layoutedContainers )
         {
-          UIElement stickyContainer = ( UIElement )stickyHeaderInfo.StickyContainer;
-
-          if( newStickyHeaders.ContainsContainer( stickyContainer ) )
-            continue;
+          var container = layoutedContainerInfo.Container;
 
-          int lastContainerIndex = customGenerator.GetLastHoldingContainerIndexForStickyHeader( stickyContainer );
+          // For each visible container, we must find what headers should be sticky for it.
+          var stickyHeaders = customGenerator.GenerateStickyHeaders( container, this.AreHeadersStickyCache, this.AreGroupHeadersStickyCache, this.AreParentRowsStickyCache );
 
-          StickyContainerInfo stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyHeaderInfo.Index, lastContainerIndex );
-          newStickyHeaders.Add( stickyContainerInfo );
+          stickyHeaders.Sort( StickyContainerGeneratedComparer.Singleton );
 
-          if( focusedElement == stickyContainer )
+          // For each sticky headers returned, we must get the index of the last container
+          // that could need that container to be sticky. 
+          foreach( var stickyHeaderInfo in stickyHeaders )
           {
-            focusedElement = null;
-          }
+            var stickyContainer = ( UIElement )stickyHeaderInfo.StickyContainer;
+            if( newStickyHeaders.ContainsContainer( stickyContainer ) )
+              continue;
 
-          this.HandleGeneratedStickyContainerPreparation( stickyHeaderInfo, measureInvalidated );
-        }
+            var lastContainerIndex = customGenerator.GetLastHoldingContainerIndexForStickyHeader( stickyContainer );
 
-        // We only need to find the sticky headers for one 
-        // more element than what is already sticky.
-        int visibleStickyHeadersCount = ( int )Math.Ceiling( this.GetStickyHeadersRegionHeight( newStickyHeaders ) / m_containerHeight );
+            var stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyHeaderInfo.Index, lastContainerIndex );
+            newStickyHeaders.Add( stickyContainerInfo );
+            nonRecyclableContainers.Remove( stickyContainer );
 
-        if( ( ++numberOfContainerChecked - visibleStickyHeadersCount ) >= 1 )
-          break;
-      }
+            this.HandleGeneratedStickyContainerPreparation( stickyHeaderInfo, measureInvalidated );
+          }
 
-      foreach( StickyContainerInfo stickyHeaderInfo in newStickyHeaders )
-      {
-        UIElement container = stickyHeaderInfo.Container;
-        int index = m_layoutedContainers.IndexOfContainer( container );
+          // We only need to find the sticky headers for one 
+          // more element than what is already sticky.
+          var visibleStickyHeadersCount = ( int )Math.Ceiling( this.GetStickyHeadersRegionHeight( newStickyHeaders ) / m_containerHeight );
 
-        if( index > -1 )
+          if( ( ++numberOfContainerChecked - visibleStickyHeadersCount ) >= 1 )
+            break;
+        }
+
+        foreach( var stickyHeaderInfo in newStickyHeaders )
         {
+          var index = m_layoutedContainers.IndexOfContainer( stickyHeaderInfo.Container );
+          if( index < 0 )
+            continue;
+
           m_layoutedContainers.RemoveAt( index );
         }
 
-        m_layoutedContainersToRecycle.Remove( container );
+        foreach( var stickyHeaderInfo in m_stickyHeaders )
+        {
+          var container = stickyHeaderInfo.Container;
+
+          if( !newStickyHeaders.ContainsContainer( container ) && !nonRecyclableContainers.Contains( container ) && !this.CanRecycleContainer( container ) )
+          {
+            nonRecyclableContainers.Add( container );
+          }
+        }
       }
 
-      this.RecycleUnusedStickyContainers( generator, m_stickyHeaders, newStickyHeaders, ref focusedElement );
+      this.RecycleUnusedStickyContainers( generator, m_stickyHeaders, newStickyHeaders, nonRecyclableContainers );
 
       m_stickyHeaders.Clear();
-      m_stickyHeaders.AddRange( newStickyHeaders );
-      m_stickyHeaders.Sort( StickyContainerInfoComparer.Singleton );
-    }
 
-    private void GenerateStickyFooters( ICustomItemContainerGenerator generator, bool measureInvalidated, ref UIElement focusedElement )
-    {
-      if( !this.AreFootersStickyCache && !this.AreGroupFootersStickyCache )
+      if( newStickyHeaders.Count > 0 )
       {
-        this.RecycleUnusedStickyContainers( generator, m_stickyFooters, null, ref focusedElement );
-        m_stickyFooters.Clear();
-        return;
+        m_stickyHeaders.AddRange( newStickyHeaders );
+        m_stickyHeaders.Sort( StickyContainerInfoComparer.Singleton );
       }
+    }
 
-      CustomItemContainerGenerator customGenerator = ( CustomItemContainerGenerator )generator;
-
-      int numberOfContainerChecked = 0;
-
-      StickyContainerInfoList newStickyFooters = new StickyContainerInfoList();
+    private void GenerateStickyFooters( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
+    {
+      var newStickyFooters = new StickyContainerInfoList();
 
-      int layoutedContainerCount = m_layoutedContainers.Count;
-      if( layoutedContainerCount > 0 )
+      if( this.AreFootersStickyCache || this.AreGroupFootersStickyCache )
       {
-        // We must not generate sticky footers if the last container is not even at the bottom of the view!
-        LayoutedContainerInfo bottomMostContainerInfo = m_layoutedContainers[ layoutedContainerCount - 1 ];
-        double bottomMostContainerOffset = this.GetContainerOffsetFromIndex( bottomMostContainerInfo.RealizedIndex );
+        var customGenerator = ( CustomItemContainerGenerator )generator;
+        var numberOfContainerChecked = 0;
+        var layoutedContainerCount = m_layoutedContainers.Count;
 
-        if( ( bottomMostContainerOffset + m_containerHeight ) >= m_viewportHeight )
+        if( layoutedContainerCount > 0 )
         {
-          for( int i = layoutedContainerCount - 1; i >= 0; i-- )
-          {
-            LayoutedContainerInfo layoutedContainerInfo = m_layoutedContainers[ i ];
-            UIElement layoutedContainer = layoutedContainerInfo.Container;
+          // We must not generate sticky footers if the last container is not even at the bottom of the view!
+          var bottomMostContainerInfo = m_layoutedContainers[ layoutedContainerCount - 1 ];
+          var bottomMostContainerOffset = this.GetContainerOffsetFromIndex( bottomMostContainerInfo.RealizedIndex );
 
-            // For each visible container, we must find what footers should be sticky for it.
-            List<StickyContainerGenerated> stickyFooters =
-              customGenerator.GenerateStickyFooters( layoutedContainer, this.AreFootersStickyCache, this.AreGroupFootersStickyCache );
+          if( ( bottomMostContainerOffset + m_containerHeight ) >= m_viewportHeight )
+          {
+            for( var i = layoutedContainerCount - 1; i >= 0; i-- )
+            {
+              var layoutedContainerInfo = m_layoutedContainers[ i ];
+              var layoutedContainer = layoutedContainerInfo.Container;
 
-            stickyFooters.Sort( StickyContainerGeneratedReverseComparer.Singleton );
+              // For each visible container, we must find what footers should be sticky for it.
+              var stickyFooters = customGenerator.GenerateStickyFooters( layoutedContainer, this.AreFootersStickyCache, this.AreGroupFootersStickyCache );
 
-            // For each sticky headers returned, we must get the index of the last container
-            // that could need that container to be sticky. 
-            foreach( StickyContainerGenerated stickyFooterInfo in stickyFooters )
-            {
-              UIElement stickyContainer = ( UIElement )stickyFooterInfo.StickyContainer;
+              stickyFooters.Sort( StickyContainerGeneratedReverseComparer.Singleton );
 
-              if( newStickyFooters.ContainsContainer( stickyContainer ) )
-                continue;
+              // For each sticky headers returned, we must get the index of the last container
+              // that could need that container to be sticky. 
+              foreach( var stickyFooterInfo in stickyFooters )
+              {
+                var stickyContainer = ( UIElement )stickyFooterInfo.StickyContainer;
+                if( newStickyFooters.ContainsContainer( stickyContainer ) )
+                  continue;
 
-              int firstContainerIndex = customGenerator.GetFirstHoldingContainerIndexForStickyFooter( stickyContainer );
+                var firstContainerIndex = customGenerator.GetFirstHoldingContainerIndexForStickyFooter( stickyContainer );
 
-              StickyContainerInfo stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyFooterInfo.Index, firstContainerIndex );
-              newStickyFooters.Add( stickyContainerInfo );
+                var stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyFooterInfo.Index, firstContainerIndex );
+                newStickyFooters.Add( stickyContainerInfo );
+                nonRecyclableContainers.Remove( stickyContainer );
 
-              if( focusedElement == stickyContainer )
-              {
-                focusedElement = null;
+                this.HandleGeneratedStickyContainerPreparation( stickyFooterInfo, measureInvalidated );
               }
 
-              this.HandleGeneratedStickyContainerPreparation( stickyFooterInfo, measureInvalidated );
-            }
-
-            // We only need to find the sticky footers for one 
-            // more element than what is already sticky.
-            int visibleStickyFootersCount = ( int )Math.Ceiling( ( this.AnimatedScrollInfo.ViewportHeight - this.GetStickyFootersRegionHeight( newStickyFooters ) ) / m_containerHeight );
+              // We only need to find the sticky footers for one 
+              // more element than what is already sticky.
+              var visibleStickyFootersCount = ( int )Math.Ceiling( ( this.AnimatedScrollInfo.ViewportHeight - this.GetStickyFootersRegionHeight( newStickyFooters ) ) / m_containerHeight );
 
-            if( ( ++numberOfContainerChecked - visibleStickyFootersCount ) >= 1 )
-              break;
+              if( ( ++numberOfContainerChecked - visibleStickyFootersCount ) >= 1 )
+                break;
+            }
           }
         }
-      }
 
-      foreach( StickyContainerInfo stickyFooterInfo in newStickyFooters )
-      {
-        int indexOf = m_layoutedContainers.IndexOfContainer( stickyFooterInfo.Container );
+        foreach( var stickyFooterInfo in newStickyFooters )
+        {
+          var index = m_layoutedContainers.IndexOfContainer( stickyFooterInfo.Container );
+          if( index < 0 )
+            continue;
 
-        if( indexOf > -1 )
+          m_layoutedContainers.RemoveAt( index );
+        }
+
+        foreach( var stickyFooterInfo in m_stickyFooters )
         {
-          m_layoutedContainers.RemoveAt( indexOf );
+          var container = stickyFooterInfo.Container;
+
+          if( !newStickyFooters.ContainsContainer( container ) && !nonRecyclableContainers.Contains( container ) && !this.CanRecycleContainer( container ) )
+          {
+            nonRecyclableContainers.Add( container );
+          }
         }
       }
 
-      this.RecycleUnusedStickyContainers( generator, m_stickyFooters, newStickyFooters, ref focusedElement );
+      this.RecycleUnusedStickyContainers( generator, m_stickyFooters, newStickyFooters, nonRecyclableContainers );
 
       m_stickyFooters.Clear();
-      m_stickyFooters.AddRange( newStickyFooters );
-      m_stickyFooters.Sort( StickyContainerInfoReverseComparer.Singleton );
+
+      if( newStickyFooters.Count > 0 )
+      {
+        m_stickyFooters.AddRange( newStickyFooters );
+        m_stickyFooters.Sort( StickyContainerInfoReverseComparer.Singleton );
+      }
     }
 
     private void HandleGeneratedStickyContainerPreparation( StickyContainerGenerated stickyContainerInfo, bool measureInvalidated )
@@ -1521,11 +1478,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private UIElement GenerateContainer(
-      ICustomItemContainerGenerator generator,
-      int index,
-      bool measureInvalidated,
-      bool delayDataContext )
+    private UIElement GenerateContainer( ICustomItemContainerGenerator generator, int index, bool measureInvalidated, bool delayDataContext )
     {
       bool isNewlyRealized;
       UIElement container = ( UIElement )generator.GenerateNext( out isNewlyRealized );
@@ -1554,11 +1507,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return container;
     }
 
-    private void HandleGeneratedContainerPreparation(
-      UIElement container,
-      int containerIndex,
-      bool isNewlyRealized,
-      bool delayDataContext )
+    private void HandleGeneratedContainerPreparation( UIElement container, int containerIndex, bool isNewlyRealized, bool delayDataContext )
     {
 #if DEBUG
       TableflowViewItemsHost.SetRealizedIndex( container, containerIndex );
@@ -1621,29 +1570,53 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void LayoutContainers()
     {
-      bool rowSelectorPaneVisible = this.IsRowSelectorPaneVisible();
+      var rowSelectorPaneVisible = this.IsRowSelectorPaneVisible();
 
-      // Layout out of view the recycled container
-      foreach( UIElement container in m_layoutedContainersToRecycle )
+      this.LayoutStickyHeaders( rowSelectorPaneVisible );
+      this.LayoutStickyFooters( rowSelectorPaneVisible );
+      this.LayoutNonStickyContainers( rowSelectorPaneVisible );
+
+      var layoutedContainers = new HashSet<UIElement>();
+
+      foreach( var container in m_layoutedContainers.Select( item => item.Container ) )
       {
-        this.ArrangeContainer( container, TableflowViewItemsHost.OutOfViewPoint, false );
+        layoutedContainers.Add( container );
       }
 
-      m_layoutedContainersToRecycle.Clear();
-      m_layoutedContainersToRecycle.TrimExcess();
+      foreach( var container in m_stickyHeaders.Select( item => item.Container ) )
+      {
+        layoutedContainers.Add( container );
+      }
 
-      this.LayoutStickyHeaders( rowSelectorPaneVisible );
-      this.LayoutStickyFooters( rowSelectorPaneVisible );
-      this.LayoutNonStickyContainers( rowSelectorPaneVisible );
+      foreach( var container in m_stickyFooters.Select( item => item.Container ) )
+      {
+        layoutedContainers.Add( container );
+      }
+
+      // Layout out of view the recycled container
+      foreach( var container in this.Children )
+      {
+        if( layoutedContainers.Contains( container ) )
+          continue;
+
+        this.ArrangeContainer( container, TableflowViewItemsHost.OutOfViewPoint, false );
+      }
 
       CommandManager.InvalidateRequerySuggested();
 
-      // We must not call Mouse.Synchronize if we are currently dragging rows. 
+      // The call to Mouse.Synchronize must not start dragging rows.
       // Update the mouse status to make sure no container has invalid mouse over status.
-      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb
-      if( ( this.ParentDataGridControl.DragDataObject == null ) && ( this.IsMouseOver ) )
+      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
+      if( this.IsMouseOver )
       {
-        Mouse.Synchronize();
+        var dataGridControl = this.ParentDataGridControl;
+        if( dataGridControl != null )
+        {
+          using( dataGridControl.InhibitDrag() )
+          {
+            Mouse.Synchronize();
+          }
+        }
       }
     }
 
@@ -1882,15 +1855,10 @@ namespace Xceed.Wpf.DataGrid.Views
       //If unset, then nothing to do in this method!
     }
 
-    private void ResetContainers()
-    {
-
-      // Everything will be recalculated and redrawn in the measure pass.
-      this.InvalidateMeasure();
-    }
-
     private void PrepareContainer( UIElement container )
     {
+      container.ClearValue( UIElement.VisibilityProperty );
+
       var dataItemStore = Xceed.Wpf.DataGrid.CustomItemContainerGenerator.GetDataItemProperty( container );
       if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
         return;
@@ -1903,7 +1871,23 @@ namespace Xceed.Wpf.DataGrid.Views
       this.ParentDataGridControl.PrepareItemContainer( container, dataItem );
     }
 
-    #endregion Containers Methods
+    private void ClearContainer( UIElement container )
+    {
+#if DEBUG
+      TableflowViewItemsHost.SetRealizedIndex( container, -1 );
+#endif //DEBUG
+      TableflowViewItemsHost.ClearIsSticky( container );
+      container.ClearValue( UIElement.ClipProperty );
+
+      this.DisableElementNavigation( container );
+      this.FreeRowSelector( container );
+
+      container.Visibility = Visibility.Collapsed;
+
+      // The call to DataGridControl.ClearItemContainer will be done by the CustomItemContainerGenerator.
+    }
+
+    #endregion
 
     #region Animations Management
 
@@ -1915,19 +1899,22 @@ namespace Xceed.Wpf.DataGrid.Views
       m_horizontalOffsetAnimation = new OffsetAnimation();
     }
 
-    private void StartHorizontalOffsetAnimation()
+    private bool StartHorizontalOffsetAnimation()
     {
-      DataGridContext rootDataGridContext = this.CachedRootDataGridContext;
-
+      var rootDataGridContext = this.CachedRootDataGridContext;
       if( rootDataGridContext == null )
       {
         this.StopHorizontalOffsetAnimation();
-        return;
+        return false;
       }
 
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
+      var scrollingAnimationDuration = TableflowView.GetScrollingAnimationDuration( rootDataGridContext );
+      if( scrollingAnimationDuration <= 0d )
+        return false;
 
-      m_horizontalOffsetAnimation.Duration = TimeSpan.FromMilliseconds( TableflowView.GetScrollingAnimationDuration( rootDataGridContext ) );
+      var animatedScrollInfo = this.AnimatedScrollInfo;
+
+      m_horizontalOffsetAnimation.Duration = TimeSpan.FromMilliseconds( scrollingAnimationDuration );
       m_horizontalOffsetAnimation.From = animatedScrollInfo.OriginalHorizontalOffset;
       m_horizontalOffsetAnimation.To = animatedScrollInfo.TargetHorizontalOffset;
 
@@ -1937,12 +1924,13 @@ namespace Xceed.Wpf.DataGrid.Views
       m_horizontalOffsetAnimationClock.Completed += this.OnHorizontalOffsetAnimationCompleted;
 
       this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedHorizontalOffsetProperty, m_horizontalOffsetAnimationClock, HandoffBehavior.SnapshotAndReplace );
+
+      return true;
     }
 
     private void StopHorizontalOffsetAnimation()
     {
-      if( ( m_horizontalOffsetAnimationClock != null )
-        && ( m_horizontalOffsetAnimationClock.Controller != null ) )
+      if( ( m_horizontalOffsetAnimationClock != null ) && ( m_horizontalOffsetAnimationClock.Controller != null ) )
       {
         // We must call Pause instead on Stop to avoid having our
         // offset momentary set to 0. Weird...
@@ -1967,25 +1955,18 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private bool StartVerticalOffsetAnimation()
     {
-      DataGridContext rootDataGridContext = this.CachedRootDataGridContext;
-
+      var rootDataGridContext = this.CachedRootDataGridContext;
       if( rootDataGridContext == null )
       {
         this.StopVerticalOffsetAnimation();
-
-        // Cannot start animation.
         return false;
       }
 
-      double scrollingAnimationDuration = TableflowView.GetScrollingAnimationDuration( rootDataGridContext );
-
-      if( scrollingAnimationDuration == 0 )
-      {
-        // No animation to start.
+      var scrollingAnimationDuration = TableflowView.GetScrollingAnimationDuration( rootDataGridContext );
+      if( scrollingAnimationDuration <= 0d )
         return false;
-      }
 
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
+      var animatedScrollInfo = this.AnimatedScrollInfo;
 
       m_verticalOffsetAnimation.Duration = TimeSpan.FromMilliseconds( scrollingAnimationDuration );
       m_verticalOffsetAnimation.From = animatedScrollInfo.OriginalVerticalOffset;
@@ -1998,14 +1979,12 @@ namespace Xceed.Wpf.DataGrid.Views
 
       this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedVerticalOffsetProperty, m_verticalOffsetAnimationClock, HandoffBehavior.SnapshotAndReplace );
 
-      // Animation started.
       return true;
     }
 
     private void StopVerticalOffsetAnimation( bool resetScrollDirection = true )
     {
-      if( ( m_verticalOffsetAnimationClock != null )
-        && ( m_verticalOffsetAnimationClock.Controller != null ) )
+      if( ( m_verticalOffsetAnimationClock != null ) && ( m_verticalOffsetAnimationClock.Controller != null ) )
       {
         if( resetScrollDirection )
         {
@@ -2018,17 +1997,15 @@ namespace Xceed.Wpf.DataGrid.Views
         m_verticalOffsetAnimationClock.Completed -= this.OnVerticalOffsetAnimationCompleted;
         m_verticalOffsetAnimationClock = null;
 
-        this.InvalidateAutomationPeerChildren();
       }
     }
 
     private void OnVerticalOffsetAnimationCompleted( object sender, EventArgs e )
     {
       this.AnimatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
-      this.InvalidateAutomationPeerChildren();
     }
 
-    #endregion Animations Management
+    #endregion
 
     #region Scrolling Management
 
@@ -2121,21 +2098,26 @@ namespace Xceed.Wpf.DataGrid.Views
       animatedScrollInfo.OriginalHorizontalOffset = animatedScrollInfo.HorizontalOffset;
       animatedScrollInfo.TargetHorizontalOffset = offset;
 
+      bool animationStarted = false;
+
       if( animate )
       {
-        this.StartHorizontalOffsetAnimation();
-
         // The animated offset will take care of generating the 
         // page and invalidating the ScrollInfo.
+        animationStarted = this.StartHorizontalOffsetAnimation();
       }
-      else
+
+      if( !animationStarted )
       {
-        this.StopHorizontalOffsetAnimation();
-        this.SetHorizontalOffsetCore( offset );
-        // No need to regenerate the page since only the horizontal offset have changed.
-        // We must, on the other hand, relayout the containers to reflect the new offsets.
-        this.LayoutContainers();
-        this.InvalidateScrollInfo();
+        if( this.CachedRootDataGridContext != null )
+        {
+          this.StopHorizontalOffsetAnimation();
+          this.SetHorizontalOffsetCore( offset );
+          // No need to regenerate the page since only the horizontal offset have changed.
+          // We must, on the other hand, relayout the containers to reflect the new offsets.
+          this.LayoutContainers();
+          this.InvalidateScrollInfo();
+        }
 
         animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.None;
       }
@@ -2213,7 +2195,6 @@ namespace Xceed.Wpf.DataGrid.Views
       animatedScrollInfo.OriginalVerticalOffset = animatedScrollInfo.VerticalOffset;
       animatedScrollInfo.TargetVerticalOffset = offset;
 
-
       bool animationStarted = false;
 
       if( animate )
@@ -2229,9 +2210,7 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           this.StopVerticalOffsetAnimation( false );
           this.SetVerticalOffsetCore( offset );
-          this.GeneratePage( false, animatedScrollInfo.ViewportHeight );
-          this.LayoutContainers();
-          this.InvalidateScrollInfo();
+          this.InvalidateLayoutFromScrollingHelper();
         }
 
         animatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
@@ -2255,9 +2234,9 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private bool SetCurrent( int index, bool changeColumn, out bool isDataRow )
     {
-      ICustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-      GeneratorPosition position = generator.GeneratorPositionFromIndex( index );
-      UIElement container = null;
+      var generator = this.CustomItemContainerGenerator;
+      var position = generator.GeneratorPositionFromIndex( index );
+      var container = default( UIElement );
 
       using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
       {
@@ -2270,9 +2249,9 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         isDataRow = ( container is DataRow );
 
-        if( ( m_layoutedContainers.IndexOfContainer( container ) == -1 )
-          && ( m_stickyHeaders.IndexOfContainer( container ) == -1 )
-          && ( m_stickyFooters.IndexOfContainer( container ) == -1 ) )
+        if( ( m_layoutedContainers.IndexOfContainer( container ) < 0 )
+          && ( m_stickyHeaders.IndexOfContainer( container ) < 0 )
+          && ( m_stickyFooters.IndexOfContainer( container ) < 0 ) )
         {
           // If the container was not already layouted, force
           // a layout of the current page so that the new container
@@ -2281,30 +2260,34 @@ namespace Xceed.Wpf.DataGrid.Views
           this.LayoutContainers();
         }
 
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-
-        ColumnBase column = ( changeColumn )
-          ? dataGridContext.CurrentColumn
-          : null;
+        var dataGridContext = DataGridControl.GetDataGridContext( container );
+        var currentContext = dataGridContext.DataGridControl.CurrentContext;
+        var column = default( ColumnBase );
 
-        // if the current column is null or is (for an unknown reason) set to current but is readOnly, 
-        // try to set a new current column
-
-        if( ( isDataRow )
-          && ( ( changeColumn ) && ( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) ) ) )
+        if( changeColumn )
         {
-          int focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
+          column = dataGridContext.CurrentColumn;
 
-          if( focusableIndex >= 0 )
+          if( isDataRow )
           {
-            column = dataGridContext.VisibleColumns[ focusableIndex ];
+            if( ( currentContext != dataGridContext ) && dataGridContext.AreDetailsFlatten )
+            {
+              column = dataGridContext.GetMatchingColumn( currentContext, currentContext.CurrentColumn ) ?? column;
+            }
+
+            if( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) )
+            {
+              var focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
+              if( focusableIndex >= 0 )
+              {
+                column = dataGridContext.VisibleColumns[ focusableIndex ];
+              }
+            }
           }
         }
 
         try
         {
-          DataGridContext currentContext = dataGridContext.DataGridControl.CurrentContext;
-
           if( currentContext != null )
           {
             currentContext.EndEdit();
@@ -2315,17 +2298,21 @@ namespace Xceed.Wpf.DataGrid.Views
           return false;
         }
 
-        if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
+        var containerIndex = generator.GetRealizedIndexForContainer( container );
+        if( containerIndex >= 0 )
         {
-          generator.SetCurrentIndex( index );
-          return true;
+          if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
+          {
+            generator.SetCurrentIndex( containerIndex );
+            return true;
+          }
         }
       }
 
       return false;
     }
 
-    #endregion Scrolling Management
+    #endregion
 
     #region BringIntoView Methods
 
@@ -2534,7 +2521,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return currentChanged;
     }
 
-    #endregion BringIntoView Methods
+    #endregion
 
     #region DataGridItemsHost Overrides
 
@@ -2543,65 +2530,28 @@ namespace Xceed.Wpf.DataGrid.Views
       return new TableflowViewUIElementCollection( this );
     }
 
-    protected override void OnItemsAdded(
-      GeneratorPosition position,
-      int index,
-      int itemCount )
+    protected override void OnItemsAdded()
     {
       this.PreventOpacityAnimation = true;
 
       // We are calling InvalidateMeasure to regenerate the current 
       // page and forcing the recycling of out-of-view containers.
       this.InvalidateMeasure();
-
-    }
-
-    protected override void OnItemsMoved(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
-    {
-      System.Diagnostics.Debug.Fail( "When is this called?" );
-      this.ResetContainers();
     }
 
-    protected override void OnItemsReplaced(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
-    {
-      System.Diagnostics.Debug.Fail( "When is this called?" );
-      this.ResetContainers();
-    }
-
-    protected override void OnItemsRemoved(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
+    protected override void OnItemsRemoved( IList<DependencyObject> containers )
     {
       this.PreventOpacityAnimation = true;
 
       // We are calling InvalidateMeasure to regenerate the current 
       // page and forcing the recycling of out-of-view containers.
       this.InvalidateMeasure();
-
     }
 
     protected override void OnItemsReset()
     {
-      this.ResetContainers();
+      // Everything will be recalculated and redrawn in the measure pass.
+      this.InvalidateMeasure();
     }
 
     protected override void OnContainersRemoved( IList<DependencyObject> removedContainers )
@@ -2656,7 +2606,15 @@ namespace Xceed.Wpf.DataGrid.Views
       base.OnParentDataGridControlChanged( oldValue, newValue );
     }
 
-    #endregion DataGridItemsHost Overrides
+    protected override void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
+    {
+      foreach( UIElement candidate in recyclingCandidates )
+      {
+        this.ClearContainer( candidate );
+      }
+    }
+
+    #endregion
 
     #region PreviewKeyDown and KeyDown Handling
 
@@ -3078,39 +3036,6 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region Scroll Easing Management
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #endregion Scroll Easing Management
-
     #region IAnimatedScrollInfo Members
 
     ScrollDirection IAnimatedScrollInfo.HorizontalScrollingDirection
@@ -3149,7 +3074,7 @@ namespace Xceed.Wpf.DataGrid.Views
       set;
     }
 
-    #endregion IAnimatedScrollInfo Members
+    #endregion
 
     #region ICustomVirtualizingPanel Members
 
@@ -3164,47 +3089,34 @@ namespace Xceed.Wpf.DataGrid.Views
       if( m_delayedBringIntoViewIndex == -1 )
         return;
 
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
       double itemOffset = ( m_delayedBringIntoViewIndex * m_containerHeight );
 
       bool areHeadersSticky = this.AreHeadersStickyCache || this.AreParentRowsStickyCache || this.AreGroupHeadersStickyCache;
-      bool areFootersSticky = this.AreFootersStickyCache || this.AreGroupFootersStickyCache;
-
-      int stickyHeadersCount = ( areHeadersSticky )
-        ? this.GetStickyHeaderCountForIndex( m_delayedBringIntoViewIndex )
-        : 0;
+      int stickyHeadersCount = ( areHeadersSticky ) ? this.GetStickyHeaderCountForIndex( m_delayedBringIntoViewIndex ) : 0;
 
       double stickyHeadersHeight = stickyHeadersCount * m_containerHeight;
       double topThreshold = m_verticalOffset + stickyHeadersHeight;
 
-      bool handled = false;
-
       if( itemOffset < topThreshold )
       {
         this.ScrollToVerticalOffset( itemOffset - stickyHeadersHeight );
-        handled = true;
+        return;
       }
 
-      if( !handled )
-      {
-        int stickyFootersCount = ( areFootersSticky )
-          ? this.GetStickyFooterCountForIndex( m_delayedBringIntoViewIndex )
-          : 0;
+      bool areFootersSticky = this.AreFootersStickyCache || this.AreGroupFootersStickyCache;
+      int stickyFootersCount = ( areFootersSticky ) ? this.GetStickyFooterCountForIndex( m_delayedBringIntoViewIndex ) : 0;
 
-        double stickyFootersHeight = stickyFootersCount * m_containerHeight;
-        double bottomThreshold = ( m_verticalOffset + m_viewportHeight ) - stickyHeadersHeight;
+      double stickyFootersHeight = stickyFootersCount * m_containerHeight;
+      double bottomThreshold = ( m_verticalOffset + m_viewportHeight ) - stickyHeadersHeight - stickyFootersHeight;
 
-        if( itemOffset + m_containerHeight > bottomThreshold )
-        {
-          this.ScrollToVerticalOffset( itemOffset - ( m_viewportHeight - stickyFootersHeight - m_containerHeight ) );
-          handled = true;
-        }
+      if( itemOffset + m_containerHeight > bottomThreshold )
+      {
+        this.ScrollToVerticalOffset( itemOffset - ( m_viewportHeight - stickyFootersHeight - m_containerHeight ) );
       }
 
     }
 
-
-    #endregion ICustomVirtualizingPanel Members
+    #endregion
 
     #region IScrollInfo Members
 
@@ -3440,27 +3352,19 @@ namespace Xceed.Wpf.DataGrid.Views
       return rectangle;
     }
 
-    #endregion IScrollInfo Members
+    #endregion
 
-    #region ScrollTip Helper Methods
+    #region IDeferableScrollInfoRefresh Members
 
-    internal bool IsDataItemHiddenBySticky( int index )
+    IDisposable IDeferableScrollInfoRefresh.DeferScrollInfoRefresh( Orientation orientation )
     {
-      if( !m_layoutedContainers.ContainsRealizedIndex( index ) )
-        return false;
-
-      double indexOffset = this.GetContainerOffsetFromIndex( index );
-      double stickyHeadersRegionHeight = this.GetStickyHeadersRegionHeight();
-      double stickyFootersRegionHeight = this.GetStickyFootersRegionHeight();
+      if( ( orientation == Orientation.Vertical ) && !this.IsDeferredLoadingEnabledCache )
+        return new LayoutSuspendedHelper( this );
 
-      return
-        ( ( indexOffset - m_verticalOffset + m_containerHeight ) <= stickyHeadersRegionHeight ) ||
-        ( ( indexOffset - m_verticalOffset ) >= stickyFootersRegionHeight );
+      return null;
     }
 
-    #endregion ScrollTip Helper Methods
-
-    #region PRIVATE METHODS
+    #endregion
 
     private static void MoveFocusForwardExecuted( object sender, ExecutedRoutedEventArgs e )
     {
@@ -3560,22 +3464,24 @@ namespace Xceed.Wpf.DataGrid.Views
       return true;
     }
 
-    #endregion PRIVATE METHODS
+    private void InvalidateLayoutFromScrollingHelper()
+    {
+      if( m_layoutSuspended.IsSet )
+      {
+        m_layoutInvalidatedDuringSuspend = true;
+        return;
+      }
 
-    #region CONSTANTS
+      this.GeneratePage( false, this.AnimatedScrollInfo.ViewportHeight );
+      this.InvalidateArrange();
+      this.InvalidateScrollInfo();
+    }
 
+    private const int MaxDataRowFailFocusCount = 50;
     private static readonly Point OutOfViewPoint = new Point( -999999, -999999 );
     private static readonly Point EmptyPoint = new Point( 0, 0 );
 
-    #endregion CONSTANTS
-
-    #region PRIVATE FIELDS
-
-
-
     private readonly LayoutedContainerInfoList m_layoutedContainers = new LayoutedContainerInfoList();
-    private readonly HashSet<UIElement> m_layoutedContainersToRecycle = new HashSet<UIElement>();
-
     private readonly StickyContainerInfoList m_stickyHeaders = new StickyContainerInfoList();
     private readonly StickyContainerInfoList m_stickyFooters = new StickyContainerInfoList();
 
@@ -3603,7 +3509,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private BitVector32 m_flags = new BitVector32();
 
-    #endregion PRIVATE FIELDS
+    private AutoResetFlag m_layoutSuspended = AutoResetFlagFactory.Create( false );
+    private bool m_layoutInvalidatedDuringSuspend;
 
     #region TableflowItemsHostFlags Private Enum
 
@@ -3619,7 +3526,7 @@ namespace Xceed.Wpf.DataGrid.Views
       IsDeferredLoadingEnabled = 64,
     }
 
-    #endregion TableflowItemsHostFlags Private Enum
+    #endregion
 
     #region PageIndexes Private Class
 
@@ -3685,6 +3592,54 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion PageIndexes Private Class
+    #endregion
+
+    #region LayoutSuspendedHelper Private Class
+
+    private sealed class LayoutSuspendedHelper : IDisposable
+    {
+      public LayoutSuspendedHelper( TableflowViewItemsHost owner )
+      {
+        if( owner == null )
+          throw new ArgumentNullException( "owner" );
+
+        m_owner = owner;
+        m_disposable = owner.m_layoutSuspended.Set();
+      }
+
+      void IDisposable.Dispose()
+      {
+        this.Dispose( true );
+        GC.SuppressFinalize( this );
+      }
+
+      private void Dispose( bool disposing )
+      {
+        var owner = Interlocked.Exchange( ref m_owner, null );
+        if( owner == null )
+          return;
+
+        if( m_disposable != null )
+        {
+          m_disposable.Dispose();
+          m_disposable = null;
+        }
+
+        if( !owner.m_layoutSuspended.IsSet && owner.m_layoutInvalidatedDuringSuspend )
+        {
+          owner.InvalidateMeasure();
+        }
+      }
+
+      ~LayoutSuspendedHelper()
+      {
+        this.Dispose( false );
+      }
+
+      private TableflowViewItemsHost m_owner;
+      private IDisposable m_disposable;
+    }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
index 4ba4215d..65423907 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
@@ -62,7 +62,7 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       m_columnStretchingDisabled = true;
 
-      foreach( Column column in m_dataGridContext.Columns )
+      foreach( ColumnBase column in m_dataGridContext.Columns )
       {
         if( column.ReadLocalValue( ColumnBase.DesiredWidthProperty ) != DependencyProperty.UnsetValue )
         {
@@ -73,7 +73,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    public void CalculateColumnStretchWidths( double widthToDistribute, ColumnStretchMode columnStretchMode, double columnStretchMinWidth )
+    public void CalculateColumnStretchWidths( double widthToDistribute, ColumnStretchMode columnStretchMode, double columnStretchMinWidth, bool canIncreaseColumnWidth )
     {
       if( m_columnStretchingDisabled )
         return;
@@ -175,11 +175,11 @@ namespace Xceed.Wpf.DataGrid.Views
           }
         }
 
-        this.CalculateColumnDesiredWidth( widthToDistribute, excludedColumns );
+        this.CalculateColumnDesiredWidth( widthToDistribute, excludedColumns, canIncreaseColumnWidth );
       }
     }
 
-    private void CalculateColumnDesiredWidth( double widthToDistribute, List<WorkingColumnWidth> excludedColumns )
+    private void CalculateColumnDesiredWidth( double widthToDistribute, List<WorkingColumnWidth> excludedColumns, bool canIncreaseColumnWidth )
     {
       double starToDistribute = 0d;
 
@@ -238,6 +238,9 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         if( columnWidth.OverriddenWidth >= 0d )
         {
+          if( !canIncreaseColumnWidth && ( columnWidth.Column.DesiredWidth < columnWidth.DesiredWidth ) )
+            continue;
+
           // Assign the desired calculated Width. Column.ActualWidth will be in charge of
           // applying the MinWidth and MaxWidth. This ultimate responsability has to be 
           // kept in Column to make MinWidth and MaxWidth modifications having an impact.
@@ -248,7 +251,12 @@ namespace Xceed.Wpf.DataGrid.Views
         }
         else
         {
-          columnWidth.Column.DesiredWidth = ( unitWidth * columnWidth.StarValue );
+          var desiredWidth = unitWidth * columnWidth.StarValue;
+
+          if( !canIncreaseColumnWidth && ( columnWidth.Column.DesiredWidth < desiredWidth ) )
+            continue;
+
+          columnWidth.Column.DesiredWidth = desiredWidth;
         }
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
index 04cc2fcb..07bf8c9e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
@@ -16,27 +16,19 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using Xceed.Utils.Wpf;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Utils.Math;
 using System.Windows.Threading;
-using System.Collections.ObjectModel;
+using Xceed.Wpf.DataGrid.Converters;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
   public class DataGridScrollViewer : ScrollViewer
   {
-    #region CONSTRUCTORS
-
     static DataGridScrollViewer()
     {
       DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( DataGridScrollViewer ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridChanged ) ) );
@@ -49,12 +41,13 @@ namespace Xceed.Wpf.DataGrid.Views
       m_templateHelper = new ScrollViewerTemplateHelper( this, this.DragScrollBegin, this.DragScrollEnd );
     }
 
-    #endregion
-
     #region SynchronizedScrollViewerPosition Attached Property
 
-    public static readonly DependencyProperty SynchronizedScrollViewerPositionProperty =
-        DependencyProperty.RegisterAttached( "SynchronizedScrollViewerPosition", typeof( SynchronizedScrollViewerPosition ), typeof( TableViewScrollViewer ), new UIPropertyMetadata( SynchronizedScrollViewerPosition.None ) );
+    public static readonly DependencyProperty SynchronizedScrollViewerPositionProperty = DependencyProperty.RegisterAttached(
+      "SynchronizedScrollViewerPosition",
+      typeof( SynchronizedScrollViewerPosition ),
+      typeof( TableViewScrollViewer ),
+      new UIPropertyMetadata( SynchronizedScrollViewerPosition.None ) );
 
     public static SynchronizedScrollViewerPosition GetSynchronizedScrollViewerPosition( DependencyObject obj )
     {
@@ -68,7 +61,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion SynchronizedScrollViewerPosition Attached Property
 
-    #region INTERNAL PROPERTIES
+    #region SynchronizedScrollViewersWidth Property
 
     internal double SynchronizedScrollViewersWidth
     {
@@ -91,6 +84,10 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    #endregion
+
+    #region SynchronizedScrollViewersHeight Property
+
     internal double SynchronizedScrollViewersHeight
     {
       get
@@ -112,6 +109,10 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    #endregion
+
+    #region SynchronizedScrollViewers Property
+
     internal IEnumerable<SynchronizedScrollViewer> SynchronizedScrollViewers
     {
       get
@@ -120,8 +121,11 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private static readonly DependencyProperty SynchronizedScrollViewerExtentProperty =
-        DependencyProperty.Register( "SynchronizedScrollViewerExtent", typeof( double ), typeof( DataGridScrollViewer ), new FrameworkPropertyMetadata( new PropertyChangedCallback( DataGridScrollViewer.OnSynchronizedScrollViewerExtentPropertyChanged ) ) );
+    private static readonly DependencyProperty SynchronizedScrollViewerExtentProperty = DependencyProperty.Register(
+      "SynchronizedScrollViewerExtent",
+      typeof( double ),
+      typeof( DataGridScrollViewer ),
+      new FrameworkPropertyMetadata( new PropertyChangedCallback( DataGridScrollViewer.OnSynchronizedScrollViewerExtentPropertyChanged ) ) );
 
     private static void OnSynchronizedScrollViewerExtentPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
@@ -148,7 +152,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region PROTECTED PROPERTIES
+    #region HorizontalScrollBar Property
 
     protected internal ScrollBar HorizontalScrollBar
     {
@@ -158,6 +162,10 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    #endregion
+
+    #region VerticalScrollBar Property
+
     protected internal ScrollBar VerticalScrollBar
     {
       get
@@ -168,8 +176,6 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region PUBLIC METHODS
-
     public override void OnApplyTemplate()
     {
       base.OnApplyTemplate();
@@ -185,10 +191,6 @@ namespace Xceed.Wpf.DataGrid.Views
       this.UpdateChildScrollViewers();
     }
 
-    #endregion
-
-    #region INTERNAL METHODS
-
     internal void HandlePageUpNavigation()
     {
       DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
@@ -284,10 +286,6 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion
-
-    #region PROTECTED METHODS
-
     protected override void OnKeyDown( KeyEventArgs e )
     {
       base.OnKeyDown( e );
@@ -601,11 +599,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
       ColumnBase currentColumn = dataGridContext.CurrentColumn;
 
-      if( ( ( navigationBehavior == NavigationBehavior.CellOnly )
-        || ( navigationBehavior == NavigationBehavior.RowOrCell ) )
-        && ( currentColumn != null ) )
+      if( ( ( navigationBehavior == NavigationBehavior.CellOnly ) || ( navigationBehavior == NavigationBehavior.RowOrCell ) ) && ( currentColumn != null ) )
       {
-
         int oldCurrentIndex = currentColumn.Index;
 
         NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext );
@@ -613,13 +608,12 @@ namespace Xceed.Wpf.DataGrid.Views
         var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
 
         //if the first focusable column is is within the viewport, scroll so 0d offset, otherwise, bringIntoView
-        bool isFixedColumn = ( columnVirtualizationManager == null ) ?
-          false : columnVirtualizationManager.GetFixedFieldNames().Contains( currentColumn.FieldName );
+        bool isFixedColumn = ( columnVirtualizationManager == null ) ? false : columnVirtualizationManager.GetFixedFieldNames().Contains( currentColumn.FieldName );
 
-        if( ( ( this.IsCellsOffsetNeedReset( dataGridContext ) )
-          && ( oldCurrentIndex == currentColumn.Index ) )
-          || ( isFixedColumn ) )
+        if( ( ( this.IsCellsOffsetNeedReset( dataGridContext ) ) && ( oldCurrentIndex == currentColumn.Index ) ) || ( isFixedColumn ) )
+        {
           this.Dispatcher.BeginInvoke( DispatcherPriority.Normal, new Action( this.ScrollToLeftEnd ) );
+        }
 
         if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
         {
@@ -644,7 +638,9 @@ namespace Xceed.Wpf.DataGrid.Views
 
           //than handle new selection!
           if( navigationBehavior != NavigationBehavior.None )
+          {
             this.HandlePageUpNavigation();
+          }
         }
         else
         {
@@ -686,18 +682,17 @@ namespace Xceed.Wpf.DataGrid.Views
 
       ColumnBase CurrentColumn = dataGridContext.CurrentColumn;
 
-      if( ( ( navigationBehavior == NavigationBehavior.CellOnly )
-        || ( navigationBehavior == NavigationBehavior.RowOrCell ) )
-        && ( CurrentColumn != null ) )
+      if( ( ( navigationBehavior == NavigationBehavior.CellOnly ) || ( navigationBehavior == NavigationBehavior.RowOrCell ) ) && ( CurrentColumn != null ) )
       {
         int oldCurrentIndex = CurrentColumn.Index;
 
         NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext );
 
         //if the last focusable column is is within the viewport, scroll to Extended offset, otherwise, bringIntoView
-
         if( ( this.IsCellsOffsetNeedReset( dataGridContext ) ) && ( oldCurrentIndex == CurrentColumn.Index ) )
+        {
           this.Dispatcher.BeginInvoke( DispatcherPriority.Normal, new Action( this.ScrollToRightEnd ) );
+        }
 
         if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
         {
@@ -722,7 +717,9 @@ namespace Xceed.Wpf.DataGrid.Views
 
           // Than handle new selection!
           if( navigationBehavior != NavigationBehavior.None )
+          {
             this.HandlePageDownNavigation();
+          }
         }
         else
         {
@@ -748,8 +745,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       Cell targetCell = dataGridContext.CurrentCell;
 
-      // if the targetCell is null, it means we are on a header or.. (a non focusable item)
-      // we want to scroll as the "no navigation" behavior
+      // if the targetCell is null, it means we are on a header or a non focusable item; thus we want to scroll as the "no navigation" behavior
       if( targetCell == null )
         return true;
 
@@ -758,6 +754,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       double viewportWidth = this.ViewportWidth;
       double fixedColumnWidth = columnVirtualizationManager.FixedColumnsWidth;
+      double fixedColumnSplitterWidth = 0;
       double cellsWidth = targetCell.ParentColumn.Width;
 
       Point cellToScrollingCellsDecorator = targetCell.TranslatePoint( new Point(), fixedCellPanel.ScrollingCellsDecorator );
@@ -768,20 +765,17 @@ namespace Xceed.Wpf.DataGrid.Views
       leftEdgeOutOfViewPort = ( cellToScrollingCellsDecorator.X < 0 ) ? true : false;
 
       // Verify if the Cell's right edge is visible in the ViewPort
-      Point cellToItemsHost = targetCell.TranslatePoint( new Point( cellsWidth, 0 ),
-        itemsHost );
+      Point cellToItemsHost = targetCell.TranslatePoint( new Point( cellsWidth, 0 ), itemsHost );
 
       // If the right edge is out of Viewport, ensure not to call the resetHorizontalOffset
       bool rightEdgeOutOfViewPort = ( ( cellToItemsHost.X - viewportWidth ) > 0 ) ? true : false;
 
       bool resetHorizontalOffset = false;
 
-      // if the cell is inside the viewPort or if one of the edges of the cell are outside the portView but the
-      // the viewPort is not wide enough to contain the cell
+      // if the cell is inside the viewPort or if one of the edges of the cell are outside the portView but the the viewPort is not wide enough to contain the cell
       if( ( ( !rightEdgeOutOfViewPort ) && ( !leftEdgeOutOfViewPort ) )
-        || ( ( ( rightEdgeOutOfViewPort )
-        || ( leftEdgeOutOfViewPort ) )
-        && ( ( cellsWidth - Math.Abs( cellToScrollingCellsDecorator.X ) ) >= ( viewportWidth - fixedColumnWidth ) ) ) )
+        || ( ( ( rightEdgeOutOfViewPort ) || ( leftEdgeOutOfViewPort ) )
+        && ( ( cellsWidth - Math.Abs( cellToScrollingCellsDecorator.X ) ) >= ( viewportWidth - fixedColumnWidth - fixedColumnSplitterWidth ) ) ) )
       {
         resetHorizontalOffset = true;
       }
@@ -938,10 +932,6 @@ namespace Xceed.Wpf.DataGrid.Views
       return base.MeasureOverride( constraint );
     }
 
-    #endregion
-
-    #region PRIVATE METHODS
-
     private static void OnParentDataGridChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
     {
       DataGridScrollViewer scrollViewer = sender as DataGridScrollViewer;
@@ -1047,17 +1037,19 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void PopulateScrollViewerListHelper( DependencyObject reference, List<SynchronizedScrollViewer> list, MultiBinding multiBinding )
     {
-      int childCount = VisualTreeHelper.GetChildrenCount( reference );
+      if( reference == null )
+        return;
+
+      var childCount = VisualTreeHelper.GetChildrenCount( reference );
 
       for( int i = 0; i < childCount; i++ )
       {
-        DependencyObject child = VisualTreeHelper.GetChild( reference, i );
-
-        SynchronizedScrollViewer synchronizedScrollViewer = child as SynchronizedScrollViewer;
+        var child = VisualTreeHelper.GetChild( reference, i );
+        var synchronizedScrollViewer = child as SynchronizedScrollViewer;
 
         if( synchronizedScrollViewer != null )
         {
-          string propertyName = String.Empty;
+          var propertyName = String.Empty;
 
           if( synchronizedScrollViewer.ScrollOrientation == ScrollOrientation.Horizontal )
           {
@@ -1068,7 +1060,7 @@ namespace Xceed.Wpf.DataGrid.Views
             propertyName = "ExtentHeight";
           }
 
-          Binding binding = new Binding();
+          var binding = new Binding();
           binding.Path = new PropertyPath( propertyName );
           binding.Mode = BindingMode.OneWay;
           binding.Source = synchronizedScrollViewer;
@@ -1086,13 +1078,15 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private void FindAllDeferableChildren( DependencyObject reference, List<IDeferableScrollChanged> list )
     {
-      int childCount = VisualTreeHelper.GetChildrenCount( reference );
+      if( reference == null )
+        return;
+
+      var childCount = VisualTreeHelper.GetChildrenCount( reference );
 
       for( int i = 0; i < childCount; i++ )
       {
-        DependencyObject child = VisualTreeHelper.GetChild( reference, i );
-
-        IDeferableScrollChanged deferable = child as IDeferableScrollChanged;
+        var child = VisualTreeHelper.GetChild( reference, i );
+        var deferable = child as IDeferableScrollChanged;
 
         if( deferable != null )
         {
@@ -1166,10 +1160,6 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion
-
-    #region PRIVATE FIELDS
-
     private List<SynchronizedScrollViewer> m_childScrollViewers = new List<SynchronizedScrollViewer>();
     private List<IDeferableScrollChanged> m_deferableChilds = new List<IDeferableScrollChanged>();
 
@@ -1177,10 +1167,6 @@ namespace Xceed.Wpf.DataGrid.Views
     IDisposable m_deferScrollInfoRefresh; // = null 
     int m_measureVersion;
 
-    #endregion
-
-    #region INTERNAL INTERFACE IDeferableScrollChanged
-
     internal interface IDeferableScrollChanged
     {
       bool DeferScrollChanged
@@ -1189,7 +1175,5 @@ namespace Xceed.Wpf.DataGrid.Views
         set;
       }
     }
-
-    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
index 9583063c..8efd9a9b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
@@ -18,8 +18,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
@@ -29,15 +27,23 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using System.Windows.Threading;
-using Xceed.Utils.Wpf;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
   public class FixedCellPanel : Panel, IVirtualizingCellsHost, IWeakEventListener
   {
-    private static readonly Point EmptyPoint = new Point();
+    private static readonly TimeSpan MaxProcessDurationTime = TimeSpan.FromMilliseconds( 25d );
+
+    static FixedCellPanel()
+    {
+      FixedCellPanel.MinHeightProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( FixedCellPanel.CoerceMinHeight ) ) );
+      TextElement.FontFamilyProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
+      TextElement.FontSizeProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
+      TextElement.FontStretchProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
+      TextElement.FontStyleProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
+      TextElement.FontWeightProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
+    }
 
     public FixedCellPanel()
     {
@@ -46,22 +52,23 @@ namespace Xceed.Wpf.DataGrid.Views
 
       m_fixedPanel = new FixedCellSubPanel( this );
 
-      m_splitter = new FixedColumnSplitter();
-
       m_scrollingPanel = new VirtualizingFixedCellSubPanel( this );
 
       m_scrollingCellsDecorator = new ScrollingCellsDecorator();
       m_scrollingCellsDecorator.Child = m_scrollingPanel;
 
       this.AddVisualChild( m_fixedPanel );
-      this.AddVisualChild( m_splitter );
+      this.AddVisualChild( null );
       this.AddVisualChild( m_scrollingCellsDecorator );
 
       // Used to get the correct item depending of the ZIndex
       m_visualChildren.Add( m_fixedPanel );
-      m_visualChildren.Add( m_splitter );
+      m_visualChildren.Add( null );
       m_visualChildren.Add( m_scrollingCellsDecorator );
 
+      this.SetCurrentValue( FixedCellPanel.MinHeightProperty, 0d );
+
+      this.LayoutUpdated += new EventHandler( FixedCellPanelLayoutUpdated );
     }
 
     #region ColumnStretchMinWidth Property
@@ -110,7 +117,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ColumnStretchMinWidth Property
+    #endregion
 
     #region ColumnStretchMode Property
 
@@ -132,7 +139,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ColumnStretchMode Property
+    #endregion
 
     #region DataGridContext Property
 
@@ -172,6 +179,18 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
+    #region VisibleColumns Property
+
+    private ReadOnlyObservableCollection<ColumnBase> VisibleColumns
+    {
+      get
+      {
+        return m_dataGridContext.VisibleColumns;
+      }
+    }
+
+    #endregion
+
     #region FixedCellCount Property
 
     public static readonly DependencyProperty FixedCellCountProperty = DependencyProperty.Register(
@@ -210,7 +229,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return ( ( int )value >= 0 );
     }
 
-    #endregion FixedCellCount Property
+    #endregion
 
     #region FixedPanel Property
 
@@ -244,7 +263,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion FixedColumnDropMarkPen Property
+    #endregion
 
     #region ParentRow Property
 
@@ -254,7 +273,7 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         if( m_parentRow == null )
         {
-          m_parentRow = Row.FindFromChild( this.DataGridContext, this );
+          m_parentRow = Row.FindFromChild( m_dataGridContext, this );
         }
 
         return m_parentRow;
@@ -323,13 +342,12 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       get
       {
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext == null )
+        if( m_dataGridContext == null )
           return null;
 
-        var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
+        var columnVirtualizationManager = m_dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
         if( columnVirtualizationManager == null )
-          throw new DataGridInternalException( "Invalid ColumnVirtualizationManager for FixedCellPanel", dataGridContext.DataGridControl );
+          throw new DataGridInternalException( "Invalid ColumnVirtualizationManager for FixedCellPanel", m_dataGridContext.DataGridControl );
 
         return columnVirtualizationManager;
       }
@@ -337,77 +355,13 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region CellsHostPrepared Private Property
-
-    private bool CellsHostPrepared
-    {
-      get
-      {
-        return m_flags[ ( int )FixedCellPanelFlags.CellsHostPrepared ];
-      }
-      set
-      {
-        m_flags[ ( int )FixedCellPanelFlags.CellsHostPrepared ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ZOrderDirty Private Property
-
-    private bool ZOrderDirty
-    {
-      get
-      {
-        return m_flags[ ( int )FixedCellPanelFlags.ZOrderDirty ];
-      }
-      set
-      {
-        m_flags[ ( int )FixedCellPanelFlags.ZOrderDirty ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SplitterDragCanceled Private Property
-
-    private bool SplitterDragCanceled
-    {
-      get
-      {
-        return m_flags[ ( int )FixedCellPanelFlags.SplitterDragCanceled ];
-      }
-      set
-      {
-        m_flags[ ( int )FixedCellPanelFlags.SplitterDragCanceled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SplitterDragCompleted Private Property
-
-    private bool SplitterDragCompleted
-    {
-      get
-      {
-        return m_flags[ ( int )FixedCellPanelFlags.SplitterDragCompleted ];
-      }
-      set
-      {
-        m_flags[ ( int )FixedCellPanelFlags.SplitterDragCompleted ] = value;
-      }
-    }
-
-    #endregion
-
     #region VisualChildrenCount Property
 
     protected override int VisualChildrenCount
     {
       get
       {
-        return s_visualChildrenCount;
+        return c_visualChildrenCount;
       }
     }
 
@@ -431,8 +385,8 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       get
       {
-        VirtualizingCellCollection virtualizingCellCollection = this.ParentRowCells;
-        if( virtualizingCellCollection == null )
+        var parentRowCells = this.ParentRowCells;
+        if( parentRowCells == null )
           return new Cell[ 0 ];
 
         TableViewColumnVirtualizationManagerBase columnVirtualizationManager = this.ColumnVirtualizationManager;
@@ -442,17 +396,12 @@ namespace Xceed.Wpf.DataGrid.Views
         List<Cell> cells = new List<Cell>();
         Cell cell;
 
-        foreach( string fieldName in columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ) )
-        {
-          if( virtualizingCellCollection.TryGetBindedCell( fieldName, out cell ) )
-          {
-            cells.Add( cell );
-          }
-        }
+        var fieldNames = columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache )
+                           .Concat( columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ) );
 
-        foreach( string fieldName in columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ) )
+        foreach( string fieldName in fieldNames )
         {
-          if( virtualizingCellCollection.TryGetBindedCell( fieldName, out cell ) )
+          if( parentRowCells.TryGetCreatedCell( fieldName, out cell ) )
           {
             cells.Add( cell );
           }
@@ -512,25 +461,23 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected override Visual GetVisualChild( int index )
     {
-      if( this.ZOrderDirty )
+      if( m_zOrderDirty )
       {
         this.RecomputeZOrder();
       }
 
-      int correctedIndex = ( m_zIndexMapping == null ) ? index : m_zIndexMapping[ index ];
+      var correctedIndex = ( m_zIndexMapping == null ) ? index : m_zIndexMapping[ index ];
 
       switch( correctedIndex )
       {
         case 0:
           return m_fixedPanel;
         case 1:
-          return m_splitter;
+          return null;
         case 2:
           return m_scrollingCellsDecorator;
         default:
-          DataGridException.ThrowSystemException( "Invalid visual child index.", typeof( IndexOutOfRangeException ), this.DataGridContext.DataGridControl.Name );
-          //Simply there to remove compiling error
-          return null;
+          throw DataGridException.Create<IndexOutOfRangeException>( "Invalid visual child index.", ( m_dataGridContext != null ? m_dataGridContext.DataGridControl : null ) );
       }
     }
 
@@ -541,10 +488,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected override Size MeasureOverride( Size availableSize )
     {
-      DataGridContext dataGridContext = this.DataGridContext;
-
       // DataGridContext can be null when the parent Row is not prepared
-      if( dataGridContext == null )
+      if( m_dataGridContext == null )
         return this.DesiredSize;
 
       this.ApplyFixedTranform();
@@ -559,9 +504,6 @@ namespace Xceed.Wpf.DataGrid.Views
       double tempDesiredHeight = 0;
       m_desiredSize.Width = 0;
 
-      // Measure the Splitter
-      m_splitter.Measure( availableSize );
-
       // Measure the Panels (visual children) around the cells (logical children).  Logical children will not be measured again during this process.
       m_fixedPanel.Measure( availableSize );
 
@@ -582,9 +524,14 @@ namespace Xceed.Wpf.DataGrid.Views
 
       m_desiredSize.Height = tempDesiredHeight;
 
-      if( !double.IsPositiveInfinity( availableSize.Width ) && !dataGridContext.IsAFlattenDetail )
+      if( !double.IsPositiveInfinity( availableSize.Width ) && !m_dataGridContext.IsAFlattenDetail )
       {
-        dataGridContext.ColumnStretchingManager.CalculateColumnStretchWidths( availableSize.Width, this.ColumnStretchMode, this.ColumnStretchMinWidth );
+        m_dataGridContext.ColumnStretchingManager.CalculateColumnStretchWidths( availableSize.Width, this.ColumnStretchMode,
+                                                                                this.ColumnStretchMinWidth, m_dataGridContext.CanIncreaseColumnWidth );
+
+        // Since a panel can make a column change its width, and since this will invalidate every panel that has already been measured, only a decreasing value
+        // is allowd to be set from one panel to another, so the layout pass does not fall into an infinite loop of increasing and decreasing values.
+        m_dataGridContext.CanIncreaseColumnWidth = false;
       }
 
       // Adjust TabIndex of fixed cell and scrolling cell for the tab navigation to be ok
@@ -596,7 +543,7 @@ namespace Xceed.Wpf.DataGrid.Views
     protected override Size ArrangeOverride( Size finalSize )
     {
       // DataGridContext can be null when the parent Row is not prepared
-      if( this.DataGridContext == null )
+      if( m_dataGridContext == null )
         return this.DesiredSize;
 
       // Very simple horizontally Arrange implementation.  We use m_visualChildren instead of GetVisualChild(index)
@@ -685,16 +632,16 @@ namespace Xceed.Wpf.DataGrid.Views
       if( cell == null )
         return retVal;
 
-      // We do not want any template cells to be added/removed to/from visual tree
+      // We do not want any template cells to be added to/removed from visual tree
       Debug.Assert( !Row.GetIsTemplateCell( cell ), "We should never insert template cells" );
 
       ColumnBase parentColumn = cell.ParentColumn;
       Debug.Assert( parentColumn != null, "The cell doesn't have a parent column" );
 
-      CellCollection cellCollection = this.ParentRowCells;
-      Debug.Assert( cellCollection != null );
+      CellCollection parentRowCells = this.ParentRowCells;
+      Debug.Assert( parentRowCells != null );
 
-      Cell targetCell = cellCollection[ parentColumn ];
+      Cell targetCell = parentRowCells[ parentColumn ];
       Debug.Assert( targetCell == cell, "The forced cell is inappropriate" );
 
       retVal = this.MoveCellToScrollingPanel( cell );
@@ -705,41 +652,34 @@ namespace Xceed.Wpf.DataGrid.Views
       return retVal;
     }
 
-    private bool CanReleaseCell( Cell cell )
-    {
-      DataGridContext dataGridContext = this.DataGridContext;
-
-
-      //We must never recycle a cell for one of the following reason:
-      //  1. Its edit template is currently displayed.  (The typed content must be kept).
-      //  2. Is the current cell.
-      //  3. Is a templated cell.
-      //  4. Is part of a dragged column.
-      return ( cell != null )
-          && ( dataGridContext != null )
-          && ( cell.CanBeRecycled )
-          && ( cell != dataGridContext.CurrentCell )
-          && ( !Row.GetIsTemplateCell( cell ) )
-          && ( ( cell.ParentColumn == null ) || ( !TableflowView.GetIsBeingDraggedAnimated( cell.ParentColumn ) ) )
-          && ( !( bool )cell.GetValue( ColumnManagerCell.IsBeingDraggedProperty ) );
-    }
-
-    private void AddCellToVisualTree( Cell cellToAdd )
+    internal void PrepareVirtualizationMode( DataGridContext dataGridContext )
     {
-      if( cellToAdd == null )
+      var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
+      if( columnVirtualizationManager == null )
         return;
 
-      UIElementCollection scrollingChildren = m_scrollingPanel.Children;
+      var parentRowCells = this.ParentRowCells;
+      m_virtualizationMode = columnVirtualizationManager.VirtualizationMode;
+      parentRowCells.VirtualizationMode = m_virtualizationMode;
 
-      if( scrollingChildren.Contains( cellToAdd ) )
+      //Cells provided through Row.Cells (in xaml for instance) must be merged now.
+      parentRowCells.MergeFreeCells();
+
+      //Check if the mode is virutalizing without cell recycling
+      if( m_virtualizationMode != ColumnVirtualizationMode.Virtualizing )
         return;
 
-      UIElementCollection fixedChildren = m_fixedPanel.Children;
+      //In this mode, cells for all visible columns are automatically generated (speeds up first time horizontal scrolling).
+      m_generateMissingCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<int>( this.GenerateMissingCells ), DispatcherPriority.Input, 0 );
+    }
 
-      if( m_fixedPanel.Children.Contains( cellToAdd ) )
+    private void FixedCellPanelLayoutUpdated( object sender, EventArgs e )
+    {
+      if( m_dataGridContext == null )
         return;
 
-      scrollingChildren.Add( cellToAdd );
+      // Once the layout pass is done, the flag must be reset so the width of columns can be resized.
+      m_dataGridContext.CanIncreaseColumnWidth = true;
     }
 
     private void MoveCellToFixedPanel( Cell movingCell )
@@ -781,64 +721,294 @@ namespace Xceed.Wpf.DataGrid.Views
       return retVal;
     }
 
-    private void RemoveLeakingCells( ICollection<Cell> collection )
+    private void RemoveCellFromFixedOrScrollingPanel( Cell cell )
     {
-      this.RemoveLeakingCells( collection, m_fixedPanel.Children );
-      this.RemoveLeakingCells( collection, m_scrollingPanel.Children );
+      if( cell == null )
+        return;
+
+      m_fixedPanel.Children.Remove( cell );
+      m_scrollingPanel.Children.Remove( cell );
     }
 
-    private void RemoveLeakingCells( ICollection<Cell> aliveCells, UIElementCollection collection )
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousLocationsOf( ColumnHierarchyManager.ILocation location )
     {
-      if( ( aliveCells == null ) || ( collection == null ) )
-        return;
+      if( location == null )
+        yield break;
+
+      var previousLocation = location.GetPreviousSiblingOrCousin();
+      while( previousLocation != null )
+      {
+        yield return previousLocation;
+        previousLocation = previousLocation.GetPreviousSiblingOrCousin();
+      }
+    }
+
+    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextLocationsOf( ColumnHierarchyManager.ILocation location )
+    {
+      if( location == null )
+        yield break;
+
+      var nextLocation = location.GetNextSiblingOrCousin();
+      while( nextLocation != null )
+      {
+        yield return nextLocation;
+        nextLocation = nextLocation.GetNextSiblingOrCousin();
+      }
+    }
 
-      //Remove the inaccessible cells from the elements collection.
-      for( int i = collection.Count - 1; i >= 0; i-- )
+    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
+    {
+      if( locations == null )
+        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
+
+      return ( from location in locations
+               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
+               where ( columnLocation != null )
+               select columnLocation );
+    }
+
+    private bool IsDropMarkAtDropTarget( DropTarget dropTarget )
+    {
+      if( ( dropTarget == null ) || ( m_dataGridContext == null ) )
+        return false;
+
+      var columnManager = m_dataGridContext.ColumnManager;
+      var levelMarkers = columnManager.GetLevelMarkersFor( dropTarget.Columns );
+      if( levelMarkers == null )
+        return false;
+
+      var splitterLocation = levelMarkers.Splitter;
+      Debug.Assert( splitterLocation != null );
+      if( splitterLocation == null )
+        return false;
+
+      // The drop mark location should not be adjusted when the only thing that is between the splitter and
+      // the target location are hidden columns.
+      if( dropTarget.Type != DropTargetType.Column )
+      {
+        var locations = ( dropTarget.Before ) ? this.GetNextLocationsOf( splitterLocation ) : this.GetPreviousLocationsOf( splitterLocation );
+
+        return this.GetColumnLocations( locations ).All( columnLocation => !columnLocation.Column.Visible );
+      }
+      else
       {
-        Cell cell = collection[ i ] as Cell;
+        Debug.Assert( dropTarget.Column != null );
 
-        if( ( cell != null ) && ( !aliveCells.Contains( cell ) ) )
+        foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( splitterLocation ) ) )
         {
-          collection.RemoveAt( i );
+          var column = columnLocation.Column;
+          if( column == dropTarget.Column )
+          {
+            if( dropTarget.Before )
+              return !column.Visible;
+
+            return true;
+          }
+
+          if( column.Visible )
+            break;
+        }
+
+        foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( splitterLocation ) ) )
+        {
+          var column = columnLocation.Column;
+          if( column == dropTarget.Column )
+          {
+            if( !dropTarget.Before )
+              return !column.Visible;
+
+            return true;
+          }
+
+          if( column.Visible )
+            break;
         }
       }
+
+      return false;
     }
 
-    private int GetCurrentLevelDropPoint( ColumnBase parentColumn, bool isPassedHalfWidth )
+    private bool ShowDropMark()
     {
-      string dummystring;
-      return this.GetCurrentLevelDropPoint( parentColumn, isPassedHalfWidth, out dummystring );
+      if( ( m_dragDropState == null ) || ( m_dataGridContext == null ) )
+        return false;
+
+      var scrollViewer = TableViewScrollViewer.GetParentTableViewScrollViewer( this );
+      if( scrollViewer == null )
+        return false;
+
+      var parentRowCells = this.ParentRowCells;
+      if( parentRowCells == null )
+        return false;
+
+      var dropTarget = m_dragDropState.DropTarget;
+      var targetCell = default( Cell );
+      var showDropMarkBeforeTargetCell = ( dropTarget != null ) ? dropTarget.Before : false;
+
+      if( ( dropTarget != null ) && !this.IsDropMarkAtDropTarget( dropTarget ) )
+      {
+        var dropTargetLocation = default( ColumnHierarchyManager.ILocation );
+
+        if( dropTarget.Type == DropTargetType.Column )
+        {
+          Debug.Assert( dropTarget.Column != null );
+          dropTargetLocation = m_dataGridContext.ColumnManager.GetColumnLocationFor( dropTarget.Column );
+        }
+        else
+        {
+          var levelMarkers = m_dataGridContext.ColumnManager.GetLevelMarkersFor( dropTarget.Columns );
+          if( levelMarkers == null )
+            return false;
+
+          switch( dropTarget.Type )
+          {
+            case DropTargetType.Start:
+              dropTargetLocation = levelMarkers.Start;
+              break;
+
+            case DropTargetType.Orphan:
+              dropTargetLocation = levelMarkers.Orphan;
+              break;
+
+            default:
+              throw new NotImplementedException();
+          }
+        }
+
+        if( dropTargetLocation == null )
+          return false;
+
+        // Since the drop target may be a hidden column, we must look for the first visible column
+        // next to it since the calculation requires a cell.
+        {
+          var columnLocation = dropTargetLocation as ColumnHierarchyManager.IColumnLocation;
+          if( ( columnLocation != null ) && columnLocation.Column.Visible )
+          {
+            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
+              return false;
+          }
+        }
+
+        if( targetCell == null )
+        {
+          foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( dropTargetLocation ) ) )
+          {
+            if( !columnLocation.Column.Visible )
+              continue;
+
+            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
+              continue;
+
+            showDropMarkBeforeTargetCell = false;
+            break;
+          }
+        }
+
+        if( targetCell == null )
+        {
+          foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( dropTargetLocation ) ) )
+          {
+            if( !columnLocation.Column.Visible )
+              continue;
+
+            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
+              continue;
+
+            showDropMarkBeforeTargetCell = true;
+            break;
+          }
+        }
+      }
+
+      double dropMarkOffset = 0;
+
+      if( targetCell != null )
+      {
+        if( showDropMarkBeforeTargetCell )
+        {
+          dropMarkOffset = targetCell.TranslatePoint( new Point(), scrollViewer ).X;
+        }
+        else
+        {
+          dropMarkOffset = targetCell.TranslatePoint( new Point( targetCell.ActualWidth, 0d ), scrollViewer ).X;
+        }
+      }
+      else
+      {
+        return false;
+      }
+
+      var adorner = m_dragDropState.DropMarkAdorner;
+      if( adorner == null )
+      {
+        // FixedCellPanel can only be used in a Horizontal manner. We can afford to plug this vertical handling of drop mark.
+        var pen = this.FixedColumnDropMarkPen;
+        if( pen == null )
+        {
+          var dropMarkWidth = 1d;
+
+          pen = new Pen( Brushes.Gray, dropMarkWidth );
+        }
+
+        adorner = new DropMarkAdorner( scrollViewer, pen, DropMarkOrientation.Vertical );
+        adorner.HorizontalPosition = dropMarkOffset;
+
+        var adornerLayer = AdornerLayer.GetAdornerLayer( scrollViewer );
+        if( adornerLayer != null )
+        {
+          adornerLayer.Add( adorner );
+        }
+
+        m_dragDropState.DropMarkAdorner = adorner;
+      }
+      else
+      {
+        adorner.HorizontalPosition = dropMarkOffset;
+      }
+
+      return true;
     }
 
-    private int GetCurrentLevelDropPoint( ColumnBase parentColumn, bool isPassedHalfWidth, out string offsetCellFieldName )
+    private void HideDropMark()
     {
-      offsetCellFieldName = parentColumn.FieldName;
+      if( m_dragDropState == null )
+        return;
 
-      if( isPassedHalfWidth )
-        return parentColumn.VisiblePosition + 1;
+      var adorner = m_dragDropState.DropMarkAdorner;
+      if( adorner == null )
+        return;
 
-      return parentColumn.VisiblePosition;
+      var adornerLayer = AdornerLayer.GetAdornerLayer( adorner.AdornedElement );
+      if( adornerLayer != null )
+      {
+        adornerLayer.Remove( adorner );
+      }
+
+      m_dragDropState.DropMarkAdorner = null;
     }
 
     private void UpdateChildren()
     {
+      // If the parent Row is not prepared, do not update children.
+      // And contrary to this.UpdateChildren( UpdateMeasureTriggeredAction action ), m_dataGridContext can be null here, since it is from a dispatched call.
+      if( m_dataGridContext == null )
+        return;
+
       this.UpdateChildren( UpdateMeasureTriggeredAction.Unspecified );
     }
 
     private void UpdateChildren( UpdateMeasureTriggeredAction action )
     {
-      Row parentRow = this.ParentRow;
+      Debug.Assert( m_dataGridContext != null, "Should not be called when a container is not prepared" );
 
-      // A CurrentItemChanged was received for a non current Row
-      if( ( action == UpdateMeasureTriggeredAction.CurrentItemChanged ) && ( parentRow != null ) && ( !parentRow.IsCurrent ) )
+      // If the parent Row is not prepared, do not update children
+      if( m_dataGridContext == null )
         return;
 
-      DataGridContext dataGridContext = this.DataGridContext;
-
-      Debug.Assert( dataGridContext != null, "Should not be called when a container is not prepared" );
+      Row parentRow = this.ParentRow;
 
-      // If the parent Row is not prepared, do not update children
-      if( dataGridContext == null )
+      // A CurrentItemChanged was received for a non current Row
+      if( ( action == UpdateMeasureTriggeredAction.CurrentItemChanged ) && ( parentRow != null ) && ( !parentRow.IsCurrent ) )
         return;
 
       bool currentItemChangedOnCurrentRow = ( action == UpdateMeasureTriggeredAction.CurrentItemChanged ) && ( parentRow != null ) && ( parentRow.IsCurrent );
@@ -847,7 +1017,7 @@ namespace Xceed.Wpf.DataGrid.Views
       if( ( m_lastColumnVirtualizationManagerVersion != columnVirtualizationManager.Version ) || ( currentItemChangedOnCurrentRow )
             || ( m_virtualizingCellCollectionChangedDispatcherOperation != null ) )
       {
-        this.UpdateChildren( dataGridContext, columnVirtualizationManager, this.ParentRowCells );
+        this.UpdateChildren( columnVirtualizationManager );
 
         m_lastColumnVirtualizationManagerVersion = columnVirtualizationManager.Version;
 
@@ -857,87 +1027,151 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private void UpdateChildren( DataGridContext dataGridContext, TableViewColumnVirtualizationManagerBase columnVirtualizationManager, VirtualizingCellCollection parentRowCells )
+    private void UpdateChildren( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
     {
+      var parentRowCells = this.ParentRowCells;
+
       //Prevent reentrance
-      if( ( parentRowCells == null ) || m_parentRowCells.IsUpdating )
+      if( ( parentRowCells == null ) || parentRowCells.IsUpdating )
         return;
 
-      using( m_parentRowCells.SetIsUpdating() )
+      using( parentRowCells.SetIsUpdating() )
       {
-        this.ClearPermanentScrollingFieldNames();
-
-        //Retrieve the cells that aren't needed anymore.
-        var unusedCells = ( from cell in parentRowCells.BindedCells
-                            where !columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
-                               && !columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
-                            select cell ).ToList();
-
-        //Release the unused binded cells now in order to minimize the number of cell's creation.
-        foreach( Cell cell in unusedCells )
+        //If in virtualizing mode but not recycling cells.
+        if( m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
         {
-          this.AddCellToVisualTree( cell );
+          //Retrieve the cells that aren't needed anymore.
+          var cellsToCollapse = this.GetCellsToCollapse( columnVirtualizationManager, parentRowCells );
 
-          if( this.CanReleaseCell( cell ) )
+          //Simply hide these cells for now.
+          foreach( var cell in cellsToCollapse )
           {
-            // Ensure to close the ContextMenu if it is open and the Cell is virtualized to avoid problems with ContextMenus defined as static resources
-            // that won't be able to reopen again if the Close private method is called after the PlacementTarget is removed from the VisualTree
-            var contextMenu = cell.ContextMenu;
-            if( ( contextMenu != null ) && ( contextMenu.IsOpen ) )
+            if( cell.CanBeCollapsed )
             {
-              contextMenu.IsOpen = false;
+              cell.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+              this.AddPermanentScrollingFieldNames( cell.FieldName );
             }
-
-            cell.ClearContainer();
-            parentRowCells.Release( cell );
           }
-          //Since the cell cannot be released, it will not be collapsed. We must keep the field
-          //name in order to let the scrolling sub-panel measure and arrange the cell out of view.
-          else
+
+          //And do the actual processing after scrolling has stopped.
+          if( m_processUnusedCellsDispatcherOperation == null )
           {
-            //Certain non recyclable cells like StatCells needs their content binding to be removed when they become out of view.
-            cell.RemoveContentBinding();
-            this.AddPermanentScrollingFieldNames( cell.FieldName );
+            m_processUnusedCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<TableViewColumnVirtualizationManagerBase>( this.ProcessCollapsedCells ),
+                                                                                   DispatcherPriority.Background, columnVirtualizationManager );
           }
         }
+        else
+        {
+          //If recycling cells, we need to process them now, in order to minimize cells' creation.
+          this.ProcessCollapsedCells( columnVirtualizationManager );
+        }
+
+        var fixedFieldNames = columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).ToList();
+        var scrollingFieldNames = columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).ToList();
 
         //Add the missing cells to the fixed region.
-        foreach( string fieldName in columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ) )
+        foreach( string fieldName in fixedFieldNames )
         {
-          //The cell is created if it is missing.
-          Cell cell = parentRowCells[ fieldName ];
-
-          //Certain non recyclable cells like StatCells need their content binding to be updated when they become (or stay) in view.
-          cell.AddContentBinding( dataGridContext, this.ParentRow, this.Columns[ cell.FieldName ] );
+          var cell = this.GetCell( fieldName, parentRowCells );
 
           //Make sure the cell is in the appropriate panel.
           this.MoveCellToFixedPanel( cell );
+
         }
 
         //Add the missing cells to the scrolling region.
-        foreach( string fieldName in columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ) )
+        foreach( string fieldName in scrollingFieldNames )
         {
-          //The cell is created if it is missing.
-          Cell cell = parentRowCells[ fieldName ];
-
-          //Certain non recyclable cells like StatCells need their content binding to be updated when they become (or stay) in view.
-          cell.AddContentBinding( dataGridContext, this.ParentRow, this.Columns[ cell.FieldName ] );
+          var cell = this.GetCell( fieldName, parentRowCells );
 
           //Make sure the cell is in the appropriate panel.
           this.MoveCellToScrollingPanel( cell );
         }
 
-        if( m_clearUnusedCellsDispatcherOperation == null )
-        {
-          m_clearUnusedCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action( this.ClearUnusedCells ), DispatcherPriority.ApplicationIdle );
-        }
-
         m_fixedPanel.InvalidateMeasure();
         m_scrollingCellsDecorator.InvalidateMeasure();
         m_scrollingPanel.InvalidateMeasure();
       }
     }
 
+    private void ProcessCollapsedCells( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
+    {
+      m_processUnusedCellsDispatcherOperation = null;
+
+      if( m_dataGridContext == null )
+        return;
+
+      this.ClearPermanentScrollingFieldNames();
+
+      //Retrieve the cells that aren't needed anymore.
+      var collapsedCells = this.GetCellsToCollapse( columnVirtualizationManager, m_parentRowCells );
+
+      foreach( Cell cell in collapsedCells )
+      {
+        var isCollapsible = cell.CanBeCollapsed;
+
+        if( isCollapsible && cell.CanBeRecycled )
+        {
+          // Ensure to close the ContextMenu if it is open and the Cell is virtualized to avoid problems with ContextMenus defined as static resources
+          // that won't be able to reopen again if the Close private method is called after the PlacementTarget is removed from the VisualTree
+          var contextMenu = cell.ContextMenu;
+          if( ( contextMenu != null ) && ( contextMenu.IsOpen ) )
+          {
+            contextMenu.IsOpen = false;
+          }
+
+          cell.ClearContainer();
+          m_parentRowCells.Release( cell );
+        }
+        else
+        {
+          //Certain non recyclable cells like StatCells needs their content binding to be removed when they become out of view.
+          cell.RemoveContentBinding();
+
+          //If in virtualizing mode but not recycling cells, release the cell so it will be collapsed, so no need to measure and arrange it.
+          if( isCollapsible && m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
+          {
+            m_parentRowCells.Release( cell );
+          }
+          else
+          {
+            //Since the cell cannot be released, it will not be collapsed. We must keep its fieldname
+            //in order to let the scrolling sub-panel measure and arrange the cell out of view.
+            this.AddPermanentScrollingFieldNames( cell.FieldName );
+          }
+        }
+      }
+    }
+
+    private List<Cell> GetCellsToCollapse( TableViewColumnVirtualizationManagerBase columnVirtualizationManager, VirtualizingCellCollection parentRowCells )
+    {
+      return ( from cell in parentRowCells.BindedCells
+               where !columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
+                 && !columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
+               select cell ).ToList();
+    }
+
+    private Cell GetCell( string fieldName, VirtualizingCellCollection parentRowCells )
+    {
+      //The cell is created if it is missing.
+      var cell = parentRowCells[ fieldName ];
+
+      //Certain non recyclable cells like StatCells need their content binding to be updated when they become (or stay) in view.
+      cell.AddContentBinding( m_dataGridContext, m_parentRow, this.Columns[ fieldName ] );
+
+      //Only when in Virtualizing mode can the cell still be collapsed at this point, since parentRowCells[ fieldName ] will have uncollapsed it in other modes.
+      if( m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
+      {
+        //The current local value must be cleared instead of setting a new local value to give a chance for a style to set a value.
+        cell.ClearValue( Cell.VisibilityProperty );
+      }
+
+      return cell;
+    }
+
     private void ApplyFixedTranform()
     {
       ScrollViewer parentScrollViewer = this.GetParentScrollViewer();
@@ -962,8 +1196,8 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       // The order of the children in the panel is not guaranteed to be good.  We do not reorder children because we will have to remove
       // and add them at a different location.  Doing that will cause more calculations to occur, so we only change the TabIndex.
-      VirtualizingCellCollection collection = this.ParentRowCells;
-      if( collection == null )
+      var parentRowCells = this.ParentRowCells;
+      if( parentRowCells == null )
         return;
 
       var fieldNameToPositionMapping = columnVirtualizationManager.GetFieldNameToPosition( m_parentRow.LevelCache );
@@ -973,7 +1207,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       foreach( var fieldName in fieldNames )
       {
-        Cell cell = collection.GetCell( fieldName, false );
+        Cell cell = parentRowCells.GetCell( fieldName, false );
         Debug.Assert( cell != null );
 
         int tabIndex;
@@ -988,26 +1222,159 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    private void ClearUnusedCells()
+    private void GenerateMissingCells( int index )
     {
-      if( ( m_clearUnusedCellsDispatcherOperation == null ) || ( m_clearUnusedCellsDispatcherOperation.Status == DispatcherOperationStatus.Aborted ) )
+      m_generateMissingCellsDispatcherOperation = null;
+
+      if( m_dataGridContext == null )
+      {
+        // The row is being recycled without having been prepared properly.  By setting these properties,
+        // it will be correctly prepare when used again (through IVirtualizingCellsHost.PrepareCellsHost()).
+        m_virtualizationModeChanged = true;
+        m_virtualizingCellCollectionUpdateRequired = true;
         return;
+      }
 
-      m_clearUnusedCellsDispatcherOperation = null;
+      DateTime startTime = DateTime.UtcNow;
 
-      DataGridContext dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
+      //Generate cells only for visible columns
+      var columns = this.VisibleColumns;
+      var parentRowCells = this.ParentRowCells;
+      var count = columns.Count;
+      var actualIndex = count;
+
+      for( int i = index; i < count; i++ )
+      {
+        var column = columns[ i ];
+
+        if( parentRowCells.HasVirtualizedCell( column.FieldName ) )
+          continue;
+
+        var cell = parentRowCells.AddVirtualizedCell( column );
+
+        //Though the cell has been newly prepared to provide better first time scrolling, it needs to be cleared like any other out of view cell.
+        //For non releasable cells (like StatCell), it's been properly processed in Row.PrepareUnbindedCell(), in the previous call.
+        if( cell.CanBeRecycled )
+        {
+          cell.ClearContainer();
+        }
+
+        if( DateTime.UtcNow.Subtract( startTime ) > FixedCellPanel.MaxProcessDurationTime )
+        {
+          actualIndex = i + 1;
+          break;
+        }
+      }
+
+      if( actualIndex == count )
         return;
 
-      VirtualizingCellCollection parentRowCells = this.ParentRowCells;
-      if( parentRowCells == null )
+      //If there is still cells to generate, dispatch again.
+      m_generateMissingCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<int>( this.GenerateMissingCells ), DispatcherPriority.Input, actualIndex );
+    }
+
+    private void GenerateOrRemoveCell( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+
+      var parentRowCells = this.ParentRowCells;
+
+      switch( m_virtualizationMode )
+      {
+        case ColumnVirtualizationMode.None:
+          {
+            if( !column.Visible )
+            {
+              Cell cell;
+              if( parentRowCells.TryGetBindedCell( column, false, out cell ) )
+              {
+                //Only remove cells that can be generated without any unique configuration (e.g. no custom template, no ResultPropertyName, etc..)
+                if( cell.CanBeRecycled )
+                {
+                  parentRowCells.InternalRemove( cell );
+                }
+              }
+            }
+            break;
+          }
+
+        case ColumnVirtualizationMode.Recycling:
+          {
+            if( !column.Visible && ( m_synchronizeRecyclingBinsDispatcherOperation == null ) )
+            {
+              m_synchronizeRecyclingBinsDispatcherOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.Background,
+                                                                                           new Action( this.SynchronizeRecyclingBinsWithRecyclingGroups ) );
+            }
+            break;
+          }
+
+        case ColumnVirtualizationMode.Virtualizing:
+          {
+            if( column.Visible )
+            {
+              if( !parentRowCells.HasVirtualizedCell( column.FieldName ) )
+              {
+                parentRowCells.AddVirtualizedCell( column );
+              }
+              break;
+            }
+
+            parentRowCells.RemoveVirtualizedCell( column );
+            break;
+          }
+      }
+    }
+
+    private void UpdateVirtualizationMode()
+    {
+      var columnVirtualizationManager = this.ColumnVirtualizationManager;
+      if( columnVirtualizationManager == null )
         return;
 
-      //Remove the recycling bins that aren't used anymore.
-      parentRowCells.ClearUnusedRecycleBins( this.Columns );
+      var parentRowCells = this.ParentRowCells;
+      m_virtualizationMode = columnVirtualizationManager.VirtualizationMode;
+      parentRowCells.VirtualizationMode = m_virtualizationMode;
+
+      switch( m_virtualizationMode )
+      {
+        case ColumnVirtualizationMode.None:
+          {
+            //Not virtualizing
+            parentRowCells.BindRecycledCells( this.Columns );
+            parentRowCells.BindVirtualizedCells();
+            break;
+          }
+
+        case ColumnVirtualizationMode.Recycling:
+          {
+            //Virtualizing and recycling
+            parentRowCells.ClearOutOfViewBindedCells( this.GetCellsToCollapse( columnVirtualizationManager, parentRowCells ) );
+            parentRowCells.ClearVirtualizedCells();
+            break;
+          }
+
+        case ColumnVirtualizationMode.Virtualizing:
+          {
+            //Virtualizing with no recycling
+            this.ProcessCollapsedCells( columnVirtualizationManager );
+            parentRowCells.VirtualizeRecycledCells();
+            if( m_generateMissingCellsDispatcherOperation == null )
+            {
+              this.GenerateMissingCells( 0 );
+            }
+            break;
+          }
+      }
+    }
+
+    private void SynchronizeRecyclingBinsWithRecyclingGroups()
+    {
+      m_synchronizeRecyclingBinsDispatcherOperation = null;
 
-      //Remove the inaccessible cells from the panels.
-      this.RemoveLeakingCells( parentRowCells.Cells );
+      if( m_dataGridContext == null )
+        return;
+
+      m_parentRowCells.SynchronizeRecyclingBinsWithRecyclingGroups( this.VisibleColumns );
     }
 
     private FrameworkElement GetPreparedContainer( Cell cell )
@@ -1030,17 +1397,35 @@ namespace Xceed.Wpf.DataGrid.Views
       return container;
     }
 
+    private static object CoerceMinHeight( DependencyObject sender, object value )
+    {
+      var self = sender as FixedCellPanel;
+      if( self == null )
+        return value;
+
+      return self.CoerceMinHeight( new Thickness(), value );
+    }
+
+    private static void InvalidateMinHeight( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var self = sender as FixedCellPanel;
+      if( self == null )
+        return;
+
+      self.CoerceValue( FixedCellPanel.MinHeightProperty );
+    }
+
     #region ZOrder Management
 
     private void RecomputeZOrder()
     {
       ZOrderHelper.ComputeZOrder( m_visualChildren, ref m_zIndexMapping );
-      this.ZOrderDirty = false;
+      m_zOrderDirty = false;
     }
 
     private void InvalidateZOrder()
     {
-      this.ZOrderDirty = true;
+      m_zOrderDirty = true;
     }
 
     internal bool ChangeCellZOrder( Cell cell, int zIndex )
@@ -1093,7 +1478,7 @@ namespace Xceed.Wpf.DataGrid.Views
       this.InvalidateZOrder();
     }
 
-    #endregion ZOrder Management
+    #endregion
 
     #region IVirtualizingCellsHost Members
 
@@ -1105,6 +1490,19 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
+    void IVirtualizingCellsHost.ClearLogicalParent( Cell cell )
+    {
+      Debug.Assert( cell != null );
+
+      VirtualizingUICellCollection cellCollection = this.Children as VirtualizingUICellCollection;
+
+      Debug.Assert( cellCollection != null );
+
+      cellCollection.ClearCellLogicalParent( cell );
+
+      this.RemoveCellFromFixedOrScrollingPanel( cell );
+    }
+
     void IVirtualizingCellsHost.SetLogicalParent( Cell cell )
     {
       Debug.Assert( cell != null );
@@ -1122,7 +1520,7 @@ namespace Xceed.Wpf.DataGrid.Views
     {
       // This method is called in Row.PrepareContainer and Row.OnApplyTemplate, which is also called in Row.PrepareContainer but only if the template
       // was not previously applied, so it is possible that this panel is already prepared. In that case, we only ignore this preparation.
-      if( this.CellsHostPrepared )
+      if( m_cellsHostPrepared )
         return;
 
       if( dataGridContext != null )
@@ -1136,43 +1534,84 @@ namespace Xceed.Wpf.DataGrid.Views
           cell.PrepareContainer( dataGridContext, dataItem );
         }
 
-        TableViewColumnVirtualizationManagerBase columnVirtualizationManager = this.ColumnVirtualizationManager;
+        var columnVirtualizationManager = this.ColumnVirtualizationManager;
+
+        //If the manager has changed, make sure to stop listening to it.
+        if( columnVirtualizationManager != m_previousColumnVirtualizationManager )
+        {
+          VirtualizingCellCollectionUpdateRequiredEventManager.RemoveListener( m_previousColumnVirtualizationManager, this );
+          VirtualizingCellCollectionUpdateRequiredEventManager.AddListener( columnVirtualizationManager, this );
+        }
+
         UpdateMeasureRequiredEventManager.AddListener( columnVirtualizationManager, this );
-        m_previousColumnVirualizationManager = columnVirtualizationManager;
+        m_previousColumnVirtualizationManager = columnVirtualizationManager;
 
-        VirtualizingCellCollection parentRowCells = this.ParentRowCells;
+        var parentRowCells = this.ParentRowCells;
         if( parentRowCells != null )
         {
           VirtualizingCellCollectionChangedEventManager.AddListener( parentRowCells, this );
         }
 
-        this.CellsHostPrepared = true;
+        //When pulling a row from the recycling pool, need to make sure it is in the correct virtualization mode and its VirtualzingCellCollection is update to date.
+        if( m_virtualizingCellCollectionUpdateRequired )
+        {
+          m_virtualizingCellCollectionUpdateRequired = false;
+
+          if( m_virtualizationModeChanged )
+          {
+            m_virtualizationModeChanged = false;
+            this.UpdateVirtualizationMode();
+          }
+
+          if( m_visibleColumnsChanged )
+          {
+            m_visibleColumnsChanged = false;
+            var columns = this.Columns;
+            foreach( WeakReference weakRef in m_changedVisibleColumns )
+            {
+              var column = weakRef.Target as ColumnBase;
+
+              if( ( column == null ) || !columns.Contains( column ) )
+                continue;
+
+              this.GenerateOrRemoveCell( column );
+            }
+            m_changedVisibleColumns.Clear();
+            m_changedVisibleColumns.TrimExcess();
+          }
+
+          if( m_visibleColumnsAdded )
+          {
+            m_visibleColumnsAdded = false;
+            this.GenerateMissingCells( 0 );
+          }
+        }
+
+        m_cellsHostPrepared = true;
       }
     }
 
     void IVirtualizingCellsHost.ClearCellsHost()
     {
-      if( !this.CellsHostPrepared )
+      if( !m_cellsHostPrepared )
         return;
 
-      VirtualizingCellCollection parentRowCells = this.ParentRowCells;
+      var parentRowCells = this.ParentRowCells;
       if( parentRowCells != null )
       {
         VirtualizingCellCollectionChangedEventManager.RemoveListener( parentRowCells, this );
       }
 
-      //Make sure to stop listening from the same manager to which it started to listen.
-      UpdateMeasureRequiredEventManager.RemoveListener( m_previousColumnVirualizationManager, this );
-      m_previousColumnVirualizationManager = null;
+      //Make sure to stop listening from the same manager it started to listen from.
+      UpdateMeasureRequiredEventManager.RemoveListener( m_previousColumnVirtualizationManager, this );
 
       m_dataGridContext = null;
-
-      this.CellsHostPrepared = false;
+      m_cellsHostPrepared = false;
     }
 
     void IVirtualizingCellsHost.InvalidateCellsHostMeasure()
     {
-      if( this.DataGridContext == null )
+      if( m_dataGridContext == null )
         return;
 
       this.InvalidateMeasure();
@@ -1243,11 +1682,15 @@ namespace Xceed.Wpf.DataGrid.Views
       }
 
       var fixedWidth = this.GetFixedWidth();
+      var viewportWidth = this.ParentScrollViewer.ViewportWidth;
+
+      //If fixed cells fill the entire viewport, then there is no scrolling cell that can be brought in to view, simply return.
+      if( fixedWidth >= viewportWidth )
+        return true;
+
       var scrollingPanel = this.ScrollingCellsDecorator;
-      var scrollingArea = new Rect( scrollingPanel.TranslatePoint( FixedCellPanel.EmptyPoint, this ),
-                                    new Size( this.ParentScrollViewer.ViewportWidth - fixedWidth, scrollingPanel.ActualHeight ) );
-      var cellArea = new Rect( cell.TranslatePoint( FixedCellPanel.EmptyPoint, this ),
-                               new Size( cell.ParentColumn.ActualWidth, cell.ActualHeight ) );
+      var scrollingArea = new Rect( scrollingPanel.TranslatePoint( new Point(), this ), new Size( viewportWidth - fixedWidth, scrollingPanel.ActualHeight ) );
+      var cellArea = new Rect( cell.TranslatePoint( new Point(), this ), new Size( cell.ParentColumn.ActualWidth, cell.ActualHeight ) );
 
       // The cell is larger than the scrolling area.
       if( cellArea.Width > scrollingArea.Width )
@@ -1267,7 +1710,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
           if( targetRect.Width <= scrollingArea.Width )
           {
-            var offset = targetObject.TranslatePoint( FixedCellPanel.EmptyPoint, cell );
+            var offset = targetObject.TranslatePoint( new Point(), cell );
             var location = cellArea.Location;
             location.Offset( offset.X, offset.Y );
 
@@ -1315,12 +1758,10 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      bool handled = false;
-
       if( managerType == typeof( UpdateMeasureRequiredEventManager ) )
       {
-        UpdateMeasureTriggeredAction action = UpdateMeasureTriggeredAction.Unspecified;
-        UpdateMeasureRequiredEventArgs eventArgs = e as UpdateMeasureRequiredEventArgs;
+        var action = UpdateMeasureTriggeredAction.Unspecified;
+        var eventArgs = e as UpdateMeasureRequiredEventArgs;
 
         if( eventArgs != null )
         {
@@ -1328,8 +1769,70 @@ namespace Xceed.Wpf.DataGrid.Views
         }
 
         this.UpdateChildren( action );
+      }
+      else if( managerType == typeof( VirtualizingCellCollectionUpdateRequiredEventManager ) )
+      {
+        var eventArgs = e as VirtualizingCellCollectionUpdateRequiredEventArgs;
+
+        switch( eventArgs.TriggeredAction )
+        {
+          case VirtualizingCellCollectionUpdateTriggeredAction.VirtualizationModeChanged:
+            {
+              if( !m_cellsHostPrepared )
+              {
+                m_virtualizationModeChanged = true;
+                m_virtualizingCellCollectionUpdateRequired = true;
+                break;
+              }
+
+              this.UpdateVirtualizationMode();
+              break;
+            }
+
+          case VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged:
+            {
+              var columns = eventArgs.Columns;
+              if( ( columns == null ) || ( columns.Count <= 0 ) )
+                break;
+
+              if( !m_cellsHostPrepared )
+              {
+                foreach( var column in columns )
+                {
+                  m_changedVisibleColumns.Add( new WeakReference( column ) );
+                }
+
+                m_visibleColumnsChanged = true;
+                m_virtualizingCellCollectionUpdateRequired = true;
+                break;
+              }
+
+              //A column was added or removed from VisibleColumns.
+              foreach( var column in columns )
+              {
+                this.GenerateOrRemoveCell( column );
+              }
+              break;
+            }
 
-        handled = true;
+          //This action will be triggered only when in Virtualizing mode, so no need to check it.
+          //No need to handle Remove, Replace, Reset, since every row will be flushed and recreated, and rows present in recycle bins will simply be flushed.
+          case VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsAdded:
+            {
+              if( !m_cellsHostPrepared )
+              {
+                m_visibleColumnsAdded = true;
+                m_virtualizingCellCollectionUpdateRequired = true;
+                break;
+              }
+
+              if( m_generateMissingCellsDispatcherOperation == null )
+              {
+                this.GenerateMissingCells( 0 );
+              }
+              break;
+            }
+        }
       }
       else if( managerType == typeof( VirtualizingCellCollectionChangedEventManager ) )
       {
@@ -1344,46 +1847,161 @@ namespace Xceed.Wpf.DataGrid.Views
             m_virtualizingCellCollectionChangedDispatcherOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.Render, new Action( this.UpdateChildren ) );
           }
         }
-        handled = true;
+      }
+      else
+      {
+        return false;
       }
 
-      return handled;
+      return true;
     }
 
     #endregion
 
     private int m_lastColumnVirtualizationManagerVersion = -1;
-    private BitVector32 m_flags = new BitVector32();
     private Row m_parentRow; // = null;
     private ScrollViewer m_parentScrollViewer; // = null;
+    private bool m_cellsHostPrepared; //false
+    private bool m_zOrderDirty; //false
 
     private Size m_desiredSize = new Size();
     private VirtualizingCellCollection m_parentRowCells; // = null;
 
+    private DragDropState m_dragDropState = null;
+
     // The immediate visual children of this panel.
     private FixedCellSubPanel m_fixedPanel;
-    private FixedColumnSplitter m_splitter;
     private ScrollingCellsDecorator m_scrollingCellsDecorator;
     private VirtualizingFixedCellSubPanel m_scrollingPanel;
 
     private int[] m_zIndexMapping; // = null;
 
-    private const int s_visualChildrenCount = 3;
+    private const int c_visualChildrenCount = 3;
     private readonly IList<UIElement> m_visualChildren = new List<UIElement>();
 
     private DataGridContext m_dataGridContext; // = null;
-    private TableViewColumnVirtualizationManagerBase m_previousColumnVirualizationManager; // = null;
+    private TableViewColumnVirtualizationManagerBase m_previousColumnVirtualizationManager; // = null;
+
+    private DispatcherOperation m_processUnusedCellsDispatcherOperation; // = null;
+    private DispatcherOperation m_virtualizingCellCollectionChangedDispatcherOperation;
+    private DispatcherOperation m_generateMissingCellsDispatcherOperation;
+    private DispatcherOperation m_synchronizeRecyclingBinsDispatcherOperation;
+    private ColumnVirtualizationMode m_virtualizationMode;
+    private List<WeakReference> m_changedVisibleColumns = new List<WeakReference>();
+    private bool m_virtualizingCellCollectionUpdateRequired;
+    private bool m_virtualizationModeChanged;
+    private bool m_visibleColumnsChanged;
+    private bool m_visibleColumnsAdded;
 
-    private DispatcherOperation m_clearUnusedCellsDispatcherOperation; // = null;
-    private object m_virtualizingCellCollectionChangedDispatcherOperation;
+    #region DragDropState Private Class
 
-    private enum FixedCellPanelFlags
+    private sealed class DragDropState
     {
-      CellsHostPrepared = 1,
-      HasDataItem = 2,
-      ZOrderDirty = 4,
-      SplitterDragCanceled = 8,
-      SplitterDragCompleted = 16,
+      internal DragDropState( double splitterOffset )
+      {
+        m_initialSplitterOffset = splitterOffset;
+      }
+
+      internal double InitialSplitterOffset
+      {
+        get
+        {
+          return m_initialSplitterOffset;
+        }
+      }
+
+      internal DropMarkAdorner DropMarkAdorner
+      {
+        get;
+        set;
+      }
+
+      internal DropTarget DropTarget
+      {
+        get;
+        set;
+      }
+
+      private readonly double m_initialSplitterOffset;
+    }
+
+    #endregion
+
+    #region DropTarget Private Class
+
+    private sealed class DropTarget
+    {
+      internal DropTarget( DropTargetType type, ColumnCollection columns )
+      {
+        if( ( type != DropTargetType.Start ) && ( type != DropTargetType.Orphan ) )
+          throw new ArgumentException( "The drop target must be a Start or Orphan target type.", "type" );
+
+        m_type = type;
+        m_column = default( ColumnBase );
+        m_before = ( type == DropTargetType.Orphan );
+        m_columns = columns;
+      }
+
+      internal DropTarget( ColumnBase column, bool before, ColumnCollection columns )
+      {
+        if( column == null )
+          throw new ArgumentNullException( "column" );
+
+        m_type = DropTargetType.Column;
+        m_column = column;
+        m_before = before;
+        m_columns = columns;
+      }
+
+      internal DropTargetType Type
+      {
+        get
+        {
+          return m_type;
+        }
+      }
+
+      internal ColumnBase Column
+      {
+        get
+        {
+          return m_column;
+        }
+      }
+
+      internal bool Before
+      {
+        get
+        {
+          return m_before;
+        }
+      }
+
+      internal ColumnCollection Columns
+      {
+        get
+        {
+          return m_columns;
+        }
+      }
+
+      private readonly DropTargetType m_type;
+      private readonly ColumnBase m_column;
+      private readonly ColumnCollection m_columns;
+      private readonly bool m_before;
+    }
+
+    #endregion
+
+    #region DropTargetType Private Enum
+
+    private enum DropTargetType
+    {
+      Column = 0,
+      Start,
+      Orphan
     }
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
index 0716822b..5946c317 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
@@ -89,20 +89,28 @@ namespace Xceed.Wpf.DataGrid.Views
       // This can be null when the parent Row is not prepared yet.
       var columnVirtualizationManager = this.ColumnVirtualizationManager;
       if( columnVirtualizationManager == null )
-        return this.DesiredSize;
+        return new Size();
+
+      var parentRow = this.ParentPanel.ParentRow;
+      if( parentRow == null )
+        return new Size();
 
       var desiredSize = new Size();
-      var fieldNameToWidth = columnVirtualizationManager.GetFieldNameToWidth( m_parentPanel.ParentRow.LevelCache );
+      var fieldNameToWidth = columnVirtualizationManager.GetFieldNameToWidth( parentRow.LevelCache );
 
-      foreach( var cell in this.GetVisibleCells() )
+      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
+      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
       {
-        Debug.Assert( !Row.GetIsTemplateCell( cell ), "No template Cells should be added to FixedCellPanel" );
+        foreach( var cell in this.GetVisibleCells() )
+        {
+          Debug.Assert( !Row.GetIsTemplateCell( cell ), "No template Cells should be added to FixedCellPanel" );
 
-        cell.Measure( new Size( fieldNameToWidth[ cell.FieldName ], constraint.Height ) );
+          cell.Measure( new Size( fieldNameToWidth[ cell.FieldName ], constraint.Height ) );
 
-        if( cell.DesiredSize.Height > desiredSize.Height )
-        {
-          desiredSize.Height = cell.DesiredSize.Height;
+          if( cell.DesiredSize.Height > desiredSize.Height )
+          {
+            desiredSize.Height = cell.DesiredSize.Height;
+          }
         }
       }
 
@@ -117,30 +125,30 @@ namespace Xceed.Wpf.DataGrid.Views
       // This can be null when the parent Row is not prepared yet.
       var columnVirtualizationManager = this.ColumnVirtualizationManager;
       if( columnVirtualizationManager == null )
-        return this.DesiredSize;
+        return new Size();
 
-      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( m_parentPanel.ParentRow.LevelCache );
+      var parentRow = this.ParentPanel.ParentRow;
+      if( parentRow == null )
+        return new Size();
+
+      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( parentRow.LevelCache );
       var finalRect = new Rect( arrangeSize );
 
-      foreach( var cell in this.GetVisibleCells() )
+      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
+      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
       {
-        // Never add Template Cells to FixedCellPanel
-        if( Row.GetIsTemplateCell( cell ) )
-          continue;
-
-        // Calculate the offset of the Cell:
-        //    The original offset of the Column
-        //    - the horizontal offset of the ScrollViewer to scroll to the right
-        //    - the width of the fixed columns since we are in the Scrolling FixedCellSubPanel
-        //    + the compensation offset used in master detail to avoid scrolling when not required 
+        foreach( var cell in this.GetVisibleCells() )
+        {
+          Debug.Assert( !Row.GetIsTemplateCell( cell ), "No template Cells should be added to FixedCellPanel" );
 
-        double cellOffset = columnToVisibleOffset[ cell.FieldName ];
+          var offset = this.CalculateCellOffset( cell.ParentColumn, columnToVisibleOffset );
 
-        finalRect.X = cellOffset;
-        finalRect.Width = cell.DesiredSize.Width;
-        finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
+          finalRect.X = offset.X;
+          finalRect.Width = cell.DesiredSize.Width;
+          finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
 
-        cell.Arrange( finalRect );
+          cell.Arrange( finalRect );
+        }
       }
 
       return arrangeSize;
@@ -157,15 +165,47 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected IEnumerable<Cell> GetVisibleCells()
     {
-      VirtualizingCellCollection collection = this.ParentPanel.ParentRowCells;
+      var parentRowCells = this.ParentPanel.ParentRowCells;
 
-      if( collection == null )
+      if( parentRowCells == null )
         yield break;
 
       foreach( string fieldName in this.GetVisibleFieldsName() )
       {
-        yield return collection.GetCell( fieldName, false );
+        yield return parentRowCells.GetCell( fieldName, false );
       }
     }
+
+    internal virtual Point CalculateCellOffset( ColumnBase column )
+    {
+      Debug.Assert( column != null );
+      var row = this.ParentPanel.ParentRow;
+
+      if( ( column != null ) && ( row != null ) )
+      {
+        var columnVirtualizationManager = this.ColumnVirtualizationManager;
+        if( columnVirtualizationManager != null )
+        {
+          var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( row.LevelCache );
+
+          return this.CalculateCellOffset( column, columnToVisibleOffset );
+        }
+      }
+
+      return new Point();
+    }
+
+    private Point CalculateCellOffset( ColumnBase column, IColumnInfoCollection<double> columnsOffset )
+    {
+      if( column == null )
+        return new Point();
+
+      Debug.Assert( columnsOffset != null );
+      Debug.Assert( columnsOffset.Contains( column ) );
+
+      var columnOffset = columnsOffset[ column ];
+
+      return new Point( columnOffset, 0d );
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs
deleted file mode 100644
index e4c6db69..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.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.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Resources;
-using System.Security;
-using System.Windows.Media;
-using System.Windows.Data;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class FixedColumnSplitter : Thumb
-  {
-    public FixedColumnSplitter()
-    {
-      this.Visibility = Visibility.Collapsed;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
index 50507317..bd54791e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
@@ -27,6 +27,8 @@ namespace Xceed.Wpf.DataGrid.Views
       get;
     }
 
+    void ClearLogicalParent( Cell cell );
+
     void SetLogicalParent( Cell cell );
 
     void PrepareCellsHost( DataGridContext dataGridContext );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs
index 3a26127b..a73e47fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs
@@ -78,18 +78,11 @@ namespace Xceed.Wpf.DataGrid.Views
       if( !dataGridContext.IsAFlattenDetail )
         return NavigationHelper.GetNextVisibleFocusableColumnIndex( dataGridContext, targetRow, columnIndex + 1 );
 
-      var columnMap = dataGridContext.ItemPropertyMap;
-      var masterColumnName = default( string );
-
-      if( !columnMap.TryGetColumnFieldName( targetColumn, out masterColumnName ) )
+      var masterColumn = default( ColumnBase );
+      if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( dataGridContext, targetColumn, out masterColumn ) )
         return -1;
 
       var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterColumn = masterDataGridContext.Columns[ masterColumnName ];
-
-      if( masterColumn == null )
-        return -1;
-
       var masterColumnIndex = masterDataGridContext.VisibleColumns.IndexOf( masterColumn );
       if( masterColumnIndex < 0 )
         return -1;
@@ -113,18 +106,11 @@ namespace Xceed.Wpf.DataGrid.Views
       if( !dataGridContext.IsAFlattenDetail )
         return NavigationHelper.GetPreviousVisibleFocusableColumnIndex( dataGridContext, targetRow, columnIndex - 1 );
 
-      var columnMap = dataGridContext.ItemPropertyMap;
-      var masterColumnName = default( string );
-
-      if( !columnMap.TryGetColumnFieldName( targetColumn, out masterColumnName ) )
+      var masterColumn = default( ColumnBase );
+      if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( dataGridContext, targetColumn, out masterColumn ) )
         return -1;
 
       var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterColumn = masterDataGridContext.Columns[ masterColumnName ];
-
-      if( masterColumn == null )
-        return -1;
-
       var masterColumnIndex = masterDataGridContext.VisibleColumns.IndexOf( masterColumn );
       if( masterColumnIndex < 0 )
         return -1;
@@ -132,6 +118,17 @@ namespace Xceed.Wpf.DataGrid.Views
       return NavigationHelper.GetPreviousVisibleFocusableDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow, masterColumnIndex - 1 );
     }
 
+    internal static int GetFirstVisibleFocusableInViewportColumnIndex( DataGridContext dataGridContext, Row targetRow )
+    {
+      if( dataGridContext == null )
+        return -1;
+
+      if( dataGridContext.IsAFlattenDetail )
+        return NavigationHelper.GetNextVisibleFocusableInViewportDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow );
+
+      return NavigationHelper.GetNextVisibleFocusableInViewportColumnIndex( dataGridContext, targetRow );
+    }
+
     internal static bool MoveFocusLeft( DataGridContext dataGridContext )
     {
       var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
@@ -140,7 +137,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       var leftToRight = ( dataGridControl.FlowDirection == FlowDirection.LeftToRight );
 
-      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, leftToRight );
+      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, leftToRight, false );
     }
 
     internal static bool MoveFocusRight( DataGridContext dataGridContext )
@@ -151,10 +148,10 @@ namespace Xceed.Wpf.DataGrid.Views
 
       var leftToRight = ( dataGridControl.FlowDirection == FlowDirection.LeftToRight );
 
-      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, !leftToRight );
+      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, !leftToRight, false );
     }
 
-    internal static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext )
+    internal static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext, bool cycle )
     {
       var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
       if( dataGridControl == null )
@@ -162,10 +159,10 @@ namespace Xceed.Wpf.DataGrid.Views
 
       Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
 
-      return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn );
+      return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
     }
 
-    internal static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext )
+    internal static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext, bool cycle )
     {
       var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
       if( dataGridControl == null )
@@ -173,7 +170,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
 
-      return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn );
+      return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
     }
 
     internal static bool MoveFocusToFirstVisibleColumn( DataGridContext dataGridContext )
@@ -232,11 +229,11 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         if( ( device.Modifiers & ModifierKeys.Shift ) == ModifierKeys.Shift )
         {
-          handled = NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext );
+          handled = NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, true );
         }
         else
         {
-          handled = NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext );
+          handled = NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, true );
         }
       }
 
@@ -303,9 +300,6 @@ namespace Xceed.Wpf.DataGrid.Views
 
       var masterDataGridContext = dataGridContext.RootDataGridContext;
       var masterVisibleColumns = masterDataGridContext.VisibleColumns;
-
-      var detailColumns = dataGridContext.Columns;
-      var detailPropertyMap = dataGridContext.ItemPropertyMap;
       var cells = targetRow.Cells;
 
       for( int i = Math.Max( 0, startIndex ); i < masterVisibleColumns.Count; i++ )
@@ -313,19 +307,13 @@ namespace Xceed.Wpf.DataGrid.Views
         var masterColumn = masterVisibleColumns[ i ];
         Debug.Assert( masterColumn != null );
 
-        var detailColumnName = default( string );
-        if( detailPropertyMap.TryGetItemPropertyName( masterColumn, out detailColumnName ) )
-        {
-          var detailColumn = detailColumns[ detailColumnName ];
-
-          if( detailColumn != null )
-          {
-            var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
+        var detailColumn = default( ColumnBase );
+        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
+          continue;
 
-            if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
-              return detailColumnIndex;
-          }
-        }
+        var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
+        if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
+          return detailColumnIndex;
       }
 
       return -1;
@@ -344,9 +332,6 @@ namespace Xceed.Wpf.DataGrid.Views
 
       var masterDataGridContext = dataGridContext.RootDataGridContext;
       var masterVisibleColumns = masterDataGridContext.VisibleColumns;
-
-      var detailColumns = dataGridContext.Columns;
-      var detailPropertyMap = dataGridContext.ItemPropertyMap;
       var cells = targetRow.Cells;
 
       for( int i = Math.Min( masterVisibleColumns.Count - 1, startIndex ); i >= 0; i-- )
@@ -354,19 +339,80 @@ namespace Xceed.Wpf.DataGrid.Views
         var masterColumn = masterVisibleColumns[ i ];
         Debug.Assert( masterColumn != null );
 
-        var detailColumnName = default( string );
-        if( detailPropertyMap.TryGetItemPropertyName( masterColumn, out detailColumnName ) )
-        {
-          var detailColumn = detailColumns[ detailColumnName ];
+        var detailColumn = default( ColumnBase );
+        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
+          continue;
 
-          if( detailColumn != null )
-          {
-            var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
+        var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
+        if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
+          return detailColumnIndex;
+      }
 
-            if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
-              return detailColumnIndex;
-          }
-        }
+      return -1;
+    }
+
+    private static int GetNextVisibleFocusableInViewportColumnIndex( DataGridContext dataGridContext, Row targetRow )
+    {
+      if( ( dataGridContext == null ) || ( targetRow == null ) )
+        return -1;
+
+      var columns = dataGridContext.VisibleColumns;
+      if( ( columns == null ) || ( columns.Count <= 0 ) )
+        return -1;
+
+      var fixedCellPanel = targetRow.CellsHostPanel as FixedCellPanel;
+      if( fixedCellPanel == null )
+        return -1;
+
+      var cell = default( Cell );
+      var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
+
+      foreach( var targetColumn in columns )
+      {
+        if( !virtualizingCellCollection.TryGetBindedCell( targetColumn, out cell ) )
+          continue;
+
+        if( cell.GetCalculatedCanBeCurrent() )
+          return columns.IndexOf( targetColumn );
+      }
+
+      return -1;
+    }
+
+    private static int GetNextVisibleFocusableInViewportDetailColumnIndexFromMasterColumnIndex( DataGridContext dataGridContext, Row targetRow )
+    {
+      if( ( dataGridContext == null ) || ( targetRow == null ) )
+        return -1;
+
+      Debug.Assert( dataGridContext.IsAFlattenDetail );
+
+      var detailVisibleColumns = dataGridContext.VisibleColumns;
+      if( ( detailVisibleColumns == null ) || ( detailVisibleColumns.Count <= 0 ) )
+        return -1;
+
+      var masterDataGridContext = dataGridContext.RootDataGridContext;
+      var masterVisibleColumns = masterDataGridContext.VisibleColumns;
+
+      var fixedCellPanel = targetRow.CellsHostPanel as FixedCellPanel;
+      if( fixedCellPanel == null )
+        return -1;
+
+      var cell = default( Cell );
+      var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
+
+      foreach( var masterColumn in masterVisibleColumns )
+      {
+        Debug.Assert( masterColumn != null );
+
+        var detailColumn = default( ColumnBase );
+        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
+          continue;
+
+        if( !virtualizingCellCollection.TryGetBindedCell( detailColumn, out cell ) )
+          continue;
+
+        if( cell.GetCalculatedCanBeCurrent() )
+          return detailVisibleColumns.IndexOf( detailColumn );
       }
 
       return -1;
@@ -389,10 +435,10 @@ namespace Xceed.Wpf.DataGrid.Views
       if( ( cell == null ) || ( cell.ParentColumn != dataGridControl.CurrentColumn ) )
         return false;
 
-      return object.Equals( cell.ParentRow.DataContext, dataGridControl.CurrentItemInEdition );
+      return object.Equals( cell.ParentRow.GetEditingDataContext(), dataGridControl.CurrentItemInEdition );
     }
 
-    private static bool MoveFocus( DataGridControl dataGridControl, DataGridContext dataGridContext, bool moveLeft )
+    private static bool MoveFocus( DataGridControl dataGridControl, DataGridContext dataGridContext, bool moveLeft, bool cycle )
     {
       Debug.Assert( dataGridControl != null );
       Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
@@ -408,46 +454,60 @@ namespace Xceed.Wpf.DataGrid.Views
         || ( ( navigationBehavior == NavigationBehavior.RowOrCell ) && isFocusWithin && ( dataGridContext.CurrentColumn != null ) ) )
       {
         if( moveLeft )
-          return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn );
+          return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
 
-        return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn );
+        return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
       }
 
       return false;
     }
 
-    private static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn )
+    private static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn, bool cycle )
     {
       if( ( dataGridContext == null ) || ( targetRow == null ) )
         return false;
 
       var columnIndex = NavigationHelper.GetNextVisibleFocusableColumnIndex( dataGridContext, targetRow, targetColumn );
       if( columnIndex < 0 )
-        return NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext, targetRow );
+      {
+        if( cycle )
+          return NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext, targetRow );
 
-      var columns = dataGridContext.VisibleColumns;
-      Debug.Assert( columns != null );
+        return false;
+      }
+      else
+      {
+        var columns = dataGridContext.VisibleColumns;
+        Debug.Assert( columns != null );
 
-      NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
+        NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
 
-      return true;
+        return true;
+      }
     }
 
-    private static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn )
+    private static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn, bool cycle )
     {
       if( ( dataGridContext == null ) || ( targetRow == null ) )
         return false;
 
       var columnIndex = NavigationHelper.GetPreviousVisibleFocusableColumnIndex( dataGridContext, targetRow, targetColumn );
       if( columnIndex < 0 )
-        return NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext, targetRow );
+      {
+        if( cycle )
+          return NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext, targetRow );
 
-      var columns = dataGridContext.VisibleColumns;
-      Debug.Assert( columns != null );
+        return false;
+      }
+      else
+      {
+        var columns = dataGridContext.VisibleColumns;
+        Debug.Assert( columns != null );
 
-      NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
+        NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
 
-      return true;
+        return true;
+      }
     }
 
     private static bool MoveFocusToFirstVisibleColumn( DataGridContext dataGridContext, Row targetRow )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
index 3f6c8ce4..977d8fbf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
@@ -15,13 +15,11 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Utils.Math;
-using System.Diagnostics;
 using System.Windows.Input;
+using System.Windows.Threading;
+using Xceed.Utils.Math;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -31,18 +29,11 @@ namespace Xceed.Wpf.DataGrid.Views
 
     static SynchronizedScrollViewer()
     {
-      ScrollViewer.HorizontalScrollBarVisibilityProperty.OverrideMetadata(
-        typeof( SynchronizedScrollViewer ),
-        new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
-
-      ScrollViewer.VerticalScrollBarVisibilityProperty.OverrideMetadata(
-        typeof( SynchronizedScrollViewer ),
-        new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
+      ScrollViewer.HorizontalScrollBarVisibilityProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
+      ScrollViewer.VerticalScrollBarVisibilityProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
 
       // By default, we never want item scrolling.
-      ScrollViewer.CanContentScrollProperty.OverrideMetadata(
-        typeof( SynchronizedScrollViewer ),
-        new FrameworkPropertyMetadata( false ) );
+      ScrollViewer.CanContentScrollProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( false ) );
     }
 
     public SynchronizedScrollViewer()
@@ -66,7 +57,7 @@ namespace Xceed.Wpf.DataGrid.Views
       set
       {
 
-        bool valueChanged = ( m_deferScrollChange != value );
+        var valueChanged = ( m_deferScrollChange != value );
 
         m_deferScrollChange = value;
 
@@ -75,7 +66,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
         if( !m_deferScrollChange && valueChanged )
         {
-          ScrollOrientation scrollOrientation = this.ScrollOrientation;
+          var scrollOrientation = this.ScrollOrientation;
 
           if( ( scrollOrientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
           {
@@ -94,8 +85,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #region ScrollOrientation property
 
-    public static readonly DependencyProperty ScrollOrientationProperty =
-      DependencyProperty.Register( "ScrollOrientation",
+    public static readonly DependencyProperty ScrollOrientationProperty = DependencyProperty.Register(
+      "ScrollOrientation",
       typeof( ScrollOrientation ),
       typeof( SynchronizedScrollViewer ),
       new PropertyMetadata( ScrollOrientation.Horizontal ) );
@@ -113,31 +104,29 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ScrollOrientation property
+    #endregion
 
-    #region LimitScrolling Property
+    #region LimitScrolling Internal Property
 
-    internal static readonly DependencyProperty LimitScrollingProperty =
-        DependencyProperty.Register( "LimitScrolling",
-        typeof( bool ),
-        typeof( SynchronizedScrollViewer ),
-        new UIPropertyMetadata( true ) );
+    internal static readonly DependencyProperty LimitScrollingProperty = DependencyProperty.Register(
+      "LimitScrolling",
+      typeof( bool ),
+      typeof( SynchronizedScrollViewer ),
+      new UIPropertyMetadata( true ) );
 
     internal bool LimitScrolling
     {
       get
       {
-        return ( bool )GetValue( SynchronizedScrollViewer.LimitScrollingProperty );
+        return ( bool )this.GetValue( SynchronizedScrollViewer.LimitScrollingProperty );
       }
       set
       {
-        SetValue( SynchronizedScrollViewer.LimitScrollingProperty, value );
+        this.SetValue( SynchronizedScrollViewer.LimitScrollingProperty, value );
       }
     }
 
-    #endregion LimitScrolling Property
-
-    #region Protected Overrides
+    #endregion
 
     public override void OnApplyTemplate()
     {
@@ -146,12 +135,16 @@ namespace Xceed.Wpf.DataGrid.Views
       if( this.TemplatedParent != m_mainScrollViewer )
       {
         if( m_mainScrollViewer != null )
-          m_mainScrollViewer.ScrollChanged -= this.OnMainScrollViewer_ScrollChanged;
+        {
+          m_mainScrollViewer.ScrollChanged -= new ScrollChangedEventHandler( this.OnMainScrollViewer_ScrollChanged );
+        }
 
         m_mainScrollViewer = this.TemplatedParent as ScrollViewer;
 
         if( m_mainScrollViewer != null )
-          m_mainScrollViewer.ScrollChanged += this.OnMainScrollViewer_ScrollChanged;
+        {
+          m_mainScrollViewer.ScrollChanged += new ScrollChangedEventHandler( this.OnMainScrollViewer_ScrollChanged );
+        }
       }
     }
 
@@ -161,8 +154,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       base.OnScrollChanged( e );
 
-      // m_mainScrollViewer will remain null in design mode.
-      // and if it's null, nothing to update
+      // m_mainScrollViewer will remain null in design mode and if it's null, nothing to update
       if( m_mainScrollViewer == null )
         return;
 
@@ -170,65 +162,35 @@ namespace Xceed.Wpf.DataGrid.Views
       // not triggered by the main ScrollViewer scrolling. In that case, we want
       // to update the main ScrollViewer. A typical example is when a Row's cell is 
       // brought into view by, let's say, activating the cell editor.
-      ScrollOrientation orientation = this.ScrollOrientation;
-
-      bool invalidateMainScrollViewerMeasure = false;
+      var invalidateMainScrollViewerMeasure = false;
 
-      if( ( orientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
+      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
+      if( this.CanScrollHorizontally() )
       {
-        invalidateMainScrollViewerMeasure = !DoubleUtil.AreClose( 0, e.ExtentWidthChange );
+        invalidateMainScrollViewerMeasure = invalidateMainScrollViewerMeasure || !DoubleUtil.AreClose( 0, e.ExtentWidthChange );
 
-        // If the Extent is 0, there is no reason to update
-        // the main ScrollViewer offset since this means there
-        // are no children
-        if( this.ExtentWidth == 0 )
-          return;
-
-        double offset = ( m_originalScrollChangedEventArgs != null )
-          ? m_originalScrollChangedEventArgs.HorizontalOffset
-          : e.HorizontalOffset;
-
-        if( offset != m_mainScrollViewer.HorizontalOffset )
-        {
-          m_mainScrollViewer.ScrollToHorizontalOffset( offset );
-        }
+        this.BeginUpdateMainScrollViewer( e );
       }
 
-      if( ( orientation & ScrollOrientation.Vertical ) == ScrollOrientation.Vertical )
+      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
+      if( this.CanScrollVertically() )
       {
-        invalidateMainScrollViewerMeasure = !DoubleUtil.AreClose( 0, e.ExtentHeightChange );
-
-        // If the Extent is 0, there is no reason to update
-        // the main ScrollViewer offset since this means there
-        // are no children
-        if( this.ExtentHeight == 0 )
-          return;
-
-        double offset = ( m_originalScrollChangedEventArgs != null )
-          ? m_originalScrollChangedEventArgs.VerticalOffset
-          : e.VerticalOffset;
+        invalidateMainScrollViewerMeasure = invalidateMainScrollViewerMeasure || !DoubleUtil.AreClose( 0, e.ExtentHeightChange );
 
-        if( ( offset != m_mainScrollViewer.VerticalOffset ) && ( this.ExtentHeight > 0 ) )
-        {
-          m_mainScrollViewer.ScrollToVerticalOffset( offset );
-        }
+        this.BeginUpdateMainScrollViewer( e );
       }
 
-      m_originalScrollChangedEventArgs = null;
-
       // In some situations, the Extent*Change event is received AFTER the 
       // layout pass of the mainScrollViewer is done. Since the measure of the
       // mainScrollViewer uses the SynchronizedScrollViewer Extent size, we must
       // call InvalidateMeasure on the mainScrollViewer to ensure it is correctly
       // layouted
       if( invalidateMainScrollViewerMeasure )
+      {
         m_mainScrollViewer.InvalidateMeasure();
+      }
     }
 
-    #endregion
-
-    #region  PreviewKeyDown and KeyDown handling overrides
-
     protected override void OnPreviewKeyDown( KeyEventArgs e )
     {
       if( e.Handled )
@@ -405,7 +367,9 @@ namespace Xceed.Wpf.DataGrid.Views
       // Mark the key as handled to avoid the DataGridScrollViewer
       // to process the PageUp.
       if( !e.Handled && this.IsKeyboardFocusWithin )
+      {
         e.Handled = true;
+      }
     }
 
     protected virtual void HandlePageDownKey( KeyEventArgs e )
@@ -420,7 +384,9 @@ namespace Xceed.Wpf.DataGrid.Views
       // Mark the key as handled to avoid the DataGridScrollViewer
       // to process the PageDown.
       if( !e.Handled && this.IsKeyboardFocusWithin )
+      {
         e.Handled = true;
+      }
     }
 
     protected virtual void HandleHomeKey( KeyEventArgs e )
@@ -451,32 +417,64 @@ namespace Xceed.Wpf.DataGrid.Views
       e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
     }
 
-    #endregion
+    private bool CanScrollHorizontally()
+    {
+      return ( ( this.ScrollOrientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
+          && ( this.ExtentWidth > 0d );
+    }
 
-    #region Private Methods
+    private bool CanScrollVertically()
+    {
+      return ( ( this.ScrollOrientation & ScrollOrientation.Vertical ) == ScrollOrientation.Vertical )
+          && ( this.ExtentHeight > 0d );
+    }
 
-    private void OnMainScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
+    private void BeginUpdateMainScrollViewer( ScrollChangedEventArgs e )
     {
-      if( e.OriginalSource != m_mainScrollViewer )
-        return;
+      if( m_scrollChangedEventArgs == null )
+      {
+        m_scrollChangedEventArgs = e;
+      }
+
+      if( m_updateMainScrollViewer == null )
+      {
+        m_updateMainScrollViewer = this.Dispatcher.BeginInvoke( new Action( this.UpdateMainScrollViewer ), DispatcherPriority.Send );
+      }
+    }
+
+    private void UpdateMainScrollViewer()
+    {
+      var e = m_scrollChangedEventArgs;
+
+      m_updateMainScrollViewer = null;
+      m_scrollChangedEventArgs = null;
 
-      if( m_deferScrollChange )
+      if( ( m_mainScrollViewer == null ) || ( e == null ) )
         return;
 
-      ScrollOrientation orientation = this.ScrollOrientation;
-      bool limitScrolling = this.LimitScrolling;
+      if( this.CanScrollHorizontally() && ( e.HorizontalOffset != m_mainScrollViewer.HorizontalOffset ) )
+      {
+        m_mainScrollViewer.ScrollToHorizontalOffset( e.HorizontalOffset );
+      }
 
-      if( ( orientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
+      if( this.CanScrollVertically() && ( e.VerticalOffset != m_mainScrollViewer.VerticalOffset ) )
       {
-        // If the Extent is 0, there is no reason to update
-        // the main ScrollViewer offset since this means there
-        // are no children
-        if( this.ExtentWidth == 0 )
-          return;
+        m_mainScrollViewer.ScrollToVerticalOffset( e.VerticalOffset );
+      }
+    }
 
-        double offset = ( limitScrolling )
-          ? Math.Min( e.HorizontalOffset, this.ExtentWidth - this.ViewportWidth )
-          : e.HorizontalOffset;
+    private void OnMainScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
+    {
+      if( ( e.OriginalSource != m_mainScrollViewer ) || m_deferScrollChange )
+        return;
+
+      var orientation = this.ScrollOrientation;
+      var limitScrolling = this.LimitScrolling;
+
+      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
+      if( this.CanScrollHorizontally() )
+      {
+        var offset = ( limitScrolling ) ? Math.Min( e.HorizontalOffset, this.ExtentWidth - this.ViewportWidth ) : e.HorizontalOffset;
 
         if( offset != this.HorizontalOffset )
         {
@@ -486,22 +484,15 @@ namespace Xceed.Wpf.DataGrid.Views
           // to scroll to that value. Since changing our offset will trigger the OnScrollChanged
           // that will update the m_mainScrollViewer, we want to changer it's offset to 
           // the right value.
-          m_originalScrollChangedEventArgs = e;
+          m_scrollChangedEventArgs = e;
           this.ScrollToHorizontalOffset( offset );
         }
       }
 
-      if( ( orientation & ScrollOrientation.Vertical ) == ScrollOrientation.Vertical )
+      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
+      if( this.CanScrollVertically() )
       {
-        // If the Extent is 0, there is no reason to update
-        // the main ScrollViewer offset since this means there
-        // are no children
-        if( this.ExtentHeight == 0 )
-          return;
-
-        double offset = ( limitScrolling )
-          ? Math.Min( e.VerticalOffset, this.ExtentHeight - this.ViewportHeight )
-          : e.VerticalOffset;
+        var offset = ( limitScrolling ) ? Math.Min( e.VerticalOffset, this.ExtentHeight - this.ViewportHeight ) : e.VerticalOffset;
 
         if( offset != this.VerticalOffset )
         {
@@ -511,19 +502,18 @@ namespace Xceed.Wpf.DataGrid.Views
           // to scroll to that value. Since changing our offset will trigger the OnScrollChanged
           // that will update the m_mainScrollViewer, we want to changer it's offset to 
           // the right value.
-          m_originalScrollChangedEventArgs = e;
+          m_scrollChangedEventArgs = e;
           this.ScrollToVerticalOffset( offset );
         }
       }
     }
 
-    #endregion
-
     #region Private Fields
 
-    private ScrollViewer m_mainScrollViewer; // = null
-    private bool m_deferScrollChange; // = false 
-    private ScrollChangedEventArgs m_originalScrollChangedEventArgs = null;
+    private ScrollViewer m_mainScrollViewer; //null
+    private bool m_deferScrollChange; //false 
+    private ScrollChangedEventArgs m_scrollChangedEventArgs; //null
+    private DispatcherOperation m_updateMainScrollViewer; //null
 
     #endregion
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
index 56ac5357..0b564811 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
@@ -17,24 +17,63 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
 using System.Security;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Resources;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
   public class TableView : UIViewBase
   {
+    // We must add a setter since this value is used as default value of a DependencyObject which will be instanciated before the static constructor is called
+    internal static Cursor DefaultFixedColumnSplitterCursor
+    {
+      get
+      {
+        if( TableView.DefaultFixedColumnSplitterCursorCache == null )
+        {
+          try
+          {
+            var uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/FixedColumnSplitter.cur" );
+            var info = Application.GetResourceStream( uri );
+
+            if( info != null )
+            {
+              TableView.DefaultFixedColumnSplitterCursorCache = new Cursor( info.Stream );
+            }
+          }
+          catch( SecurityException )
+          {
+          }
+          catch( UriFormatException )
+          {
+          }
+          catch( IOException )
+          {
+          }
+          finally
+          {
+            if( TableView.DefaultFixedColumnSplitterCursorCache == null )
+            {
+              TableView.DefaultFixedColumnSplitterCursorCache = Cursors.SizeWE;
+            }
+          }
+        }
+
+        return TableView.DefaultFixedColumnSplitterCursorCache;
+      }
+    }
+
+    private static Cursor DefaultFixedColumnSplitterCursorCache;
+
     internal static Cursor DefaultRowSelectorResizeNorthSouthCursor = Cursors.SizeNS;
     internal static Cursor DefaultRowSelectorResizeWestEastCursor = Cursors.SizeWE;
 
     static TableView()
     {
-      FrameworkContentElement.DefaultStyleKeyProperty.OverrideMetadata(
-        typeof( TableView ),
-        new FrameworkPropertyMetadata( TableView.GetDefaultStyleKey( typeof( TableView ), null ) ) );
+      FrameworkContentElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( TableView ), new FrameworkPropertyMetadata( TableView.GetDefaultStyleKey( typeof( TableView ), null ) ) );
 
       TableView.CompensationOffsetProperty = TableView.CompensationOffsetPropertyKey.DependencyProperty;
 
@@ -57,8 +96,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
     [EditorBrowsable( EditorBrowsableState.Never )]
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AutoFillLastPageProperty =
-      DependencyProperty.RegisterAttached( "AutoFillLastPage",
+    public static readonly DependencyProperty AutoFillLastPageProperty = DependencyProperty.RegisterAttached(
+      "AutoFillLastPage",
       typeof( bool ),
       typeof( TableView ),
       new PropertyMetadata( true ) );
@@ -88,12 +127,15 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.AutoFillLastPageProperty, value );
     }
 
-    #endregion AutoFillLastPage Property
+    #endregion
 
     #region CanScrollHorizontally Attached Property
 
-    public static readonly DependencyProperty CanScrollHorizontallyProperty =
-        DependencyProperty.RegisterAttached( "CanScrollHorizontally", typeof( bool ), typeof( TableView ), new UIPropertyMetadata( true, new PropertyChangedCallback( TableView.OnCanScrollHorizontallyChanged ) ) );
+    public static readonly DependencyProperty CanScrollHorizontallyProperty = DependencyProperty.RegisterAttached(
+      "CanScrollHorizontally",
+      typeof( bool ),
+      typeof( TableView ),
+      new UIPropertyMetadata( true, new PropertyChangedCallback( TableView.OnCanScrollHorizontallyChanged ) ) );
 
     public static bool GetCanScrollHorizontally( DependencyObject obj )
     {
@@ -115,12 +157,14 @@ namespace Xceed.Wpf.DataGrid.Views
       TableViewScrollViewer.SetFixedTranslateTransform( element, ( bool )e.NewValue );
     }
 
-    #endregion CanScrollHorizontally Attached Property
+    #endregion
 
     #region CompensationOffset Attached Property
 
     internal static readonly DependencyPropertyKey CompensationOffsetPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "CompensationOffset", typeof( double ), typeof( TableView ),
+      "CompensationOffset",
+      typeof( double ),
+      typeof( TableView ),
       new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.Inherits ) );
 
     internal static readonly DependencyProperty CompensationOffsetProperty;
@@ -135,15 +179,17 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.CompensationOffsetPropertyKey, value );
     }
 
-    #endregion CompensationOffset Attached Property
+    #endregion
 
     // View properties
 
     #region ColumnStretchMinWidth Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty ColumnStretchMinWidthProperty =
-      DependencyProperty.RegisterAttached( "ColumnStretchMinWidth", typeof( double ), typeof( TableView ),
+    public static readonly DependencyProperty ColumnStretchMinWidthProperty = DependencyProperty.RegisterAttached(
+      "ColumnStretchMinWidth",
+      typeof( double ),
+      typeof( TableView ),
       new UIPropertyMetadata( 50d ),
       new ValidateValueCallback( TableView.ValidateColumnStretchMinWidthCallback ) );
 
@@ -185,13 +231,15 @@ namespace Xceed.Wpf.DataGrid.Views
       return true;
     }
 
-    #endregion ColumnStretchMinWidth Property
+    #endregion
 
     #region ColumnStretchMode Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty ColumnStretchModeProperty =
-      DependencyProperty.RegisterAttached( "ColumnStretchMode", typeof( ColumnStretchMode ), typeof( TableView ),
+    public static readonly DependencyProperty ColumnStretchModeProperty = DependencyProperty.RegisterAttached(
+      "ColumnStretchMode",
+      typeof( ColumnStretchMode ),
+      typeof( TableView ),
       new UIPropertyMetadata( ColumnStretchMode.None, new PropertyChangedCallback( TableView.ColumnStretchModeChanged ) ) );
 
     public ColumnStretchMode ColumnStretchMode
@@ -301,13 +349,15 @@ namespace Xceed.Wpf.DataGrid.Views
       return modified;
     }
 
-    #endregion ColumnStretchMode Property
+    #endregion
 
     #region RemoveColumnStretchingOnResize Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty RemoveColumnStretchingOnResizeProperty =
-      DependencyProperty.RegisterAttached( "RemoveColumnStretchingOnResize", typeof( bool ), typeof( TableView ),
+    public static readonly DependencyProperty RemoveColumnStretchingOnResizeProperty = DependencyProperty.RegisterAttached(
+      "RemoveColumnStretchingOnResize",
+      typeof( bool ),
+      typeof( TableView ),
       new UIPropertyMetadata( false ) );
 
     public bool RemoveColumnStretchingOnResize
@@ -332,13 +382,15 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.RemoveColumnStretchingOnResizeProperty, value );
     }
 
-    #endregion RemoveColumnStretchingOnResize Property
+    #endregion
 
     #region FixedColumnCount Property
 
     [ViewProperty( ViewPropertyMode.RoutedNoFallback, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty FixedColumnCountProperty =
-      DependencyProperty.RegisterAttached( "FixedColumnCount", typeof( int ), typeof( TableView ),
+    public static readonly DependencyProperty FixedColumnCountProperty = DependencyProperty.RegisterAttached(
+      "FixedColumnCount",
+      typeof( int ),
+      typeof( TableView ),
       new UIPropertyMetadata( 0 ),
       new ValidateValueCallback( TableView.ValidateFixedColumnCountCallback ) );
 
@@ -369,13 +421,15 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.FixedColumnCountProperty, value );
     }
 
-    #endregion FixedColumnCount Property
+    #endregion
 
     #region FixedColumnDropMarkPen Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty FixedColumnDropMarkPenProperty =
-        DependencyProperty.RegisterAttached( "FixedColumnDropMarkPen", typeof( Pen ), typeof( TableView ) );
+    public static readonly DependencyProperty FixedColumnDropMarkPenProperty = DependencyProperty.RegisterAttached(
+      "FixedColumnDropMarkPen",
+      typeof( Pen ),
+      typeof( TableView ) );
 
     public Pen FixedColumnDropMarkPen
     {
@@ -399,13 +453,16 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.FixedColumnDropMarkPenProperty, value );
     }
 
-    #endregion FixedColumnDropMarkPen Property
+    #endregion
 
     #region HorizontalGridLineBrush Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty HorizontalGridLineBrushProperty =
-        DependencyProperty.RegisterAttached( "HorizontalGridLineBrush", typeof( Brush ), typeof( TableView ), new PropertyMetadata( null ) );
+    public static readonly DependencyProperty HorizontalGridLineBrushProperty = DependencyProperty.RegisterAttached(
+      "HorizontalGridLineBrush",
+      typeof( Brush ),
+      typeof( TableView ),
+      new PropertyMetadata( null ) );
 
     public Brush HorizontalGridLineBrush
     {
@@ -429,13 +486,16 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.HorizontalGridLineBrushProperty, value );
     }
 
-    #endregion HorizontalGridLineBrush Property
+    #endregion
 
     #region HorizontalGridLineThickness Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty HorizontalGridLineThicknessProperty =
-        DependencyProperty.RegisterAttached( "HorizontalGridLineThickness", typeof( double ), typeof( TableView ), new PropertyMetadata() );
+    public static readonly DependencyProperty HorizontalGridLineThicknessProperty = DependencyProperty.RegisterAttached(
+      "HorizontalGridLineThickness",
+      typeof( double ),
+      typeof( TableView ),
+      new PropertyMetadata() );
 
     public double HorizontalGridLineThickness
     {
@@ -459,13 +519,16 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.HorizontalGridLineThicknessProperty, value );
     }
 
-    #endregion HorizontalGridLineThickness Property
+    #endregion
 
     #region VerticalGridLineBrush Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty VerticalGridLineBrushProperty =
-        DependencyProperty.RegisterAttached( "VerticalGridLineBrush", typeof( Brush ), typeof( TableView ), new PropertyMetadata( null ) );
+    public static readonly DependencyProperty VerticalGridLineBrushProperty = DependencyProperty.RegisterAttached(
+      "VerticalGridLineBrush",
+      typeof( Brush ),
+      typeof( TableView ),
+      new PropertyMetadata( null ) );
 
     public Brush VerticalGridLineBrush
     {
@@ -489,13 +552,16 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.VerticalGridLineBrushProperty, value );
     }
 
-    #endregion VerticalGridLineBrush Property
+    #endregion
 
     #region VerticalGridLineThickness Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty VerticalGridLineThicknessProperty =
-        DependencyProperty.RegisterAttached( "VerticalGridLineThickness", typeof( double ), typeof( TableView ), new PropertyMetadata() );
+    public static readonly DependencyProperty VerticalGridLineThicknessProperty = DependencyProperty.RegisterAttached(
+      "VerticalGridLineThickness",
+      typeof( double ),
+      typeof( TableView ),
+      new PropertyMetadata() );
 
     public double VerticalGridLineThickness
     {
@@ -519,7 +585,7 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.VerticalGridLineThicknessProperty, value );
     }
 
-    #endregion VerticalGridLineThickness Property
+    #endregion
 
     #region AllowRowResize Property
 
@@ -547,7 +613,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion AllowRowResize Property
+    #endregion
 
     #region RowSelectorPaneWidth Property
 
@@ -557,8 +623,7 @@ namespace Xceed.Wpf.DataGrid.Views
     //      property can be set on DetailConfigurations.
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty RowSelectorPaneWidthProperty =
-      TableViewScrollViewer.RowSelectorPaneWidthProperty.AddOwner( typeof( TableView ) );
+    public static readonly DependencyProperty RowSelectorPaneWidthProperty = TableViewScrollViewer.RowSelectorPaneWidthProperty.AddOwner( typeof( TableView ) );
 
     public double RowSelectorPaneWidth
     {
@@ -572,7 +637,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion RowSelectorPaneWidth Property
+    #endregion
 
     #region ShowRowSelectorPane Property
 
@@ -582,8 +647,11 @@ namespace Xceed.Wpf.DataGrid.Views
     //      property can be set on DetailConfigurations.
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ShowRowSelectorPaneProperty =
-        DependencyProperty.Register( "ShowRowSelectorPane", typeof( bool ), typeof( TableView ), new PropertyMetadata( true ) );
+    public static readonly DependencyProperty ShowRowSelectorPaneProperty = DependencyProperty.Register(
+      "ShowRowSelectorPane",
+      typeof( bool ),
+      typeof( TableView ),
+      new PropertyMetadata( true ) );
 
     public bool ShowRowSelectorPane
     {
@@ -597,13 +665,16 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ShowRowSelectorPane Property
+    #endregion
 
     #region GroupLevelIndicatorWidth Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty GroupLevelIndicatorWidthProperty =
-        DependencyProperty.RegisterAttached( "GroupLevelIndicatorWidth", typeof( double ), typeof( TableView ), new UIPropertyMetadata() );
+    public static readonly DependencyProperty GroupLevelIndicatorWidthProperty = DependencyProperty.RegisterAttached(
+      "GroupLevelIndicatorWidth",
+      typeof( double ),
+      typeof( TableView ),
+      new UIPropertyMetadata() );
 
     public double GroupLevelIndicatorWidth
     {
@@ -627,13 +698,16 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.GroupLevelIndicatorWidthProperty, value );
     }
 
-    #endregion GroupLevelIndicatorWidth Property
+    #endregion
 
     #region DetailIndicatorWidth Property
 
     [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty DetailIndicatorWidthProperty =
-        DependencyProperty.RegisterAttached( "DetailIndicatorWidth", typeof( double ), typeof( TableView ), new UIPropertyMetadata() );
+    public static readonly DependencyProperty DetailIndicatorWidthProperty = DependencyProperty.RegisterAttached(
+      "DetailIndicatorWidth",
+      typeof( double ),
+      typeof( TableView ),
+      new UIPropertyMetadata() );
 
     public double DetailIndicatorWidth
     {
@@ -657,17 +731,23 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.DetailIndicatorWidthProperty, value );
     }
 
-    #endregion DetailIndicatorWidth Property
+    #endregion
 
     #region IsColumnVirtualizationEnabled Property
 
-    [ViewProperty( ViewPropertyMode.Routed, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty IsColumnVirtualizationEnabledProperty =
-        DependencyProperty.RegisterAttached( "IsColumnVirtualizationEnabled",
-          typeof( bool ),
-          typeof( TableView ),
-          new UIPropertyMetadata( true ) );
+    [Obsolete( "The IsColumnVirtualizationEnabled property is obsolete and has been replaced by the ColumnVirtualizationMode property.", false )]
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
+    [ViewProperty( ViewPropertyMode.ViewOnly )]
+    public static readonly DependencyProperty IsColumnVirtualizationEnabledProperty = DependencyProperty.RegisterAttached(
+      "IsColumnVirtualizationEnabled",
+      typeof( bool ),
+      typeof( TableView ),
+      new UIPropertyMetadata( true ) );
 
+    [Obsolete( "The IsColumnVirtualizationEnabled property is obsolete and has been replaced by the ColumnVirtualizationMode property.", false )]
+    [Browsable( false )]
+    [EditorBrowsable( EditorBrowsableState.Never )]
     public bool IsColumnVirtualizationEnabled
     {
       get
@@ -682,12 +762,49 @@ namespace Xceed.Wpf.DataGrid.Views
 
     public static bool GetIsColumnVirtualizationEnabled( DependencyObject obj )
     {
+#pragma warning disable 618
       return ( bool )obj.GetValue( TableView.IsColumnVirtualizationEnabledProperty );
+#pragma warning restore 618
     }
 
     public static void SetIsColumnVirtualizationEnabled( DependencyObject obj, bool value )
     {
+#pragma warning disable 618
       obj.SetValue( TableView.IsColumnVirtualizationEnabledProperty, value );
+#pragma warning restore 618
+    }
+
+    #endregion
+
+    #region ColumnVirtualizationMode Property
+
+    [ViewProperty( ViewPropertyMode.ViewOnly )]
+    public static readonly DependencyProperty ColumnVirtualizationModeProperty = DependencyProperty.RegisterAttached(
+      "ColumnVirtualizationMode",
+      typeof( ColumnVirtualizationMode ),
+      typeof( TableView ),
+      new FrameworkPropertyMetadata( ColumnVirtualizationMode.Recycling ) );
+
+    public ColumnVirtualizationMode ColumnVirtualizationMode
+    {
+      get
+      {
+        return ( ColumnVirtualizationMode )this.GetValue( TableView.ColumnVirtualizationModeProperty );
+      }
+      set
+      {
+        this.SetValue( TableView.ColumnVirtualizationModeProperty, value );
+      }
+    }
+
+    public static ColumnVirtualizationMode GetColumnVirtualizationMode( DependencyObject obj )
+    {
+      return ( ColumnVirtualizationMode )obj.GetValue( TableView.ColumnVirtualizationModeProperty );
+    }
+
+    public static void SetColumnVirtualizationMode( DependencyObject obj, ColumnVirtualizationMode value )
+    {
+      obj.SetValue( TableView.ColumnVirtualizationModeProperty, value );
     }
 
     #endregion
@@ -695,8 +812,11 @@ namespace Xceed.Wpf.DataGrid.Views
     #region IsAlternatingRowStyleEnabled Property
 
     [ViewProperty( ViewPropertyMode.Routed, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty IsAlternatingRowStyleEnabledProperty =
-      DependencyProperty.RegisterAttached( "IsAlternatingRowStyleEnabled", typeof( bool ), typeof( TableView ), new UIPropertyMetadata( false ) );
+    public static readonly DependencyProperty IsAlternatingRowStyleEnabledProperty = DependencyProperty.RegisterAttached(
+      "IsAlternatingRowStyleEnabled",
+      typeof( bool ),
+      typeof( TableView ),
+      new UIPropertyMetadata( false ) );
 
     public bool IsAlternatingRowStyleEnabled
     {
@@ -720,7 +840,7 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( TableView.IsAlternatingRowStyleEnabledProperty, value );
     }
 
-    #endregion IsAlternatingRowStyleEnabled Property
+    #endregion
 
     #region AutoScrollInterval Attached Property
 
@@ -743,23 +863,23 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region AutoScrollTreshold Attached Property
+    #region AutoScrollThreshold Attached Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    internal static readonly DependencyProperty AutoScrollTresholdProperty = DependencyProperty.RegisterAttached(
-      "AutoScrollTreshold",
+    internal static readonly DependencyProperty AutoScrollThresholdProperty = DependencyProperty.RegisterAttached(
+      "AutoScrollThreshold",
       typeof( int ),
       typeof( TableView ),
       new FrameworkPropertyMetadata( 5 ) );
 
-    internal static int GetAutoScrollTreshold( DependencyObject obj )
+    internal static int GetAutoScrollThreshold( DependencyObject obj )
     {
-      return ( int )obj.GetValue( TableView.AutoScrollTresholdProperty );
+      return ( int )obj.GetValue( TableView.AutoScrollThresholdProperty );
     }
 
-    internal static void SetAutoScrollTreshold( DependencyObject obj, int value )
+    internal static void SetAutoScrollThreshold( DependencyObject obj, int value )
     {
-      obj.SetValue( TableView.AutoScrollTresholdProperty, value );
+      obj.SetValue( TableView.AutoScrollThresholdProperty, value );
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
index 0f3d23a3..6b70fb7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
@@ -16,9 +16,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -31,8 +31,6 @@ namespace Xceed.Wpf.DataGrid.Views
 {
   public class TableViewItemsHost : DataGridItemsHost, IScrollInfo, IDeferableScrollInfoRefresh
   {
-    #region Constructors
-
     static TableViewItemsHost()
     {
       KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(
@@ -61,8 +59,6 @@ namespace Xceed.Wpf.DataGrid.Views
       this.AddHandler( FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( this.OnRequestBringIntoView ) );
     }
 
-    #endregion CONSTRUCTORS
-
     #region Orientation Property
 
     [Obsolete( "The Orientation property is obsolete. Only a vertical orientation is supported.", false )]
@@ -86,7 +82,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion Orientation Property
+    #endregion
 
     #region StableScrollingEnabled Property
 
@@ -111,7 +107,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion StableScrollingEnabled Property
+    #endregion
 
     #region StableScrollingProportion Property
 
@@ -136,7 +132,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion StableScrollingProportion Property
+    #endregion
 
     #region ScrollInfo Property
 
@@ -148,7 +144,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ScrollInfo Property
+    #endregion
 
     #region PreviousTabNavigationMode ( private attached property )
 
@@ -168,7 +164,7 @@ namespace Xceed.Wpf.DataGrid.Views
       d.SetValue( TableViewItemsHost.PreviousTabNavigationModeProperty, value );
     }
 
-    #endregion PreviousTabNavigationMode ( private attached property )
+    #endregion
 
     #region PreviousDirectionalNavigationMode ( private attached property )
 
@@ -188,7 +184,7 @@ namespace Xceed.Wpf.DataGrid.Views
       d.SetValue( TableViewItemsHost.PreviousDirectionalNavigationModeProperty, value );
     }
 
-    #endregion PreviousDirectionalNavigationMode ( private attached property )
+    #endregion
 
     #region RowSelectorPane Property
 
@@ -212,7 +208,7 @@ namespace Xceed.Wpf.DataGrid.Views
           && ( rowSelectorPane.Visibility == Visibility.Visible );
     }
 
-    #endregion RowSelectorPane Property
+    #endregion
 
     #region Measure/Arrange Methods
 
@@ -350,12 +346,19 @@ namespace Xceed.Wpf.DataGrid.Views
 
       CommandManager.InvalidateRequerySuggested();
 
-      // We must not call Mouse.Synchronize if we are currently dragging rows. 
+      // The call to Mouse.Synchronize must not start dragging rows.
       // Update the mouse status to make sure no container has invalid mouse over status.
-      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb
-      if( ( this.ParentDataGridControl.DragDataObject == null ) && ( this.IsMouseOver ) )
+      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
+      if( this.IsMouseOver )
       {
-        Mouse.Synchronize();
+        var dataGridControl = this.ParentDataGridControl;
+        if( dataGridControl != null )
+        {
+          using( dataGridControl.InhibitDrag() )
+          {
+            Mouse.Synchronize();
+          }
+        }
       }
 
       m_lastLayoutedPage = m_lastGeneratedPage;
@@ -393,12 +396,14 @@ namespace Xceed.Wpf.DataGrid.Views
       if( ( item == null ) || ( VisualTreeHelper.GetChildrenCount( item ) == 0 ) )
         return null;
 
-      DependencyObject firstChild = VisualTreeHelper.GetChild( item, 0 );
-      PassiveLayoutDecorator decorator = firstChild as PassiveLayoutDecorator;
+      var child = VisualTreeHelper.GetChild( item, 0 );
+      if( child == null )
+        return null;
 
-      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( firstChild ) > 0 ) )
+      var decorator = child as PassiveLayoutDecorator;
+      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( child ) > 0 ) )
       {
-        decorator = VisualTreeHelper.GetChild( firstChild, 0 ) as PassiveLayoutDecorator;
+        decorator = VisualTreeHelper.GetChild( child, 0 ) as PassiveLayoutDecorator;
       }
 
       return decorator;
@@ -529,7 +534,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return new Size( m_viewportWidth, desiredHeight );
     }
 
-    #endregion Measure/Arrange Methods
+    #endregion
 
     #region Containers Methods
 
@@ -598,25 +603,39 @@ namespace Xceed.Wpf.DataGrid.Views
       return m_lastGeneratedPage;
     }
 
-    private void RecycleContainer( ICustomItemContainerGenerator generator, LayoutedContainerInfo containerInfo )
+    private void RecycleContainer( ICustomItemContainerGenerator generator, UIElement element, int realizedIndex, bool clearContainer = true )
     {
-      Debug.Assert( containerInfo != null );
+      if( !clearContainer )
+      {
+        var container = element as IDataGridItemContainer;
+        if( container != null )
+        {
+          container.IsRecyclingCandidate = true;
+        }
+      }
+      else
+      {
+        this.ClearContainer( element );
+      }
 
-      var index = containerInfo.RealizedIndex;
-      if( ( generator != null ) && ( index >= 0 ) )
+      if( ( generator != null ) && ( realizedIndex >= 0 ) )
       {
         try
         {
-          var position = generator.GeneratorPositionFromIndex( index );
+          var position = generator.GeneratorPositionFromIndex( realizedIndex );
           generator.Remove( position, 1 );
         }
         catch
         {
-          Debug.Fail( "Unable to remove container for containerIndex " + index );
+          Debug.Fail( "Unable to remove container for realized index " + realizedIndex );
         }
       }
+    }
 
-      this.ClearContainer( containerInfo.Container );
+    private void CleanRecyclingCandidates()
+    {
+      var generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
+      generator.CleanRecyclingCandidates();
     }
 
     private UIElement GenerateContainer( ICustomItemContainerGenerator generator, int index, bool forceMeasure )
@@ -691,9 +710,10 @@ namespace Xceed.Wpf.DataGrid.Views
 
       container.Visibility = Visibility.Collapsed;
 
+      // The call to DataGridControl.ClearItemContainer will be done by the CustomItemContainerGenerator.
     }
 
-    #endregion Containers Methods
+    #endregion
 
     #region Scrolling Management
 
@@ -722,10 +742,6 @@ namespace Xceed.Wpf.DataGrid.Views
           this.InvalidateArrange();
         }
       }
-      else
-      {
-        this.InvalidateAutomationPeerChildren();
-      }
     }
 
     private TableViewPage GeneratePageAndUpdateIScrollInfoValues( Size availableSize, bool forceMeasure )
@@ -776,7 +792,6 @@ namespace Xceed.Wpf.DataGrid.Views
       }
 
       this.InvalidateScrollInfo();
-      this.InvalidateAutomationPeerChildren();
 
       return generatedPage;
     }
@@ -834,9 +849,9 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private bool SetCurrent( int index, bool changeColumn, out bool isDataRow )
     {
-      ICustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-      GeneratorPosition position = generator.GeneratorPositionFromIndex( index );
-      UIElement container = null;
+      var generator = this.CustomItemContainerGenerator;
+      var position = generator.GeneratorPositionFromIndex( index );
+      var container = default( UIElement );
 
       using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
       {
@@ -849,29 +864,39 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         isDataRow = ( container is DataRow );
 
-        if( m_layoutedContainers.IndexOfContainer( container ) == -1 )
+        if( m_layoutedContainers.IndexOfContainer( container ) < 0 )
         {
           m_layoutedContainers.Add( new LayoutedContainerInfo( index, container ) );
         }
 
         var dataGridContext = DataGridControl.GetDataGridContext( container );
-        var column = ( changeColumn ) ? dataGridContext.CurrentColumn : null;
+        var currentContext = dataGridContext.DataGridControl.CurrentContext;
+        var column = default( ColumnBase );
 
-        // if the current column is null or is (for an unknown reason) set to current but is readOnly, 
-        // try to set a new current column
-        if( ( isDataRow )
-          && ( ( changeColumn ) && ( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) ) ) )
+        if( changeColumn )
         {
-          var focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
-          if( focusableIndex >= 0 )
+          column = dataGridContext.CurrentColumn;
+
+          if( isDataRow )
           {
-            column = dataGridContext.VisibleColumns[ focusableIndex ];
+            if( ( currentContext != dataGridContext ) && dataGridContext.AreDetailsFlatten )
+            {
+              column = dataGridContext.GetMatchingColumn( currentContext, currentContext.CurrentColumn ) ?? column;
+            }
+
+            if( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) )
+            {
+              var focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
+              if( focusableIndex >= 0 )
+              {
+                column = dataGridContext.VisibleColumns[ focusableIndex ];
+              }
+            }
           }
         }
 
         try
         {
-          var currentContext = dataGridContext.DataGridControl.CurrentContext;
           if( currentContext != null )
           {
             currentContext.EndEdit();
@@ -882,17 +907,21 @@ namespace Xceed.Wpf.DataGrid.Views
           return false;
         }
 
-        if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
+        var containerIndex = generator.GetRealizedIndexForContainer( container );
+        if( containerIndex >= 0 )
         {
-          generator.SetCurrentIndex( index );
-          return true;
+          if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
+          {
+            generator.SetCurrentIndex( containerIndex );
+            return true;
+          }
         }
       }
 
       return false;
     }
 
-    #endregion Scrolling Management
+    #endregion
 
     #region BringIntoView Methods
 
@@ -1101,58 +1130,18 @@ namespace Xceed.Wpf.DataGrid.Views
       return currentChanged;
     }
 
-    #endregion BringIntoView Methods
+    #endregion
 
     #region DataGridItemsHost Overrides
 
-    protected override void OnItemsAdded(
-      GeneratorPosition position,
-      int index,
-      int itemCount )
+    protected override void OnItemsAdded()
     {
       // We are calling InvalidateMeasure to regenerate the current 
       // page and forcing the recycling of out-of-view containers.
       this.InvalidateMeasure();
     }
 
-    protected override void OnItemsMoved(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
-    {
-      System.Diagnostics.Debug.Fail( "When is this called?" );
-
-      // Everything will be recalculated and redrawn in the measure pass.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsReplaced(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
-    {
-      System.Diagnostics.Debug.Fail( "When is this called?" );
-
-      // Everything will be recalculated and redrawn in the measure pass.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsRemoved(
-      GeneratorPosition position,
-      int index,
-      GeneratorPosition oldPosition,
-      int oldIndex,
-      int itemCount,
-      int itemUICount,
-      IList<DependencyObject> affectedContainers )
+    protected override void OnItemsRemoved( IList<DependencyObject> containers )
     {
       // We are calling InvalidateMeasure to regenerate the current 
       // page and forcing the recycling of out-of-view containers.
@@ -1161,7 +1150,8 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected override void OnItemsReset()
     {
-      // Everything will be recalculated and redrawn in the measure pass.
+      // We are calling InvalidateMeasure to regenerate the current 
+      // page and forcing the recycling of out-of-view containers.
       this.InvalidateMeasure();
     }
 
@@ -1171,11 +1161,8 @@ namespace Xceed.Wpf.DataGrid.Views
       {
         this.ClearContainer( container );
 
-        // Avoid checking if Children already contains
-        // the element. No exception will be thrown
-        // if the item is not found. This ensure to
-        // at parse all the children only 1 time as
-        // worst scenario
+        // Avoid checking if Children already contains the element. No exception will be thrown if the item is not found.
+        // This ensures to parse all children only one time.
         this.Children.Remove( container );
 
         int index = m_layoutedContainers.IndexOfContainer( container );
@@ -1186,7 +1173,15 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion DataGridItemsHost Overrides
+    protected override void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
+    {
+      foreach( UIElement candidate in recyclingCandidates )
+      {
+        this.ClearContainer( candidate );
+      }
+    }
+
+    #endregion
 
     #region PreviewKeyDown and KeyDown Handling
 
@@ -1629,18 +1624,22 @@ namespace Xceed.Wpf.DataGrid.Views
 
     protected override void BringIntoViewCore( int index )
     {
-      if( m_lastGeneratedPage == TableViewPage.Empty )
-        return;
+      if( !this.DelayBringIntoView )
+      {
+        if( m_lastGeneratedPage == TableViewPage.Empty )
+          return;
 
-      var pageInfo = m_lastGeneratedPage.InnerPage;
-      if( ( index >= pageInfo.Start ) && ( index < pageInfo.End ) )
-        return;
+        var pageInfo = m_lastGeneratedPage.InnerPage;
+        if( ( index >= pageInfo.Start ) && ( index < pageInfo.End ) )
+          return;
+      }
 
       this.InvalidateMeasure();
+
       m_indexToBringIntoView = index;
     }
 
-    #endregion ICustomVirtualizingPanel Members
+    #endregion
 
     #region IScrollInfo Members
 
@@ -1886,7 +1885,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return rectangle;
     }
 
-    #endregion IScrollInfo Members
+    #endregion
 
     #region IDeferableScrollInfoRefresh Members
 
@@ -1898,13 +1897,9 @@ namespace Xceed.Wpf.DataGrid.Views
       return null;
     }
 
-    #endregion IDeferableScrollInfoRefresh Members
-
-    #region Internal Methods
+    #endregion
 
-    internal static bool ComputedCanScrollHorizontally(
-      FrameworkElement target,
-      DataGridItemsHost itemsHost )
+    internal static bool ComputedCanScrollHorizontally( FrameworkElement target, DataGridItemsHost itemsHost )
     {
       Debug.Assert( target != null );
 
@@ -1926,10 +1921,7 @@ namespace Xceed.Wpf.DataGrid.Views
       return retval;
     }
 
-    internal static double GetVisibleDimensionForRequestBringIntoViewTarget(
-      double targetDimension,
-      double targetToItemsHostOffset,
-      double viewportDimension )
+    internal static double GetVisibleDimensionForRequestBringIntoViewTarget( double targetDimension, double targetToItemsHostOffset, double viewportDimension )
     {
       // The items left upper corner is in the Viewport
       if( targetToItemsHostOffset >= 0 )
@@ -1981,10 +1973,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    internal static bool TargetRequiresBringIntoView(
-      double targetToItemsHostPosition,
-      double targetDesiredSizeDimension,
-      double itemsHostRenderSizeDimension )
+    internal static bool TargetRequiresBringIntoView( double targetToItemsHostPosition, double targetDesiredSizeDimension, double itemsHostRenderSizeDimension )
     {
       //If the Offset is negative, then it's sure its not totally visible
       if( targetToItemsHostPosition < 0 )
@@ -2260,10 +2249,6 @@ namespace Xceed.Wpf.DataGrid.Views
       return 0;
     }
 
-    #endregion Internal Methods
-
-    #region PRIVATE METHODS
-
     private static void MoveFocusForwardExecuted( object sender, ExecutedRoutedEventArgs e )
     {
       var itemsHost = ( TableViewItemsHost )sender;
@@ -2373,10 +2358,6 @@ namespace Xceed.Wpf.DataGrid.Views
       this.GeneratePageAndUpdateIScrollInfoValues();
     }
 
-    #endregion PRIVATE METHODS
-
-    #region CONSTANTS
-
     private const int MaxDataRowFailFocusCount = 50;
     private const int NullIndex = int.MinValue;
 
@@ -2384,12 +2365,6 @@ namespace Xceed.Wpf.DataGrid.Views
     private static readonly Size EmptySize = new Size( 0d, 0d );
     private static readonly Rect OutOfViewRect = new Rect( new Point( -999999d, -999999d ), TableViewItemsHost.EmptySize );
 
-    #endregion CONSTANTS
-
-    #region PRIVATE FIELDS
-
-
-
     private readonly LayoutedContainerInfoList m_layoutedContainers = new LayoutedContainerInfoList();
 
     private TableViewPage m_lastGeneratedPage = TableViewPage.Empty;
@@ -2406,8 +2381,6 @@ namespace Xceed.Wpf.DataGrid.Views
     private AutoResetFlag m_layoutSuspended = AutoResetFlagFactory.Create( false );
     private bool m_layoutInvalidatedDuringSuspend;
 
-    #endregion PRIVATE FIELDS
-
     #region LayoutSuspendedHelper Private Class
 
     private sealed class LayoutSuspendedHelper : IDisposable
@@ -2429,11 +2402,19 @@ namespace Xceed.Wpf.DataGrid.Views
 
       private void Dispose( bool disposing )
       {
-        m_disposable.Dispose();
+        var owner = Interlocked.Exchange( ref m_owner, null );
+        if( owner == null )
+          return;
 
-        if( !m_owner.m_layoutSuspended.IsSet && m_owner.m_layoutInvalidatedDuringSuspend )
+        if( m_disposable != null )
         {
-          m_owner.InvalidateMeasure();
+          m_disposable.Dispose();
+          m_disposable = null;
+        }
+
+        if( !owner.m_layoutSuspended.IsSet && owner.m_layoutInvalidatedDuringSuspend )
+        {
+          owner.InvalidateMeasure();
         }
       }
 
@@ -2442,8 +2423,8 @@ namespace Xceed.Wpf.DataGrid.Views
         this.Dispose( false );
       }
 
-      private readonly TableViewItemsHost m_owner;
-      private readonly IDisposable m_disposable;
+      private TableViewItemsHost m_owner;
+      private IDisposable m_disposable;
     }
 
     #endregion
@@ -2644,6 +2625,7 @@ namespace Xceed.Wpf.DataGrid.Views
             return null;
 
           m_remainingViewportHeight -= container.DesiredSize.Height;
+          m_nonRecyclableContainers.Remove( container );
           m_oldLayoutedContainers.Remove( container );
 
           var containerInfo = new LayoutedContainerInfo( realizedIndex, container );
@@ -2660,10 +2642,11 @@ namespace Xceed.Wpf.DataGrid.Views
 
         m_generator.IsRecyclingEnabled = true;
 
+        // We call ItemCount before any other call to make sure the internal state of the generator is up-to-date.
         m_itemCount = m_generator.ItemCount;
-        m_focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( m_itemsHost, Keyboard.FocusedElement as DependencyObject );
 
         var lastGeneratedPageSize = lastGeneratedPage.OuterPage.Length;
+        m_nonRecyclableContainers = new HashSet<UIElement>();
         m_oldLayoutedContainers = new Dictionary<UIElement, int>( lastGeneratedPageSize );
         m_newLayoutedContainers = null;
 
@@ -2672,14 +2655,19 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           var newRealizedIndex = m_generator.GetRealizedIndexForContainer( container );
 
-          if( ( newRealizedIndex >= 0 ) || ( container == m_focusedContainer ) )
+          if( !m_itemsHost.CanRecycleContainer( container ) )
+          {
+            m_nonRecyclableContainers.Add( container );
+            m_oldLayoutedContainers.Add( container, newRealizedIndex );
+          }
+          else if( newRealizedIndex >= 0 )
           {
             m_oldLayoutedContainers.Add( container, newRealizedIndex );
           }
           // The container is lost, recycle it.
           else
           {
-            m_itemsHost.RecycleContainer( m_generator, new LayoutedContainerInfo( newRealizedIndex, container ) );
+            m_itemsHost.RecycleContainer( m_generator, container, newRealizedIndex );
           }
         }
 
@@ -2697,15 +2685,15 @@ namespace Xceed.Wpf.DataGrid.Views
           var fillLastPage = ( dataGridContext != null ) && TableView.GetAutoFillLastPage( dataGridContext );
           var pageInfo = this.GenerateContainers( m_startIndex, m_itemCount, m_availableHeight, extendedHeight, fillLastPage );
 
-          // Keep the focused container active by putting it in the layouted containers collection.
-          if( m_focusedContainer != null )
+          // Keep active the containers that cannot be recycled by putting them in the layouted containers collection.
+          foreach( var entry in m_nonRecyclableContainers )
           {
-            int newRealizedIndex;
-            if( m_oldLayoutedContainers.TryGetValue( m_focusedContainer, out newRealizedIndex ) )
-            {
-              m_oldLayoutedContainers.Remove( m_focusedContainer );
-              m_newLayoutedContainers.Add( new LayoutedContainerInfo( newRealizedIndex, m_focusedContainer ) );
-            }
+            int realizedIndex;
+            if( !m_oldLayoutedContainers.TryGetValue( entry, out realizedIndex ) )
+              continue;
+
+            m_oldLayoutedContainers.Remove( entry );
+            m_newLayoutedContainers.Add( new LayoutedContainerInfo( realizedIndex, entry ) );
           }
 
           result = new TableViewPageResult( pageInfo, m_newLayoutedContainers );
@@ -2718,9 +2706,11 @@ namespace Xceed.Wpf.DataGrid.Views
         // Recycle the containers that have not been reused.
         foreach( var entry in m_oldLayoutedContainers )
         {
-          m_itemsHost.RecycleContainer( m_generator, new LayoutedContainerInfo( entry.Value, entry.Key ) );
+          m_itemsHost.RecycleContainer( m_generator, entry.Key, entry.Value );
         }
 
+        m_itemsHost.CleanRecyclingCandidates();
+
         return result;
       }
 
@@ -2830,23 +2820,16 @@ namespace Xceed.Wpf.DataGrid.Views
 
       private void RecycleCandidate( UIElement container )
       {
+        //Do not recycle the focused container
+        if( m_nonRecyclableContainers.Contains( container ) )
+          return;
+
         int realizedIndex;
         if( !m_oldLayoutedContainers.TryGetValue( container, out realizedIndex ) )
           return;
 
         m_oldLayoutedContainers.Remove( container );
-
-        var containerInfo = new LayoutedContainerInfo( realizedIndex, container );
-
-        // Keep the focused container active by putting it in the layouted containers collection.
-        if( container == m_focusedContainer )
-        {
-          m_newLayoutedContainers.Add( containerInfo );
-        }
-        else
-        {
-          m_itemsHost.RecycleContainer( m_generator, containerInfo );
-        }
+        m_itemsHost.RecycleContainer( m_generator, container, realizedIndex, false );
       }
 
       private readonly TableViewItemsHost m_itemsHost;
@@ -2856,7 +2839,7 @@ namespace Xceed.Wpf.DataGrid.Views
 
       private ICustomItemContainerGenerator m_generator;
       private int m_itemCount;
-      private UIElement m_focusedContainer;
+      private HashSet<UIElement> m_nonRecyclableContainers;
       private Dictionary<UIElement, int> m_oldLayoutedContainers;
       private List<LayoutedContainerInfo> m_newLayoutedContainers;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
index ac781167..4343ed28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
@@ -319,14 +319,13 @@ namespace Xceed.Wpf.DataGrid.Views
 
     private FixedCellPanel LocateFixedCellPanel( DependencyObject obj )
     {
-      DependencyObject child;
-      FixedCellPanel foundPanel;
+      if( obj == null )
+        return null;
 
       for( int i = VisualTreeHelper.GetChildrenCount( obj ) - 1; i >= 0; i-- )
       {
-        child = VisualTreeHelper.GetChild( obj, i );
-
-        foundPanel = child as FixedCellPanel;
+        var child = VisualTreeHelper.GetChild( obj, i );
+        var foundPanel = child as FixedCellPanel;
 
         if( foundPanel != null )
           return foundPanel;
@@ -336,8 +335,7 @@ namespace Xceed.Wpf.DataGrid.Views
         if( foundPanel != null )
         {
           // The FixedCellPanel found can be one of the recycled container in the visual tree
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( foundPanel );
-
+          var dataGridContext = DataGridControl.GetDataGridContext( foundPanel );
           if( dataGridContext != null )
           {
             if( dataGridContext.GetItemFromContainer( foundPanel ) != null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
index 2f3c8576..8a83b171 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
@@ -102,6 +102,7 @@ namespace Xceed.Wpf.DataGrid.Views
   }
 
   [TargetView( typeof( TableflowView ) )]
+  [TargetView( typeof( TableView ) )]
   public class Windows8Theme : Theme
   {
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
index 3dfecec0..6b98ad30 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
@@ -15,16 +15,12 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.IO;
+using System.Security;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.ComponentModel;
 using System.Windows.Input;
-using System.Security;
-using System.Windows.Resources;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.DataGrid.Views
 {
@@ -43,9 +39,8 @@ namespace Xceed.Wpf.DataGrid.Views
         {
           try
           {
-            Uri uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/NoDrop.cur" );
-
-            StreamResourceInfo info = Application.GetResourceStream( uri );
+            var uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/NoDrop.cur" );
+            var info = Application.GetResourceStream( uri );
 
             if( info != null )
             {
@@ -57,7 +52,9 @@ namespace Xceed.Wpf.DataGrid.Views
           }
           catch( UriFormatException )
           {
-            // This will occur during the VisualStudio Toolbox refreshing.
+          }
+          catch( IOException )
+          {
           }
           finally
           {
@@ -79,19 +76,12 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion
 
-    #region CONSTRUCTORS
-
-    internal UIViewBase()
-      : base()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
     #region DropMarkPen Attached Property
 
     public static readonly DependencyProperty DropMarkPenProperty = DependencyProperty.RegisterAttached(
-      "DropMarkPen", typeof( Pen ), typeof( UIViewBase ),
+      "DropMarkPen",
+      typeof( Pen ),
+      typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static Pen GetDropMarkPen( DependencyObject obj )
@@ -104,12 +94,14 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( UIViewBase.DropMarkPenProperty, value );
     }
 
-    #endregion DropMarkPen Attached Property
+    #endregion
 
     #region DropMarkOrientation Attached Property
 
     public static readonly DependencyProperty DropMarkOrientationProperty = DependencyProperty.RegisterAttached(
-      "DropMarkOrientation", typeof( DropMarkOrientation ), typeof( UIViewBase ),
+      "DropMarkOrientation",
+      typeof( DropMarkOrientation ),
+      typeof( UIViewBase ),
       new FrameworkPropertyMetadata( DropMarkOrientation.Default, FrameworkPropertyMetadataOptions.Inherits ) );
 
     public static DropMarkOrientation GetDropMarkOrientation( DependencyObject obj )
@@ -122,34 +114,33 @@ namespace Xceed.Wpf.DataGrid.Views
       obj.SetValue( UIViewBase.DropMarkOrientationProperty, value );
     }
 
-    #endregion DropMarkOrientation Attached Property
+    #endregion
 
     #region ShowScrollTip Property
 
-    public static readonly DependencyProperty ShowScrollTipProperty =
-      DependencyProperty.Register( "ShowScrollTip", typeof( bool ), typeof( UIViewBase ) );
+    public static readonly DependencyProperty ShowScrollTipProperty = DependencyProperty.Register(
+      "ShowScrollTip",
+      typeof( bool ),
+      typeof( UIViewBase ) );
 
     public bool ShowScrollTip
     {
       get
       {
-        return ( bool )GetValue( ShowScrollTipProperty );
+        return ( bool )this.GetValue( UIViewBase.ShowScrollTipProperty );
       }
       set
       {
-        SetValue( ShowScrollTipProperty, value );
+        this.SetValue( UIViewBase.ShowScrollTipProperty, value );
       }
     }
 
     #endregion
 
-    // View Properties
-
     #region DefaultDropMarkPen Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty DefaultDropMarkPenProperty =
-      DependencyProperty.Register(
+    public static readonly DependencyProperty DefaultDropMarkPenProperty = DependencyProperty.Register(
       "DefaultDropMarkPen",
       typeof( Pen ),
       typeof( UIViewBase ),
@@ -167,13 +158,16 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion DefaultDropMarkPen Property
+    #endregion
 
     #region DefaultDropMarkOrientation Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty DefaultDropMarkOrientationProperty =
-        DependencyProperty.Register( "DefaultDropMarkOrientation", typeof( DropMarkOrientation ), typeof( UIViewBase ), new UIPropertyMetadata( DropMarkOrientation.Vertical ) );
+    public static readonly DependencyProperty DefaultDropMarkOrientationProperty = DependencyProperty.Register(
+      "DefaultDropMarkOrientation",
+      typeof( DropMarkOrientation ),
+      typeof( UIViewBase ),
+      new UIPropertyMetadata( DropMarkOrientation.Vertical ) );
 
     public DropMarkOrientation DefaultDropMarkOrientation
     {
@@ -187,13 +181,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion DefaultDropMarkOrientation Property
+    #endregion
 
     #region CurrentItemGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty CurrentItemGlyphProperty =
-      DependencyProperty.Register( "CurrentItemGlyph",
+    public static readonly DependencyProperty CurrentItemGlyphProperty = DependencyProperty.Register(
+      "CurrentItemGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -210,13 +204,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion CurrentItemGlyph Property
+    #endregion
 
     #region EditingRowGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty EditingRowGlyphProperty =
-      DependencyProperty.Register( "EditingRowGlyph",
+    public static readonly DependencyProperty EditingRowGlyphProperty = DependencyProperty.Register(
+      "EditingRowGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -233,13 +227,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion EditingRowGlyph  Property
+    #endregion
 
     #region ValidationErrorGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ValidationErrorGlyphProperty =
-      DependencyProperty.Register( "ValidationErrorGlyph",
+    public static readonly DependencyProperty ValidationErrorGlyphProperty = DependencyProperty.Register(
+      "ValidationErrorGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -256,52 +250,60 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ValidationErrorGlyph Property
+    #endregion
 
     #region ScrollTipContentTemplate Property
 
+    [ViewProperty( ViewPropertyMode.ViewOnly )]
+    public static readonly DependencyProperty ScrollTipContentTemplateProperty = DependencyProperty.Register(
+      "ScrollTipContentTemplate",
+      typeof( DataTemplate ),
+      typeof( UIViewBase ) );
+
     public DataTemplate ScrollTipContentTemplate
     {
       get
       {
-        return ( DataTemplate )GetValue( ScrollTipContentTemplateProperty );
+        return ( DataTemplate )this.GetValue( UIViewBase.ScrollTipContentTemplateProperty );
       }
       set
       {
-        SetValue( ScrollTipContentTemplateProperty, value );
+        this.SetValue( UIViewBase.ScrollTipContentTemplateProperty, value );
       }
     }
 
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ScrollTipContentTemplateProperty =
-        DependencyProperty.Register( "ScrollTipContentTemplate", typeof( DataTemplate ), typeof( UIViewBase ) );
-
-    #endregion ScrollTipContentTemplate
+    #endregion
 
     #region ScrollTipContentTemplateSelector Property
 
+    [ViewProperty( ViewPropertyMode.ViewOnly )]
+    public static readonly DependencyProperty ScrollTipContentTemplateSelectorProperty = DependencyProperty.Register(
+      "ScrollTipContentTemplateSelector",
+      typeof( DataTemplateSelector ),
+      typeof( UIViewBase ) );
+
     public DataTemplateSelector ScrollTipContentTemplateSelector
     {
       get
       {
-        return ( DataTemplateSelector )GetValue( ScrollTipContentTemplateSelectorProperty );
+        return ( DataTemplateSelector )this.GetValue( UIViewBase.ScrollTipContentTemplateSelectorProperty );
       }
       set
       {
-        SetValue( ScrollTipContentTemplateSelectorProperty, value );
+        this.SetValue( UIViewBase.ScrollTipContentTemplateSelectorProperty, value );
       }
     }
 
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ScrollTipContentTemplateSelectorProperty =
-        DependencyProperty.Register( "ScrollTipContentTemplateSelector", typeof( DataTemplateSelector ), typeof( UIViewBase ) );
-
-    #endregion ScrollTipContentTemplateSelector
+    #endregion
 
     #region IsConnectionStateGlyphEnabled Property
+
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty IsConnectionStateGlyphEnabledProperty =
-      DependencyProperty.Register( "IsConnectionStateGlyphEnabled", typeof( bool ), typeof( UIViewBase ), new PropertyMetadata( true ) );
+    public static readonly DependencyProperty IsConnectionStateGlyphEnabledProperty = DependencyProperty.Register(
+      "IsConnectionStateGlyphEnabled",
+      typeof( bool ),
+      typeof( UIViewBase ),
+      new PropertyMetadata( true ) );
 
     public bool IsConnectionStateGlyphEnabled
     {
@@ -315,13 +317,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion IsConnectionStateGlyphEnabled Property
+    #endregion
 
     #region ConnectionStateLoadingGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateLoadingGlyphProperty =
-      DependencyProperty.Register( "ConnectionStateLoadingGlyph",
+    public static readonly DependencyProperty ConnectionStateLoadingGlyphProperty = DependencyProperty.Register(
+      "ConnectionStateLoadingGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -338,13 +340,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ConnectionStateLoadingGlyph Property
+    #endregion
 
     #region ConnectionStateCommittingGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateCommittingGlyphProperty =
-      DependencyProperty.Register( "ConnectionStateCommittingGlyph",
+    public static readonly DependencyProperty ConnectionStateCommittingGlyphProperty = DependencyProperty.Register(
+      "ConnectionStateCommittingGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -361,13 +363,13 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ConnectionStateCommittingGlyph Property
+    #endregion
 
     #region ConnectionStateErrorGlyph Property
 
     [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateErrorGlyphProperty =
-      DependencyProperty.Register( "ConnectionStateErrorGlyph",
+    public static readonly DependencyProperty ConnectionStateErrorGlyphProperty = DependencyProperty.Register(
+      "ConnectionStateErrorGlyph",
       typeof( DataTemplate ),
       typeof( UIViewBase ),
       new FrameworkPropertyMetadata( null ) );
@@ -384,7 +386,7 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion ConnectionStateErrorGlyph Property
+    #endregion
 
     #region BusyCursor Property
 
@@ -477,6 +479,5 @@ namespace Xceed.Wpf.DataGrid.Views
     }
 
     #endregion
-
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
index 05ef4d67..c5b7df74 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
@@ -45,8 +45,6 @@ namespace Xceed.Wpf.DataGrid.Views
 
     #endregion Static Members
 
-    #region Constructors
-
     static ViewBase()
     {
       ViewBase.FixedHeadersProperty = ViewBase.FixedHeadersPropertyKey.DependencyProperty;
@@ -69,8 +67,6 @@ namespace Xceed.Wpf.DataGrid.Views
       }
     }
 
-    #endregion Constructors
-
     #region Theme Property
 
     public static readonly DependencyProperty ThemeProperty =
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
index 90402e7e..22e0b236 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
@@ -45,8 +45,6 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        this.MergeFreeCells();
-
         return m_readOnlyCellsCollection;
       }
     }
@@ -61,14 +59,24 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
-        this.MergeFreeCells();
-
         return m_bindedCells.Values;
       }
     }
 
     #endregion
 
+    #region VirtualizedCells Property
+
+    internal ICollection<Cell> VirtualizedCells
+    {
+      get
+      {
+        return m_unbindedCells.Values;
+      }
+    }
+
+    #endregion
+
     #region DataGridContext Private Property
 
     private DataGridContext DataGridContext
@@ -115,6 +123,16 @@ namespace Xceed.Wpf.DataGrid
 
     #endregion
 
+    #region VirtualizationMode property
+
+    internal ColumnVirtualizationMode VirtualizationMode
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
     #region CollectionChanged Event
 
     internal event EventHandler CollectionChanged;
@@ -134,6 +152,19 @@ namespace Xceed.Wpf.DataGrid
     {
       get
       {
+        if( column == null )
+          return null;
+
+        var columns = this.Columns;
+        if( columns == null )
+          return null;
+
+        var match = columns[ column.FieldName ];
+        if( match == null )
+          return null;
+
+        Debug.Assert( match == column );
+
         return this.GetCell( column, true );
       }
     }
@@ -168,26 +199,43 @@ namespace Xceed.Wpf.DataGrid
 
     internal override void InternalAdd( Cell cell )
     {
-      this.Bind( cell, true );
+      this.InternalAddCore( cell );
     }
 
     internal override void InternalClear()
     {
+      //Try to be GC friendly
+      if( m_recyclingBins != null )
+      {
+        foreach( var recycleBin in m_recyclingBins.Values )
+        {
+          recycleBin.Clear();
+        }
+        m_recyclingBins.Clear();
+      }
       m_recyclingBins = null;
+
+      if( m_freeCells != null )
+      {
+        m_freeCells.Clear();
+        m_freeCells.TrimExcess();
+      }
       m_freeCells = null;
 
       m_bindedCells.Clear();
+      m_unbindedCells.Clear();
+      m_unprocessedCells.Clear();
       m_cells.Clear();
     }
 
     internal override void InternalInsert( int index, Cell cell )
     {
-      this.Bind( cell, false );
+      this.InternalAddCore( cell );
     }
 
     internal override void InternalRemove( Cell cell )
     {
-      this.Unbind( cell, false );
+      this.InternalRemoveCore( cell, true );
     }
 
     internal override void InternalRemoveAt( int index )
@@ -200,7 +248,7 @@ namespace Xceed.Wpf.DataGrid
       if( !m_bindedCells.TryGetValue( column.FieldName, out cell ) )
         return;
 
-      this.Unbind( cell, false );
+      this.InternalRemoveCore( cell, true );
     }
 
     internal override void InternalSetCell( int index, Cell cell )
@@ -210,12 +258,11 @@ namespace Xceed.Wpf.DataGrid
 
     internal void Release( Cell cell )
     {
-      // Make sure the cell is allowed to be recycled.
-      if( ( cell == null ) || ( !VirtualizingCellCollection.IsRecyclableCell( cell ) ) )
+      if( cell == null )
         return;
 
       // Remove the target cell from the binded cells.
-      this.Unbind( cell, true );
+      this.ReleaseCore( cell );
 
       cell.Visibility = Visibility.Collapsed;
     }
@@ -226,10 +273,10 @@ namespace Xceed.Wpf.DataGrid
         return null;
 
       Cell cell;
-      if( this.TryGetCell( fieldName, prepareCell, out cell ) )
+      if( this.TryGetBindedCell( fieldName, prepareCell, out cell ) )
         return cell;
 
-      return this.CreateOrRecycleCell( fieldName );
+      return this.CreateOrRecoverCell( fieldName );
     }
 
     internal Cell GetCell( ColumnBase column, bool prepareCell )
@@ -238,35 +285,33 @@ namespace Xceed.Wpf.DataGrid
         return null;
 
       Cell cell;
-      if( this.TryGetCell( column, prepareCell, out cell ) )
+      if( this.TryGetBindedCell( column, prepareCell, out cell ) )
         return cell;
 
-      return this.CreateOrRecycleCell( column, this.DataGridContext );
+      return this.CreateOrRecoverCell( column, this.DataGridContext );
     }
 
-    internal bool TryGetCell( string fieldName, out Cell cell )
+    internal bool TryGetBindedCell( string fieldName, out Cell cell )
     {
-      return this.TryGetCell( fieldName, true, out cell );
+      return this.TryGetBindedCell( fieldName, true, out cell );
     }
 
-    internal bool TryGetCell( ColumnBase column, out Cell cell )
+    internal bool TryGetBindedCell( ColumnBase column, out Cell cell )
     {
-      return this.TryGetCell( column, true, out cell );
+      return this.TryGetBindedCell( column, true, out cell );
     }
 
-    internal bool TryGetCell( string fieldName, bool prepareCell, out Cell cell )
+    internal bool TryGetBindedCell( string fieldName, bool prepareCell, out Cell cell )
     {
-      return this.TryGetCell( this.GetColumn( fieldName ), prepareCell, out cell );
+      return this.TryGetBindedCell( this.GetColumn( fieldName ), prepareCell, out cell );
     }
 
-    internal bool TryGetCell( ColumnBase column, bool prepareCell, out Cell cell )
+    internal bool TryGetBindedCell( ColumnBase column, bool prepareCell, out Cell cell )
     {
       cell = null;
       if( column == null )
         return false;
 
-      this.MergeFreeCells();
-
       if( !m_bindedCells.TryGetValue( column.FieldName, out cell ) )
         return false;
 
@@ -278,139 +323,389 @@ namespace Xceed.Wpf.DataGrid
       return true;
     }
 
-    internal bool TryGetBindedCell( string fieldName, out Cell cell )
+    internal bool TryGetCreatedCell( string fieldName, out Cell cell )
     {
-      this.MergeFreeCells();
-
       if( m_bindedCells.TryGetValue( fieldName, out cell ) )
         return true;
 
+      //The required cell may have been added in xaml, but may still not be added to the binded cells.  If this is the case, add it now.
+      if( m_unprocessedCells.TryGetValue( fieldName, out cell ) )
+      {
+        m_unprocessedCells.Remove( fieldName );
+        cell = m_parentRow.PrepareUnbindedCell( this.GetColumn( fieldName ), cell );
+
+        m_bindedCells.Add( fieldName, cell );
+
+        return true;
+      }
+
       return false;
     }
 
-    internal void ClearUnusedRecycleBins( ColumnCollection columns )
+    internal void MergeFreeCells()
+    {
+      if( m_freeCells == null )
+        return;
+
+      var dataGridContext = this.DataGridContext;
+      var columns = this.Columns;
+
+      foreach( Cell cell in m_freeCells )
+      {
+        this.MergeFreeCell( cell, dataGridContext, columns );
+      }
+
+      //Try to be GC friendly
+      m_freeCells.Clear();
+      m_freeCells.TrimExcess();
+      m_freeCells = null;
+
+      m_freeCellsHaveBeenMerged = true;
+    }
+
+    internal bool HasVirtualizedCell( string fieldName )
+    {
+      if( string.IsNullOrWhiteSpace( fieldName ) )
+        return false;
+
+      if( m_bindedCells.ContainsKey( fieldName ) )
+        return true;
+
+      if( m_unbindedCells.ContainsKey( fieldName ) )
+        return true;
+
+      return false;
+    }
+
+    internal Cell AddVirtualizedCell( ColumnBase column )
+    {
+      var fieldName = column.FieldName;
+      Cell cell;
+      var addToCells = true;
+
+      if( m_unprocessedCells.TryGetValue( fieldName, out cell ) )
+      {
+        //A cell was provided in xaml
+        m_unprocessedCells.Remove( fieldName );
+        addToCells = false;
+      }
+
+      //If no cell was provided, this will generate one.
+      cell = m_parentRow.PrepareUnbindedCell( column, cell );
+
+      m_unbindedCells.Add( fieldName, cell );
+
+      //A new generated cell must be added to the CellSet.  If it was provided through xaml, it is already added.
+      if( addToCells )
+      {
+        m_cells.Add( cell );
+      }
+
+      return cell;
+    }
+
+    internal void RemoveVirtualizedCell( ColumnBase column )
+    {
+      Cell cell;
+      var binded = true;
+
+      if( !this.TryGetBindedCell( column, false, out cell ) )
+      {
+        binded = false;
+        this.TryRecoverCell( column, out cell, false );
+      }
+
+      if( cell != null )
+      {
+        //Only remove cells that can be generated without any unique configuration (e.g. no custom template, no ResultPropertyName, etc..)
+        if( this.CanBeRemoved( cell ) )
+        {
+          this.InternalRemoveCore( cell, binded );
+        }
+        else
+        {
+          if( binded )
+          {
+            m_bindedCells.Remove( cell.FieldName );
+            cell.Visibility = Visibility.Collapsed;
+            cell.RemoveContentBinding();
+          }
+          m_unprocessedCells.Add( cell.FieldName, cell );
+        }
+      }
+    }
+
+    internal void BindRecycledCells( ColumnCollection columns )
     {
       if( m_recyclingBins == null )
         return;
 
-      var unusedRecyclingGroups = new HashSet<object>( m_recyclingBins.Keys );
+      Cell cell;
 
       if( columns != null )
       {
         foreach( ColumnBase column in columns )
         {
-          if( unusedRecyclingGroups.Count == 0 )
-            break;
+          if( m_bindedCells.ContainsKey( column.FieldName ) )
+            continue;
 
-          unusedRecyclingGroups.Remove( this.GetRecyclingGroup( column ) );
+          if( this.TryGetRecycledCell( column, out cell ) )
+          {
+            cell.ClearValue( Cell.VisibilityProperty );
+            m_bindedCells.Add( cell.FieldName, cell );
+          }
         }
       }
 
-      foreach( object recyclingGroup in unusedRecyclingGroups )
+      this.ClearRecycleBins();
+    }
+
+    internal void BindVirtualizedCells()
+    {
+      foreach( KeyValuePair<string, Cell> item in m_unbindedCells )
       {
-        LinkedList<Cell> recycleBin = m_recyclingBins[ recyclingGroup ];
-        m_recyclingBins.Remove( recyclingGroup );
+        var cell = item.Value;
+        cell.ClearValue( Cell.VisibilityProperty );
+        m_bindedCells.Add( item.Key, cell );
+      }
+      m_unbindedCells.Clear();
 
-        foreach( Cell cell in recycleBin )
+      foreach( KeyValuePair<string, Cell> item in m_unprocessedCells )
+      {
+        var cell = m_parentRow.PrepareUnbindedCell( this.GetColumn( item.Key ), item.Value );
+        cell.ClearValue( Cell.VisibilityProperty );
+        m_bindedCells.Add( item.Key, cell );
+      }
+      m_unprocessedCells.Clear();
+    }
+
+    internal void ClearOutOfViewBindedCells( List<Cell> cells )
+    {
+      foreach( Cell cell in cells )
+      {
+        if( this.CanBeRemoved( cell ) )
         {
-          m_cells.Remove( cell );
+          this.InternalRemoveCore( cell, true );
+          continue;
         }
+
+        //No need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
+        //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
+        cell.RemoveContentBinding();
       }
+    }
 
-      if( m_recyclingBins.Count == 0 )
+    internal void ClearVirtualizedCells()
+    {
+      foreach( Cell cell in m_unbindedCells.Values )
       {
-        m_recyclingBins = null;
+        if( this.CanBeRemoved( cell ) )
+        {
+          this.InternalRemoveCore( cell );
+          continue;
+        }
+
+        //No need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
+        //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
+        cell.RemoveContentBinding();
+        cell.Arrange( new Rect( 0, 0, 0, 0 ) );
+        cell.ClearValue( Cell.VisibilityProperty );
+        m_bindedCells.Add( cell.FieldName, cell );
       }
+
+      m_unbindedCells.Clear();
+
+      foreach( Cell cell in m_unprocessedCells.Values )
+      {
+        if( this.CanBeRemoved( cell ) )
+        {
+          this.InternalRemoveCore( cell );
+          continue;
+        }
+
+        var fieldName = cell.FieldName;
+        m_parentRow.PrepareUnbindedCell( this.GetColumn( fieldName ), cell );
+        cell.Arrange( new Rect( 0, 0, 0, 0 ) );
+        cell.ClearValue( Cell.VisibilityProperty );
+        m_bindedCells.Add( fieldName, cell );
+      }
+
+      m_unprocessedCells.Clear();
     }
 
-    private void Bind( Cell cell, bool overwrite )
+    internal void VirtualizeRecycledCells()
     {
-      if( cell == null )
-        throw new ArgumentNullException( "cell" );
+      if( m_recyclingBins == null )
+        return;
 
-      if( !VirtualizingCellCollection.IsFreeCell( cell ) )
+      foreach( LinkedList<Cell> recycleBin in m_recyclingBins.Values )
       {
-        string fieldName = cell.FieldName;
-
-        Cell oldCell;
-        if( m_bindedCells.TryGetValue( fieldName, out oldCell ) )
+        foreach( Cell cell in recycleBin )
         {
-          if( cell == oldCell )
-            return;
-
-          if( !overwrite )
-            this.ThrowCellBinded( fieldName );
+          if( !m_unbindedCells.ContainsKey( cell.FieldName ) )
+          {
+            m_unbindedCells.Add( cell.FieldName, cell );
+            continue;
+          }
 
-          this.InternalRemove( oldCell );
+          Debug.Fail( "Why is there a cell with the same fieldname already present in the unbindedCells?" );
+          this.InternalRemoveCore( cell );
         }
+        recycleBin.Clear();
+      }
 
-        m_bindedCells.Add( fieldName, cell );
+      m_recyclingBins.Clear();
+      m_recyclingBins = null;
+    }
+
+    internal void SynchronizeRecyclingBinsWithRecyclingGroups( IEnumerable<ColumnBase> visibleColumns )
+    {
+      if( m_recyclingBins == null )
+        return;
+
+      //Get the recycling groups of visible columns only
+      var recyclingGroups = new List<object>();
+      foreach( ColumnBase column in visibleColumns )
+      {
+        var recyclingGroup = this.GetRecyclingGroup( column );
+        if( !recyclingGroups.Contains( recyclingGroup ) )
+        {
+          recyclingGroups.Add( recyclingGroup );
+        }
       }
-      else
+
+      //Clear cells and remove recycleBins not linked to a currently used recyclingGroup.
+      var unusedRecyclingGroups = new List<object>();
+      foreach( KeyValuePair<object, LinkedList<Cell>> item in m_recyclingBins )
       {
-        if( m_freeCells == null )
+        var recyclingGroup = item.Key;
+        if( recyclingGroups.Contains( recyclingGroup ) )
+          continue;
+
+        unusedRecyclingGroups.Add( recyclingGroup );
+        var recycleBin = item.Value;
+        foreach( Cell cell in recycleBin )
         {
-          m_freeCells = new List<Cell>( 1 );
+          this.InternalRemoveCore( cell );
         }
+        recycleBin.Clear();
+      }
 
-        m_freeCells.Add( cell );
+      foreach( object recyclingGroup in unusedRecyclingGroups )
+      {
+        m_recyclingBins.Remove( recyclingGroup );
       }
+    }
 
-      m_cells.Add( cell );
+    private bool CanBeRemoved( Cell cell )
+    {
+      // Calling this method assumes it is for cells that are handled by the FixedCellPanel, which does not handle template cells,
+      // thus no need to check if it is one through Row.GetIsTemplateCell( cell ).
+      return ( cell.CanBeRecycled ) && ( cell.CanBeCollapsed );
     }
 
-    private void Unbind( Cell cell, bool recycle )
+    private void ReleaseCore( Cell cell )
     {
-      if( cell == null )
-        throw new ArgumentNullException( "cell" );
+      Debug.Assert( !VirtualizingCellCollection.IsFreeCell( cell ), "Should always have a field name" );
+
+      m_bindedCells.Remove( cell.FieldName );
 
-      if( !VirtualizingCellCollection.IsFreeCell( cell ) )
+      switch( this.VirtualizationMode )
       {
-        m_bindedCells.Remove( cell.FieldName );
+        case ColumnVirtualizationMode.None:
+          {
+            //Not virtualizing
+            this.InternalRemoveCore( cell );
+            break;
+          }
+
+        case ColumnVirtualizationMode.Recycling:
+          {
+            // If recycling, put the cell into the appropriate recycle bin.
+            var recyclingGroup = this.GetRecyclingGroup( this.GetColumn( cell ) );
+            var recycleBin = this.GetRecycleBinOrNew( recyclingGroup );
+
+            // A released cell shouldn't be in the recycle bin already.
+            Debug.Assert( !recycleBin.Contains( cell ) );
+            recycleBin.Add( cell );
+            break;
+          }
+
+        case ColumnVirtualizationMode.Virtualizing:
+          {
+            //Virtualizing with no recycling
+            m_unbindedCells.Add( cell.FieldName, cell );
+            break;
+          }
       }
-      else
+    }
+
+    private void InternalAddCore( Cell cell )
+    {
+      //This method should be invoked only to add cells provided by the user through Row.Cells, in xaml for instance.
+      //For template cells, an other mechanism is used (See Row.OnApplyTemplate()).
+      Debug.Assert( cell != null );
+
+      //If a cell is provided in code behind, the user must provide a fieldname, and therefore it can be merged right away.
+      if( m_freeCellsHaveBeenMerged )
       {
-        Debug.Fail( "Should always have a field name" );
+        this.MergeFreeCell( cell, this.DataGridContext, this.Columns );
+        return;
       }
 
-      if( recycle )
+      if( m_freeCells == null )
       {
-        // Put the cell into the appropriate recycle bin.
-        var recyclingGroup = this.GetRecyclingGroup( this.GetColumn( cell ) );
-        var recycleBin = this.GetRecycleBinOrNew( recyclingGroup );
-
-        // A released cell shouldn't be in the recycle bin already.
-        Debug.Assert( !recycleBin.Contains( cell ) );
-        recycleBin.Add( cell );
+        m_freeCells = new List<Cell>( 1 );
       }
-      else
+
+      m_freeCells.Add( cell );
+      m_cells.Add( cell );
+    }
+
+    private void InternalRemoveCore( Cell cell, bool unbind = false )
+    {
+      Debug.Assert( !VirtualizingCellCollection.IsFreeCell( cell ), "Should always have a field name" );
+
+      if( unbind )
       {
-        m_cells.Remove( cell );
+        m_bindedCells.Remove( cell.FieldName );
       }
+
+      m_cells.Remove( cell );
+      m_parentRow.RemoveFromVisualTree( cell );
+
+      //This must absolutely be done once every collection has removed the cell, for the ParentColumn will be set to null, thus the FieldName will be lost.
+      cell.CleanUpOnRemove();
     }
 
-    private Cell CreateOrRecycleCell( string fieldName )
+    private Cell CreateOrRecoverCell( string fieldName )
     {
-      return this.CreateOrRecycleCell( this.GetColumn( fieldName ), this.DataGridContext );
+      return this.CreateOrRecoverCell( this.GetColumn( fieldName ), this.DataGridContext );
     }
 
-    private Cell CreateOrRecycleCell( ColumnBase column, DataGridContext context )
+    private Cell CreateOrRecoverCell( ColumnBase column, DataGridContext dataGridContext )
     {
-      // Create a new cell if recycling wasn't possible.
       Cell cell;
-      if( !this.TryGetRecycledCell( column, out cell ) )
+      if( !this.TryRecoverCell( column, out cell, true ) )
       {
+        // Create a new cell if a suitable cell was not found.
         cell = m_parentRow.ProvideCell( column );
         Debug.Assert( cell != null );
+
+        //Add the new cell to the CellSet
+        m_cells.Add( cell );
       }
       else
       {
+        //The current local value must be cleared instead of setting a new local value to give a chance for a style to set a value.
         cell.ClearValue( Cell.VisibilityProperty );
       }
 
       // Make sure the cell is initialized and prepared to be used.
-      this.PrepareCell( cell, column, context );
-      this.InternalAdd( cell );
+      this.PrepareCell( cell, column, dataGridContext );
+
+      //Once the fieldname is updated, add it to the dictionary
+      m_bindedCells.Add( cell.FieldName, cell );
 
       //Need to notify only when cells are not already binded, since the binded cells will get properly measured and arranged by the Virtualizing/FixedCellSubPanel(s).
       if( !this.IsUpdating )
@@ -421,20 +716,62 @@ namespace Xceed.Wpf.DataGrid
       return cell;
     }
 
-    private void PrepareCell( Cell cell, ColumnBase column, DataGridContext context )
+    private void PrepareCell( Cell cell, ColumnBase column, DataGridContext dataGridContext )
     {
       //context can be null when the DataGridCollectionView directly has a list of Xceed.Wpf.DataGrid.DataRow
-      if( ( cell == null ) || ( context == null ) )
+      if( ( cell == null ) || ( dataGridContext == null ) )
         return;
 
       // Initialize the cell in case it hasn't been initialized or in case of a column change.
-      cell.Initialize( context, m_parentRow, column );
+      cell.Initialize( dataGridContext, m_parentRow, column );
 
       // Certain non recycling cells like StatCell must not be (re)prepared if their binding is not set, for performance reasons.
       if( cell.HasAliveContentBinding )
       {
         // Make sure the cell is prepared before leaving this method.
-        cell.PrepareContainer( context, m_parentRow.DataContext );
+        cell.PrepareContainer( dataGridContext, m_parentRow.DataContext );
+      }
+    }
+
+    private bool TryRecoverCell( ColumnBase column, out Cell cell, bool includeUnprocessedCells )
+    {
+      cell = null;
+
+      if( column == null )
+        return false;
+
+      switch( this.VirtualizationMode )
+      {
+        case ColumnVirtualizationMode.Recycling:
+          {
+            return this.TryGetRecycledCell( column, out cell );
+          }
+
+        case ColumnVirtualizationMode.Virtualizing:
+          {
+            //When not recycling, get the cell already created for the required column.
+            if( ( m_unbindedCells.Count > 0 ) && ( m_unbindedCells.TryGetValue( column.FieldName, out cell ) ) )
+            {
+              m_unbindedCells.Remove( column.FieldName );
+              return true;
+            }
+
+            //It may still be unprocessed (provided in xaml), so process it now.
+            if( ( m_unprocessedCells.Count > 0 ) && ( includeUnprocessedCells ) && ( m_unprocessedCells.TryGetValue( column.FieldName, out cell ) ) )
+            {
+              m_unprocessedCells.Remove( column.FieldName );
+              cell = m_parentRow.PrepareUnbindedCell( column, cell );
+              return true;
+            }
+
+            return false;
+          }
+
+        default:
+          {
+            //Not virtualizing
+            return false;
+          }
       }
     }
 
@@ -442,16 +779,25 @@ namespace Xceed.Wpf.DataGrid
     {
       cell = null;
 
-      if( ( column == null ) || ( m_recyclingBins == null ) )
+      if( m_recyclingBins == null )
         return false;
 
-      object recyclingGroup = this.GetRecyclingGroup( column );
-      LinkedList<Cell> recycleBin;
+      // Make sure the cell recycling group is up-to-date.
+      var dataGridContext = this.DataGridContext;
+      if( dataGridContext != null )
+      {
+        var propertyDescription = ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, column, null );
+        ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, dataGridContext.DataGridControl.DefaultCellEditors, dataGridContext.AutoCreateForeignKeyConfigurations, propertyDescription );
+      }
+
+      var recyclingGroup = this.GetRecyclingGroup( column );
+      var recycleBin = default( LinkedList<Cell> );
 
       if( m_recyclingBins.TryGetValue( recyclingGroup, out recycleBin ) )
       {
         // Try to recycle a cell that has already the appropriate column in order to minimize the cell's initialization time.
-        LinkedListNode<Cell> targetNode = null;
+        var targetNode = default( LinkedListNode<Cell> );
+
         for( var node = recycleBin.Last; node != null; node = node.Previous )
         {
           targetNode = node;
@@ -474,28 +820,37 @@ namespace Xceed.Wpf.DataGrid
       return ( cell != null );
     }
 
-    private void MergeFreeCell( Cell cell )
+    private void MergeFreeCell( Cell cell, DataGridContext dataGridContext, ColumnCollection columns )
     {
-      string fieldName = cell.FieldName;
+      var fieldName = cell.FieldName;
 
       // Make sure the field name is valid and there is no other cell using it.
       this.CheckCellFieldName( fieldName );
-      this.CheckCellBinded( fieldName );
+      this.CheckCellAlreadyExists( fieldName );
 
-      m_bindedCells.Add( fieldName, cell );
-    }
+      // Cells added in xaml (e.g a StatCell) must be added to the visual tree right away, even if they are not visible for the moment,
+      // to make sure any binding defined on a property works correctly.
+      m_parentRow.AddToVisualTree( cell );
 
-    private void MergeFreeCells()
-    {
-      if( m_freeCells == null )
+      //These cell will need further processing when not recycling before they can be used as BindedCells.
+      if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
+      {
+        m_unprocessedCells.Add( fieldName, cell );
         return;
+      }
 
-      foreach( Cell cell in m_freeCells )
+      //This following calls will be done for unprocessedCells when actually using them.
+      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
+
+      //It is possible a cell provided through Row.Cells does not correspond to any actual column in the grid, so do not prepare it.
+      var parentColumn = columns[ cell.FieldName ];
+      if( parentColumn != null )
       {
-        this.MergeFreeCell( cell );
+        cell.Initialize( dataGridContext, m_parentRow, parentColumn );
+        cell.PrepareContainer( dataGridContext, m_parentRow.DataContext );
       }
 
-      m_freeCells = null;
+      m_bindedCells.Add( fieldName, cell );
     }
 
     private ColumnBase GetColumn( Cell cell )
@@ -503,7 +858,7 @@ namespace Xceed.Wpf.DataGrid
       if( cell == null )
         return null;
 
-      ColumnBase column = cell.ParentColumn;
+      var column = cell.ParentColumn;
       if( column == null )
       {
         column = this.GetColumn( cell.FieldName );
@@ -543,6 +898,21 @@ namespace Xceed.Wpf.DataGrid
       return recycleBin;
     }
 
+    private void ClearRecycleBins()
+    {
+      foreach( LinkedList<Cell> recycleBin in m_recyclingBins.Values )
+      {
+        foreach( Cell cell in recycleBin )
+        {
+          this.InternalRemoveCore( cell );
+        }
+        recycleBin.Clear();
+      }
+
+      m_recyclingBins.Clear();
+      m_recyclingBins = null;
+    }
+
     private void CheckFieldName( string fieldName )
     {
       if( string.IsNullOrEmpty( fieldName ) )
@@ -555,59 +925,64 @@ namespace Xceed.Wpf.DataGrid
         throw new DataGridInternalException( "A Cell should always have a FieldName.", this.DataGridContext.DataGridControl );
     }
 
-    private void CheckCellBinded( string fieldName )
+    private void CheckCellAlreadyExists( string fieldName )
     {
-      if( m_bindedCells.ContainsKey( fieldName ) )
+      var alreadyExists = false;
+
+      if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
       {
-        this.ThrowCellBinded( fieldName );
+        alreadyExists = m_unprocessedCells.ContainsKey( fieldName );
+
+        if( !alreadyExists )
+        {
+          alreadyExists = m_unbindedCells.ContainsKey( fieldName );
+        }
       }
-    }
 
-    private void ThrowCellBinded( string fieldName )
-    {
-      throw new DataGridInternalException( string.Format( "A cell with FieldName {0} already exists.", fieldName ), this.DataGridContext.DataGridControl );
-    }
+      if( !alreadyExists )
+      {
+        alreadyExists = m_bindedCells.ContainsKey( fieldName );
+      }
 
-    private static bool IsRecyclableCell( Cell cell )
-    {
-      return ( cell != null )
-          && !VirtualizingCellCollection.IsTemplatedCell( cell );
+      if( alreadyExists )
+      {
+        this.ThrowCellAlreadyExists( fieldName );
+      }
     }
 
-    private static bool IsTemplatedCell( Cell cell )
+    private void ThrowCellAlreadyExists( string fieldName )
     {
-      return ( cell != null )
-          && Row.GetIsTemplateCell( cell );
+      throw new DataGridInternalException( string.Format( "A cell with FieldName {0} already exists.", fieldName ), this.DataGridContext.DataGridControl );
     }
 
     private static bool IsFreeCell( Cell cell )
     {
-      if( cell == null )
-        throw new ArgumentNullException( "cell" );
+      Debug.Assert( cell != null );
 
       return string.IsNullOrEmpty( cell.FieldName );
     }
 
-    #region Private Fields
-
     private readonly Row m_parentRow;
     private readonly ICollection<Cell> m_cells;
 
-    // This Dictionary is used as a caching system to optimize lookup when virtualizing instead of
-    // parsing every columns looking for the fieldname. e.g.: looking for the last one when 1000
-    // Cells in the parent row. When virtualizing, only the cell visible in the viewport will be contained
+    // This Dictionary is used as a caching system to optimize lookup when virtualizing instead of parsing every columns looking for the fieldname,
+    // e.g.: looking for the last one when 1000 cells in the parent row. When virtualizing, only the cell visible in the viewport will be contained
     // within this collection speeding the lookup.
     private readonly Dictionary<string, Cell> m_bindedCells = new Dictionary<string, Cell>();
 
+    //This Dictionary is used in combinations with m_bindedCells when virtualizing without recycling. It contains cells assigned to a column, but not currently in view.
+    private readonly Dictionary<string, Cell> m_unbindedCells = new Dictionary<string, Cell>();
+
+    //This Dictionary is used to temporarily store FreeCells until they are correctly prepared and added to the designated dictionnary (binded or unbinded cells)
+    private readonly Dictionary<string, Cell> m_unprocessedCells = new Dictionary<string, Cell>();
+
     // This Dictionary contains the recycling queues for the cells ready to be recycled.
     private Dictionary<object, LinkedList<Cell>> m_recyclingBins; //null
 
-    // This collection is used to store cells that are added to the Collection
-    // before the FieldName and/or ParentColumn being set. This occurs when
-    // defining a Row with Cell in XAML during a BeginInit / EndInit.
+    // This collection is used to store cells that are added to the Collection before the FieldName and/or ParentColumn being set.
+    // This occurs when defining a Row with Cell in XAML during a BeginInit / EndInit.
     private List<Cell> m_freeCells; //null
-
-    #endregion
+    private bool m_freeCellsHaveBeenMerged = false;
 
     #region VirtualizingCellCollectionEnumerator Nested Type
 
@@ -644,7 +1019,7 @@ namespace Xceed.Wpf.DataGrid
         if( m_collection == null )
           throw new ObjectDisposedException( string.Empty );
 
-        int count = m_collection.Count;
+        var count = m_collection.Count;
         m_index = Math.Min( m_index + 1, count );
 
         if( m_index < count )
@@ -680,9 +1055,7 @@ namespace Xceed.Wpf.DataGrid
 
     #region VirtualizingItemsList Nested Type
 
-    // This class is used to force the Collection<T>.Items.Count to return
-    // the total number of columns. Every other method except this[index] are
-    // not supported 
+    // This class is used to force the Collection<T>.Items.Count to return the total number of columns. Every other method except this[index] are not supported 
     private class VirtualizingItemsList : IList<Cell>
     {
       internal VirtualizingItemsList()
@@ -724,12 +1097,12 @@ namespace Xceed.Wpf.DataGrid
       {
         get
         {
-          Cell cell = null;
-          ColumnCollection columns = this.Columns;
+          var cell = default( Cell );
+          var columns = this.Columns;
 
           if( columns != null )
           {
-            ColumnBase column = columns[ index ];
+            var column = columns[ index ];
 
             if( column != null )
             {
@@ -762,7 +1135,21 @@ namespace Xceed.Wpf.DataGrid
 
       int IList<Cell>.IndexOf( Cell item )
       {
-        throw new NotSupportedException();
+        if( item == null )
+          return -1;
+
+        var columns = this.Columns;
+
+        if( columns == null )
+          return -1;
+
+        string fieldName = item.FieldName;
+        var column = columns[ fieldName ];
+
+        if( column == null )
+          return -1;
+
+        return columns.IndexOf( column );
       }
 
       void IList<Cell>.Insert( int index, Cell item )
@@ -791,7 +1178,7 @@ namespace Xceed.Wpf.DataGrid
           return false;
 
         string fieldName = item.FieldName;
-        ColumnCollection columns = this.Columns;
+        var columns = this.Columns;
 
         if( columns != null )
           return ( columns[ fieldName ] != null );
@@ -981,7 +1368,7 @@ namespace Xceed.Wpf.DataGrid
           return;
 
         // Do not process the bring into view for a templated cell.
-        if( VirtualizingCellCollection.IsTemplatedCell( targetCell ) )
+        if( Row.GetIsTemplateCell( targetCell ) )
           return;
 
         var targetRow = targetCell.ParentRow;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs
deleted file mode 100644
index efd02a2b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VisibleColumnsUpdatingEventManager : WeakEventManager
-  {
-    private VisibleColumnsUpdatingEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.VisibleColumnsUpdating += new EventHandler( this.OnVisibleColumnsUpdating );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.VisibleColumnsUpdating -= new EventHandler( this.OnVisibleColumnsUpdating );
-    }
-
-    private static VisibleColumnsUpdatingEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VisibleColumnsUpdatingEventManager );
-        VisibleColumnsUpdatingEventManager currentManager = ( VisibleColumnsUpdatingEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new VisibleColumnsUpdatingEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVisibleColumnsUpdating( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Watermark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Watermark.png
deleted file mode 100644
index 50da27b2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Watermark.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs
deleted file mode 100644
index 2eaf65b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Documents;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Controls;
-using System.Windows.Shapes;
-using System.Windows.Resources;
-using System.Security;
-using System.Windows.Media.Imaging;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class WatermarkAdorner : Adorner
-  {
-    public WatermarkAdorner( UIElement adornedElement )
-      : base( adornedElement )
-    {
-      BitmapImage bitmapImage = null;
-
-      try
-      {
-        Uri uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/Watermark.png" );
-        bitmapImage = new BitmapImage( uri );
-        bitmapImage.CacheOption = BitmapCacheOption.OnDemand;
-      }
-      catch( SecurityException )
-      {
-      }
-      catch( UriFormatException )
-      {
-        // This will occur during the VisualStudio Toolbox refreshing.
-      }
-
-      m_content = 
-        new Image()
-        {
-          Stretch = Stretch.None,
-          Source = bitmapImage
-        };
-      }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      m_content.Arrange( new Rect( finalSize ) );
-      return finalSize;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      m_content.Measure( constraint );
-      return m_content.DesiredSize;
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      return m_content;
-    }
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
-    {
-      Size gridRenderSize = this.AdornedElement.RenderSize;
-      Size contentDesiredSize = m_content.DesiredSize;
-
-      GeneralTransformGroup result = new GeneralTransformGroup();
-      result.Children.Add( base.GetDesiredTransform( transform ) );
-      result.Children.Add( new TranslateTransform( gridRenderSize.Width - contentDesiredSize.Width - 9, 4 ) );
-      return result;
-    }
-
-    private UIElement m_content;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
index 31f5d996..74743f09 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
@@ -65,42 +65,6 @@
     <ErrorReport>prompt</ErrorReport>
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release+Log|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;CODE_ANALYSIS;XBAP_FRIENDLY;LOG</DefineConstants>
-    <BaseAddress>125829120</BaseAddress>
-    <Optimize>true</Optimize>
-    <NoWarn>1699</NoWarn>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <CodeAnalysisLogFile>bin\Release\Xceed.Wpf.DataGrid.v4.2.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug+Log|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;XBAP_FRIENDLY;LOG</DefineConstants>
-    <BaseAddress>125829120</BaseAddress>
-    <NoWarn>1699</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Xceed.Wpf.DataGrid.v4.2.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="PresentationFramework.Classic" />
@@ -145,7 +109,6 @@
     <Compile Include="%28CollectionView%29\AsyncCommitInfo.cs" />
     <Compile Include="%28CollectionView%29\AsyncQueryInfo.cs" />
     <Compile Include="%28CollectionView%29\AsyncQueryInfoWeakComparer.cs" />
-    <Compile Include="%28CollectionView%29\AutoFilterValuesChangedEventArgs.cs" />
     <Compile Include="%28CollectionView%29\BindingPathValueExtractor.cs" />
     <Compile Include="%28CollectionView%29\CollectionViewGroupExtensions.cs" />
     <Compile Include="%28CollectionView%29\CommitItemsEvent.cs" />
@@ -153,7 +116,6 @@
     <Compile Include="%28CollectionView%29\ConnectionStateChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\CustomDistinctValueItemConfiguration.cs" />
     <Compile Include="%28CollectionView%29\CustomDistinctValueItemConfigurationCollection.cs" />
-    <Compile Include="%28CollectionView%29\CustomDistinctValueItemFilterEventArgs.cs" />
     <Compile Include="%28CollectionView%29\DataGridCollectionViewBase.cs" />
     <Compile Include="%28CollectionView%29\DataGridCollectionViewBaseDataProvider.cs" />
     <Compile Include="%28CollectionView%29\DataGridCollectionViewSourceBase.cs" />
@@ -162,6 +124,9 @@
     <Compile Include="%28CollectionView%29\DataGridItemProperty.PropertyDescriptorFromItemProperty.cs" />
     <Compile Include="%28CollectionView%29\DataGridItemPropertyBase.cs" />
     <Compile Include="%28CollectionView%29\DataGridItemPropertyDictionary.cs" />
+    <Compile Include="%28CollectionView%29\DataGridItemPropertyRoute.cs" />
+    <Compile Include="%28CollectionView%29\DataGridItemPropertyMap.cs" />
+    <Compile Include="%28CollectionView%29\DataGridItemPropertyMapHelper.cs" />
     <Compile Include="%28CollectionView%29\DataGridLINQPageManager.cs" />
     <Compile Include="%28CollectionView%29\DataGridPageManager.cs" />
     <Compile Include="%28CollectionView%29\DataGridVirtualizingCollectionView.cs" />
@@ -206,8 +171,6 @@
     <Compile Include="%28CollectionView%29\ItemPropertyGroupSortStatNameChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\PostBatchCollectionChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\PreBatchCollectionChangedEventManager.cs" />
-    <Compile Include="%28CollectionView%29\ProxyApplyingFilterCriteriasEventManager.cs" />
-    <Compile Include="%28CollectionView%29\ProxyAutoFilterValuesChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\ProxyCollectionRefreshEventManager.cs" />
     <Compile Include="%28CollectionView%29\ProxyGroupDescriptionsChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\ProxySortDescriptionsChangedEventManager.cs" />
@@ -228,12 +191,10 @@
     <Compile Include="%28CollectionView%29\PropertyDetailDescription.cs" />
     <Compile Include="%28CollectionView%29\DataGridRemovingItemEvent.cs" />
     <Compile Include="%28CollectionView%29\QueryableExtensions.cs" />
-    <Compile Include="%28CollectionView%29\QueryAutoFilterDistinctValuesEvent.cs" />
     <Compile Include="%28CollectionView%29\QueryGroupsEventArgs.cs" />
     <Compile Include="%28CollectionView%29\QueryItemCountEvent.cs" />
     <Compile Include="%28CollectionView%29\QueryItemsEvent.cs" />
     <Compile Include="%28CollectionView%29\RawItemMap.cs" />
-    <Compile Include="%28CollectionView%29\RootGroupChangedEventManager.cs" />
     <Compile Include="%28CollectionView%29\SortDescriptionsSyncContext.cs" />
     <Compile Include="%28CollectionView%29\%28DataVirtualization%29\VirtualizedItemInfo.cs" />
     <Compile Include="%28CollectionView%29\%28DataVirtualization%29\VirtualizedItemValueCollection.cs" />
@@ -241,109 +202,165 @@
     <Compile Include="%28CollectionView%29\UnboundDataItem.cs" />
     <Compile Include="%28enums%29\AutoScrollCurrentItemTriggersEnum.cs" />
     <Compile Include="%28enums%29\AutoScrollCurrentItemSourceTriggersEnum.cs" />
+    <Compile Include="%28enums%29\ColumnDraggableStatusEnum.cs" />
     <Compile Include="%28enums%29\CommitModeEnum.cs" />
     <Compile Include="%28enums%29\DataGridConnectionStateEnum.cs" />
     <Compile Include="%28enums%29\DataGridUpdateSourceTriggerEnum.cs" />
     <Compile Include="%28enums%29\DeletingSelectedItemErrorActionEnum.cs" />
     <Compile Include="%28enums%29\DistinctValuesUpdateModeEnum.cs" />
-    <Compile Include="%28enums%29\FilterCriteriaModeEnum.cs" />
-    <Compile Include="%28enums%29\FilterTokenPriorityEnum.cs" />
-    <Compile Include="%28enums%29\InsertionModeEnum.cs" />
+    <Compile Include="%28enums%29\DataGridDragBehaviorEnum.cs" />
+    <Compile Include="%28enums%29\LocationTypeEnum.cs" />
+    <Compile Include="%28enums%29\PropertyRouteSegmentTypeEnum.cs" />
     <Compile Include="%28enums%29\ScrollDirectionEnum.cs" />
+    <Compile Include="%28enums%29\SelectionBehaviorEnum.cs" />
     <Compile Include="%28enums%29\SelectionUnitEnum.cs" />
+    <Compile Include="%28Events%29\ColumnsLayoutChangedEventManager.cs" />
+    <Compile Include="%28Events%29\ColumnsLayoutChangingEventManager.cs" />
+    <Compile Include="%28Events%29\ColumnSortDirectionChangingEvent.cs" />
+    <Compile Include="%28Events%29\CurrentItemChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DetailsExpansionChangedEventArgs.cs" />
+    <Compile Include="%28Events%29\DetailsExpansionChangingEventArgs.cs" />
+    <Compile Include="%28Events%29\GroupExpansionChangedEventArgs.cs" />
+    <Compile Include="%28Events%29\GroupExpansionChangingEventArgs.cs" />
+    <Compile Include="%28Events%29\InitializeItemPropertyEventArgs.cs" />
+    <Compile Include="%28Events%29\InitializeItemPropertyEventManager.cs" />
+    <Compile Include="%28Events%29\MappingChangedEventManager.cs" />
+    <Compile Include="%28Events%29\SelectionChangedInternalEventManager.cs" />
+    <Compile Include="%28ForeignKeys%29\DataGridForeignKeyConverter.cs" />
+    <Compile Include="%28ForeignKeys%29\ForeignKeyDistinctValueItemContentControl.cs" />
     <Compile Include="%28ForeignKeys%29\ForeignKeyGroupContentControl.cs" />
     <Compile Include="%28ForeignKeys%29\DataTableForeignKeyConverter.cs" />
     <Compile Include="%28ForeignKeys%29\ForeignKeyConverter.cs" />
     <Compile Include="%28ForeignKeys%29\ForeignKeyScrollTipContentControl.cs" />
+    <Compile Include="%28Events%29\ColumnActualWidthChangedEvent.cs" />
+    <Compile Include="%28Events%29\ColumnActualWidthEventManager.cs" />
+    <Compile Include="%28Events%29\CurrentColumnChangedEventManager.cs" />
+    <Compile Include="%28Generator%29\CustomItemContainerGenerator.Trace.cs">
+      <DependentUpon>CustomItemContainerGenerator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="%28Generator%29\CustomItemContainerGeneratorRecyclingPools.cs" />
     <Compile Include="%28Generator%29\DataItemDataProvider.cs" />
     <Compile Include="%28Generator%29\DataItemDataProviderBase.cs" />
     <Compile Include="%28Generator%29\EmptyDataItemDataProvider.cs" />
     <Compile Include="%28Generator%29\IInhibitGenPosToIndexUpdating.cs" />
+    <Compile Include="%28Generator%29\RecyclingCandidateCleanedEvent.cs" />
     <Compile Include="%28Generator%29\StickyContainerGeneratedComparer.cs" />
     <Compile Include="%28Generator%29\StickyContainerGeneratedReverseComparer.cs" />
     <Compile Include="%28Generator%29\StickyContainerGeneratedStruct.cs" />
-    <Compile Include="%28Generator%29\VisibilityChangingEventManager.cs" />
-    <Compile Include="Automation\AutomationPeerExtensions.cs" />
     <Compile Include="AutoResetFlag.cs" />
     <Compile Include="AutoResetFlagFactory.cs" />
     <Compile Include="AutoScrollCurrentItemSourceTriggersRestrictions.cs" />
-    <Compile Include="CanBeCurrentWhenReadOnlyChangedEventManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CellContentStringFormatChangedEventManager.cs" />
-    <Compile Include="CellContentTemplateChangedEventManager.cs" />
-    <Compile Include="CellEditorDisplayConditionsChangedEventManager.cs" />
-    <Compile Include="ValidateInputWrapper.cs" />
+    <Compile Include="BindingProxy.cs" />
+    <Compile Include="CellEditorSelector.cs" />
     <Compile Include="CheckBox.cs" />
-    <Compile Include="ChildColumnVisibilityChangedEventManager.cs" />
     <Compile Include="ColumnAddGroupCommand.cs" />
     <Compile Include="ColumnCommand.cs" />
     <Compile Include="ColumnGroupCommand.cs" />
+    <Compile Include="ColumnHierarchyManager.cs" />
+    <Compile Include="ColumnHierarchyManagerHelper.cs" />
+    <Compile Include="ColumnHierarchyModel.Generic.cs" />
+    <Compile Include="ColumnManagerRowConfiguration.cs" />
     <Compile Include="ColumnSortCommand.cs" />
     <Compile Include="Converters\SortingDirectionToBooleanConverter.cs" />
     <Compile Include="Converters\StringFormatMultiConverter.cs" />
     <Compile Include="DataItemEventDescriptor.cs" />
     <Compile Include="DataItemEventDescriptorBase.cs" />
     <Compile Include="DataItemEventDescriptorFactory.cs" />
+    <Compile Include="DataItemIndexerDescriptor.cs" />
     <Compile Include="DataItemPropertyDescriptor.cs" />
     <Compile Include="DataItemPropertyDescriptorBase.cs" />
     <Compile Include="DataItemPropertyDescriptorFactory.cs" />
     <Compile Include="DataItemTypeDescriptionProvider.cs" />
     <Compile Include="DataItemTypeDescriptor.cs" />
-    <Compile Include="FilterCriteria\FilterExpressionHelper.cs" />
-    <Compile Include="ForeignKeyConfigNotifyCollectionChangedEventManager.cs" />
-    <Compile Include="DataGridControlSelectionChangedWeakEventManager.cs" />
-    <Compile Include="DataGridCurrentChangedEvent.cs" />
-    <Compile Include="DataGridCurrentChangingEvent.cs" />
+    <Compile Include="DetailConfigurationSelector.cs" />
+    <Compile Include="Diagnostics\DataGridControlTraceSources.cs" />
+    <Compile Include="Diagnostics\DataGridTraceArg.cs" />
+    <Compile Include="Diagnostics\DataGridTraceArg.Generic.cs" />
+    <Compile Include="Diagnostics\DataGridTraceArgs.cs" />
+    <Compile Include="Diagnostics\DataGridTraceEventIdEnum.cs" />
+    <Compile Include="Diagnostics\DataGridTraceMessages.cs" />
+    <Compile Include="Diagnostics\DataGridTraceSource.cs" />
+    <Compile Include="%28ForeignKeys%29\ForeignKeyConfigNotifyCollectionChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DataGridControlSelectionChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DataGridCurrentChangedEvent.cs" />
+    <Compile Include="%28Events%29\DataGridCurrentChangingEvent.cs" />
     <Compile Include="DataGridDatePicker.cs" />
     <Compile Include="DataGridFocusException.cs" />
     <Compile Include="DataGridItemContainerManager.cs" />
-    <Compile Include="DataGridSelectionChangingEvent.cs" />
-    <Compile Include="FittedWidthRequestedEventArgs.cs" />
-    <Compile Include="ForeignKeyConfigurationChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DataGridSelectionChangingEvent.cs" />
+    <Compile Include="%28Events%29\FittedWidthRequestedEvent.cs" />
+    <Compile Include="%28ForeignKeys%29\ForeignKeyConfigurationChangedEventManager.cs" />
+    <Compile Include="Export\%28Clipboard%29\CF_HtmlStream.cs" />
+    <Compile Include="Export\%28Clipboard%29\HtmlClipboardExporter.cs" />
+    <Compile Include="Export\%28Clipboard%29\HtmlFormatSettings.cs" />
+    <Compile Include="Export\%28Clipboard%29\UnicodeCsvClipboardExporter.cs" />
+    <Compile Include="FrameworkElementExtensions.cs" />
     <Compile Include="GenericContentTemplateSelector.cs" />
+    <Compile Include="%28Generator%29\GroupHeaderFooterItemContainerRecyclingPool.cs" />
     <Compile Include="GroupNavigationButton.cs" />
     <Compile Include="CellEditorContext.cs" />
     <Compile Include="Converters\EmptyStringToBooleanConverter.cs" />
     <Compile Include="ColumnBase.cs" />
-    <Compile Include="FilterCriteria\EndsWithFilterCriterion.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="FilterCriteria\StartsWithFilterCriterion.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="GroupNavigationControl.cs" />
     <Compile Include="GroupNavigationControlItem.cs" />
     <Compile Include="HashedLinkedList.cs" />
+    <Compile Include="%28Generator%29\HeaderFooterItemContainerRecyclingPool.cs" />
     <Compile Include="IDataGridItemContainerExtensions.cs" />
     <Compile Include="IGroupLevelDescription.cs" />
+    <Compile Include="IndexerDescriptor.cs" />
+    <Compile Include="IndexerParametersParser.cs" />
     <Compile Include="InnerCellContentPresenter.cs" />
-    <Compile Include="ItemPropertiesChangedEventManager.cs" />
-    <Compile Include="ItemPropertyNameMap.cs" />
+    <Compile Include="%28Generator%29\ItemContainerRecyclingPool.cs" />
     <Compile Include="LateGroupLevelDescription.cs" />
-    <Compile Include="Log.cs" />
     <Compile Include="Markup\DataGridThemeResourceDictionary.cs" />
     <Compile Include="Markup\FrameworkThemeResourceDictionary.cs" />
     <Compile Include="Markup\SharedResourceDictionary.cs" />
     <Compile Include="Markup\SharedThemeResourceDictionary.cs" />
-    <Compile Include="FieldNameMap.cs" />
-    <Compile Include="NotifyCollectionChangedEventArgsExtensions.cs" />
-    <Compile Include="SelectionChangedInternalEventArgs.cs" />
+    <Compile Include="%28Events%29\NotifyBatchCollectionChangedEventArgs.cs" />
+    <Compile Include="%28Events%29\NotifyCollectionChangedEventArgsExtensions.cs" />
+    <Compile Include="PropertyDescription.cs" />
+    <Compile Include="PropertyDescriptionRouteDictionary.cs" />
+    <Compile Include="PropertyDescriptionRoute.cs" />
+    <Compile Include="PropertyRoute.cs" />
+    <Compile Include="PropertyRouteBuilder.cs" />
+    <Compile Include="PropertyRouteParser.cs" />
+    <Compile Include="PropertyRouteSegment.Struct.cs" />
+    <Compile Include="RelativePoint.Struct.cs" />
+    <Compile Include="SortDirectionCycleCollection.cs" />
+    <Compile Include="%28Events%29\SelectionChangedInternalEventArgs.cs" />
     <Compile Include="SelectionRangePoint.cs" />
     <Compile Include="StringFormatDataTemplate.cs" />
+    <Compile Include="Utils\Collections\ArrayHelper.cs" />
     <Compile Include="Utils\Collections\DoubleFenwickTree.cs" />
     <Compile Include="Utils\Collections\FenwickTree.Generic.cs" />
+    <Compile Include="Utils\Collections\IBinaryTree.Generic.cs" />
+    <Compile Include="Utils\Collections\IBinaryTreeNode.Generic.cs" />
+    <Compile Include="Utils\Collections\IListExtensions.cs" />
+    <Compile Include="Utils\Collections\IListWrapper.cs" />
+    <Compile Include="Utils\Collections\IListWrapper.Generic.cs" />
+    <Compile Include="Utils\Collections\LLRBTree.Generic.cs" />
     <Compile Include="Utils\Collections\LongestIncreasingSubsequence.cs" />
+    <Compile Include="Utils\Collections\RSTree.Generic.cs" />
+    <Compile Include="Utils\Collections\RSTree1D.Generic.cs" />
+    <Compile Include="Utils\Collections\RSTree2D.Generic.cs" />
+    <Compile Include="Utils\Collections\RSTreeHelper.Generic.cs" />
+    <Compile Include="Utils\Collections\WeakDictionary.Generic.cs" />
     <Compile Include="Utils\PropertyHelper.cs" />
+    <Compile Include="Utils\Wpf\DeferredDisposable.cs" />
+    <Compile Include="Utils\Wpf\DeferredDisposableState.cs" />
+    <Compile Include="Utils\Wpf\DispatcherDisposable.cs" />
     <Compile Include="Utils\Wpf\DragDrop\AutoScrollManager.cs" />
+    <Compile Include="Utils\Wpf\DragDrop\DragSourceManagerBase.cs" />
+    <Compile Include="Utils\Wpf\DragDrop\DropTargetInfo.Struct.cs" />
+    <Compile Include="ValueChangeDataItemIndexerDescriptor.cs" />
     <Compile Include="ValueChangeDataItemPropertyDescriptor.cs" />
-    <Compile Include="NotifyRangeCollectionChangedEventArgs.cs" />
+    <Compile Include="%28Events%29\NotifyRangeCollectionChangedEventArgs.cs" />
     <Compile Include="ObjectComparer.cs" />
     <Compile Include="ObservableColumnCollection.cs" />
-    <Compile Include="FrameworkElementUnloadedEventManager.cs" />
-    <Compile Include="RequestBringIntoViewWeakEventManager.cs" />
-    <Compile Include="RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs" />
-    <Compile Include="ScrollChangedWeakEventManager.cs" />
+    <Compile Include="%28Events%29\FrameworkElementUnloadedEventManager.cs" />
+    <Compile Include="%28Events%29\RequestBringIntoViewWeakEventManager.cs" />
+    <Compile Include="%28Events%29\RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs" />
+    <Compile Include="%28Events%29\ScrollChangedWeakEventManager.cs" />
     <Compile Include="SelectedCellsStorage.cs" />
     <Compile Include="SelectionCellRange.cs" />
     <Compile Include="SelectionCellRangeCollection.cs" />
@@ -356,27 +373,10 @@
     <Compile Include="ToggleColumnSortCommand.cs" />
     <Compile Include="UnboundColumn.cs" />
     <Compile Include="SelectionInfo.cs" />
-    <Compile Include="DataGridSelectionChangedEvent.cs" />
-    <Compile Include="FilterCriteria\AndFilterCriterion.cs" />
+    <Compile Include="%28Events%29\DataGridSelectionChangedEvent.cs" />
     <Compile Include="%28enums%29\CompareResultEnum.cs" />
-    <Compile Include="FilterCriteria\RelationalFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\ContainsFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\CriterionDescriptorAttribute.cs" />
-    <Compile Include="FilterCriteria\DifferentThanFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\EqualToFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\FilterCriterion.cs" />
-    <Compile Include="%28enums%29\FilterOperatorPrecedenceEnum.cs" />
-    <Compile Include="FilterParser.cs" />
-    <Compile Include="FilterParserTestWindow.cs" />
-    <Compile Include="FilterParser_UnitTests.cs" />
-    <Compile Include="FilterCriteria\GreaterThanOrEqualToFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\GreaterThanFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\LessThanOrEqualToFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\LessThanFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\NotFilterCriterion.cs" />
-    <Compile Include="FilterCriteria\OrFilterCriterion.cs" />
-    <Compile Include="MaxGroupLevelsChangedEventManager.cs" />
-    <Compile Include="MaxSortLevelsChangedEventManager.cs" />
+    <Compile Include="%28Events%29\MaxGroupLevelsChangedEventManager.cs" />
+    <Compile Include="%28Events%29\MaxSortLevelsChangedEventManager.cs" />
     <Compile Include="UpdateColumnSortCommand.cs" />
     <Compile Include="Utils\WeakEventHandler.cs" />
     <Compile Include="Utils\Wpf\BreadthFirstSearchTreeTraversal.cs" />
@@ -386,29 +386,20 @@
     <Compile Include="Utils\Wpf\DragDrop\DragDropHelper.cs" />
     <Compile Include="Utils\Wpf\ITreeTraversal.cs" />
     <Compile Include="Utils\Wpf\ITreeTraversalStrategy.cs" />
-    <Compile Include="Automation\ColumnManagerCellAutomationPeer.cs" />
-    <Compile Include="Automation\ColumnManagerRowAutomationPeer.cs" />
-    <Compile Include="Automation\DataGridItemCellAutomationPeer.cs" />
-    <Compile Include="Automation\HeaderFooterItemAutomationPeer.cs" />
-    <Compile Include="Automation\AutomationQueryEvents.cs" />
-    <Compile Include="Automation\QueryAutomationIdRoutedEventArgs.cs" />
-    <Compile Include="Automation\QueryHelpTextRoutedEventArgs.cs" />
-    <Compile Include="Automation\QueryItemStatusRoutedEventArgs.cs" />
-    <Compile Include="Automation\QueryItemTypeRoutedEventArgs.cs" />
-    <Compile Include="Automation\QueryNameRoutedEventArgs.cs" />
     <Compile Include="Column.GenericContentTemplateSelectorResources.cs" />
-    <Compile Include="%28ForeignKeys%29\ForeignKeyContentControl.cs" />
     <Compile Include="Export\%28Clipboard%29\ClipboardExporterBase.cs" />
     <Compile Include="Export\%28Clipboard%29\CsvClipboardExporter.cs" />
     <Compile Include="Export\FormatSettingsBase.cs" />
+    <Compile Include="%28ForeignKeys%29\ForeignKeyContentControl.cs" />
     <Compile Include="%28ForeignKeys%29\ForeignKeyConfiguration.cs" />
     <Compile Include="GroupExtensions.cs" />
     <Compile Include="SharedListStruct.cs" />
-    <Compile Include="Views\%28ColumnVirtualization%29\FixedColumnCountChangedEventArgs.cs" />
-    <Compile Include="Views\%28ColumnVirtualization%29\FixedColumnCountEventManager.cs" />
+    <Compile Include="Views\%28ColumnVirtualization%29\VirtualizingCellCollectionUpdateRequiredEventArgs.cs" />
+    <Compile Include="Views\%28ColumnVirtualization%29\VirtualizingCellCollectionUpdateRequiredEventManager.cs" />
     <Compile Include="Views\%28ColumnVirtualization%29\IColumnInfoCollection.Generic.cs" />
     <Compile Include="Views\%28ColumnVirtualization%29\IColumnNameCollection.cs" />
     <Compile Include="Views\%28ColumnVirtualization%29\TableViewColumnVirtualizationManagerBase.cs" />
+    <Compile Include="Views\%28Enums%29\ColumnVirtualizationModeEnum.cs" />
     <Compile Include="Views\%28Enums%29\FlattenDetailBindingModeEnum.cs" />
     <Compile Include="Views\%28Enums%29\MasterDetailLayoutModeEnum.cs" />
     <Compile Include="Views\%28TableflowView%29\AnimatedDraggedElementAdorner.cs" />
@@ -429,29 +420,23 @@
     <Compile Include="Views\%28TableflowView%29\ZOrderHelper.cs" />
     <Compile Include="%28enums%29\NavigationBehaviorEnum.cs" />
     <Compile Include="%28Generator%29\GroupNamesTreeKey.cs" />
-    <Compile Include="%28Generator%29\NamesTreeGroupFinderVisitor.cs" />
-    <Compile Include="CellValidationErrorRoutedEvent.cs" />
+    <Compile Include="%28Events%29\CancelRoutedEvent.cs" />
+    <Compile Include="%28Events%29\CellValidationErrorRoutedEvent.cs" />
     <Compile Include="ContainerSizeState.cs" />
     <Compile Include="Converters\CurrencyConverter.cs" />
     <Compile Include="Converters\SynchronizedScrollViewerMultiConverter.cs" />
     <Compile Include="Converters\TypeToVisibilityConverter.cs" />
     <Compile Include="CurrencyManager.cs" />
-    <Compile Include="DeletingSelectedItemErrorRoutedEventArgs.cs" />
-    <Compile Include="DetailVisibilityChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DeletingSelectedItemErrorRoutedEvent.cs" />
+    <Compile Include="%28Events%29\DetailVisibilityChangedEventManager.cs" />
     <Compile Include="Export\%28Clipboard%29\XceedDataObject.cs" />
     <Compile Include="Export\CsvFormatSettings.cs" />
     <Compile Include="Export\FormatHelper.cs" />
     <Compile Include="RowValidationError.cs" />
-    <Compile Include="RowValidationErrorRoutedEvent.cs" />
+    <Compile Include="%28Events%29\RowValidationErrorRoutedEvent.cs" />
     <Compile Include="SelectedItemsStorage.cs" />
     <Compile Include="SelectionChanger.cs" />
     <Compile Include="SelectionManager.cs" />
-    <Compile Include="Automation\CellAutomationPeer.cs" />
-    <Compile Include="Automation\DataGridContextAutomationPeer.cs" />
-    <Compile Include="Automation\DataGridControlAutomationPeer.cs" />
-    <Compile Include="Automation\DataGridGroupAutomationPeer.cs" />
-    <Compile Include="Automation\DataGridItemAutomationPeer.cs" />
-    <Compile Include="Automation\RowAutomationPeer.cs" />
     <Compile Include="Utils\Collections\ReadOnlyDictionary.cs" />
     <Compile Include="Utils\XmlSerialization\XmlSerializableBaseType.cs" />
     <Compile Include="ValidationRules\CellContentBindingValidationRule.cs" />
@@ -472,20 +457,17 @@
     <Compile Include="Views\%28Enums%29\ColumnStretchModeEnum.cs" />
     <Compile Include="%28enums%29\ColumnWidthUnitTypeEnum.cs" />
     <Compile Include="%28enums%29\DataGridContextVisitorTypeEnum.cs" />
-    <Compile Include="%28Generator%29\ColumnActualWidthChangedHandler.cs" />
-    <Compile Include="%28Generator%29\ContainersRemovedEventArgs.cs" />
-    <Compile Include="%28Generator%29\ColumnActualWidthEventManager.cs" />
-    <Compile Include="ColumnVisibilePositionChangedEventArgs.cs" />
+    <Compile Include="%28Generator%29\ContainersRemovedEvent.cs" />
+    <Compile Include="%28Events%29\ColumnVisibilePositionChangedEventArgs.cs" />
     <Compile Include="ColumnWidth.cs" />
     <Compile Include="Converters\ColumnWidthConverter.cs" />
     <Compile Include="Converters\ValueToMaskedTextConverter.cs" />
     <Compile Include="DataGridBindingInfo.cs" />
-    <Compile Include="DataGridControlTemplateChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DataGridControlTemplateChangedEventManager.cs" />
     <Compile Include="IDataGridItemContainer.cs" />
     <Compile Include="ItemsHostUIElementCollection.cs" />
-    <Compile Include="RecyclingManager.cs" />
     <Compile Include="CellContentPresenter.cs" />
-    <Compile Include="SelectionChangedEventManager.cs" />
+    <Compile Include="%28Events%29\SelectionChangedEventManager.cs" />
     <Compile Include="Views\%28ColumnVirtualization%29\VirtualizingFixedCellSubPanel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -497,23 +479,22 @@
     <Compile Include="Views\IVirtualizingCellsHost.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ThemeChangedEventManager.cs" />
+    <Compile Include="%28Events%29\ThemeChangedEventManager.cs" />
     <Compile Include="Views\TableViewEndPageInfo.cs" />
     <Compile Include="Views\TableViewFullPageInfo.cs" />
     <Compile Include="Views\TableViewHeaderFooterPanel.cs" />
     <Compile Include="Views\%28Enums%29\ViewPropertyModeEnum.cs" />
     <Compile Include="%28Generator%29\WeakDataGridContextKey.cs" />
-    <Compile Include="%28Generator%29\DistinctValuesRequestedEventArgs.cs" />
-    <Compile Include="%28Generator%29\DistinctValuesRequestedEventManager.cs" />
-    <Compile Include="%28Generator%29\CurrentColumnChangedEventManager.cs" />
-    <Compile Include="%28Generator%29\CustomGeneratorChangedEventArgs.cs" />
+    <Compile Include="%28Events%29\DistinctValuesRequestedEvent.cs" />
+    <Compile Include="%28Events%29\DistinctValuesRequestedEventManager.cs" />
+    <Compile Include="%28Generator%29\CustomGeneratorChangedEvent.cs" />
     <Compile Include="%28Generator%29\DetailGeneratorNode.cs" />
     <Compile Include="%28Generator%29\SaveRestoreDataGridContextStateVisitor.cs" />
     <Compile Include="%28Generator%29\ItemContextVisitor.cs" />
     <Compile Include="%28Generator%29\SaveRestoreStateVisitor.cs" />
     <Compile Include="%28Generator%29\SaveRestoreGlobalStateVisitor.cs" />
     <Compile Include="%28Generator%29\SelectAllVisitor.cs" />
-    <Compile Include="AllowDetailToggleChangedEventManager.cs" />
+    <Compile Include="%28Events%29\AllowDetailToggleChangedEventManager.cs" />
     <Compile Include="Converters\TreeViewLineConverter.cs" />
     <Compile Include="DefaultDetailConfiguration.cs" />
     <Compile Include="DetailIndicator.cs" />
@@ -525,7 +506,7 @@
     <Compile Include="GroupByControl.cs" />
     <Compile Include="GroupByItem.cs" />
     <Compile Include="GroupConfigurationSelector.cs" />
-    <Compile Include="GroupConfigurationSelectorChangedEventManager.cs" />
+    <Compile Include="%28Events%29\GroupConfigurationSelectorChangedEventManager.cs" />
     <Compile Include="GroupingHelper.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -535,10 +516,8 @@
     <Compile Include="IDataGridContextVisitable.cs" />
     <Compile Include="IDataGridContextVisitor.cs" />
     <Compile Include="%28Generator%29\RangeSelectionVisitor.cs" />
-    <Compile Include="%28Generator%29\RealizedContainersRequestedEventArgs.cs" />
-    <Compile Include="%28Generator%29\RealizedContainersRequestedEventManager.cs" />
-    <Compile Include="%28Generator%29\VisibilityChangedEventManager.cs" />
-    <Compile Include="%28Generator%29\VisibleColumnsUpdatedEventManager.cs" />
+    <Compile Include="%28Events%29\RealizedContainersRequestedEvent.cs" />
+    <Compile Include="%28Events%29\RealizedContainersRequestedEventManager.cs" />
     <Compile Include="Converters\TypeToBooleanConverter.cs" />
     <Compile Include="DetailConfiguration.cs" />
     <Compile Include="DetailConfigurationCollection.cs" />
@@ -565,7 +544,6 @@
     <Compile Include="%28enums%29\DropMarkAlignmentEnum.cs" />
     <Compile Include="Views\%28Enums%29\DropMarkOrientationEnum.cs" />
     <Compile Include="%28enums%29\EditTriggersEnum.cs" />
-    <Compile Include="%28enums%29\AutoFilterModeEnum.cs" />
     <Compile Include="%28enums%29\GeneratorNodeTypeEnum.cs" />
     <Compile Include="%28enums%29\ItemScrollingBehaviorEnum.cs" />
     <Compile Include="%28enums%29\PagingBehaviorEnum.cs" />
@@ -581,7 +559,6 @@
     <Compile Include="%28Generator%29\HeadersFootersGeneratorNode.cs" />
     <Compile Include="%28Generator%29\ItemsGeneratorNode.cs" />
     <Compile Include="%28Generator%29\GroupHeaderFooterItemTemplate.cs" />
-    <Compile Include="ColumnReorderingEvent.cs" />
     <Compile Include="Converters\GreaterThanZeroConverter.cs" />
     <Compile Include="Converters\IndexToOddConverter.cs" />
     <Compile Include="Converters\InverseBooleanConverter.cs" />
@@ -591,12 +568,11 @@
     <Compile Include="Converters\StringFormatConverter.cs" />
     <Compile Include="%28CollectionView%29\DataGridDetailDescription.cs" />
     <Compile Include="%28CollectionView%29\DataGridDetailDescriptionCollection.cs" />
-    <Compile Include="DetailsChangedEventManager.cs" />
+    <Compile Include="%28Events%29\DetailsChangedEventManager.cs" />
     <Compile Include="GroupHeaderFooterCollection.cs" />
     <Compile Include="GroupConfiguration.cs" />
-    <Compile Include="ItemsSourceChangedEventManager.cs" />
+    <Compile Include="%28Events%29\ItemsSourceChangedEventManager.cs" />
     <Compile Include="ScrollTip.cs" />
-    <Compile Include="Stats\StatFunction.cs" />
     <Compile Include="Utils\Collections\EnumerableWrapper.cs" />
     <Compile Include="Utils\Collections\ObservableHashList.cs" />
     <Compile Include="Utils\Collections\ObservableList.cs" />
@@ -605,11 +581,8 @@
     <Compile Include="%28Generator%29\GeneratorNodeFactory.cs" />
     <Compile Include="%28Generator%29\GeneratorNodeHelper.cs" />
     <Compile Include="ValidationRules\SourceDataConverterValidationRule.cs" />
-    <Compile Include="Stats\StatFunctionCollection.cs" />
-    <Compile Include="Stats\StatFunctionComparer.cs" />
-    <Compile Include="Stats\StatResult.cs" />
     <Compile Include="Utils\Collections\IndexWeakHeapSort.cs" />
-    <Compile Include="Utils\Collections\ListChangedEventManager.cs" />
+    <Compile Include="%28Events%29\ListChangedEventManager.cs" />
     <Compile Include="Utils\Data\BoolDataStore.cs" />
     <Compile Include="Utils\Data\DataStore.cs" />
     <Compile Include="Utils\Data\ObjectDataStore.cs" />
@@ -623,23 +596,22 @@
     <Compile Include="Utils\Wpf\DragDrop\IDropTarget.cs" />
     <Compile Include="Utils\Wpf\Markup\XceedResourceDictionary.cs" />
     <Compile Include="Utils\Wpf\TreeHelper.cs" />
-    <Compile Include="ViewChangedEventManager.cs" />
+    <Compile Include="%28Events%29\ViewChangedEventManager.cs" />
     <Compile Include="Views\DataGridScrollViewer.cs" />
     <Compile Include="IDeferableScrollInfoRefresh.cs" />
     <Compile Include="Views\PassiveLayoutDecorator.cs" />
     <Compile Include="Views\ScrollingCellsDecorator.cs" />
     <Compile Include="Views\FixedCellSubPanel.cs" />
-    <Compile Include="Views\FixedColumnSplitter.cs" />
     <Compile Include="Views\%28Enums%29\SynchronizedScrollViewerPositionEnum.cs" />
     <Compile Include="%28enums%29\ValidationModeEnum.cs" />
     <Compile Include="ActivationGesture.cs" />
-    <Compile Include="AddingNewDataItemEvent.cs" />
+    <Compile Include="%28Events%29\AddingNewDataItemEventArgs.cs" />
     <Compile Include="AssemblyVersionInfo.cs" />
     <Compile Include="AssemblyVersionInfoCommon.cs" />
     <Compile Include="ActivationGestureCollection.cs" />
     <Compile Include="Markup\CellEditorBindingExtension.cs" />
     <Compile Include="CellState.cs" />
-    <Compile Include="CellValidatingEvent.cs" />
+    <Compile Include="%28Events%29\CellValidatingEventArgs.cs" />
     <Compile Include="CellValidationContext.cs" />
     <Compile Include="CellValidationError.cs" />
     <Compile Include="ValidationRules\CellValidationRule.cs" />
@@ -712,11 +684,8 @@
     <Compile Include="DataGridItemsHost.cs" />
     <Compile Include="Views\TableViewItemsHost.cs" />
     <Compile Include="VirtualizingCellCollection.cs" />
-    <Compile Include="VirtualizingCellCollectionChangedEventManager.cs" />
+    <Compile Include="%28Events%29\VirtualizingCellCollectionChangedEventManager.cs" />
     <Compile Include="VirtualizingStackPanel.cs" />
-    <Compile Include="VisibleColumnsUpdatedEventArgs.cs" />
-    <Compile Include="VisibleColumnsUpdatingEventManager.cs" />
-    <Compile Include="WatermarkAdorner.cs" />
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
@@ -832,12 +801,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="themes\Controls\FixedColumnSplitter.generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="themes\Controls\TableViewScrollViewer.generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1059,9 +1022,6 @@
   <ItemGroup>
     <EmbeddedResource Include="DataGridControl.icon.16x16.bmp" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Watermark.png" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.baml
new file mode 100644
index 00000000..31523c5c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.cs
new file mode 100644
index 00000000..586765b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.cs
@@ -0,0 +1,74 @@
+#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4BF34B07A3997687DC4B0F3552087A20"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Column.GenericContentTemplateSelectorResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.i.cs
new file mode 100644
index 00000000..586765b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Column.GenericContentTemplateSelectorResources.g.i.cs
@@ -0,0 +1,74 @@
+#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4BF34B07A3997687DC4B0F3552087A20"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/DefaultCellEditorSelector.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.baml
new file mode 100644
index 00000000..5d934bde
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.g.cs
new file mode 100644
index 00000000..4fb207c2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.g.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C724B9148F504B4EB1F16BC5194069E6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/DefaultCellEditorSelector.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.g.i.cs
new file mode 100644
index 00000000..4fb207c2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/DefaultCellEditorSelector.g.i.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C724B9148F504B4EB1F16BC5194069E6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.baml
new file mode 100644
index 00000000..eef820c5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.cs
new file mode 100644
index 00000000..3b00a9b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.cs
@@ -0,0 +1,73 @@
+#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "279A7DEB7D9B78065F1B639B85BD7024"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs
new file mode 100644
index 00000000..3b00a9b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Views/DataGridControlBackgroundBrushesResources.g.i.cs
@@ -0,0 +1,73 @@
+#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "279A7DEB7D9B78065F1B639B85BD7024"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..17326b53
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
@@ -0,0 +1,72 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Debug\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Debug\Xceed.Wpf.DataGrid.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Common\Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Column.GenericContentTemplateSelectorResources.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\DefaultCellEditorSelector.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Views\DataGridControlBackgroundBrushesResources.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Column.GenericContentTemplateSelectorResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\DefaultCellEditorSelector.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero\TableflowView.Aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero\Resources\Aero.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero\Resources\Aero.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero\Resources\TableView.Aero.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero\TableView.Aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\classic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Classic\TableflowView.Classic.systemcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Classic\Resources\Classic.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Classic\Resources\Classic.systemcolor.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Classic\Resources\Classic.systemcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Classic\TableView.Classic.systemcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Common\TableflowView.GridElementTemplates.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Common\Common.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Common\TableView.GridElementTemplates.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Controls\TableViewScrollViewer.generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableflowView.Luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableflowView.Luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableflowView.Luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Royale\TableflowView.Royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Windows7\Resources\TableView.Windows7.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Windows7\Resources\Windows7.Controls.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Windows7\Resources\Windows7.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Windows7\TableflowView.Windows7.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Windows7\TableView.Windows7.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero2\Resources\Aero2.normalcolor.Controls.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero2\Resources\Aero2.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero2\TableflowView.Aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Aero2\TableView.Aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Zune\TableflowView.Zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Zune\Resources\Zune.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Zune\Resources\Zune.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Zune\Resources\TableView.Zune.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Zune\TableView.Zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\Resources\Luna.homestead.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\Resources\Luna.metallic.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\Resources\Luna.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\Resources\Luna.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\Resources\TableView.Luna.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableView.Luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableView.Luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Luna\TableView.Luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Royale\Resources\Royale.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Royale\Resources\Royale.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Royale\Resources\TableView.Royale.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\themes\Royale\TableView.Royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Views\DataGridControlBackgroundBrushesResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\Xceed.Wpf.DataGrid.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid.g.resources
new file mode 100644
index 00000000..89fb1881
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.i.lref
new file mode 100644
index 00000000..4a2c6c1c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.i.lref
@@ -0,0 +1,60 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Views\DataGridControlBackgroundBrushesResources.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.lref
new file mode 100644
index 00000000..8ec5ce6a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/Xceed.Wpf.DataGrid_MarkupCompile.lref
@@ -0,0 +1,60 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Views\DataGridControlBackgroundBrushesResources.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.Resources.baml
new file mode 100644
index 00000000..f6482559
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.normalcolor.Resources.baml
new file mode 100644
index 00000000..aa6a76c6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/Aero.normalcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/TableView.Aero.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/TableView.Aero.Graphics.baml
new file mode 100644
index 00000000..866714a5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/Resources/TableView.Aero.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableView.Aero.normalcolor.baml
new file mode 100644
index 00000000..b16b4d21
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableView.Aero.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableflowView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableflowView.Aero.normalcolor.baml
new file mode 100644
index 00000000..6cc9cd47
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero/TableflowView.Aero.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml
new file mode 100644
index 00000000..a5e47fb7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml
new file mode 100644
index 00000000..4b40debb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml
new file mode 100644
index 00000000..d0654782
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableView.Aero2.normalcolor.baml
new file mode 100644
index 00000000..3764ab70
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableView.Aero2.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableflowView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableflowView.Aero2.normalcolor.baml
new file mode 100644
index 00000000..3dd12f41
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Aero2/TableflowView.Aero2.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.Resources.baml
new file mode 100644
index 00000000..967e0db3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Graphics.baml
new file mode 100644
index 00000000..8a0acf96
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Resources.baml
new file mode 100644
index 00000000..9e5e9257
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/Resources/Classic.systemcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableView.Classic.systemcolor.baml
new file mode 100644
index 00000000..73362864
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableView.Classic.systemcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableflowView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableflowView.Classic.systemcolor.baml
new file mode 100644
index 00000000..c33b3507
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Classic/TableflowView.Classic.systemcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Common.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Common.Resources.baml
new file mode 100644
index 00000000..e5a2fc86
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Common.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Graphics.baml
new file mode 100644
index 00000000..42ab4f66
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableView.GridElementTemplates.baml
new file mode 100644
index 00000000..cb9fb4cb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableView.GridElementTemplates.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableflowView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableflowView.GridElementTemplates.baml
new file mode 100644
index 00000000..1bbefa23
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Common/TableflowView.GridElementTemplates.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Controls/TableViewScrollViewer.generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Controls/TableViewScrollViewer.generic.baml
new file mode 100644
index 00000000..d82dfa01
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Controls/TableViewScrollViewer.generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.Resources.baml
new file mode 100644
index 00000000..f96184d6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.homestead.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.homestead.Resources.baml
new file mode 100644
index 00000000..23b661bf
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.homestead.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.metallic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.metallic.Resources.baml
new file mode 100644
index 00000000..57b0bd14
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.metallic.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.normalcolor.Resources.baml
new file mode 100644
index 00000000..c1c1a7a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/Luna.normalcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/TableView.Luna.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/TableView.Luna.Graphics.baml
new file mode 100644
index 00000000..f29797f6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/Resources/TableView.Luna.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.homestead.baml
new file mode 100644
index 00000000..de78c51d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.homestead.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.metallic.baml
new file mode 100644
index 00000000..645c0fcc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.metallic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.normalcolor.baml
new file mode 100644
index 00000000..a148a397
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableView.Luna.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.homestead.baml
new file mode 100644
index 00000000..d55ba837
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.homestead.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.metallic.baml
new file mode 100644
index 00000000..838ebab8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.metallic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.normalcolor.baml
new file mode 100644
index 00000000..91cd3d77
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Luna/TableflowView.Luna.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.Resources.baml
new file mode 100644
index 00000000..ea3b5db8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.normalcolor.Resources.baml
new file mode 100644
index 00000000..3a1e08a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/Royale.normalcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/TableView.Royale.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/TableView.Royale.Graphics.baml
new file mode 100644
index 00000000..8d0a4561
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/Resources/TableView.Royale.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableView.Royale.normalcolor.baml
new file mode 100644
index 00000000..01674323
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableView.Royale.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableflowView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableflowView.Royale.normalcolor.baml
new file mode 100644
index 00000000..b5150c5d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Royale/TableflowView.Royale.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/TableView.Windows7.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/TableView.Windows7.Graphics.baml
new file mode 100644
index 00000000..2ebc7bc7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/TableView.Windows7.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Controls.baml
new file mode 100644
index 00000000..9b3ad727
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Controls.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Resources.baml
new file mode 100644
index 00000000..ae2a88b2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/Resources/Windows7.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableView.Windows7.baml
new file mode 100644
index 00000000..a4521ca2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableView.Windows7.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableflowView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableflowView.Windows7.baml
new file mode 100644
index 00000000..c728f525
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Windows7/TableflowView.Windows7.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/TableView.Zune.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/TableView.Zune.Graphics.baml
new file mode 100644
index 00000000..8d0a4561
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/TableView.Zune.Graphics.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.Resources.baml
new file mode 100644
index 00000000..ea3b5db8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.normalcolor.Resources.baml
new file mode 100644
index 00000000..0273c91c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/Resources/Zune.normalcolor.Resources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableView.Zune.normalcolor.baml
new file mode 100644
index 00000000..8713c794
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableView.Zune.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableflowView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableflowView.Zune.normalcolor.baml
new file mode 100644
index 00000000..4e6246b4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/Zune/TableflowView.Zune.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero.normalcolor.baml
new file mode 100644
index 00000000..e57f3d16
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero2.normalcolor.baml
new file mode 100644
index 00000000..6afc9672
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/aero2.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/classic.baml
new file mode 100644
index 00000000..7be9451b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/classic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/generic.baml
new file mode 100644
index 00000000..e47dc989
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.homestead.baml
new file mode 100644
index 00000000..a1c867d6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.homestead.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.metallic.baml
new file mode 100644
index 00000000..99949821
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.metallic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.normalcolor.baml
new file mode 100644
index 00000000..64c23f54
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/luna.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/royale.normalcolor.baml
new file mode 100644
index 00000000..bfe3222b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/royale.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/zune.normalcolor.baml
new file mode 100644
index 00000000..696cd140
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Debug/themes/zune.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml
new file mode 100644
index 00000000..15c17697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml 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
new file mode 100644
index 00000000..586765b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs
@@ -0,0 +1,74 @@
+#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4BF34B07A3997687DC4B0F3552087A20"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..586765b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.i.cs
@@ -0,0 +1,74 @@
+#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4BF34B07A3997687DC4B0F3552087A20"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..d28b627f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml 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
new file mode 100644
index 00000000..4fb207c2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C724B9148F504B4EB1F16BC5194069E6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..4fb207c2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.i.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C724B9148F504B4EB1F16BC5194069E6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..7a072b61
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml 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
new file mode 100644
index 00000000..3b00a9b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs
@@ -0,0 +1,73 @@
+#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "279A7DEB7D9B78065F1B639B85BD7024"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..3b00a9b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.i.cs
@@ -0,0 +1,73 @@
+#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "279A7DEB7D9B78065F1B639B85BD7024"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..745fbbc5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
@@ -0,0 +1,72 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableflowView.Aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\TableView.Aero.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableView.Aero.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\classic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableflowView.Classic.systemcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableView.Classic.systemcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableflowView.GridElementTemplates.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Common.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableView.GridElementTemplates.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Controls\TableViewScrollViewer.generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableflowView.Royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\TableView.Windows7.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Controls.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableflowView.Windows7.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableView.Windows7.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Controls.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableflowView.Aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableView.Aero2.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableflowView.Zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\TableView.Zune.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableView.Zune.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.homestead.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.metallic.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\TableView.Luna.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.normalcolor.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.Resources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\TableView.Royale.Graphics.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableView.Royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..b253814a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.i.lref
new file mode 100644
index 00000000..99df69fc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.i.lref
@@ -0,0 +1,60 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Views\DataGridControlBackgroundBrushesResources.xaml;;
+
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
new file mode 100644
index 00000000..07f75d15
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref
@@ -0,0 +1,60 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..0603ffc7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml 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
new file mode 100644
index 00000000..eb8f1153
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml 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
new file mode 100644
index 00000000..c83ed63d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml 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
new file mode 100644
index 00000000..eb2e91ed
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml 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
new file mode 100644
index 00000000..bc644eec
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml 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
new file mode 100644
index 00000000..97150b83
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml 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
new file mode 100644
index 00000000..ad414106
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml 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
new file mode 100644
index 00000000..8cc0f3c3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml 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
new file mode 100644
index 00000000..d62bbce0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml 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
new file mode 100644
index 00000000..6797fbca
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml 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
new file mode 100644
index 00000000..447acf54
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml 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
new file mode 100644
index 00000000..75ad0c83
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml 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
new file mode 100644
index 00000000..9fec8877
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml 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
new file mode 100644
index 00000000..ab30dbe4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml 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
new file mode 100644
index 00000000..7e65f1fa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml 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
new file mode 100644
index 00000000..298df624
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml 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
new file mode 100644
index 00000000..e077ab60
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml 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
new file mode 100644
index 00000000..582ead23
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml 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
new file mode 100644
index 00000000..2f6097f6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml 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
new file mode 100644
index 00000000..eb644439
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml 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
new file mode 100644
index 00000000..37975b80
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml 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
new file mode 100644
index 00000000..6f8085d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml 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
new file mode 100644
index 00000000..156ef86a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml 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
new file mode 100644
index 00000000..1b551fd9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml 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
new file mode 100644
index 00000000..87be0979
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml 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
new file mode 100644
index 00000000..095e81cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml 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
new file mode 100644
index 00000000..293441a8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml 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
new file mode 100644
index 00000000..3efca3c2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml 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
new file mode 100644
index 00000000..e7bb1b53
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml 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
new file mode 100644
index 00000000..92ee8a56
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml 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
new file mode 100644
index 00000000..338df82b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml 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
new file mode 100644
index 00000000..1d2e3af2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml 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
new file mode 100644
index 00000000..b3c0ad68
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml 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
new file mode 100644
index 00000000..92c2f9d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml 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
new file mode 100644
index 00000000..a6708314
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml 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
new file mode 100644
index 00000000..96cc37f1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml 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
new file mode 100644
index 00000000..014802a8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml 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
new file mode 100644
index 00000000..d1a36d96
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml 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
new file mode 100644
index 00000000..09aef6f1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml 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
new file mode 100644
index 00000000..0fa0a43b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml 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
new file mode 100644
index 00000000..18e0caf4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml 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
new file mode 100644
index 00000000..92c2f9d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml 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
new file mode 100644
index 00000000..1d2e3af2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml 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
new file mode 100644
index 00000000..891d025b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml 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
new file mode 100644
index 00000000..817d95e3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml 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
new file mode 100644
index 00000000..416aa34f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml 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
new file mode 100644
index 00000000..106f53eb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml 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
new file mode 100644
index 00000000..63f96b2a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml 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
new file mode 100644
index 00000000..f23f028e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml 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
new file mode 100644
index 00000000..813bd33c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml 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
new file mode 100644
index 00000000..24d399bd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml 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
new file mode 100644
index 00000000..f5968676
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml 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
new file mode 100644
index 00000000..3afcac81
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml 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
new file mode 100644
index 00000000..30714456
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml 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
new file mode 100644
index 00000000..6b41d2cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
index c53675e1..ccc95ca7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
@@ -14,12 +14,29 @@
 
   **********************************************************************************-->
 
+<!-- =======================================================================
+  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
+  Copyright (c) 2007-2017 Xceed Software Inc.
+
+  [Aero.normalcolor.Resources.xaml]
+
+  This file is part of the Xceed DataGrid for WPF product. The use and
+  distribution of this Customization Code is subject to the terms
+  and conditions refering to "Customization Code" that are specified in
+  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
+======================================================================= -->
+
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
                     xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
                     xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
 
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="Navy" />
 
@@ -35,6 +52,50 @@
    <SolidColorBrush x:Key="warningForegroundBrush"
                     Color="Black" />
 
+   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
+   <LinearGradientBrush x:Key="hotInnerRowBackgroundBrush"
+                        StartPoint="0.5,1"
+                        EndPoint="0.5,0">
+      <GradientStop Offset="1"
+                    Color="#F3FAFD" />
+      <GradientStop Offset="0"
+                    Color="#E2F3FC" />
+   </LinearGradientBrush>
+
+   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
+   <LinearGradientBrush x:Key="hotSelectionInnerRowBackgroundBrush"
+                        StartPoint="0.5,1"
+                        EndPoint="0.5,0">
+      <GradientStop Offset="1"
+                    Color="#E8F6FD" />
+      <GradientStop Offset="0"
+                    Color="#C4E8FA" />
+   </LinearGradientBrush>
+
+   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
+   <LinearGradientBrush x:Key="inactiveSelectionInnerRowBackgroundBrush"
+                        StartPoint="0.5,1"
+                        EndPoint="0.5,0">
+      <GradientStop Offset="1"
+                    Color="#F8F8F8" />
+      <GradientStop Offset="0"
+                    Color="#E5E5E5" />
+   </LinearGradientBrush>
+
+   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
+   <LinearGradientBrush x:Key="rowSelectorHotBackgroundBrush"
+                        StartPoint="0,0.5"
+                        EndPoint="1,0.5">
+      <GradientStop Offset="0"
+                    Color="#F2F9FC" />
+      <GradientStop Offset="0.956"
+                    Color="#DDEEF7" />
+   </LinearGradientBrush>
+
+   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
+   <SolidColorBrush x:Key="hotSelectionRowBorderBrush"
+                    Color="#B6E6FB" />
+
 
    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
    <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
@@ -427,7 +488,7 @@
     * TEMPLATE: ScrollTip
     ************************** -->
    <ControlTemplate x:Key="scrollTipTemplate"
-                    TargetType="{x:Type local:ScrollTip}">
+                    TargetType="local:ScrollTip">
 
       <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
             HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
index ca80e719..c345fcf3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
@@ -49,35 +49,33 @@
       </Canvas>
    </DataTemplate>
 
-   <DataTemplate x:Key="descendingSortGlyph">
-      <Canvas Height="4"
-              Width="7">
-         <Path Opacity="1"
-               Data="M 3.59375,4 C3.59375,4 7,0.15625 7,0.15625 7,0.15625 0,0.15625 0,0.15625 0,0.15625 3.59375,4 3.59375,4 z">
-            <Path.Fill>
-               <LinearGradientBrush
-                  StartPoint="0,-0.040"
-                  EndPoint="0.669,-0.040">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop Offset="0" 
-                                      Color="#3D6F89"/>
-                        <GradientStop 
-                           Offset="0.961"
-                           Color="#A6D8F3" />
-                     </GradientStopCollection>
-                  </LinearGradientBrush.GradientStops>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path Opacity="1"
-               Data="M 0.5,0.5 C0.5,0.5 3.5,3.5 3.5,3.5 "
-               Stroke="#406274"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-   <DataTemplate x:Key="collapseGroupGlyph">
+  <DataTemplate x:Key="descendingSortGlyph">
+    <Canvas Height="4"
+            Width="7">
+      <Path Opacity="1"
+            Data="M 3.59375,4 C3.59375,4 7,0.15625 7,0.15625 7,0.15625 0,0.15625 0,0.15625 0,0.15625 3.59375,4 3.59375,4 z">
+        <Path.Fill>
+          <LinearGradientBrush StartPoint="0,-0.040"
+                               EndPoint="0.669,-0.040">
+            <LinearGradientBrush.GradientStops>
+              <GradientStopCollection>
+                <GradientStop Offset="0"
+                              Color="#3D6F89" />
+                <GradientStop Offset="0.961"
+                              Color="#A6D8F3" />
+              </GradientStopCollection>
+            </LinearGradientBrush.GradientStops>
+          </LinearGradientBrush>
+        </Path.Fill>
+      </Path>
+      <Path Opacity="1"
+            Data="M 0.5,0.5 C0.5,0.5 3.5,3.5 3.5,3.5 "
+            Stroke="#406274"
+            StrokeThickness="1" />
+    </Canvas>
+  </DataTemplate>
+
+  <DataTemplate x:Key="collapseGroupGlyph">
       <Grid Height="15"
             Width="15">
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
index b511b329..dee627b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
@@ -41,6 +41,14 @@
    <!-- Resources specific to this View/Theme/ColorScheme                   -->
    <!-- =================================================================== -->
 
+   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
+                            InverseValue="True" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
+
    <SolidColorBrush x:Key="hotRowBorderBrush"
                     Color="#CDEFFE" />
 
@@ -413,11 +421,102 @@
    <ControlTemplate x:Key="tableViewRowTemplate"
                     TargetType="local:Row">
 
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
+                                                    Grid.Column="0" />
+
+         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+                       whenever this Row is part of a group. -->
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1" />
+
+         <Border x:Name="outerBackground"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 views:TableView.CanScrollHorizontally="False" />
+
+         <Border x:Name="rowBorder"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 BorderThickness="1"
+                 CornerRadius="3"
+                 views:TableView.CanScrollHorizontally="False">
+            <Border x:Name="innerBackground"
+                    BorderThickness="1"
+                    CornerRadius="2" />
+         </Border>
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+         <views:FixedCellPanel x:Name="PART_CellsHost"
+                               Grid.Column="3"
+                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                               Margin="{TemplateBinding BorderThickness}" />
+
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <!-- This trigger is used to display Mouse Over look -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="rowBorder"
+                    Property="BorderBrush"
+                    Value="{StaticResource hotRowBorderBrush}" />
+            <Setter TargetName="outerBackground"
+                    Property="Background"
+                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
+            <Setter TargetName="innerBackground"
+                    Property="Background"
+                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
+
+         </MultiDataTrigger>
+
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+   <ControlTemplate x:Key="tableViewDataRowTemplate"
+                    TargetType="local:DataRow">
 
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -458,25 +557,16 @@
                     CornerRadius="2" />
          </Border>
 
-         <!-- Button that is used to expand/collapse the group. -->
          <Button x:Name="detailsToggle"
+                 Grid.Column="2"
                  Template="{StaticResource detailsExpanderButtonTemplate}"
                  VerticalAlignment="Top"
-                 Grid.Column="2"
                  Margin="2"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
                  OverridesDefaultStyle="True"
                  Focusable="False"
                  Visibility="Collapsed"
                  views:TableView.CanScrollHorizontally="False" />
 
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <views:FixedCellPanel x:Name="PART_CellsHost"
                                Grid.Column="3"
@@ -493,27 +583,21 @@
          <!-- This trigger is used to display the Active Selection look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="True" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource selectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
@@ -523,30 +607,23 @@
          <!-- This trigger is used to display the Inactive Selection look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="False" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
                           Value="False" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
@@ -556,23 +633,18 @@
          <!-- This trigger is used to display Mouse Over look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource hotRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource hotOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource hotInnerRowBackgroundBrush}" />
@@ -582,26 +654,20 @@
          <!-- This trigger is used to display Mouse Over + Selected look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource hotSelectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
@@ -651,11 +717,6 @@
    <ControlTemplate x:Key="tableViewColumnManagerRowTemplate"
                     TargetType="local:ColumnManagerRow">
 
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
-
       <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
@@ -682,7 +743,7 @@
                  Padding="{TemplateBinding Padding}" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
                                                     views:TableView.CanScrollHorizontally="False"
                                                     Background="{TemplateBinding Background}" />
@@ -691,17 +752,17 @@
                                         views:TableView.CanScrollHorizontally="False"
                                         Background="{TemplateBinding Background}" />
 
-         <!-- Button that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <Decorator x:Name="indentationDecorator"
@@ -715,25 +776,6 @@
          </Decorator>
 
       </Grid>
-      <ControlTemplate.Triggers>
-         <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
 
    </ControlTemplate>
 
@@ -1003,12 +1045,6 @@
 
          </MultiDataTrigger>
 
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When the trigger is not active anymore, default binding
-              is restored automatically. -->
-
          <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
                       Value="False">
             <Setter Property="Visibility"
@@ -1022,6 +1058,7 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
+    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
     <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
    <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
@@ -1114,16 +1151,6 @@
                     Value="19,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
               depending on the ParentColumn's SortDirection. -->
 
@@ -1265,12 +1292,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1278,7 +1299,6 @@
    <!--**************************
     * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -1293,7 +1313,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
                     Background="{TemplateBinding Background}"
@@ -2161,6 +2181,10 @@
    <Style x:Key="tableViewAeroNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewAeroNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -2277,6 +2301,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
index b506c1c9..98b1c01d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
@@ -37,6 +37,15 @@
 
    </ResourceDictionary.MergedDictionaries>
 
+   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
+                            InverseValue="True" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
+
    <!-- =================================================================== -->
    <!-- Resources specific to this View/Theme/ColorScheme                   -->
    <!-- =================================================================== -->
@@ -620,9 +629,113 @@
    <ControlTemplate x:Key="tableflowViewRowTemplate"
                     TargetType="local:Row">
 
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
+                                                    Grid.Column="0" />
+
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1" />
+
+         <Border x:Name="outerBackground"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 views:TableView.CanScrollHorizontally="False" />
+
+         <Border x:Name="rowBorder"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 BorderThickness="1"
+                 CornerRadius="3"
+                 views:TableView.CanScrollHorizontally="False">
+            <Border x:Name="innerBackground"
+                    BorderThickness="1"
+                    CornerRadius="2" />
+         </Border>
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+         <views:FixedCellPanel x:Name="PART_CellsHost"
+                               Grid.Column="3"
+                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                               Margin="{TemplateBinding BorderThickness}" />
+
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <!-- This trigger is used to display Mouse Over look -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="rowBorder"
+                    Property="BorderBrush"
+                    Value="{StaticResource hotRowBorderBrush}" />
+            <Setter TargetName="outerBackground"
+                    Property="Background"
+                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
+            <Setter TargetName="innerBackground"
+                    Property="Background"
+                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
+
+         </MultiDataTrigger>
+
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AllowDetailToggle}"
+                          Value="True" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="detailsToggle"
+                    Property="Visibility"
+                    Value="Hidden" />
+
+         </MultiDataTrigger>
+
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+   <ControlTemplate x:Key="tableflowViewDataRowTemplate"
+                    TargetType="local:DataRow">
 
       <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
@@ -665,25 +778,17 @@
                     CornerRadius="2" />
          </Border>
 
-         <!-- Button that is used to expand/collapse the group. -->
+         <!-- Button that is used to expand/collapse the details. -->
          <Button x:Name="detailsToggle"
+                 Grid.Column="2"
                  Template="{StaticResource detailsExpanderButtonTemplate}"
                  VerticalAlignment="Top"
-                 Grid.Column="2"
                  Margin="2"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
                  OverridesDefaultStyle="True"
                  Focusable="False"
                  Visibility="Collapsed"
                  views:TableView.CanScrollHorizontally="False" />
 
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <views:FixedCellPanel x:Name="PART_CellsHost"
                                Grid.Column="3"
@@ -700,27 +805,21 @@
          <!-- This trigger is used to display the Active Selection look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="True" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource selectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
@@ -730,30 +829,23 @@
          <!-- This trigger is used to display the Inactive Selection look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="False" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
                           Value="False" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
@@ -763,23 +855,18 @@
          <!-- This trigger is used to display Mouse Over look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource hotRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource hotOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource hotInnerRowBackgroundBrush}" />
@@ -789,26 +876,20 @@
          <!-- This trigger is used to display Mouse Over + Selected look -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rowBorder"
                     Property="BorderBrush"
                     Value="{StaticResource hotSelectionRowBorderBrush}" />
-
             <Setter TargetName="outerBackground"
                     Property="Background"
                     Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-
             <Setter TargetName="innerBackground"
                     Property="Background"
                     Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
@@ -858,12 +939,6 @@
    <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
                     TargetType="local:ColumnManagerRow">
 
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -889,7 +964,7 @@
                  Padding="{TemplateBinding Padding}" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
                                                     views:TableView.CanScrollHorizontally="False"
                                                     Background="{TemplateBinding Background}" />
@@ -898,17 +973,17 @@
                                         views:TableView.CanScrollHorizontally="False"
                                         Background="{TemplateBinding Background}" />
 
-         <!-- Button that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <Decorator x:Name="indentationDecorator"
@@ -922,25 +997,6 @@
          </Decorator>
 
       </Grid>
-      <ControlTemplate.Triggers>
-         <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
 
    </ControlTemplate>
 
@@ -1210,12 +1266,6 @@
 
          </MultiDataTrigger>
 
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When the trigger is not active anymore, default binding
-              is restored automatically. -->
-
          <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
                       Value="False">
             <Setter Property="Visibility"
@@ -1229,6 +1279,7 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
+    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
     <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
    <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
@@ -1322,16 +1373,6 @@
                     Value="19,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
               depending on the ParentColumn's SortDirection. -->
 
@@ -1473,12 +1514,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1486,7 +1521,6 @@
    <!--**************************
     * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableflowViewGroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -1501,7 +1535,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
                     Background="{TemplateBinding Background}"
@@ -1591,7 +1625,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border x:Name="outerBorder"
@@ -2350,7 +2384,6 @@
    <!--**************************
     * STYLE: RowSelector 
     ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
    <Style x:Key="tableflowViewAeroNormalColorRowSelectorStyle"
           TargetType="local:RowSelector">
 
@@ -2487,6 +2520,10 @@
    <Style x:Key="tableflowViewAeroNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewAeroNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -2602,6 +2639,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2674,7 +2714,7 @@
               Value="Transparent" />
 
       <Setter Property="BorderThickness"
-              Value="1" />      
+              Value="1" />
 
       <Setter Property="Padding"
               Value="{StaticResource cellPadding}" />
@@ -3173,4 +3213,5 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlItemStyle}" />
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml
index ad565c3e..770c765a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml
@@ -50,6 +50,13 @@
               Background="{TemplateBinding Background}" />
    </ControlTemplate>
 
+   <!--These Brushes are the basic light and dark borders for the controls-->
+   <SolidColorBrush x:Key="basicWhiteBorderBrush"
+                    Color="White" />
+
+   <SolidColorBrush x:Key="basicBlackBorderBrush"
+                    Color="Black" />
+
    <!-- Used for Checkmark, Radio button, TreeViewItem, Expander ToggleButton glyphs -->
    <SolidColorBrush x:Key="aero2NormalColorGlyphBrush"
                     Color="#444" />
@@ -476,7 +483,7 @@
                              Property="Background"
                              Value="{StaticResource checkBoxBorderPressedBackgroundBrush}" />
                   </Trigger>
-                     <Trigger Property="IsChecked"
+                  <Trigger Property="IsChecked"
                            Value="true">
                      <Setter TargetName="CheckMark"
                              Property="Visibility"
@@ -1064,7 +1071,7 @@
       <Setter Property="Background"
               Value="#FFD1ECFF" />
 
-     <Setter Property="Template">
+      <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ScrollBar}">
                <Grid x:Name="GridRoot"
@@ -1684,8 +1691,8 @@
 
                            <!-- The StackPanel is used to display the children by setting IsItemsHost to be True -->
                            <StackPanel IsItemsHost="True"
-                                       KeyboardNavigation.DirectionalNavigation="Contained" 
-                                       TextElement.Foreground="White"/>
+                                       KeyboardNavigation.DirectionalNavigation="Contained"
+                                       TextElement.Foreground="White" />
 
                         </ScrollViewer>
 
@@ -1887,11 +1894,12 @@
       </Setter>
 
       <Style.Triggers>
-         <Trigger Property="IsVisible" Value="True">
+         <Trigger Property="IsVisible"
+                  Value="True">
             <Setter Property="HorizontalContentAlignment"
-                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
             <Setter Property="VerticalContentAlignment"
-                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
          </Trigger>
       </Style.Triggers>
    </Style>
@@ -1944,7 +1952,8 @@
           TargetType="{x:Type RepeatButton}">
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}"><Border Background="Transparent">
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="Transparent">
                   <ContentPresenter x:Name="glyphZone">
                      <ContentPresenter.Content>
                         <Canvas x:Name="leftArrowCanvas"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml
index e67ffca5..fca8aac1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml
@@ -16,10 +16,24 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
 
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <SolidColorBrush x:Key="defaultBackgroundBrush"
+                    Color="White" />
+   <SolidColorBrush x:Key="defaultForegroundBrush"
+                    Color="#FF151C55" />
+
+   <SolidColorBrush x:Key="warningBackgroundBrush"
+                    Color="#FFC400" />
+
+   <SolidColorBrush x:Key="warningForegroundBrush"
+                    Color="Black" />
 
    <LinearGradientBrush x:Key="errorBackgroundBrush"
                         EndPoint="0.5,1"
@@ -44,24 +58,24 @@
     * TEMPLATE: ScrollTip
     ************************** -->
    <ControlTemplate x:Key="scrollTipTemplate"
-                    TargetType="{x:Type local:ScrollTip}">
+                    TargetType="local:ScrollTip">
 
-        <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
+      <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
             HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
 
-            <Border BorderThickness="1,1,1,1"
+         <Border BorderThickness="1,1,1,1"
                  BorderBrush="{TemplateBinding BorderBrush}"
                  Background="{TemplateBinding Background}">
 
-                <ContentPresenter VerticalAlignment="Center"
+            <ContentPresenter VerticalAlignment="Center"
                               HorizontalAlignment="Right"
                               Margin="5"
                               TextElement.Foreground="{TemplateBinding TextElement.Foreground}"
                               Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Border>
-        </Grid>
-    </ControlTemplate>
+         </Border>
+      </Grid>
+   </ControlTemplate>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml
index 317bdc16..21a5f6d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml
@@ -25,7 +25,7 @@
       <markup:DataGridThemeResourceDictionary Source="../../Common/Graphics.xaml" />
 
       <!-- Needs Windows8 Resources -->
-      <markup:DataGridThemeResourceDictionary Source="Aero2.NormalColor.Resources.xaml" />
+      <markup:DataGridThemeResourceDictionary Source="Aero2.normalColor.Resources.xaml" />
 
    </ResourceDictionary.MergedDictionaries>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml
index 8300c726..08870b22 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml
@@ -14,6 +14,17 @@
 
   **********************************************************************************-->
 
+<!-- =======================================================================
+  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
+  Copyright (c) 2007-2017 Xceed Software Inc.
+
+  [TableView.Aero2.normalcolor.xaml]
+
+  This file is part of the Xceed DataGrid for WPF product. The use and
+  distribution of this Customization Code is subject to the terms
+  and conditions refering to "Customization Code" that are specified in
+  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
+======================================================================= -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:s="clr-namespace:System;assembly=mscorlib"
@@ -34,12 +45,1755 @@
       <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
 
       <!-- Control Styles used in the Grid Control -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.normalcolor.Controls.xaml" />
 
    </ResourceDictionary.MergedDictionaries>
 
+   <SolidColorBrush x:Key="warningBackgroundBrush"
+                    Color="#FFC400" />
+
+   <SolidColorBrush x:Key="warningForegroundBrush"
+                    Color="Black" />
+
+   <SolidColorBrush x:Key="gridLineBrush"
+                    Color="Transparent" />
+
+   <!-- ****************************************** -->
+   <!-- Windows8 Font                              -->
+   <!-- ****************************************** -->
+
+   <FontFamily x:Key="defaultFontFamily">Segoe UI</FontFamily>
+   <s:Double x:Key="defaultFontSize">12</s:Double>
+
+   <!-- ****************************************** -->
+   <!--  Windows8 Color Scheme                     -->
+   <!-- ****************************************** -->
+
+   <!-- Default -->
+   <SolidColorBrush x:Key="defaultBackgroundBrush"
+                    Color="White" />
+   <SolidColorBrush x:Key="defaultForegroundBrush"
+                    Color="#FF151C55" />
+
+   <!-- DataGridControl -->
+   <SolidColorBrush x:Key="gridBorderBrush"
+                    Color="#FF5284BC" />
+
+   <!-- ColumnManagerCell -->
+   <LinearGradientBrush x:Key="columnManagerCellBackgroundBrush"
+                        StartPoint="0,0"
+                        EndPoint="0,1">
+      <GradientStop Color="#FFF0F0F0"
+                    Offset="0.0" />
+      <GradientStop Color="#FFE5E5E5"
+                    Offset="1.0" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="columnManagerCellMouseOverBackgroundBrush"
+                    Color="#FFBEE6FD" />
+   <SolidColorBrush x:Key="columnManagerCellPressedBackgroundBrush"
+                    Color="#FFC4E5F6" />
+
+   <!-- DataRow -->
+   <SolidColorBrush x:Key="rowBackgroundBrush"
+                    Color="White" />
+   <SolidColorBrush x:Key="rowAlternatingBackgroundBrush"
+                    Color="#FFF7F7F7" />
+   <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
+                    Color="#FFCBE8F6" />
+   <SolidColorBrush x:Key="rowMouseOverBackgroundBrush"
+                    Color="#FFE5F3FB" />
+   <SolidColorBrush x:Key="rowMouseOverSelectionBackgroundBrush"
+                    Color="#FFD1E8FF" />
+   <SolidColorBrush x:Key="rowInactiveSelectionBackgroundBrush"
+                    Color="#FFF7F7F7" />
+
+   <!--<SolidColorBrush x:Key="rowSelectionBorderBrush" Color="#FF26A0DA" />-->
+   <!--<SolidColorBrush x:Key="rowMouseOverBorderBrush" Color="#FF70C0E7" />-->
+   <!--<SolidColorBrush x:Key="rowMouseOverSelectionBorderBrush" Color="#FF66A7E8" />-->
+   <!--<SolidColorBrush x:Key="rowInactiveSelectionBorderBrush" Color="#FFDEDEDE" />-->
+
+   <!-- Groups -->
+   <SolidColorBrush x:Key="groupByControlBackgroundBrush"
+                    Color="Gray" />
+   <SolidColorBrush x:Key="groupLevelIndicatorBackgroundBrush"
+                    Color="#FFDFE7F2" />
+   <LinearGradientBrush x:Key="groupHeaderBackgroundBrush"
+                        StartPoint="0,0"
+                        EndPoint="0,1">
+      <GradientStop Color="#FFE9F1FC"
+                    Offset="0.0" />
+      <GradientStop Color="#FFDFE7F2"
+                    Offset="1.0" />
+   </LinearGradientBrush>
+
+   <!-- =================================================================== -->
+   <!-- Templates specific to this View/Theme/ColorScheme                   -->
+   <!-- =================================================================== -->
+
+   <!--**************************
+    * TEMPLATE: RowSelector 
+    ************************** -->
+   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
+                    TargetType="local:RowSelector">
+
+      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
+      <Grid>
+
+         <Border Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}">
+
+            <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
+            <Grid>
+
+               <!-- This Border is used to apply the Padding around the ContentPresenter.
+                    We cannot use the ContentPresenter's Margin for this purpose because
+                    the Margin is used to represent the Pressed state. -->
+               <Border Padding="{TemplateBinding Padding}">
+
+                  <ContentPresenter x:Name="contentPresenter"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+               </Border>
+
+               <!-- Bottom Line -->
+               <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Top"
+                          Height="1"
+                          Margin="2,0,2,0" />
+
+               <!-- Top Line -->
+               <Rectangle x:Name="bottomBorder"
+                          Fill="LightGray"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Bottom"
+                          Height="1"
+                          Margin="2,0,2,0" />
+            </Grid>
+         </Border>
+
+         <!-- Thumb that is used to resize the Row. -->
+         <Thumb x:Name="PART_RowResizerThumb"
+                Style="{StaticResource invisibleThumbStyle}"
+                VerticalAlignment="Bottom" />
+
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
+                      Value="True">
+
+            <Setter TargetName="bottomBorder"
+                    Property="Fill"
+                    Value="LightGray" />
+
+         </DataTrigger>
+
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: ColumnManagerCell 
+    ************************** -->
+   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
+
+   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
+                    TargetType="local:ColumnManagerCell">
+      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
+      <Grid>
+
+         <Border x:Name="rootBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}">
+
+            <Grid>
+
+               <Rectangle Fill="LightGray"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
+
+               <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                          HorizontalAlignment="Right"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
+
+               <DockPanel>
+                  <Border x:Name="thumbToggleBackgroundBorder"
+                          DockPanel.Dock="Right">
+
+                     <Grid>
+
+                        <Border x:Name="toggleDelimeterBorder"
+                                BorderBrush="{StaticResource defaultForegroundBrush}"
+                                BorderThickness="1,0,0,0"
+                                Margin="0,4,0,4"
+                                Background="Transparent"
+                                Visibility="Collapsed">
+
+                           <Border x:Name="toggleDelimeterBorder2"
+                                   BorderBrush="LightGray"
+                                   BorderThickness="1,0,0,0"
+                                   Margin="0,0,0,0"
+                                   Background="Transparent"
+                                   Visibility="Collapsed">
+
+                           </Border>
+                        </Border>
+
+                        <Border x:Name="borderToggleBackground"
+                                Background="{TemplateBinding Background}"
+                                Margin="1,0,1,0" />
+
+                        <ToggleButton x:Name="toggleButton"
+                                      Focusable="False"
+                                      VerticalAlignment="Stretch"
+                                      Visibility="Collapsed"
+                                      Margin="2,0,0,0" />
+                     </Grid>
+                  </Border>
+
+                  <Border Background="{TemplateBinding Background}">
+
+                     <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
+                     <Grid>
+
+                        <Border Padding="{TemplateBinding Padding}">
+
+                           <Grid x:Name="contentPanel"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+
+                              <!-- Same ContentPresenter as in the base Cell Template. -->
+                              <local:CellContentPresenter x:Name="PART_CellContentPresenter"
+                                                          Grid.Column="0" />
+
+                              <!-- ContentPresenter that is used to display the sort glyph.
+                                                We explicitely set its Content property to Null to prevent the XAML parser
+                                                from implicitely setting it to its TemplatedParent's Content. -->
+                              <ContentPresenter x:Name="sortGlyphPresenter"
+                                                Grid.Column="1"
+                                                Content="{x:Null}"
+                                                ContentTemplate="{x:Null}" />
+                           </Grid>
+                        </Border>
+                     </Grid>
+                  </Border>
+               </DockPanel>
+            </Grid>
+         </Border>
+
+         <!-- Thumb that is used to resize the Column. -->
+         <Thumb x:Name="PART_ColumnResizerThumbLeft"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Left" />
+
+         <!-- Thumb that is used to resize the Column. -->
+         <Thumb x:Name="PART_ColumnResizerThumb"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Right" />
+
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <!-- The following triggers allows the content to correctly align to the center when the mouse is over the ColumnManagerCell and the HorizontalContentAlignment is Center -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Value="Visible"
+                          Binding="{Binding ElementName=toggleButton, Path=Visibility}" />
+               <Condition Value="Center"
+                          Binding="{Binding RelativeSource={RelativeSource Self},
+                        Path=HorizontalContentAlignment}" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="PART_CellContentPresenter"
+                    Property="Margin"
+                    Value="16,0,0,0" />
+         </MultiDataTrigger>
+
+         <Trigger Property="IsBeingDragged"
+                  Value="True">
+
+            <Setter TargetName="borderToggleBackground"
+                    Property="Margin"
+                    Value="0,0,1,0" />
+
+         </Trigger>
+
+         <Trigger Property="IsPressed"
+                  Value="True">
+
+            <!-- Change background color of cell when IsPressed -->
+            <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+
+         <!-- Change background color of cell when MouseOver -->
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsMouseOver"
+                          Value="True" />
+               <Condition Property="IsPressed"
+                          Value="False" />
+            </MultiTrigger.Conditions>
+            <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+         </MultiTrigger>
+
+         <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
+              depending on the ParentColumn's SortDirection. -->
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Ascending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+         </DataTrigger>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Descending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+         </DataTrigger>
+
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
+                          Value="True" />
+
+               <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+                    end-user resize. -->
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+         </MultiDataTrigger>
+
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
+                          Value="True" />
+
+               <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+                    end-user resize. -->
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+         </MultiDataTrigger>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
+                      Value="False">
+            <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+            <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+         </DataTrigger>
+
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: GroupByItem
+    ************************** -->
+   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
+                    TargetType="local:GroupByItem">
+
+      <Border x:Name="mainBorder"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Padding="{TemplateBinding Padding}">
+
+         <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
+         <StackPanel Orientation="Horizontal">
+
+            <!-- Same ContentPresenter as in the base Cell Template. -->
+            <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+            <!-- ContentPresenter that is used to display the sort glyph.
+                 We explicitely set its Content property to Null to prevent the XAML parser
+                 from implicitely setting it to its TemplatedParent's Content. -->
+            <ContentPresenter x:Name="sortGlyphPresenter"
+                              Content="{x:Null}"
+                              ContentTemplate="{x:Null}"
+                              Margin="15,0,0,0"
+                              TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
+
+         </StackPanel>
+      </Border>
+
+      <ControlTemplate.Triggers>
+
+         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
+              depending on the ParentColumn's SortDirection. -->
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Ascending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+         </DataTrigger>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Descending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+         </DataTrigger>
+
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: HierarchicalGroupByControlNode
+    ************************** -->
+   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
+                    TargetType="local:HierarchicalGroupByControlNode">
+
+      <StackPanel Orientation="Horizontal"
+                  Background="{TemplateBinding Background}">
+
+         <Border BorderBrush="{StaticResource defaultForegroundBrush}"
+                 Background="#55FFFFFF"
+                 BorderThickness="1"
+                 VerticalAlignment="Top"
+                 HorizontalAlignment="Center">
+
+            <TextBlock x:Name="titleTextBlock"
+                       Text="{TemplateBinding Title}"
+                       Margin="3"
+                       FontFamily="{StaticResource defaultFontFamily}"
+                       FontSize="{StaticResource defaultFontSize}" />
+
+         </Border>
+
+         <ItemsPresenter Margin="0,0,0,0" />
+
+      </StackPanel>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: HierarchicalGroupByItem
+    ************************** -->
+   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
+                    TargetType="local:HierarchicalGroupByItem">
+      <Grid>
+         <Border x:Name="mainBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}">
+
+            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
+            <StackPanel Orientation="Horizontal">
+
+               <!-- Same ContentPresenter as in the base Cell Template. -->
+               <ContentPresenter Content="{TemplateBinding Content}"
+                                 ContentTemplate="{TemplateBinding ContentTemplate}"
+                                 ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+               <!-- ContentPresenter that is used to display the sort glyph.
+                 We explicitely set its Content property to Null to prevent the XAML parser
+                 from implicitely setting it to its TemplatedParent's Content. -->
+               <ContentPresenter x:Name="sortGlyphPresenter"
+                                 Content="{x:Null}"
+                                 ContentTemplate="{x:Null}"
+                                 Margin="15,0,0,0"
+                                 TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
+
+            </StackPanel>
+         </Border>
+      </Grid>
+      <ControlTemplate.Triggers>
+
+         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
+              depending on the ParentColumn's SortDirection. -->
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Ascending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+         </DataTrigger>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Descending">
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+         </DataTrigger>
+
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: GroupHeaderControl
+    ************************** -->
+   <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
+                    TargetType="local:GroupHeaderControl">
+
+      <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
+           defined by the grid's column. -->
+      <views:PassiveLayoutDecorator Axis="Horizontal">
+         <DockPanel>
+
+            <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this GroupHeaderControl is part of a group. -->
+            <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
+            <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
+                                           Indented="False"
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
+            <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
+            <Border x:Name="mainBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Padding="{TemplateBinding Padding}"
+                    Focusable="True"
+                    FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
+
+               <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
+               <Border.InputBindings>
+                  <KeyBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                              Key="Space" />
+
+                  <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                              Key="Right" />
+
+                  <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                              Key="Add" />
+
+                  <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                              Key="Left" />
+
+                  <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                              Key="Subtract" />
+
+                  <MouseBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                                MouseAction="LeftDoubleClick" />
+
+               </Border.InputBindings>
+               <Grid>
+                  <DockPanel>
+
+                     <!-- ToggleButton that is used to expand/collapse the group. -->
+                     <ToggleButton DockPanel.Dock="Left"
+                                   OverridesDefaultStyle="True"
+                                   Template="{StaticResource groupExpanderToggleButtonTemplate}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   Focusable="False"
+                                   IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
+
+                     <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is a Group by default. -->
+                     <ContentPresenter DockPanel.Dock="Left"
+                                       Margin="3,0,0,0"
+                                       Content="{TemplateBinding Content}"
+                                       ContentTemplate="{TemplateBinding ContentTemplate}"
+                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                     <!-- Line that is traced across the GroupHeader, following the content -->
+                     <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalAlignment="Stretch"
+                                Height="1"
+                                Margin="7,0,0,0" />
+                  </DockPanel>
+               </Grid>
+            </Border>
+         </DockPanel>
+      </views:PassiveLayoutDecorator>
+
+      <ControlTemplate.Triggers>
+         <Trigger Property="local:DataGridControl.NavigationBehavior"
+                  Value="None">
+            <Setter TargetName="mainBorder"
+                    Property="Focusable"
+                    Value="False" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: ColumnManagerRow
+    ************************** -->
+   <ControlTemplate x:Key="tableViewColumnManagerRowTemplate"
+                    TargetType="local:ColumnManagerRow">
+
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <!-- The border responsible for the visual outline of the row (gridlines and background)
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+         <Border x:Name="rootBorder"
+                 Grid.Column="1"
+                 Grid.ColumnSpan="3"
+                 views:TableView.CanScrollHorizontally="False"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}" />
+
+         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this Row is part of a group. -->
+         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
+                                                    Grid.Column="0"
+                                                    Background="{TemplateBinding Background}" />
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1"
+                                        Background="{TemplateBinding Background}" />
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <Decorator x:Name="indentationDecorator"
+                    Grid.Column="3">
+
+            <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+            <views:FixedCellPanel x:Name="PART_CellsHost"
+                                  ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                                  ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                                  FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                                  FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                                  Margin="{TemplateBinding BorderThickness}" />
+         </Decorator>
+
+      </Grid>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: GroupLevelIndicatorPane
+    ************************** -->
+   <ControlTemplate x:Key="tableViewGroupLevelIndicatorPaneTemplate"
+                    TargetType="local:GroupLevelIndicatorPane">
+      <Grid>
+
+         <Border x:Name="horizontalBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
+
+         <Border x:Name="verticalBorder"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 Padding="{TemplateBinding Padding}"
+                 BorderThickness="0">
+            <StackPanel x:Name="PART_GroupLevelIndicatorHost"
+                        Orientation="Horizontal" />
+         </Border>
+
+      </Grid>
+      <ControlTemplate.Triggers>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+
+               <Condition Property="CurrentIndicatorCount"
+                          Value="0" />
+
+               <Condition Property="IsLeaf"
+                          Value="False" />
+            </MultiTrigger.Conditions>
+
+            <Setter TargetName="verticalBorder"
+                    Property="BorderThickness"
+                    Value="0" />
+         </MultiTrigger>
+
+         <Trigger Property="ShowVerticalBorder"
+                  Value="False">
+            <Setter TargetName="verticalBorder"
+                    Property="BorderThickness"
+                    Value="0" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- =================================================================== -->
+   <!-- Styles required by some grid elements                               -->
+   <!-- =================================================================== -->
+
+
+   <!--**************************
+    * STYLE: CellErrorStyle 
+    ************************** -->
+   <Style x:Key="cellErrorStyle"
+          TargetType="local:Cell">
+
+      <Setter Property="Background"
+              Value="{StaticResource errorBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource errorForegroundBrush}" />
+
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=ValidationError.ErrorContent}" />
+
+      <Style.Triggers>
+         <Trigger Property="IsValidationErrorRestrictive"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource errorBackgroundBrush}" />
+
+         </Trigger>
+
+         <Trigger Property="IsValidationErrorRestrictive"
+                  Value="False">
+
+            <Setter Property="Foreground"
+                    Value="{StaticResource warningForegroundBrush}" />
+
+            <Setter Property="Background"
+                    Value="{StaticResource warningBackgroundBrush}" />
+
+         </Trigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!-- =================================================================== -->
+   <!-- Keyed Styles of grid elements                                       -->
+   <!-- =================================================================== -->
+
+   <!--**************************
+    * STYLE: DataGridControl 
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGridControlStyle"
+          TargetType="local:DataGridControl">
+
+      <!--<Style.Resources>
+            <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Controls.xaml" />
+        </Style.Resources>-->
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource gridBorderBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="1" />
+
+      <Setter Property="Background"
+              Value="{StaticResource defaultBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <!-- This is required to display gridlines of uniform thickness -->
+      <Setter Property="SnapsToDevicePixels"
+              Value="True" />
+
+      <Setter Property="CellErrorStyle"
+              Value="{StaticResource cellErrorStyle}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataGridControlTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: RowSelectorPane
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorRowSelectorPaneStyle"
+          TargetType="local:RowSelectorPane">
+
+      <!-- same background as the ColumnManagerCells -->
+      <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+      <Setter Property="TextElement.Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: RowSelector 
+    ************************** -->
+   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
+   <Style x:Key="tableViewAero2NormalColorRowSelectorStyle"
+          TargetType="local:RowSelector">
+
+      <!-- Set the RowSelector's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying RowSelectorPane. -->
+      <Setter Property="Background"
+              Value="Transparent" />
+
+      <Setter Property="HorizontalContentAlignment"
+              Value="Center" />
+
+      <Setter Property="VerticalContentAlignment"
+              Value="Top" />
+
+      <Setter Property="Padding"
+              Value="2" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewRowSelectorTemplate}" />
+
+      <Style.Triggers>
+
+         <!-- We have to use triggers on the type of the Row associated with this 
+              RowSelector instead of assigning a value to RowSelector.RowSelectorStyle 
+              on each row type. This is to avoid a custom RowSelector.RowSelectorStyle
+              set by a client of the DataGridControl to completely override the 
+              RowSelector style (DefaultStyleKey). -->
+
+         <!-- When the Row is Current, display the current glyph in the RowSelector (but not when the Row is an InsertionRow. -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsCurrent}"
+                          Value="True" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).CurrentItemGlyph}" />
+         </MultiDataTrigger>
+
+         <!-- When the Row is being edited, display the appropriate glyph in the RowSelector. -->
+         <Trigger Property="IsBeingEdited"
+                  Value="True">
+            <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).EditingRowGlyph}" />
+
+         </Trigger>
+
+         <!-- When the Row has a validation error, display the appropriate glyph in the RowSelector. -->
+         <Trigger Property="HasValidationError"
+                  Value="True">
+            <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ValidationErrorGlyph}" />
+         </Trigger>
+
+         <!-- Use default Button States colors on the RowSelector -->
+         <Trigger Property="IsMouseOver"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+         </Trigger>
+         <Trigger Property="IsPressed"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: Row Style
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorRowStyle"
+          TargetType="local:Row">
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="FocusVisualStyle"
+              Value="{StaticResource tableViewRowFocusVisualStyle}" />
+
+      <Setter Property="SelectionBackground"
+              Value="{StaticResource rowSelectionBackgroundBrush}" />
+
+      <Setter Property="SelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="InactiveSelectionBackground"
+              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
+
+      <Setter Property="InactiveSelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="0" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewRowTemplate}" />
+
+      <Setter Property="Background"
+              Value="Transparent" />
+
+      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
+                         the issue doesn't occur when we assign a value for the foreground property in the default style.
+                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
+                         parent's property.-->
+      <Setter Property="Foreground"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
+
+      <Style.Triggers>
+
+         <!-- Enabled/Disabled Odd datarow style alternation -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).IsAlternatingRowStyleEnabled}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridVirtualizingPanel.ItemIndex), Converter={x:Static conv:IndexToOddConverter.Singleton}}"
+                          Value="True" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="Background"
+                    Value="{StaticResource rowAlternatingBackgroundBrush}" />
+         </MultiDataTrigger>
+
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: DataRow 
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorDataRowStyle"
+          TargetType="local:DataRow"
+          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
+      <Style.Triggers>
+         <!-- MouseOver + NotSelected -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="Background"
+                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
+         </MultiDataTrigger>
+
+         <!-- MouseOver + Selected -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="True" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="SelectionBackground"
+                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
+         </MultiDataTrigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: ColumnManagerRow
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorColumnManagerRowStyle"
+          TargetType="local:ColumnManagerRow"
+          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}">
+
+      <!-- Use a different background and foreground than the base Row style. -->
+      <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="0,1,0,1" />
+
+      <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="Padding"
+              Value="12" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
+
+      <Style.Triggers>
+         <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
+                  Value="-1">
+            <!-- We don't want to display the Group Margins for the ColumnManagerRow. -->
+            <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+                    Value="False" />
+         </Trigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: Cell Style
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorCellStyle"
+          TargetType="local:Cell">
+
+      <Setter Property="CurrentBackground"
+              Value="{StaticResource defaultBackgroundBrush}" />
+
+      <Setter Property="CurrentForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="SelectionBackground"
+              Value="{StaticResource rowSelectionBackgroundBrush}" />
+
+      <Setter Property="SelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="InactiveSelectionBackground"
+              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
+
+      <Setter Property="InactiveSelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <!-- Set the Cell's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying Row. -->
+      <Setter Property="Background"
+              Value="Transparent" />
+
+      <Setter Property="Foreground"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
+
+      <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.ActualWidth}" />
+
+      <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+      <Setter Property="HorizontalContentAlignment"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
+
+      <Setter Property="VerticalContentAlignment"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
+
+      <!-- The Cell is responsible for drawing the vertical gridlines. It draws only its right gridline, 
+           assuming that the left gridline will have been drawn by its preceding cell -->
+
+      <Setter Property="BorderThickness"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Right'}" />
+
+      <Setter Property="BorderBrush"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewCellTemplate}" />
+   </Style>
+
+   <!--**************************
+    * STYLE: DataCell
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorDataCellStyle"
+          TargetType="local:DataCell"
+          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}">
+
+      <Style.Triggers>
+         <!-- MouseOver + NotSelected -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Cell" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="Background"
+                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
+         </MultiDataTrigger>
+
+         <!-- MouseOver + Selected -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Cell" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="True" />
+            </MultiDataTrigger.Conditions>
+            <Setter Property="SelectionBackground"
+                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
+         </MultiDataTrigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: ColumnManagerCell
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorColumnManagerCellStyle"
+          TargetType="local:ColumnManagerCell">
+
+      <!-- Set the Cell's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying Row. -->
+      <Setter Property="Background"
+              Value="Transparent" />
+
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
+      <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
+
+      <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+      <Setter Property="HorizontalContentAlignment"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
+
+      <Setter Property="VerticalContentAlignment"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
+
+      <Style.Triggers>
+
+         <Trigger Property="IsBeingDragged"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: GroupByControl
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGroupByControlStyle"
+          TargetType="local:GroupByControl">
+
+      <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
+           the control with a Height of 0, which makes it invisible and unusable.
+           In a typical TableView, a height of at least 25 is appropriate for the GroupByControl. -->
+      <Setter Property="MinHeight"
+              Value="25" />
+
+      <Setter Property="Background"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="Padding"
+              Value="8" />
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="1,1,1,0" />
+
+      <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+      <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewGroupByControlTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: GroupByItem
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGroupByItemStyle"
+          TargetType="local:GroupByItem">
+
+      <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewGroupByItemTemplate}" />
+
+      <!-- Use default Button States colors on the GroupByItems -->
+      <Style.Triggers>
+         <Trigger Property="IsMouseOver"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+         </Trigger>
+         <Trigger Property="IsPressed"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: GroupHeaderControl
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGroupHeaderControlStyle"
+          TargetType="local:GroupHeaderControl">
+
+      <Setter Property="Background"
+              Value="Transparent" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+      <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+      <Setter Property="VerticalContentAlignment"
+              Value="Center" />
+
+      <Setter Property="SelectionBackground"
+              Value="{StaticResource rowSelectionBackgroundBrush}" />
+
+      <Setter Property="SelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="InactiveSelectionBackground"
+              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
+
+      <Setter Property="InactiveSelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <!-- The GroupHeaderControl itself must not be focusable. The main Border inside its Template will
+           be made Focusable because it is holding the various InputBindings that make the
+           GroupHeaderControl work. -->
+      <Setter Property="Focusable"
+              Value="False" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewGroupHeaderControlTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: GroupLevelIndicator
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGroupLevelIndicatorStyle"
+          TargetType="local:GroupLevelIndicator">
+
+      <Setter Property="Background"
+              Value="White" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="0" />
+
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: DetailIndicator
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorDetailIndicatorStyle"
+          TargetType="local:DetailIndicator">
+
+      <Setter Property="Background"
+              Value="{x:Null}" />
+
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailIndicatorWidth}" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDetailIndicatorTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: GroupLevelIndicatorPane
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorGroupLevelIndicatorPaneStyle"
+          TargetType="local:GroupLevelIndicatorPane">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Style.Triggers>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsLeaf"
+                          Value="False" />
+               <Condition Property="views:ViewBase.IsLastItem"
+                          Value="True" />
+            </MultiTrigger.Conditions>
+
+            <Setter Property="Margin"
+                    Value="0,0,0,-5" />
+         </MultiTrigger>
+
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: HierarchicalGroupLevelIndicatorPane
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle"
+          TargetType="local:HierarchicalGroupLevelIndicatorPane">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
+
+      <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+              Value="True" />
+
+      <Setter Property="local:GroupLevelIndicatorPane.ShowVerticalBorder"
+              Value="True" />
+
+      <Style.Triggers>
+         <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
+                  Value="-1">
+
+            <!-- Stop the propagation of the value set by the default style trigger of
+                 the ColumnManagerRow. -->
+            <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+                    Value="True" />
+
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: HierarchicalGroupByControlNode
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle"
+          TargetType="local:HierarchicalGroupByControlNode">
+
+      <Setter Property="StairHeight"
+              Value="0" />
+
+      <Setter Property="ConnectionLineOffset"
+              Value="0" />
+
+      <Setter Property="ConnectionLineAlignment"
+              Value="CenterToCenter" />
+
+      <Setter Property="Focusable"
+              Value="False" />
+
+      <Setter Property="Margin"
+              Value="4" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
+
+   </Style>
+
+   <!--**************************
+    * STYLE: HierarchicalGroupByControl
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupByControlStyle"
+          TargetType="local:HierarchicalGroupByControl">
+
+      <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
+           the control with a Height of 0, which makes it invisible and unusable.
+           In a typical TableView, a height of at least 25 is appropriate for the GroupByControl. -->
+      <Setter Property="MinHeight"
+              Value="25" />
+
+      <Setter Property="Background"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="Padding"
+              Value="8" />
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+      <Setter Property="BorderThickness"
+              Value="1,1,1,0" />
+
+      <Setter Property="StairHeight"
+              Value="0" />
+
+      <Setter Property="ConnectionLineOffset"
+              Value="0" />
+
+      <Setter Property="ConnectionLineAlignment"
+              Value="CenterToCenter" />
+
+      <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+      <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewCommonHierarchicalGroupByControlTemplate}" />
+
+      <Style.Triggers>
+
+         <!-- We use the old GroupByControl Template if there are no Details in the DataGridControl.ItemsSource -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
+                          Value="False" />
+
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ParentDataGridContext, Converter={StaticResource nullToBooleanConverter}}"
+                          Value="True" />
+
+            </MultiDataTrigger.Conditions>
+
+            <Setter Property="Template"
+                    Value="{StaticResource tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
+
+         </MultiDataTrigger>
+
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: HierarchicalGroupByItem
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupByItemStyle"
+          TargetType="local:HierarchicalGroupByItem">
+
+      <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+      <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+      <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+      <Setter Property="Margin"
+              Value="4,0,4,0" />
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
+
+      <!-- Use default Button States colors on the HierarchicalGroupByItems -->
+      <Style.Triggers>
+         <Trigger Property="IsMouseOver"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+         </Trigger>
+         <Trigger Property="IsPressed"
+                  Value="True">
+            <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+      </Style.Triggers>
+
+   </Style>
+
+   <!--**************************
+    * STYLE: ScrollTip
+    ************************** -->
+   <Style x:Key="tableViewAero2NormalColorScrollTipStyle"
+          TargetType="local:ScrollTip">
+
+      <Setter Property="Template"
+              Value="{StaticResource scrollTipTemplate}" />
+
+      <Setter Property="VerticalAlignment"
+              Value="Center" />
+
+      <Setter Property="HorizontalAlignment"
+              Value="Right" />
+
+      <Setter Property="Background"
+              Value="{StaticResource groupHeaderBackgroundBrush}" />
+
+      <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+      <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+   </Style>
+
+   <!-- =================================================================== -->
+   <!-- Default values for the View                                         -->
+   <!-- =================================================================== -->
+
+   <Style x:Key="tableViewAero2NormalColorDefaultValues"
+          TargetType="views:TableView">
+
+      <Setter Property="HorizontalGridLineBrush"
+              Value="{StaticResource gridLineBrush}" />
+
+      <Setter Property="HorizontalGridLineThickness"
+              Value="1" />
+
+      <Setter Property="GroupLevelIndicatorWidth"
+              Value="17" />
+
+      <Setter Property="DetailIndicatorWidth"
+              Value="34" />
+
+      <Setter Property="DefaultDropMarkPen"
+              Value="{StaticResource dropMarkPen}" />
+
+      <!-- Those glyphs are null by default on ViewBase, so every Theme should define
+           and set their own custom glyphs. -->
+
+      <Setter Property="AscendingSortGlyph"
+              Value="{StaticResource ascendingSortGlyph}" />
+
+      <Setter Property="DescendingSortGlyph"
+              Value="{StaticResource descendingSortGlyph}" />
+
+      <Setter Property="ExpandGroupGlyph"
+              Value="{StaticResource expandGroupGlyph}" />
+
+      <Setter Property="CollapseGroupGlyph"
+              Value="{StaticResource collapseGroupGlyph}" />
+
+      <Setter Property="CurrentItemGlyph"
+              Value="{StaticResource currentItemGlyph}" />
+
+      <Setter Property="EditingRowGlyph"
+              Value="{StaticResource editingRowGlyph}" />
+
+      <Setter Property="ValidationErrorGlyph"
+              Value="{StaticResource validationErrorGlyph}" />
+
+      <Setter Property="ConnectionStateLoadingGlyph"
+              Value="{StaticResource connectionStateLoadingGlyph}" />
+
+      <Setter Property="ConnectionStateCommittingGlyph"
+              Value="{StaticResource connectionStateLoadingGlyph}" />
+
+      <Setter Property="ConnectionStateErrorGlyph"
+              Value="{StaticResource connectionStateErrorGlyph}" />
+
+   </Style>
+
    <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
+   <!-- DefaultStyleKey declarations                                        -->
    <!-- =================================================================== -->
 
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme}"
+          TargetType="views:TableView"
+          BasedOn="{StaticResource tableViewAero2NormalColorDefaultValues}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataGridControl}"
+          TargetType="local:DataGridControl"
+          BasedOn="{StaticResource tableViewAero2NormalColorGridControlStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelectorPane}"
+          TargetType="local:RowSelectorPane"
+          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorPaneStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelector}"
+          TargetType="local:RowSelector"
+          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:Row}"
+          TargetType="local:Row"
+          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataRow}"
+          TargetType="local:DataRow"
+          BasedOn="{StaticResource tableViewAero2NormalColorDataRowStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerRow}"
+          TargetType="local:ColumnManagerRow"
+          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerRowStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:Cell}"
+          TargetType="local:Cell"
+          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataCell}"
+          TargetType="local:DataCell"
+          BasedOn="{StaticResource tableViewAero2NormalColorDataCellStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerCell}"
+          TargetType="local:ColumnManagerCell"
+          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerCellStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByControl}"
+          TargetType="local:GroupByControl"
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupByControlStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByItem}"
+          TargetType="local:GroupByItem"
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupByItemStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupHeaderControl}"
+          TargetType="local:GroupHeaderControl"
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupHeaderControlStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicator}"
+          TargetType="local:GroupLevelIndicator"
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DetailIndicator}"
+          TargetType="local:DetailIndicator"
+          BasedOn="{StaticResource tableViewAero2NormalColorDetailIndicatorStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicatorPane}"
+          TargetType="local:GroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
+          TargetType="local:HierarchicalGroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ScrollTip}"
+          TargetType="local:ScrollTip"
+          BasedOn="{StaticResource tableViewAero2NormalColorScrollTipStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
+          TargetType="local:HierarchicalGroupByControlNode"
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControl}"
+          TargetType="local:HierarchicalGroupByControl"
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlStyle}" />
+
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByItem}"
+          TargetType="local:HierarchicalGroupByItem"
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByItemStyle}" />
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml
index ac126581..12bbca44 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml
@@ -24,18 +24,16 @@
 
    <ResourceDictionary.MergedDictionaries>
 
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Resources.xaml" />
+      <!-- Include the view independant, color-scheme dependant, theme resources -->
+      <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.normalcolor.Resources.xaml" />
 
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero2.NormalColor.Graphics.xaml" />
+      <!-- Include the view dependant, color-scheme dependant, theme graphics -->
+      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero2.normalcolor.Graphics.xaml" />
 
       <!-- Include the standard grid element templates -->
       <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
 
       <!-- Control Styles used in the Grid Control -->
-      <!-- TODO : for now do not use Aero2.NormalColor.Controls.xaml (see case 153892)  -->
-      <!--<markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Controls.xaml" />-->
 
    </ResourceDictionary.MergedDictionaries>
 
@@ -45,6 +43,9 @@
    <SolidColorBrush x:Key="warningForegroundBrush"
                     Color="Black" />
 
+   <SolidColorBrush x:Key="gridLineBrush"
+                    Color="Transparent" />
+
    <!-- ****************************************** -->
    <!-- Windows8 Font                              -->
    <!-- ****************************************** -->
@@ -85,7 +86,6 @@
                     Color="White" />
    <SolidColorBrush x:Key="rowAlternatingBackgroundBrush"
                     Color="#FFF7F7F7" />
-   <!-- TODO : determine the alternate row background color -->
    <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
                     Color="#FFCBE8F6" />
    <SolidColorBrush x:Key="rowMouseOverBackgroundBrush"
@@ -95,7 +95,6 @@
    <SolidColorBrush x:Key="rowInactiveSelectionBackgroundBrush"
                     Color="#FFF7F7F7" />
 
-   <!-- DataRow Borders (if we implement this behavior) -->
    <!--<SolidColorBrush x:Key="rowSelectionBorderBrush" Color="#FF26A0DA" />-->
    <!--<SolidColorBrush x:Key="rowMouseOverBorderBrush" Color="#FF70C0E7" />-->
    <!--<SolidColorBrush x:Key="rowMouseOverSelectionBorderBrush" Color="#FF66A7E8" />-->
@@ -369,256 +368,241 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
-    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
+   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
-    <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                     TargetType="local:ColumnManagerCell">
-        <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-        <Grid>
+   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
+                    TargetType="local:ColumnManagerCell">
+      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
+      <Grid>
 
-            <Border x:Name="rootBorder"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
-
-                <Grid>
-
-                    <Rectangle Fill="LightGray"
-                               HorizontalAlignment="Left"
-                               VerticalAlignment="Stretch"
-                               Width="1"
-                               Margin="0,2,0,2" />
-
-                    <Rectangle Fill="{StaticResource defaultForegroundBrush}"
-                               HorizontalAlignment="Right"
-                               VerticalAlignment="Stretch"
-                               Width="1"
-                               Margin="0,2,0,2" />
-
-                    <DockPanel>
-                        <Border x:Name="thumbToggleBackgroundBorder"
-                                DockPanel.Dock="Right">
-
-                            <Grid>
-
-                                <Border x:Name="toggleDelimeterBorder"
-                                        BorderBrush="{StaticResource defaultForegroundBrush}"
-                                        BorderThickness="1,0,0,0"
-                                        Margin="0,4,0,4"
-                                        Background="Transparent"
-                                        Visibility="Collapsed">
-
-                                    <Border x:Name="toggleDelimeterBorder2"
-                                            BorderBrush="LightGray"
-                                            BorderThickness="1,0,0,0"
-                                            Margin="0,0,0,0"
-                                            Background="Transparent"
-                                            Visibility="Collapsed">
-
-                                    </Border>
-                                </Border>
-
-                                <Border x:Name="borderToggleBackground"
-                                        Background="{TemplateBinding Background}"
-                                        Margin="1,0,1,0" />
-
-                                <ToggleButton x:Name="toggleButton"
-                                              Focusable="False"
-                                              VerticalAlignment="Stretch"
-                                              Visibility="Collapsed"
-                                              Margin="2,0,0,0"
-                                              Opacity="0.5" />
-                            </Grid>
-                        </Border>
+         <Border x:Name="rootBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}">
 
-                        <Border Background="{TemplateBinding Background}">
+            <Grid>
 
-                            <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
-                            <Grid>
+               <Rectangle Fill="LightGray"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
 
-                                <Border Padding="{TemplateBinding Padding}">
+               <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                          HorizontalAlignment="Right"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
 
-                                    <Grid x:Name="contentPanel"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
+               <DockPanel>
+                  <Border x:Name="thumbToggleBackgroundBorder"
+                          DockPanel.Dock="Right">
+
+                     <Grid>
+
+                        <Border x:Name="toggleDelimeterBorder"
+                                BorderBrush="{StaticResource defaultForegroundBrush}"
+                                BorderThickness="1,0,0,0"
+                                Margin="0,4,0,4"
+                                Background="Transparent"
+                                Visibility="Collapsed">
+
+                           <Border x:Name="toggleDelimeterBorder2"
+                                   BorderBrush="LightGray"
+                                   BorderThickness="1,0,0,0"
+                                   Margin="0,0,0,0"
+                                   Background="Transparent"
+                                   Visibility="Collapsed">
+
+                           </Border>
+                        </Border>
+
+                        <Border x:Name="borderToggleBackground"
+                                Background="{TemplateBinding Background}"
+                                Margin="1,0,1,0" />
+
+                        <ToggleButton x:Name="toggleButton"
+                                      Focusable="False"
+                                      VerticalAlignment="Stretch"
+                                      Visibility="Collapsed"
+                                      Margin="2,0,0,0"
+                                      Opacity="0.5" />
+                     </Grid>
+                  </Border>
 
-                                        <!-- Same ContentPresenter as in the base Cell Template. -->
-                                        <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                                                    Grid.Column="0" />
+                  <Border Background="{TemplateBinding Background}">
 
-                                        <!-- ContentPresenter that is used to display the sort glyph.
+                     <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
+                     <Grid>
+
+                        <Border Padding="{TemplateBinding Padding}">
+
+                           <Grid x:Name="contentPanel"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+
+                              <!-- Same ContentPresenter as in the base Cell Template. -->
+                              <local:CellContentPresenter x:Name="PART_CellContentPresenter"
+                                                          Grid.Column="0" />
+
+                              <!-- ContentPresenter that is used to display the sort glyph.
                                                 We explicitely set its Content property to Null to prevent the XAML parser
                                                 from implicitely setting it to its TemplatedParent's Content. -->
-                                        <ContentPresenter x:Name="sortGlyphPresenter"
-                                                          Grid.Column="1"
-                                                          Content="{x:Null}"
-                                                          ContentTemplate="{x:Null}" />
-                                    </Grid>
-                                </Border>
-                            </Grid>
+                              <ContentPresenter x:Name="sortGlyphPresenter"
+                                                Grid.Column="1"
+                                                Content="{x:Null}"
+                                                ContentTemplate="{x:Null}" />
+                           </Grid>
                         </Border>
-                    </DockPanel>
-                </Grid>
-            </Border>
+                     </Grid>
+                  </Border>
+               </DockPanel>
+            </Grid>
+         </Border>
+
+         <!-- Thumb that is used to resize the Column. -->
+         <Thumb x:Name="PART_ColumnResizerThumbLeft"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Left" />
+
+         <!-- Thumb that is used to resize the Column. -->
+         <Thumb x:Name="PART_ColumnResizerThumb"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Right" />
+
+      </Grid>
 
-            <!-- Thumb that is used to resize the Column. -->
-            <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                   Style="{StaticResource invisibleThumbStyle}"
-                   Width="6"
-                   HorizontalAlignment="Left" />
-
-            <!-- Thumb that is used to resize the Column. -->
-            <Thumb x:Name="PART_ColumnResizerThumb"
-                   Style="{StaticResource invisibleThumbStyle}"
-                   Width="6"
-                   HorizontalAlignment="Right" />
-
-        </Grid>
-
-        <ControlTemplate.Triggers>
-
-            <!-- The following triggers allows the content to correctly align to the center when the mouse is over the ColumnManagerCell and the HorizontalContentAlignment is Center -->
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Value="Visible"
-                               Binding="{Binding ElementName=toggleButton, Path=Visibility}" />
-                    <Condition Value="Center"
-                               Binding="{Binding RelativeSource={RelativeSource Self},
+      <ControlTemplate.Triggers>
+
+         <!-- The following triggers allows the content to correctly align to the center when the mouse is over the ColumnManagerCell and the HorizontalContentAlignment is Center -->
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Value="Visible"
+                          Binding="{Binding ElementName=toggleButton, Path=Visibility}" />
+               <Condition Value="Center"
+                          Binding="{Binding RelativeSource={RelativeSource Self},
                         Path=HorizontalContentAlignment}" />
-                </MultiDataTrigger.Conditions>
-
-                <Setter TargetName="PART_CellContentPresenter"
-                        Property="Margin"
-                        Value="16,0,0,0" />
-            </MultiDataTrigger>
-
-            <!-- Trigger related to the filteringToggleButton-->
-            <Trigger SourceName="toggleButton"
-                     Property="IsMouseOver"
-                     Value="True">
-
-                <Setter TargetName="toggleButton"
-                        Property="Opacity"
-                        Value="1" />
-            </Trigger>
-
-            <Trigger Property="IsBeingDragged"
-                     Value="True">
-
-                <Setter TargetName="borderToggleBackground"
-                        Property="Margin"
-                        Value="0,0,1,0" />
-
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-
-                <!-- Change background color of cell when IsPressed -->
-                <Setter TargetName="rootBorder"
-                        Property="Background"
-                        Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-            </Trigger>
-
-            <!-- Change background color of cell when MouseOver -->
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver"
-                               Value="True" />
-                    <Condition Property="IsPressed"
-                               Value="False" />
-                </MultiTrigger.Conditions>
-                <Setter TargetName="rootBorder"
-                        Property="Background"
-                        Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
-            </MultiTrigger>
-
-            <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="PART_CellContentPresenter"
+                    Property="Margin"
+                    Value="16,0,0,0" />
+         </MultiDataTrigger>
+
+         <Trigger Property="IsBeingDragged"
+                  Value="True">
+
+            <Setter TargetName="borderToggleBackground"
+                    Property="Margin"
+                    Value="0,0,1,0" />
+
+         </Trigger>
+
+         <Trigger Property="IsPressed"
+                  Value="True">
+
+            <!-- Change background color of cell when IsPressed -->
+            <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+         </Trigger>
+
+         <!-- Change background color of cell when MouseOver -->
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsMouseOver"
+                          Value="True" />
+               <Condition Property="IsPressed"
+                          Value="False" />
+            </MultiTrigger.Conditions>
+            <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+         </MultiTrigger>
+
+         <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
               depending on the ParentColumn's SortDirection. -->
 
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                         Value="Ascending">
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Ascending">
 
-                <Setter TargetName="sortGlyphPresenter"
-                        Property="ContentPresenter.ContentTemplate"
-                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
 
-                <Setter TargetName="sortGlyphPresenter"
-                        Property="Margin"
-                        Value="6,0,0,0" />
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
 
-            </DataTrigger>
+         </DataTrigger>
 
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                         Value="Descending">
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Descending">
 
-                <Setter TargetName="sortGlyphPresenter"
-                        Property="ContentPresenter.ContentTemplate"
-                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
 
-                <Setter TargetName="sortGlyphPresenter"
-                        Property="Margin"
-                        Value="6,0,0,0" />
-            </DataTrigger>
+            <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+         </DataTrigger>
 
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
-                               Value="True" />
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
+                          Value="True" />
 
-                    <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+               <!-- Don't disable resizing if ColumnStretching can be disabled by an 
                     end-user resize. -->
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                               Value="False" />
-                </MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
 
-                <Setter TargetName="PART_ColumnResizerThumb"
-                        Property="IsEnabled"
-                        Value="False" />
-            </MultiDataTrigger>
+            <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+         </MultiDataTrigger>
 
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
-                               Value="True" />
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
+                          Value="True" />
 
-                    <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+               <!-- Don't disable resizing if ColumnStretching can be disabled by an 
                     end-user resize. -->
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                               Value="False" />
-                </MultiDataTrigger.Conditions>
-
-                <Setter TargetName="PART_ColumnResizerThumbLeft"
-                        Property="IsEnabled"
-                        Value="False" />
-            </MultiDataTrigger>
-
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
-                         Value="False">
-                <Setter TargetName="PART_ColumnResizerThumb"
-                        Property="IsEnabled"
-                        Value="False" />
-                <Setter TargetName="PART_ColumnResizerThumbLeft"
-                        Property="IsEnabled"
-                        Value="False" />
-            </DataTrigger>
-
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                         Value="False">
-                <Setter Property="Visibility"
-                        Value="Collapsed" />
-            </DataTrigger>
-
-        </ControlTemplate.Triggers>
-
-    </ControlTemplate>
-
-    <!--**************************
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+         </MultiDataTrigger>
+
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
+                      Value="False">
+            <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+            <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+         </DataTrigger>
+
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
     * TEMPLATE: GroupByItem
     ************************** -->
    <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
@@ -782,9 +766,8 @@
    </ControlTemplate>
 
    <!--**************************
-    * TEMPLATE: GroupHeaderControl (copied from Office2007Blue)
+    * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableflowViewGroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -798,7 +781,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
                     Background="{TemplateBinding Background}"
@@ -829,32 +812,33 @@
                                 MouseAction="LeftDoubleClick" />
 
                </Border.InputBindings>
+               <Grid>
+                  <DockPanel>
 
-               <DockPanel>
-
-                  <!-- ToggleButton that is used to expand/collapse the group. -->
-                  <ToggleButton DockPanel.Dock="Left"
-                                OverridesDefaultStyle="True"
-                                Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Focusable="False"
-                                IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
+                     <!-- ToggleButton that is used to expand/collapse the group. -->
+                     <ToggleButton DockPanel.Dock="Left"
+                                   OverridesDefaultStyle="True"
+                                   Template="{StaticResource groupExpanderToggleButtonTemplate}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   Focusable="False"
+                                   IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
 
-                  <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is a Group by default. -->
-                  <ContentPresenter DockPanel.Dock="Left"
-                                    Margin="3,0,0,0"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                     <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is a Group by default. -->
+                     <ContentPresenter DockPanel.Dock="Left"
+                                       Margin="3,0,0,0"
+                                       Content="{TemplateBinding Content}"
+                                       ContentTemplate="{TemplateBinding ContentTemplate}"
+                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 
-                  <!-- Line that is traced across the GroupHeader, following the content -->
-                  <Rectangle Fill="{StaticResource defaultForegroundBrush}"
-                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                             HorizontalAlignment="Stretch"
-                             Height="1"
-                             Margin="7,0,0,0" />
-               </DockPanel>
+                     <!-- Line that is traced across the GroupHeader, following the content -->
+                     <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalAlignment="Stretch"
+                                Height="1"
+                                Margin="7,0,0,0" />
+                  </DockPanel>
+               </Grid>
             </Border>
          </DockPanel>
       </views:PassiveLayoutDecorator>
@@ -886,7 +870,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border Background="{StaticResource groupHeaderBackgroundBrush}" />
@@ -958,20 +942,11 @@
    </ControlTemplate>
 
    <!--**************************
-    * TEMPLATE: ColumnManagerRow (copied from Common)
+    * TEMPLATE: ColumnManagerRow
     ************************** -->
    <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
                     TargetType="local:ColumnManagerRow">
 
-      <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -985,8 +960,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="1"
                  Grid.ColumnSpan="3"
@@ -997,7 +972,7 @@
                  Padding="{TemplateBinding Padding}" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
                                                     Grid.Column="0"
                                                     Background="{TemplateBinding Background}" />
@@ -1006,17 +981,17 @@
                                         Grid.Column="1"
                                         Background="{TemplateBinding Background}" />
 
-         <!-- ToggleButton that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <Decorator x:Name="indentationDecorator"
                     Grid.Column="3">
@@ -1032,30 +1007,10 @@
 
       </Grid>
 
-      <ControlTemplate.Triggers>
-         <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
    </ControlTemplate>
 
    <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane (copied from common)
+    * TEMPLATE: GroupLevelIndicatorPane
     ************************** -->
    <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorPaneTemplate"
                     TargetType="local:GroupLevelIndicatorPane">
@@ -1104,6 +1059,7 @@
    <!-- Styles required by some grid elements                               -->
    <!-- =================================================================== -->
 
+
    <!--**************************
     * STYLE: CellErrorStyle 
     ************************** -->
@@ -1151,7 +1107,6 @@
    <Style x:Key="tableflowViewAero2NormalColorGridControlStyle"
           TargetType="local:DataGridControl">
 
-      <!-- TODO : for now do not use Aero2.NormalColor.Controls.xaml (see case 153892)  -->
       <!--<Style.Resources>
             <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Controls.xaml" />
         </Style.Resources>-->
@@ -1227,7 +1182,7 @@
               set by a client of the DataGridControl to completely override the 
               RowSelector style (DefaultStyleKey). -->
 
-         <!-- When the Row is Current, display the current glyph in the RowSelector -->
+         <!-- When the Row is Current, display the current glyph in the RowSelector (but not when the Row is an InsertionRow. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsCurrent}"
@@ -1252,7 +1207,6 @@
                     Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ValidationErrorGlyph}" />
          </Trigger>
 
-
          <!-- Use default Button States colors on the RowSelector -->
          <Trigger Property="IsMouseOver"
                   Value="True">
@@ -1304,6 +1258,10 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
+                         the issue doesn't occur when we assign a value for the foreground property in the default style.
+                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
+                         parent's property.-->
       <Setter Property="Foreground"
               Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
 
@@ -1331,6 +1289,9 @@
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}">
 
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
       <Style.Triggers>
          <!-- MouseOver + NotSelected -->
          <MultiDataTrigger>
@@ -1399,14 +1360,12 @@
               Value="{StaticResource tableflowViewColumnManagerRowTemplate}" />
 
       <Style.Triggers>
-
          <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
                   Value="-1">
             <!-- We don't want to display the Group Margins for the ColumnManagerRow. -->
             <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
                     Value="False" />
          </Trigger>
-
       </Style.Triggers>
 
    </Style>
@@ -1519,6 +1478,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
index 1c4faeba..69ed6263 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridLineBrush"
                     Color="Gray" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
index 3e8f4719..e441016a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
@@ -257,16 +257,6 @@
                     Value="16,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsBeingDragged"
                   Value="True">
 
@@ -356,12 +346,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -853,6 +837,10 @@
    <Style x:Key="tableViewClassicSystemColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewClassicSystemColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -964,6 +952,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
index f2aa192d..21edb308 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
@@ -433,15 +433,6 @@
                     Property="Margin"
                     Value="16,0,0,0" />
          </MultiDataTrigger>
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
 
          <Trigger Property="IsBeingDragged"
                   Value="True">
@@ -532,12 +523,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -802,7 +787,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
@@ -1075,6 +1060,10 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
+                         the issue doesn't occur when we assign a value for the foreground property in the default style.
+                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
+                         parent's property.-->
       <Setter Property="Foreground"
               Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
 
@@ -1115,6 +1104,10 @@
    <Style x:Key="tableflowViewClassicSystemColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewClassicSystemColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1178,6 +1171,10 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
+                         the issue doesn't occur when we assign a value for the foreground property in the default style.
+                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
+                         parent's property. -->
       <Setter Property="Foreground"
               Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
 
@@ -1226,6 +1223,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -1861,4 +1861,5 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationControlItemStyle}" />
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
index 8ae3a994..312b9c12 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
@@ -17,11 +17,70 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
-                    xmlns:cnv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
                     xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views"
-                    xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase">
-
-    <cnv:StringFormatMultiConverter x:Key="stringFormatMultiConverter" />
+                    xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
+                    xmlns:mscorlib="clr-namespace:System;assembly=mscorlib">
+
+   <conv:StringFormatMultiConverter x:Key="stringFormatMultiConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:LevelToOpacityConverter x:Key="levelToOpacityConverter" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
+   <conv:SourceDataConverter x:Key="sourceDataConverter" />
+
+   <!-- DownArrow -->
+   <Path x:Key="downArrow"
+         Data="M454.165,177.507L422.165,212.46 390.165,177.507 454.165,177.507z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="24" />
+
+   <!-- UpArrow -->
+   <Path x:Key="upArrow"
+         Data="M167.5,212.46L199.5,177.507 231.5,212.46 167.5,212.46z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="24" />
+
+   <!-- Visible icon -->
+   <Path x:Key="visibleIcon"
+         x:Shared="False"
+         Data="M10.666975,3.7209997C11.811488,3.7209999 12.74,4.6494002 12.74,5.7939548 12.74,6.9385099 11.811488,7.8670001 10.666975,7.8670001 9.5224209,7.8670001 8.5939999,6.9385099 8.5939999,5.7939548 8.5939999,4.6494002 9.5224209,3.7209999 10.666975,3.7209997z M10.6665,1.4661931C8.2771845,1.4661933 6.3384409,3.4050867 6.3384409,5.7944998 6.3384409,8.1851625 8.2771845,10.122937 10.6665,10.122937 13.055855,10.122937 14.994618,8.1851625 14.994618,5.7944998 14.994618,3.4050867 13.055855,1.4661933 10.6665,1.4661931z M10.6665,0C16.557089,-5.0623953E-08 21.333,5.7944998 21.333,5.7944998 21.333,5.7944998 16.557089,11.589 10.6665,11.589 4.7761602,11.589 0,5.7944998 0,5.7944998 0,5.7944998 4.7761602,-5.0623953E-08 10.6665,0z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="16" />
+
+   <!-- Delete icon -->
+   <Path x:Key="deleteIcon"
+         x:Shared="False"
+         Data="M33.978,27.679999L33.978,58.098995 41.374,58.098995 41.374,27.679999z M14.841001,27.679999L14.841001,58.098995 22.237,58.098995 22.237,27.679999z M4.0320003,22.430001L52.183002,22.430001 52.183002,63.995998 4.0320003,63.995998z M15.974001,0L40.194999,0 40.194999,7.7200003 56.166999,7.7200003 56.166999,15.995 0,15.995 0,7.7200003 15.974001,7.7200003z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="12" />
+
+   <!-- Insert Group icon -->
+   <Path x:Key="insertGroupIcon"
+         x:Shared="False"
+         Data="M19.833,0L32.501,0 32.501,19.833999 52.334,19.833999 52.334,32.500999 32.501,32.500999 32.501,52.333 19.833,52.333 19.833,32.500999 0,32.500999 0,19.833999 19.833,19.833999z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="12" />
+
+   <!-- Rename Group icon -->
+   <Path x:Key="renameGroupIcon"
+         x:Shared="False"
+         Data="M0,44.439791L18.98951,54.569246 0.47998798,62.66881z M17.428029,12.359973L36.955557,23.568769 21.957478,49.686174 20.847757,46.346189 15.11851,45.756407 14.138656,42.166935 8.5292659,41.966761 6.9493899,38.037481 2.4399572,38.477377z M26.812517,0.0009765625C27.350616,-0.012230873,27.875986,0.10826397,28.348372,0.3782568L42.175028,8.3180408C43.85462,9.2780154,44.234529,11.777948,43.02482,13.89789L41.375219,16.767812 21.460039,5.3381228 23.10964,2.4582005C23.979116,0.941679,25.437378,0.034730911,26.812517,0.0009765625z"
+         Stretch="Uniform"
+         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
+         Width="16"
+         Height="12" />
 
    <!-- Style applied to the Thumbs that are used to resize the columns and rows.
         The Thumb's template is an empty Grid with a Transparent background to
@@ -94,19 +153,21 @@
 
          <TextBlock Text=": "
                     VerticalAlignment="Center" />
-            <ContentPresenter ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplate}"
-                              ContentTemplateSelector="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplateSelector}"
-                              VerticalAlignment="Center">
-                <ContentPresenter.Content>
-                   <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                        <Binding Path="Value" />
-                        <Binding Path="DataContext.ValueStringFormat" RelativeSource="{RelativeSource TemplatedParent}" />
-                        <Binding Path="DataContext.ValueStringFormatCulture" RelativeSource="{RelativeSource TemplatedParent}" />
-                   </MultiBinding>
-                </ContentPresenter.Content>
-            </ContentPresenter>
-
-            <TextBlock Text=" ("
+         <ContentPresenter ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplate}"
+                           ContentTemplateSelector="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplateSelector}"
+                           VerticalAlignment="Center">
+            <ContentPresenter.Content>
+               <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
+                  <Binding Path="Value" />
+                  <Binding Path="DataContext.ValueStringFormat"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                  <Binding Path="DataContext.ValueStringFormatCulture"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+               </MultiBinding>
+            </ContentPresenter.Content>
+         </ContentPresenter>
+
+         <TextBlock Text=" ("
                     VerticalAlignment="Center" />
          <TextBlock Text="{Binding ItemCount}"
                     VerticalAlignment="Center" />
@@ -135,23 +196,23 @@
          <DataTemplate x:Key="detailedGroupItemContentTemplate">
             <StackPanel Orientation="Horizontal"
                         VerticalAlignment="Center">
-                    <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
-                                    ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}"
-                                    TextBlock.FontWeight="Bold"
-                                    VerticalAlignment="Center">
-                        <ContentControl.Content>
+               <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
+                               ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}"
+                               TextBlock.FontWeight="Bold"
+                               VerticalAlignment="Center">
+                  <ContentControl.Content>
                      <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                                <Binding Path="(local:GroupNavigationControl.Group).Value"
-                                         RelativeSource="{RelativeSource Self}"/>
-                                <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
-                                         RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
-                                         RelativeSource="{RelativeSource Self}" />
-                           </MultiBinding>
-                        </ContentControl.Content>
-                    </ContentControl>
-
-                    <TextBlock Text=" ("
+                        <Binding Path="(local:GroupNavigationControl.Group).Value"
+                                 RelativeSource="{RelativeSource Self}" />
+                        <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
+                                 RelativeSource="{RelativeSource Self}" />
+                        <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
+                                 RelativeSource="{RelativeSource Self}" />
+                     </MultiBinding>
+                  </ContentControl.Content>
+               </ContentControl>
+
+               <TextBlock Text=" ("
                           VerticalAlignment="Center" />
                <TextBlock Text="{Binding ItemCount}"
                           VerticalAlignment="Center" />
@@ -176,20 +237,20 @@
          </DataTemplate>
 
          <DataTemplate x:Key="groupItemContentTemplate">
-                <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
-                                ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}">
-                    <ContentControl.Content>
+            <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
+                            ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}">
+               <ContentControl.Content>
                   <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                            <Binding Path="(local:GroupNavigationControl.Group).Value" 
-                                     RelativeSource="{RelativeSource Self}" />
-                            <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
-                                     RelativeSource="{RelativeSource Self}" />
-                            <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
-                                     RelativeSource="{RelativeSource Self}" />
-                        </MultiBinding>
-                    </ContentControl.Content>
-                </ContentControl>
-            </DataTemplate>
+                     <Binding Path="(local:GroupNavigationControl.Group).Value"
+                              RelativeSource="{RelativeSource Self}" />
+                     <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
+                              RelativeSource="{RelativeSource Self}" />
+                     <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
+                              RelativeSource="{RelativeSource Self}" />
+                  </MultiBinding>
+               </ContentControl.Content>
+            </ContentControl>
+         </DataTemplate>
 
          <DataTemplate x:Key="parentGroupTemplate">
             <local:GroupNavigationControl Group="{Binding}"
@@ -225,7 +286,7 @@
                       ContentTemplate="{StaticResource defaultGroupTemplate}" />
 
       <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.View, Converter={x:Static cnv:TypeToBooleanConverter.Singleton}, ConverterParameter={x:Type views:TableflowView}}"
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.View, Converter={x:Static conv:TypeToBooleanConverter.Singleton}, ConverterParameter={x:Type views:TableflowView}}"
                       Value="True">
             <Setter Property="ContentTemplate"
                     Value="{StaticResource stickyGroupTemplate}"
@@ -242,52 +303,12 @@
 
    </DataTemplate>
 
-   <!-- ValueConverter that is used to do DataTriggers on Content properties to check if they are null. -->
-   <cnv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-
-   <cnv:IntAdditionConverter x:Key="intAdditionConverter" />
-
-   <!-- ValueConverter that is used to map GridLineThickness properties (of type double)
-        to Thickness structures that we can set to BorderThickness properties in the templates. -->
-   <cnv:ThicknessConverter x:Key="thicknessConverter" />
-
-   <cnv:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
-
-   <cnv:SourceDataConverter x:Key="sourceDataConverter" />
-
    <Thickness x:Key="cellPadding"
               Left="2"
               Top="2"
               Right="2"
               Bottom="2" />
 
-   <!--**************************
-   * Style: ListBoxItem Style (AutoFilter Options)
-   **************************-->
-   <Style x:Key="defaultAutoFilteringCheckBoxItemStyle"
-          TargetType="ListBoxItem">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ListBoxItem}">
-
-               <Border Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}">
-
-                  <CheckBox Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                            Focusable="False"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsSelected, Mode=TwoWay}"
-                            Margin="2,2,2,2"
-                            AutomationProperties.AutomationId="{Binding RelativeSource={RelativeSource Self}, Path=Content, Converter={StaticResource sourceDataConverter}}" />
-               </Border>
-
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
 
    <DataTemplate x:Key="connectionStateLoadingGlyph">
       <DataTemplate.Resources>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
index d9c942eb..23c32eff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
@@ -41,7 +41,7 @@
       </Border>
    </DataTemplate>
 
-   <!-- Glyph that is displayed in the group headers to expand the group. -->
+  <!-- Glyph that is displayed in the group headers to expand the group. -->
    <DataTemplate x:Key="expandGroupGlyph">
       <Canvas Width="9"
               Height="9">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
index 4f83ac82..7f4b3a8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
@@ -25,12 +25,16 @@
       <markup:DataGridThemeResourceDictionary Source="Common.Resources.xaml" />
    </ResourceDictionary.MergedDictionaries>
 
+   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
+                            InverseValue="True" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
+
    <Style x:Key="tableViewRowFocusVisualStyle"
           TargetType="IFrameworkInputElement">
-      <Style.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter" />
-      </Style.Resources>
-
       <Setter Property="Control.Template">
          <Setter.Value>
             <ControlTemplate>
@@ -44,10 +48,6 @@
       </Setter>
    </Style>
 
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-
    <!--**************************
     * TEMPLATE: DataGridControl 
     ************************** -->
@@ -175,9 +175,6 @@
 
       <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
            This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
 
       <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
@@ -194,8 +191,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="2"
                  Grid.ColumnSpan="2"
@@ -209,30 +206,90 @@
                                                     views:TableView.CanScrollHorizontally="False" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1" />
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+         <views:FixedCellPanel x:Name="PART_CellsHost"
+                               Grid.Column="3"
+                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                               Margin="{TemplateBinding BorderThickness}" />
+      </Grid>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+   <ControlTemplate x:Key="tableViewDataRowTemplate"
+                    TargetType="local:DataRow">
+
+      <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
+           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
+
+      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- MasterDetail ToggleButton -->
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <!-- The border responsible for the visual outline of the row (gridlines and background)
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+         <Border x:Name="rootBorder"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 views:TableView.CanScrollHorizontally="False"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}" />
+
+         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
+                                                    views:TableView.CanScrollHorizontally="False" />
+
+         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this Row is part of a group. -->
          <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
                                         views:TableView.CanScrollHorizontally="False"
                                         Grid.Column="1" />
 
          <!-- ToggleButton that is used to expand/collapse the group. -->
          <Button x:Name="detailsToggle"
+                 Grid.Column="2"
                  Template="{StaticResource detailsExpanderButtonTemplate}"
                  VerticalAlignment="Top"
-                 Grid.Column="2"
                  Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
                  OverridesDefaultStyle="True"
                  Focusable="False"
                  Visibility="Collapsed"
                  views:TableView.CanScrollHorizontally="False" />
 
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <views:FixedCellPanel x:Name="PART_CellsHost"
                                Grid.Column="3"
@@ -255,19 +312,15 @@
          <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="True" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
@@ -278,22 +331,17 @@
               the Row's background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="False" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
                           Value="False" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
@@ -345,11 +393,6 @@
       <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
            This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
 
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
-
       <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
@@ -364,8 +407,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="1"
                  Grid.ColumnSpan="3"
@@ -376,7 +419,7 @@
                  Padding="{TemplateBinding Padding}" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
                                                     Grid.Column="0"
                                                     Background="{TemplateBinding Background}" />
@@ -385,17 +428,17 @@
                                         Grid.Column="1"
                                         Background="{TemplateBinding Background}" />
 
-         <!-- ToggleButton that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <Decorator x:Name="indentationDecorator"
                     Grid.Column="3">
@@ -407,6 +450,7 @@
                                   FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
                                   FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
                                   Margin="{TemplateBinding BorderThickness}" />
+
          </Decorator>
 
       </Grid>
@@ -561,18 +605,6 @@
 
          </MultiDataTrigger>
 
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When trigger is not active anymore, default binding
-              is restored automatically. -->
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -663,6 +695,7 @@
                            <ContentPresenter x:Name="sortGlyphPresenter"
                                              Content="{x:Null}"
                                              ContentTemplate="{x:Null}" />
+
                         </StackPanel>
                      </Border>
 
@@ -690,16 +723,6 @@
 
       <ControlTemplate.Triggers>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsPressed"
                   Value="True">
 
@@ -780,12 +803,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -905,7 +922,6 @@
    <!--**************************
     * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -920,7 +936,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
index f7f390c1..334ea8e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
@@ -338,7 +338,124 @@
 
    </ControlTemplate>
 
-   <!--**************************
+  <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+  <ControlTemplate x:Key="tableflowViewDataRowTemplate"
+                   TargetType="local:DataRow">
+
+    <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
+           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
+
+    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
+    <Grid x:Name="rootGrid">
+      <Grid.ColumnDefinitions>
+        <!-- HierarchicalGroupLevelIndicatorPane -->
+        <ColumnDefinition Width="Auto" />
+        <!-- GroupLevelIndicatorPane -->
+        <ColumnDefinition Width="Auto" />
+        <!-- MasterDetail ToggleButton -->
+        <ColumnDefinition Width="Auto" />
+
+        <!-- CellsHost panel -->
+        <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <!-- The border responsible for the visual outline of the row (gridlines and background)
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+      <Border x:Name="rootBorder"
+              Grid.Column="2"
+              Grid.ColumnSpan="2"
+              views:TableView.CanScrollHorizontally="False"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Padding="{TemplateBinding Padding}" />
+
+      <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
+                                                 views:TableView.CanScrollHorizontally="False" />
+
+      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this Row is part of a group. -->
+      <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                     views:TableView.CanScrollHorizontally="False"
+                                     Grid.Column="1" />
+
+      <!-- ToggleButton that is used to expand/collapse details. -->
+      <Button x:Name="detailsToggle"
+              Grid.Column="2"
+              Template="{StaticResource detailsExpanderButtonTemplate}"
+              VerticalAlignment="Top"
+              Margin="2,4,2,0"
+              OverridesDefaultStyle="True"
+              Focusable="False"
+              Visibility="Collapsed"
+              views:TableView.CanScrollHorizontally="False" />
+
+      <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+      <views:FixedCellPanel x:Name="PART_CellsHost"
+                            Grid.Column="3"
+                            ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                            ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                            FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                            FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                            Margin="{TemplateBinding BorderThickness}" />
+    </Grid>
+
+    <ControlTemplate.Triggers>
+
+      <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
+              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
+              elements because we want those modifications to be effective even when a value has been
+              explicitely set to these properties on the TemplatedParent. Also, when someone queries
+              the value of these properties on the TemplatedParent, we don't want to return the
+              intermediate, state-specific values. -->
+
+      <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
+                     Value="True" />
+          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
+                     Value="True" />
+        </MultiDataTrigger.Conditions>
+
+        <Setter TargetName="rootBorder"
+                Property="Background"
+                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
+        <Setter TargetName="rootGrid"
+                Property="TextElement.Foreground"
+                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
+
+      </MultiDataTrigger>
+
+      <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
+              the Row's background/foreground to the appropriate brushes. -->
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
+                     Value="True" />
+          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
+                     Value="False" />
+          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
+                     Value="False" />
+        </MultiDataTrigger.Conditions>
+
+        <Setter TargetName="rootBorder"
+                Property="Background"
+                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
+        <Setter TargetName="rootGrid"
+                Property="TextElement.Foreground"
+                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
+
+      </MultiDataTrigger>
+
+    </ControlTemplate.Triggers>
+
+  </ControlTemplate>
+
+  <!--**************************
     * TEMPLATE: ColumnManagerRow 
     ************************** -->
    <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
@@ -606,6 +723,7 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
+    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
     <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
    <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
@@ -666,6 +784,7 @@
                                       Visibility="Collapsed"
                                       Margin="2,0,0,0"
                                       Opacity="0.5" />
+
                      </Grid>
 
                   </Border>
@@ -719,16 +838,6 @@
 
       <ControlTemplate.Triggers>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsPressed"
                   Value="True">
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml
deleted file mode 100644
index 891429fa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or 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>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
index 3cbf1aa0..11cd9bdf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
@@ -14,6 +14,18 @@
 
   **********************************************************************************-->
 
+<!-- =======================================================================
+  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
+  Copyright (c) 2007-2017 Xceed Software Inc.
+
+  [TableViewScrollViewer.generic.xaml]
+
+  This file is part of the Xceed DataGrid for WPF product. The use and
+  distribution of this Customization Code is subject to the terms
+  and conditions refering to "Customization Code" that are specified in
+  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
+======================================================================= -->
+
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
index 0f605cf5..a016d396 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="#7F9DB9" />
@@ -27,6 +33,10 @@
    <SolidColorBrush x:Key="errorForegroundBrush"
                     Color="White" />
 
+   <!-- same as in TableflowView.Luna.homestead.xaml-->
+   <SolidColorBrush x:Key="headerBackgroundBrush"
+                    Color="#EBEADB" />
+
    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
    <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
    <Pen x:Key="dropMarkPen"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
index b3636d11..9315f999 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="#7F9DB9" />
@@ -27,6 +33,10 @@
    <SolidColorBrush x:Key="errorForegroundBrush"
                     Color="White" />
 
+   <!-- same as in TableflowView.Luna.metallic.xaml-->
+   <SolidColorBrush x:Key="headerBackgroundBrush"
+                    Color="#F9FAFD" />
+
    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
    <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
    <Pen x:Key="dropMarkPen"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
index 9bc51f8e..43324919 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="#7F9DB9" />
@@ -27,6 +33,10 @@
    <SolidColorBrush x:Key="errorForegroundBrush"
                     Color="White" />
 
+   <!-- same as in TableflowView.Luna.normalcolor.xaml-->
+   <SolidColorBrush x:Key="headerBackgroundBrush"
+                    Color="#EBEADB" />
+
    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
    <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
    <Pen x:Key="dropMarkPen"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
index 6bdc4de0..d7c66cca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
@@ -421,15 +421,6 @@
                     Property="Margin"
                     Value="18,0,0,0" />
          </MultiDataTrigger>
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
 
          <Trigger Property="IsMouseOver"
                   Value="True">
@@ -576,12 +567,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1150,6 +1135,10 @@
    <Style x:Key="tableViewLunaHomesteadDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewLunaHomesteadRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1261,6 +1250,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
index 81dff704..2033fa87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
@@ -585,16 +585,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -783,12 +773,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1435,6 +1419,10 @@
    <Style x:Key="tableViewLunaMetallicDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewLunaMetallicRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1545,6 +1533,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -1563,7 +1554,6 @@
 
    </Style>
 
-
    <!--**************************
     * STYLE: GroupByControl 
     ************************** -->
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
index 9868cab5..b9c4767f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
@@ -592,16 +592,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -790,12 +780,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1438,6 +1422,10 @@
    <Style x:Key="tableViewLunaNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1548,6 +1536,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
index 8710f1aa..072e47ee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
@@ -647,16 +647,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -802,12 +792,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1150,7 +1134,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,1,0,1">
@@ -1481,6 +1465,10 @@
    <Style x:Key="tableflowViewLunaHomesteadDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewLunaHomesteadRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1592,6 +1580,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2212,4 +2203,5 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlItemStyle}" />
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
index 69e3c257..de0687a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
@@ -809,16 +809,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -1007,12 +997,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1433,7 +1417,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,1,0,1">
@@ -1763,6 +1747,10 @@
    <Style x:Key="tableflowViewLunaMetallicDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewLunaMetallicRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
 
@@ -1875,6 +1863,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2499,4 +2490,6 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlItemStyle}" />
+
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
index abf88b76..ae50e8a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
@@ -814,16 +814,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -1012,12 +1002,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1438,7 +1422,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,1,0,1">
@@ -1765,6 +1749,10 @@
    <Style x:Key="tableflowViewLunaNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1875,6 +1863,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2497,5 +2488,6 @@
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />
+          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />  
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
index 4cd258a3..3b634382 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="#7F9DB9" />
@@ -64,5 +70,4 @@
 
    </ControlTemplate>
 
-
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
index f2ae1df3..961fb8f7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
@@ -563,16 +563,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -753,12 +743,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1405,6 +1389,10 @@
    <Style x:Key="tableViewRoyaleNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewRoyaleNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1516,6 +1504,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
index d17e8839..86908039 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
@@ -786,16 +786,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -976,12 +966,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1402,7 +1386,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,1,0,1">
@@ -1732,6 +1716,10 @@
    <Style x:Key="tableflowViewRoyaleNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1843,6 +1831,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2463,4 +2454,5 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlItemStyle}" />
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
index 1540eb3d..b14c11c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
@@ -183,6 +183,47 @@
    <SolidColorBrush x:Key="repeatButtonBorderDefaultBackgrounBrush"
                     Color="Transparent" />
 
+   <!--These Brushes are the basic light and dark borders for the controls-->
+   <LinearGradientBrush x:Key="basicWhiteBorderBrush"
+                        EndPoint="1.11,1.10"
+                        StartPoint="-0.03,-0.04">
+      <GradientStop Color="White" />
+      <GradientStop Offset="1"
+                    Color="White" />
+      <GradientStop Offset="0.5" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="basicBlackBorderBrush"
+                        EndPoint="1.18,1.16"
+                        StartPoint="-0.21,-0.19">
+      <GradientStop Color="Black"
+                    Offset="1" />
+      <GradientStop Color="#00000000"
+                    Offset="0.47" />
+      <GradientStop Color="Black" />
+   </LinearGradientBrush>
+
+   <!-- Used for DatePicker-->
+   <LinearGradientBrush x:Key="SelectedDatePickerItemBorderBrush"
+                        EndPoint="0.5,1"
+                        StartPoint="0.5,0">
+      <GradientStop Color="White"
+                    Offset="0.509" />
+      <GradientStop Color="#7FFFFFFF"
+                    Offset="1" />
+      <GradientStop Offset="0"
+                    Color="#7FFFFFFF" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="SelectedDatePickerItemBackground"
+                        EndPoint="0.5,1"
+                        StartPoint="0.5,0">
+      <GradientStop Color="#FFA8F5FB"
+                    Offset="0.703" />
+      <GradientStop Color="White"
+                    Offset="0.293" />
+   </LinearGradientBrush>
+
    <DataTemplate x:Key="leafGlyph">
       <Viewbox RenderTransformOrigin="0.5,0.5">
          <Viewbox.LayoutTransform>
@@ -476,7 +517,7 @@
                              Property="Background"
                              Value="{StaticResource checkBoxBorderPressedBackgroundBrush}" />
                   </Trigger>
-                     <Trigger Property="IsChecked"
+                  <Trigger Property="IsChecked"
                            Value="true">
                      <Setter TargetName="CheckMark"
                              Property="Visibility"
@@ -1599,6 +1640,9 @@
 
    </Style>
 
+   <Style TargetType="{x:Type ScrollViewer}"
+          BasedOn="{StaticResource ScrollViewerWindows7}" />
+
    <Style x:Key="windows7ComboBoxStyle"
           TargetType="{x:Type ComboBox}">
 
@@ -1684,8 +1728,8 @@
 
                            <!-- The StackPanel is used to display the children by setting IsItemsHost to be True -->
                            <StackPanel IsItemsHost="True"
-                                       KeyboardNavigation.DirectionalNavigation="Contained" 
-                                       TextElement.Foreground="White"/>
+                                       KeyboardNavigation.DirectionalNavigation="Contained"
+                                       TextElement.Foreground="White" />
 
                         </ScrollViewer>
 
@@ -1887,11 +1931,12 @@
       </Setter>
 
       <Style.Triggers>
-         <Trigger Property="IsVisible" Value="True">
+         <Trigger Property="IsVisible"
+                  Value="True">
             <Setter Property="HorizontalContentAlignment"
-                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
             <Setter Property="VerticalContentAlignment"
-                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
          </Trigger>
       </Style.Triggers>
    </Style>
@@ -1944,7 +1989,8 @@
           TargetType="{x:Type RepeatButton}">
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}"><Border Background="Transparent">
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="Transparent">
                   <ContentPresenter x:Name="glyphZone">
                      <ContentPresenter.Content>
                         <Canvas x:Name="leftArrowCanvas"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
index 31daaba8..4e50bcf0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
@@ -16,7 +16,16 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <SolidColorBrush x:Key="dataGridControlBackgroundBrush"
+                    Color="#E5EFFF" />
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="Black" />
@@ -66,6 +75,24 @@
         Brush="{StaticResource dropMarkBrush}"
         Thickness="7" />
 
+   <!-- Same as in TableflowView.Windows7.xaml-->
+   <SolidColorBrush x:Key="currentCellBackgroundBrush"
+                    Color="#7FFFFFFF" />
+
+   <!-- Same as in TableflowView.Windows7.xaml-->
+   <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
+                    Color="#FF3EBCF6" />
+
+   <!-- Same as in TableflowView.Windows7.xaml-->
+   <LinearGradientBrush x:Key="rowInactiveSelectionBackgroundBrush"
+                        EndPoint="1,0.5"
+                        StartPoint="0,0.5">
+      <GradientStop Color="#FFD9D9D9"
+                    Offset="0" />
+      <GradientStop Color="#FF9A9A9A"
+                    Offset="1" />
+   </LinearGradientBrush>
+
    <!--**************************
     * TEMPLATE: Button (for GroupByControl bubbles)
     ************************** -->
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
index b0a3d3eb..b91e8cc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
@@ -42,6 +42,14 @@
    <!-- Resources specific to this View/Theme/ColorScheme                   -->
    <!-- =================================================================== -->
 
+   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
+                            InverseValue="True" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
+
    <Color x:Key="mainGradientColor">
       #C4DDFF
    </Color>
@@ -313,6 +321,7 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
+   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
    <ControlTemplate x:Key="tableViewWindows7ColumnManagerCellTemplate"
@@ -521,14 +530,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-
-         </DataTrigger>
-
          <!-- Trigger to set the background and pressed effect depending on state -->
          <Trigger Property="IsMouseOver"
                   Value="true">
@@ -952,7 +953,6 @@
    <!--**************************
     * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableViewWindows7GroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -967,7 +967,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
@@ -1295,13 +1295,106 @@
    <ControlTemplate x:Key="tableViewWindows7RowTemplate"
                     TargetType="local:Row">
 
-      <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- MasterDetail ToggleButton -->
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <!-- The border responsible for the visual outline of the row (gridlines and background)
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+         <Border x:Name="rootBorder"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 views:TableView.CanScrollHorizontally="False"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}" />
+
+         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
+                                                    views:TableView.CanScrollHorizontally="False" />
+
+         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this Row is part of a group. -->
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1" />
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+         <views:FixedCellPanel x:Name="PART_CellsHost"
+                               Grid.Column="3"
+                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                               Margin="{TemplateBinding BorderThickness}" />
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
+              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
+              elements because we want those modifications to be effective even when a value has been
+              explicitely set to these properties on the TemplatedParent. Also, when someone queries
+              the value of these properties on the TemplatedParent, we don't want to return the
+              intermediate, state-specific values. -->
+
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="rootBorder"
+                    Property="Background">
+               <Setter.Value>
+                  <RadialGradientBrush Center="0.503,0.35"
+                                       GradientOrigin="1.009,0.295"
+                                       RadiusX="0.636"
+                                       RadiusY="2.375">
+                     <GradientStop Color="#FF04A2F7" />
+                     <GradientStop Color="#FF86E9F9"
+                                   Offset="1" />
+                     <GradientStop Color="#FF86E9F9"
+                                   Offset="0.5" />
+                  </RadialGradientBrush>
+               </Setter.Value>
+            </Setter>
+
+         </MultiDataTrigger>
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+   <ControlTemplate x:Key="tableViewWindows7DataRowTemplate"
+                    TargetType="local:DataRow">
 
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -1316,8 +1409,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="2"
                  Grid.ColumnSpan="2"
@@ -1331,30 +1424,22 @@
                                                     views:TableView.CanScrollHorizontally="False" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
                                         views:TableView.CanScrollHorizontally="False"
                                         Grid.Column="1" />
 
          <!-- ToggleButton that is used to expand/collapse the group. -->
          <Button x:Name="detailsToggle"
+                 Grid.Column="2"
                  Template="{StaticResource detailsExpanderButtonTemplate}"
                  VerticalAlignment="Top"
-                 Grid.Column="2"
                  Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
                  OverridesDefaultStyle="True"
                  Focusable="False"
                  Visibility="Collapsed"
                  views:TableView.CanScrollHorizontally="False" />
 
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <views:FixedCellPanel x:Name="PART_CellsHost"
                                Grid.Column="3"
@@ -1376,13 +1461,10 @@
 
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
@@ -1400,24 +1482,21 @@
                   </RadialGradientBrush>
                </Setter.Value>
             </Setter>
+
          </MultiDataTrigger>
 
          <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="True" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
@@ -1428,22 +1507,17 @@
               the Row's background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="False" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
                           Value="False" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
@@ -1491,15 +1565,10 @@
     ************************** -->
    <ControlTemplate x:Key="tableViewWindows7ColumnManagerRowTemplate"
                     TargetType="local:ColumnManagerRow">
+
       <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
            This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
 
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -1513,8 +1582,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="1"
                  Grid.ColumnSpan="3"
@@ -1547,17 +1616,17 @@
                                         Grid.Column="1"
                                         Background="{TemplateBinding Background}" />
 
-         <!-- Button that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,0,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <Decorator x:Name="indentationDecorator"
@@ -1790,18 +1859,6 @@
 
          </MultiDataTrigger>
 
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When the trigger is not active anymore, default binding
-              is restored automatically. -->
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
          <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
               the Cell's background to the appropriate brushes. -->
          <MultiDataTrigger>
@@ -2059,6 +2116,10 @@
    <Style x:Key="tableViewWindows7DataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewWindows7RowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewWindows7DataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -2174,6 +2235,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <Setter Property="TextElement.Foreground"
               Value="White" />
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
index fd2b5f2b..3b7a38a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
@@ -42,6 +42,15 @@
    <!-- Resources specific to this View/Theme/ColorScheme                   -->
    <!-- =================================================================== -->
 
+   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
+   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
+   <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
+   <conv:ThicknessConverter x:Key="thicknessConverter" />
+   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
+                            InverseValue="True" />
+   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
+   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
+
    <Color x:Key="mainGradientColor">
       #C4DDFF
    </Color>
@@ -540,6 +549,7 @@
    <!--**************************
     * TEMPLATE: ColumnManagerCell 
     ************************** -->
+   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
 
    <ControlTemplate x:Key="tableflowViewWindows7ColumnManagerCellTemplate"
@@ -685,16 +695,6 @@
 
       <ControlTemplate.Triggers>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <!-- The following 2 triggers allow to display the appropriate Sort Glyph
               depending on the ParentColumn's SortDirection. -->
 
@@ -758,14 +758,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-
-         </DataTrigger>
-
          <!-- Trigger to set the background and pressed effect depending on state -->
          <Trigger Property="IsMouseOver"
                   Value="true">
@@ -907,13 +899,104 @@
    <ControlTemplate x:Key="tableflowViewWindows7RowTemplate"
                     TargetType="local:Row">
 
-      <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
+      <Grid x:Name="rootGrid">
+         <Grid.ColumnDefinitions>
+            <!-- HierarchicalGroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <!-- GroupLevelIndicatorPane -->
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+
+            <!-- CellsHost panel -->
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <!-- The border responsible for the visual outline of the row (gridlines and background)
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+         <Border x:Name="rootBorder"
+                 Grid.Column="2"
+                 Grid.ColumnSpan="2"
+                 views:TableView.CanScrollHorizontally="False"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}" />
+
+         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
+                                                    views:TableView.CanScrollHorizontally="False" />
+
+         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this Row is part of a group. -->
+         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1" />
+
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
+
+         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+         <views:FixedCellPanel x:Name="PART_CellsHost"
+                               Grid.Column="3"
+                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                               Margin="{TemplateBinding BorderThickness}" />
+      </Grid>
+
+      <ControlTemplate.Triggers>
+
+         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
+              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
+              elements because we want those modifications to be effective even when a value has been
+              explicitely set to these properties on the TemplatedParent. Also, when someone queries
+              the value of these properties on the TemplatedParent, we don't want to return the
+              intermediate, state-specific values. -->
+
+         <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+            </MultiDataTrigger.Conditions>
+
+            <Setter TargetName="rootBorder"
+                    Property="Background">
+               <Setter.Value>
+                  <RadialGradientBrush Center="0.503,0.35"
+                                       GradientOrigin="1.009,0.295"
+                                       RadiusX="0.636"
+                                       RadiusY="2.375">
+                     <GradientStop Color="#FF04A2F7" />
+                     <GradientStop Color="#FF86E9F9"
+                                   Offset="1" />
+                     <GradientStop Color="#FF86E9F9"
+                                   Offset="0.5" />
+                  </RadialGradientBrush>
+               </Setter.Value>
+            </Setter>
+         </MultiDataTrigger>
+      </ControlTemplate.Triggers>
+
+   </ControlTemplate>
+
+   <!--**************************
+    * TEMPLATE: DataRow 
+    ************************** -->
+   <ControlTemplate x:Key="tableflowViewWindows7DataRowTemplate"
+                    TargetType="local:DataRow">
 
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -928,8 +1011,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="2"
                  Grid.ColumnSpan="2"
@@ -943,30 +1026,22 @@
                                                     views:TableView.CanScrollHorizontally="False" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
                                         views:TableView.CanScrollHorizontally="False"
                                         Grid.Column="1" />
 
          <!-- ToggleButton that is used to expand/collapse the group. -->
          <Button x:Name="detailsToggle"
+                 Grid.Column="2"
                  Template="{StaticResource detailsExpanderButtonTemplate}"
                  VerticalAlignment="Top"
-                 Grid.Column="2"
                  Margin="2,4,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
                  OverridesDefaultStyle="True"
                  Focusable="False"
                  Visibility="Collapsed"
                  views:TableView.CanScrollHorizontally="False" />
 
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <views:FixedCellPanel x:Name="PART_CellsHost"
                                Grid.Column="3"
@@ -988,13 +1063,10 @@
 
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
                           Value="Row" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
@@ -1017,19 +1089,15 @@
          <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="True" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
@@ -1040,22 +1108,17 @@
               the Row's background/foreground to the appropriate brushes. -->
          <MultiDataTrigger>
             <MultiDataTrigger.Conditions>
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
                           Value="True" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
                           Value="False" />
-
                <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
                           Value="False" />
-
             </MultiDataTrigger.Conditions>
 
             <Setter TargetName="rootBorder"
                     Property="Background"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
             <Setter TargetName="rootGrid"
                     Property="TextElement.Foreground"
                     Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
@@ -1396,7 +1459,6 @@
    <!--**************************
     * TEMPLATE: GroupHeaderControl
     ************************** -->
-   <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
    <ControlTemplate x:Key="tableflowViewWindows7GroupHeaderControlTemplate"
                     TargetType="local:GroupHeaderControl">
 
@@ -1410,7 +1472,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
             <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
             <Border x:Name="mainBorder"
                     Background="{TemplateBinding Background}"
@@ -1509,7 +1571,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,0,0,1"
@@ -1850,15 +1912,7 @@
     ************************** -->
    <ControlTemplate x:Key="tableflowViewWindows7ColumnManagerRowTemplate"
                     TargetType="local:ColumnManagerRow">
-      <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-      <ControlTemplate.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-      </ControlTemplate.Resources>
 
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
       <Grid x:Name="rootGrid">
          <Grid.ColumnDefinitions>
             <!-- HierarchicalGroupLevelIndicatorPane -->
@@ -1872,8 +1926,8 @@
          </Grid.ColumnDefinitions>
 
          <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
          <Border x:Name="rootBorder"
                  Grid.Column="1"
                  Grid.ColumnSpan="3"
@@ -1897,23 +1951,24 @@
                  views:TableView.CanScrollHorizontally="False" />
 
          <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
+              whenever this Row is part of a group. -->
          <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
                                                     Grid.Column="0" />
          <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
                                         views:TableView.CanScrollHorizontally="False"
                                         Grid.Column="1" />
 
-         <!-- Button that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 Grid.Column="2"
-                 Margin="2,0,2,0"
-                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
+         <!-- Space reserved for alignment with data rows. -->
+         <ContentPresenter x:Name="detailsToggle"
+                           Grid.Column="2"
+                           Content="{x:Null}"
+                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
+                           VerticalAlignment="Top"
+                           Margin="2,4,2,0"
+                           OverridesDefaultStyle="True"
+                           Focusable="False"
+                           Visibility="Collapsed"
+                           views:TableView.CanScrollHorizontally="False" />
 
          <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
          <Decorator x:Name="indentationDecorator"
@@ -1957,10 +2012,6 @@
    <ControlTemplate x:Key="tableflowViewWindows7CellTemplate"
                     TargetType="local:Cell">
 
-      <ControlTemplate.Resources>
-         <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </ControlTemplate.Resources>
-
       <Grid>
 
          <Border x:Name="rootBorder"
@@ -2104,18 +2155,6 @@
 
          </DataTrigger>
 
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When the trigger is not active anymore, default binding
-              is restored automatically. -->
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
          <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
               the Cell's background to the appropriate brushes. -->
          <MultiDataTrigger>
@@ -2428,6 +2467,10 @@
    <Style x:Key="tableflowViewWindows7DataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewWindows7RowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewWindows7DataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -2543,6 +2586,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <Setter Property="TextElement.Foreground"
               Value="White" />
 
@@ -2695,6 +2741,7 @@
             <Setter Property="Template"
                     Value="{StaticResource tableflowViewWindows7GroupHeaderTopLevelStickyControlTemplate}" />
          </MultiDataTrigger>
+
       </Style.Triggers>
 
    </Style>
@@ -3170,15 +3217,15 @@
           BasedOn="{StaticResource tableflowViewWindows7HierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewWindows7GroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewWindows7GroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewWindows7GroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
index 9bc51f8e..180900dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
@@ -16,7 +16,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+   <ResourceDictionary.MergedDictionaries>
+      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
    <SolidColorBrush x:Key="gridControlBorderBrush"
                     Color="#7F9DB9" />
@@ -27,6 +33,20 @@
    <SolidColorBrush x:Key="errorForegroundBrush"
                     Color="White" />
 
+   <!-- Same as in TableflowView.Zune.normalcolor.xaml-->
+   <LinearGradientBrush x:Key="headerBackgroundBrush"
+                        StartPoint="0.5,0"
+                        EndPoint="0.5,1">
+      <GradientStop Color="#e2e2e2"
+                    Offset="0" />
+      <GradientStop Color="#e2e2e2"
+                    Offset="0.16" />
+      <GradientStop Color="#DBDBDB"
+                    Offset="0.16" />
+      <GradientStop Color="#DBDBDB"
+                    Offset="1" />
+   </LinearGradientBrush>
+
    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
    <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
    <Pen x:Key="dropMarkPen"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
index 82fb9ba0..62fdd709 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
@@ -496,16 +496,6 @@
 
       <ControlTemplate.Triggers>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -648,12 +638,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1224,6 +1208,10 @@
    <Style x:Key="tableViewZuneNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableViewZuneNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1335,6 +1323,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
index 012793a7..690966ce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
@@ -721,16 +721,6 @@
                     Value="18,0,0,0" />
          </MultiDataTrigger>
 
-         <!-- Trigger related to the filteringToggleButton-->
-         <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
          <Trigger Property="IsMouseOver"
                   Value="True">
 
@@ -873,12 +863,6 @@
                     Value="False" />
          </DataTrigger>
 
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
       </ControlTemplate.Triggers>
 
    </ControlTemplate>
@@ -1223,7 +1207,7 @@
             <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
             <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
                                            Indented="False"
-                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource intAdditionConverter}, ConverterParameter=-1}" />
 
             <Grid>
                <Border BorderThickness="0,1,0,1">
@@ -1554,6 +1538,10 @@
    <Style x:Key="tableflowViewZuneNormalColorDataRowStyle"
           TargetType="local:DataRow"
           BasedOn="{StaticResource tableflowViewZuneNormalColorRowStyle}">
+
+      <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataRowTemplate}" />
+
    </Style>
 
    <!--**************************
@@ -1665,6 +1653,9 @@
       <Setter Property="Background"
               Value="Transparent" />
 
+      <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
+
       <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
       <Setter Property="Width"
               Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
@@ -2296,4 +2287,6 @@
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
           TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlItemStyle}" />
+
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
index 316e120c..b7be7f01 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml"/>
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml"/>
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -211,15 +210,15 @@
           BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
index 07bf18da..6add0aed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml"/>
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml"/>
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -44,87 +43,83 @@
           TargetType="views:TableView"
           BasedOn="{StaticResource tableViewAero2NormalColorDefaultValues}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
           TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGridControlStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGridControlStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
           TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorPaneStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorPaneStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
           TargetType="local:RowSelector"
           BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
           TargetType="local:Row"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
           TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataRowStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorDataRowStyle}" />
 
     <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
           TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerRowStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerRowStyle}" />
 
     <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
           TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
           TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataCellStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorDataCellStyle}" />
 
     <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
           TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerCellStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerCellStyle}" />
 
     <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
           TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByControlStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupByControlStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
           TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByItemStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupByItemStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
           TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupHeaderControlStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupHeaderControlStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
           TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
           TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorDetailIndicatorStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorDetailIndicatorStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}"/>
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
           TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorPaneStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
 
     <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
           TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewAero2NormalColorScrollTipStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorScrollTipStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
           TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
+   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
           TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlStyle}"/>
+          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlStyle}" />
 
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByItemStyle}"/> -->
+  <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
+         TargetType="local:HierarchicalGroupByItem"
+         BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByItemStyle}" />-->
 
-   <!-- Generic theme for TableflowView -->
+  <!-- Generic theme for TableflowView -->
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
           TargetType="views:TableflowView"
@@ -211,15 +206,15 @@
           BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
index 3c1da49d..1063eaf2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml"/>
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml"/>
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
index 09f861ac..d49a4fff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -262,15 +261,15 @@
           BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
index 0b5bb85f..2da5fb65 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -203,15 +202,15 @@
           BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
index f1893424..630cd4b2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -211,15 +210,15 @@
           BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
index 4dafadcb..bd5ead6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -203,15 +202,15 @@
           BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
index 26796eb1..1d955ce0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -211,15 +210,15 @@
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
index 322f7d20..986169b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
@@ -23,7 +23,6 @@
    <ResourceDictionary.MergedDictionaries>
       <!-- Style definitions for specific controls (things that are not grid elements) -->
 
-      <markup:DataGridThemeResourceDictionary Source="/themes/Controls/FixedColumnSplitter.generic.xaml" />
       <markup:DataGridThemeResourceDictionary Source="/themes/Controls/TableViewScrollViewer.generic.xaml" />
 
       <!-- For each specific systeme theme ResourceDictionary, we only need to include 
@@ -211,15 +210,15 @@
           BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByItemStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
           BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationButtonStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
           BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlStyle}" />
 
    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
           BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlItemStyle}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
index cfd75b51..ee02ab5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
index b878d4d4..84c34e12 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/CodeBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
index b3eb63cf..6a9e6c2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/AutoSelectTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
index ce10aeba..81c9135d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/AutoSelectTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt
index 1d7a3c92..7c5f24d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
            The AutoSelectTextBox allows the text content to be selected when the control get the focus. It also allows the Focus navigation behavior within the control to be affected.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <StackPanel>
       <StackPanel.Resources>
          <Style TargetType="{x:Type xctk:AutoSelectTextBox}">
@@ -54,7 +54,7 @@
             </StackPanel>
          </Grid>
       </GroupBox>
-      
+
       <StackPanel>
          <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
          <RichTextBox IsReadOnly="True" BorderThickness="0">
@@ -75,7 +75,7 @@
                </Paragraph>
             </FlowDocument>
          </RichTextBox>
-         
+
          <!-- PHONE NUMBER FIELDS -->         
          <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <TextBlock Text="(" VerticalAlignment="Center"/>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt
index a5c9dffe..73380b92 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/AvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt
index d8fc6655..67420a70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,107 +14,141 @@
 
   ***********************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views.AvalonDockView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 Title="AvalonDock">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
-      </Paragraph>
-   </local:DemoView.Description>
-      
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                Title="AvalonDock">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
+    </Paragraph>
+  </local:DemoView.Description>
 
-     <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" />
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
 
-      <xcad:DockingManager Grid.Row="2" MaxHeight="395"
-                           AllowMixedOrientation="True"
-                           BorderBrush="Black"
-                           BorderThickness="1">
-         <xcad:DockingManager.DocumentHeaderTemplate>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="{Binding IconSource}" Margin="0,0,4,0"/>
-                  <TextBlock Text="{Binding Title}" />
-               </StackPanel>
-            </DataTemplate>
-         </xcad:DockingManager.DocumentHeaderTemplate>
-         <xcad:LayoutRoot x:Name="_layoutRoot">
-            <xcad:LayoutPanel Orientation="Horizontal">
-               <xcad:LayoutAnchorablePane DockWidth="200">
-                  <xcad:LayoutAnchorable ContentId="properties" Title="Properties" CanHide="False" CanClose="False"
-                                            AutoHideWidth="240"
-                                         IconSource="../Images/property-blue.png">
-                     <xctk:PropertyGrid NameColumnWidth="110" SelectedObject="{Binding ElementName=_layoutRoot, Path=LastFocusedDocument.Content}" AutoGenerateProperties="False">
-                        <xctk:PropertyGrid.PropertyDefinitions>
-                           <xctk:PropertyDefinition TargetProperties="Background" />
-                           <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                           <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                           <xctk:PropertyDefinition TargetProperties="FontSize" />
-                           <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                           <xctk:PropertyDefinition TargetProperties="Width" />
-                           <xctk:PropertyDefinition TargetProperties="Height" />
-                        </xctk:PropertyGrid.PropertyDefinitions>
-                     </xctk:PropertyGrid>
-                  </xcad:LayoutAnchorable>
-               </xcad:LayoutAnchorablePane>
-               <xcad:LayoutDocumentPaneGroup >
-                  <xcad:LayoutDocumentPane>
-                     <xcad:LayoutDocument ContentId="document1" Title="Document 1" IconSource="../Images/document.png" >
-                           <Button Content="Document 1 Content" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                     </xcad:LayoutDocument>
-                     <xcad:LayoutDocument ContentId="document2" Title="Document 2" IconSource="../Images/document.png">
-                        <TextBox Text="Document 2 Content" AcceptsReturn="True"/>
-                     </xcad:LayoutDocument>
-                  </xcad:LayoutDocumentPane>
-               </xcad:LayoutDocumentPaneGroup >
-               <xcad:LayoutAnchorablePaneGroup DockWidth="125">
-                  <xcad:LayoutAnchorablePane>
-                     <xcad:LayoutAnchorable ContentId="alarms" Title="Alarms" IconSource="../Images/alarm-clock-blue.png" >
-                        <ListBox>
-                           <s:String>Alarm 1</s:String>
-                           <s:String>Alarm 2</s:String>
-                           <s:String>Alarm 3</s:String>
-                        </ListBox>
-                     </xcad:LayoutAnchorable>
-                     <xcad:LayoutAnchorable ContentId="journal" Title="Journal" >
-                        <RichTextBox>
-                           <FlowDocument>
-                              <Paragraph FontSize="14" FontFamily="Segoe">
-                                 This is the content of the Journal Pane.
-                                 <LineBreak/>
-                                 A
-                                 <Bold>RichTextBox</Bold> has been added here
-                              </Paragraph>
-                           </FlowDocument>
-                        </RichTextBox>
-                     </xcad:LayoutAnchorable>
-                  </xcad:LayoutAnchorablePane>
-               </xcad:LayoutAnchorablePaneGroup>
-            </xcad:LayoutPanel>
+    <TextBlock Grid.Row="1"
+               Text="Usage:"
+               Style="{StaticResource Header}" />
 
-            <xcad:LayoutRoot.LeftSide>
-               <xcad:LayoutAnchorSide>
-                  <xcad:LayoutAnchorGroup>
-                     <xcad:LayoutAnchorable Title="Agenda" ContentId="agenda" IconSource="../Images/address-book-open.png">
-                        <TextBlock Text="Agenda Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
-                     </xcad:LayoutAnchorable>
-                     <xcad:LayoutAnchorable Title="Contacts" ContentId="contacts" IconSource="../Images/address-book--pencil.png" >
-                        <TextBlock Text="Contacts Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
-                     </xcad:LayoutAnchorable>
-                  </xcad:LayoutAnchorGroup>
-               </xcad:LayoutAnchorSide>
-            </xcad:LayoutRoot.LeftSide>
-         </xcad:LayoutRoot>
-      </xcad:DockingManager>
-   </Grid>
+    <xcad:DockingManager Grid.Row="2"
+                         MaxHeight="395"
+                         AllowMixedOrientation="True"
+                         BorderBrush="Black"
+                         BorderThickness="1">
+      <xcad:DockingManager.DocumentHeaderTemplate>
+        <DataTemplate>
+          <StackPanel Orientation="Horizontal">
+            <Image Source="{Binding IconSource}"
+                   Margin="0,0,4,0" />
+            <TextBlock Text="{Binding Title}" />
+          </StackPanel>
+        </DataTemplate>
+      </xcad:DockingManager.DocumentHeaderTemplate>
+      <xcad:LayoutRoot x:Name="_layoutRoot">
+        <xcad:LayoutPanel Orientation="Horizontal">
+          <xcad:LayoutAnchorablePane DockWidth="200">
+            <xcad:LayoutAnchorable ContentId="properties"
+                                   Title="Properties"
+                                   CanHide="False"
+                                   CanClose="False"
+                                   AutoHideWidth="240"
+                                   IconSource="../Images/property-blue.png">
+              <xctk:PropertyGrid NameColumnWidth="110"
+                                 SelectedObject="{Binding ElementName=_layoutRoot, Path=LastFocusedDocument.Content}"
+                                 AutoGenerateProperties="False">
+                <xctk:PropertyGrid.PropertyDefinitions>
+                  <xctk:PropertyDefinition TargetProperties="Background" />
+                  <xctk:PropertyDefinition TargetProperties="BorderBrush" />
+                  <xctk:PropertyDefinition TargetProperties="BorderThickness" />
+                  <xctk:PropertyDefinition TargetProperties="FontSize" />
+                  <xctk:PropertyDefinition TargetProperties="FontStyle" />
+                  <xctk:PropertyDefinition TargetProperties="Width" />
+                  <xctk:PropertyDefinition TargetProperties="Height" />
+                </xctk:PropertyGrid.PropertyDefinitions>
+              </xctk:PropertyGrid>
+            </xcad:LayoutAnchorable>
+          </xcad:LayoutAnchorablePane>
+          <xcad:LayoutDocumentPaneGroup>
+            <xcad:LayoutDocumentPane>
+              <xcad:LayoutDocument ContentId="document1"
+                                   Title="Document 1"
+                                   IconSource="../Images/document.png">
+                <Button Content="Document 1 Content"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center" />
+              </xcad:LayoutDocument>
+              <xcad:LayoutDocument ContentId="document2"
+                                   Title="Document 2"
+                                   IconSource="../Images/document.png">
+                <TextBox Text="Document 2 Content"
+                         AcceptsReturn="True" />
+              </xcad:LayoutDocument>
+            </xcad:LayoutDocumentPane>
+          </xcad:LayoutDocumentPaneGroup >
+          <xcad:LayoutAnchorablePaneGroup DockWidth="125">
+            <xcad:LayoutAnchorablePane>
+              <xcad:LayoutAnchorable ContentId="alarms"
+                                     Title="Alarms"
+                                     IconSource="../Images/alarm-clock-blue.png"
+                                     CanClose="True">
+                <ListBox>
+                  <s:String>Alarm 1</s:String>
+                  <s:String>Alarm 2</s:String>
+                  <s:String>Alarm 3</s:String>
+                </ListBox>
+              </xcad:LayoutAnchorable>
+              <xcad:LayoutAnchorable ContentId="journal"
+                                     Title="Journal">
+                <RichTextBox>
+                  <FlowDocument>
+                    <Paragraph FontSize="14"
+                               FontFamily="Segoe">
+                      This is the content of the Journal Pane.
+                      <LineBreak />
+                      A
+                      <Bold>RichTextBox</Bold> has been added here
+                    </Paragraph>
+                  </FlowDocument>
+                </RichTextBox>
+              </xcad:LayoutAnchorable>
+            </xcad:LayoutAnchorablePane>
+          </xcad:LayoutAnchorablePaneGroup>
+        </xcad:LayoutPanel>
+
+        <xcad:LayoutRoot.LeftSide>
+          <xcad:LayoutAnchorSide>
+            <xcad:LayoutAnchorGroup>
+              <xcad:LayoutAnchorable Title="Agenda"
+                                     ContentId="agenda"
+                                     IconSource="../Images/address-book-open.png">
+                <TextBlock Text="Agenda Content"
+                           Margin="10"
+                           FontSize="18"
+                           FontWeight="Black"
+                           TextWrapping="Wrap" />
+              </xcad:LayoutAnchorable>
+              <xcad:LayoutAnchorable Title="Contacts"
+                                     ContentId="contacts"
+                                     IconSource="../Images/address-book--pencil.png">
+                <TextBlock Text="Contacts Content"
+                           Margin="10"
+                           FontSize="18"
+                           FontWeight="Black"
+                           TextWrapping="Wrap" />
+              </xcad:LayoutAnchorable>
+            </xcad:LayoutAnchorGroup>
+          </xcad:LayoutAnchorSide>
+        </xcad:LayoutRoot.LeftSide>
+      </xcad:LayoutRoot>
+    </xcad:DockingManager>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt
index d2b3b9c0..54099f48 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicatorCustomContentTemplateView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt
index d1dc36f9..f620b849 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
             This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt
index 6570ead1..02af7688 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicatorCustomContentView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt
index e0830f05..79180dbf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
             This example demonstrates how to define your own custom content. This is done by setting the BusyContent property.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt
index 1cbe9296..d1ccd2aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt
index 0f5762c2..aaa3bece 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ButtonSpinnerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt
index 6bb8736b..2cbdd52f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ButtonSpinnerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt
index 5939da76..7b8b20b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,9 +25,9 @@
             The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
-       
+
       <x:Array x:Key="names" Type="s:String">
          <s:String>John Smith</s:String>
          <s:String>Janel Leverling</s:String>
@@ -40,7 +40,7 @@
          <s:String>Naomi Suyama</s:String>
       </x:Array>       
    </local:DemoView.Resources>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt
index 87163825..77ca355a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/CalculatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt
index 670fd1af..1363f5f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
             The Calculator is a control used for performing mathematical calculations.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt
index 9a149c79..85c4ba11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;
@@ -29,119 +26,33 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
   /// </summary>
   public partial class ChartAxisView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
-
-    private static DataPointsList<DataPoint> _numericDataPoints = new DataPointsList<DataPoint>() 
-                                                                  {   new DataPoint(1, 1)
-                                                                    , new DataPoint(2, 2)
-                                                                    , new DataPoint(1.5, 3)
-                                                                    , new DataPoint(5, 3.5) 
-                                                                  };
-    private static DataPointsList<DataPoint> _dateTimeDataPoints = new DataPointsList<DataPoint>()
-                                                                  {
-                                                                      new DataPoint( new System.DateTime( 2000, 1, 1 ).ToOADate(), 1 )
-                                                                    , new DataPoint( new System.DateTime( 2001, 1, 1 ).ToOADate(), 2 )
-                                                                    , new DataPoint( new System.DateTime( 2002, 5, 5 ).ToOADate(), 4 )
-                                                                    , new DataPoint( new System.DateTime( 2003, 1, 1 ).ToOADate(), 3 )
-                                                                  };
-    private static DataPointsList<DataPoint> _labelsDataPoints = new DataPointsList<DataPoint>()
-                                                                  {
-                                                                      new DataPoint( 0, 5, "Zeus" )
-                                                                    , new DataPoint( 0, 2, "Poseidon" )
-                                                                    , new DataPoint( 0, 3, "Hades" )
-                                                                    , new DataPoint( 0, 4, "Hestia" )
-                                                                    , new DataPoint( 0, 1, "Hera" )
-                                                                  };
-    #endregion
 
 
-    #region Dependency Properties
 
-    public static readonly DependencyProperty SelectedAxisProperty = DependencyProperty.Register(
-     "SelectedAxis",
-     typeof( Axis ),
-     typeof( ChartAxisView ),
-     new UIPropertyMetadata( null ) );
 
-    #endregion
 
-    #region Properties
 
-    public Axis SelectedAxis
-    {
-      get
-      {
-        return ( Axis )GetValue( SelectedAxisProperty );
-      }
-      set
-      {
-        SetValue( SelectedAxisProperty, value );
-      }
-    }
 
-    #endregion
-#endif
+
 
     #region Initialization
 
     public ChartAxisView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      _axisComboBox.SelectedIndex = 0;
-      _xAxis.DateTimeFormat = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
-#endif
     }
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Event Handlers
 
-    private void OnAxisComboBoxSelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = ( ComboBox )sender;
-      
-      this.SelectedAxis = ( comboBox.SelectedIndex == 0 ) ? _xAxis : _yAxis;
-    }
 
-    private void OnAxisLabelsTypeChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = ( ComboBox )sender;
-
-      switch( (LabelsType)comboBox.SelectedItem )
-      {
-        case LabelsType.Numeric: 
-          this.SetSeriesDataPoints( _numericDataPoints ); 
-          break;
-        case LabelsType.DateTime:
-          this.SetSeriesDataPoints( _dateTimeDataPoints );
-          break;
-        case LabelsType.Labels : 
-          this.SetSeriesDataPoints( _labelsDataPoints ); 
-          this.SelectedAxis.GraduationMode = AxisGraduationMode.Manual; 
-          break;
-      }
-    }
 
-    #endregion
-#endif
+
+
 
     #region Implementation
 
-#if !OPEN_SOURCE
-    private void SetSeriesDataPoints( DataPointsList<DataPoint> list )
-    {
-      if( _series != null )
-      {
-        _series.DataPoints.Clear();
 
-        foreach( DataPoint dataPoint in list )
-          _series.DataPoints.Add( dataPoint );
-      }
-    }
-#endif
     #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
index da0fd540..4be65176 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,212 +25,29 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The chart's Axis class represents the x- and y-axis of an area (Area class) in a chart. They can be individually configured with many properties.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="AxisLabelsType" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:LabelsType" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisGraduationMode" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisGraduationMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisScaleMode" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisScaleMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisLabelLayout" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisLabelLayout" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <x:Array x:Key="AxisArray" Type="sys:String">
-            <sys:String>X Axis</sys:String>
-            <sys:String>Y Axis</sys:String>
-        </x:Array>
-        
-        <conv:GraduationModeToComboBoxConverter x:Key="GraduationModeToComboBoxConverter" />
-        <conv:LabelsTypeToPropertyEnabledConverter x:Key="LabelsTypeToPropertyEnabledConverter" />
-        <conv:ScaleModeToPropertyEnabledConverter x:Key="ScaleModeToPropertyEnabledConverter" />
-        <conv:AxesLabelsTypePropertyEnabledConverter x:Key="AxesLabelsTypePropertyEnabledConverter" />
-        
-        <sys:String x:Key="AxisLabelsLayoutTooltip">
-            Resize the window along the orientation of the selected axis to see all labels (staggered) or only the ones that fit (every second, third label, etc., is omitted).
-        </sys:String>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="3">
-         <Grid Margin="3" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column -->
-            <TextBlock Text="Axis: " VerticalAlignment="Center" FontWeight="Bold" FontSize="13"/>
-            <ComboBox x:Name="_axisComboBox" FontWeight="Bold" FontSize="13" Grid.Column="1" ItemsSource="{StaticResource AxisArray}" SelectionChanged="OnAxisComboBoxSelectionChanged" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3"/>
-            <TextBlock Text="Labels Type: " Grid.Row="1" VerticalAlignment="Center" />
-            <ComboBox x:Name="_labelsType" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisLabelsType}}" SelectedItem="{Binding SelectedAxis.LabelsType, ElementName=_demo}" SelectionChanged="OnAxisLabelsTypeChanged" IsEnabled="{Binding SelectedIndex, ElementName=_axisComboBox, Converter={StaticResource AxesLabelsTypePropertyEnabledConverter}}"  Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Graduation Mode: " Grid.Row="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_graduationMode}" />
-            <ComboBox x:Name="_graduationMode" Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisGraduationMode}}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_labelsType, Converter={StaticResource LabelsTypeToPropertyEnabledConverter}, ConverterParameter=0}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3">
-                <ComboBox.SelectedItem>
-                    <MultiBinding Converter="{StaticResource GraduationModeToComboBoxConverter}" >
-                       <Binding Path="SelectedAxis.GraduationMode" ElementName="_demo" />
-                       <Binding Path="SelectedAxis.LabelsType" ElementName="_demo" />
-                    </MultiBinding>
-                </ComboBox.SelectedItem>
-            </ComboBox>
-            <TextBlock Text="Scale Mode: " Grid.Row="3" VerticalAlignment="Center" />
-            <ComboBox x:Name="_scaleMode" Grid.Row="3" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisScaleMode}}" SelectedItem="{Binding SelectedAxis.ScaleMode, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Custom Range Start: " Grid.Row="4" VerticalAlignment="Center" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_customRangeStart" Grid.Row="4" Grid.Column="1" Minimum="0" Maximum="{Binding Value, ElementName=_customRangeEnd}" Value="{Binding SelectedAxis.CustomRangeStart, ElementName=_demo}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Custom Range End: " Grid.Row="5" VerticalAlignment="Center" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_customRangeEnd" Grid.Row="5" Grid.Column="1" Minimum="{Binding Value, ElementName=_customRangeStart}" Maximum="100" Value="{Binding SelectedAxis.CustomRangeEnd, ElementName=_demo}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Label Decimal Count: " Grid.Row="6" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_labelDecimalCount}" Style="{StaticResource DisableGrayText}"/>
-            <ComboBox x:Name="_labelDecimalCount" Grid.Row="6" Grid.Column="1" SelectedValue="{Binding SelectedAxis.LabelDecimalCount, ElementName=_demo}" SelectedValuePath="Tag" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" IsEnabled="{Binding SelectedItem, ElementName=_labelsType, Converter={StaticResource LabelsTypeToPropertyEnabledConverter}, ConverterParameter=1}" Margin="3" ToolTip="Gets/sets the decimal count on labels when GraduationMode is Numeric.">
-               <ComboBoxItem Content="Null" Tag="{x:Null}"/>
-               <ComboBoxItem Content="0" Tag="0"/>
-               <ComboBoxItem Content="1" Tag="1"/>
-               <ComboBoxItem Content="2" Tag="2"/>
-               <ComboBoxItem Content="3" Tag="3"/>
-               <ComboBoxItem Content="4" Tag="4"/>
-            </ComboBox>
-
-            <!-- 2nd column -->
-            <TextBlock Text="Title: " Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <TextBox Grid.Column="3" Text="{Binding SelectedAxis.Title, ElementName=_demo, UpdateSourceTrigger=PropertyChanged}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Title Margin: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding SelectedAxis.TitleMargin, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Axis Labels Layout: " Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <ComboBox Grid.Row="2" Grid.Column="3" ItemsSource="{Binding Source={StaticResource AxisLabelLayout}}" SelectedItem="{Binding SelectedAxis.AxisLabelsLayout, ElementName=_demo}" ToolTip="{StaticResource AxisLabelsLayoutTooltip}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Ticks Count: " Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding SelectedAxis.TicksCount, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Reversed: " Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="4" Grid.Column="3" IsChecked="{Binding SelectedAxis.Reversed, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="IntersectMinValue: " Grid.Row="5" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="5" Grid.Column="3" IsChecked="{Binding SelectedAxis.IntersectMinValue, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" ToolTip="Gets/Sets if the axis intersects the other axis at other axis minimim value."/>
-            
-            <!-- 3rd column -->
-            <TextBlock Text="Show Arrow: " Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowArrow, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Show Axis: " Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="1" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowAxis, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Show Grid Lines: " Grid.Row="2" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="2" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowGridLines, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Show Ticks: " Grid.Row="3" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="3" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowTicks, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Show Tick Labels: " Grid.Row="4" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="4" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowTickLabels, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-            <TextBlock Text="Show Axis Label: " Grid.Row="5" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="5" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowAxisLabel, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="200" ShowLegend="False">
-         <xctk:Chart.Areas>
-            <xctk:Area Title="Area #1">
-               <xctk:Area.XAxis>
-				  <xctk:Axis x:Name="_xAxis" 
-                             LabelsType="Numeric"
-                             GraduationMode="Automatic" 
-                             TicksCount="10"
-                             ScaleMode="Automatic"
-                             CustomRangeStart="0"
-                             CustomRangeEnd="10"
-                             Title="X Axis"
-                             TitleMargin="10"
-                             AxisLabelsLayout="ShowAll"
-                             ShowArrow="False"
-                             ShowAxis="True"
-                             ShowGridLines="True"
-                             ShowTicks="True"
-                             ShowTickLabels="True"
-                             ShowAxisLabel="True"
-                             Reversed="False"
-                             IntersectMinValue="True"
-                             LabelDecimalCount="{x:Null}"/>
-				</xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-				  <xctk:Axis x:Name="_yAxis" 
-                             LabelsType="Numeric"
-                             GraduationMode="Automatic" 
-                             TicksCount="10"
-                             ScaleMode="Automatic"
-                             CustomRangeStart="0"
-                             CustomRangeEnd="10"
-                             Title="Y Axis"
-                             TitleMargin="10"
-                             AxisLabelsLayout="ShowAll"
-                             ShowArrow="False"
-                             ShowAxis="True"
-                             ShowGridLines="True"
-                             ShowTicks="True"
-                             ShowTickLabels="True"
-                             ShowAxisLabel="True"
-                             Reversed="False"
-                             IntersectMinValue="True"
-                             LabelDecimalCount="{x:Null}" />
-				</xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series x:Name="_series"
-                                 DefaultInterior="Red">
-                        <xctk:Series.Layout>
-							<xctk:ColumnLayout/>
-						</xctk:Series.Layout>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-         </xctk:Chart.Areas>
-      </xctk:Chart>
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartAxis.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt
index f3bf7bc0..4fa944ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   **************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt
index fe99f425..ed9dd017 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,135 +28,24 @@
             <LineBreak />
             <LineBreak />
             <Run>A legend can be moved around, resized, and docked. Please note that a legend can be resized only when its Dock property is set to Float and if the AllowResize property is set to true.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->      
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="LegendDock" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:LegendDock" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Dock: " VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Source={StaticResource LegendDock}}" SelectedItem="{Binding Dock, ElementName=_legend}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Title: " Grid.Row="1" VerticalAlignment="Center" />
-            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_legend, UpdateSourceTrigger=PropertyChanged}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-             
-            <!-- 2nd column-->
-            <TextBlock Text="Allow Resize: " Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Column="3" IsChecked="{Binding AllowResize, ElementName=_legend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Allow Move: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox x:Name="_allowMove" Grid.Row="1" Grid.Column="3" IsChecked="{Binding AllowMove, ElementName=_legend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!--3rd column-->
-            <TextBlock Text="Allow Dock: " Grid.Column="4" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_allowMove}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox Grid.Column="5" IsChecked="{Binding AllowDock, ElementName=_legend}" IsEnabled="{Binding IsChecked, ElementName=_allowMove}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="350">
-         <xctk:Chart.Legend>
-               <xctk:Legend x:Name="_legend"
-                              Dock="Left"
-                              AllowResize="True"
-                              AllowDock="True"
-                              AllowMove="True"
-                              Title="Legend"/>
-            </xctk:Chart.Legend>
-         <xctk:Chart.Areas>
-            <xctk:Area Title="Wins/month">
-               <xctk:Area.XAxis>
-                     <xctk:Axis ShowAxisLabel="False" ShowTickLabels="False" ShowTicks="False"/>
-               </xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-                     <xctk:Axis  ShowAxisLabel="False" ShowTickLabels="False" ShowTicks="False"/>
-               </xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series  Title="Months"
-                                 DefaultInterior="Green"
-                                 ShowPointsInLegend="True"
-                                 ShowHintLabels="True">
-                        <xctk:Series.Layout>
-                           <xctk:PieLayout />
-                        </xctk:Series.Layout>
-                        <xctk:Series.DataPoints>
-                           <xctk:DataPoint X="6" Y="6" Label="Jan" />
-                           <xctk:DataPoint X="7" Y="7" Label="Feb"/>
-                           <xctk:DataPoint X="4" Y="4" Label="Mar" />
-                           <xctk:DataPoint X="2" Y="2" Label="Apr"/>
-                        </xctk:Series.DataPoints>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-                    
-            <xctk:Area Title="Goals/player">
-               <xctk:Area.XAxis>
-                     <xctk:Axis Title="Player's Name" LabelsType="Labels" GraduationMode="Manual"/>
-               </xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-                     <xctk:Axis Title="Goals" AxisLabelsLayout="ShowToFit"/>
-               </xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series  Title="Players"
-                                 DefaultInterior="Orange">
-                        <xctk:Series.Layout>
-                           <xctk:ColumnLayout />
-                        </xctk:Series.Layout>
-                        <xctk:Series.DataPoints>
-                           <xctk:DataPoint Y="36" Label="Tom" />
-                           <xctk:DataPoint Y="7" Label="Steven"/>
-                           <xctk:DataPoint Y="24" Label="Kirk" />
-                           <xctk:DataPoint Y="12" Label="Erik"/>
-                           <xctk:DataPoint Y="10" Label="Scott"/>
-                        </xctk:Series.DataPoints>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-         </xctk:Chart.Areas>
-      </xctk:Chart>
-   </Grid>
-<!--##END-->  
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartLegend.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
index 178a944c..bfce285f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Panels;
@@ -29,16 +26,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
   /// </summary>
   public partial class ChartSeriesBasicTypesView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Series _columnSeries;
-    private Series _lineSeries;
-    private Series _pieSeries;
-    private Series _areaSeries;
 
-    #endregion
-#endif
 
     #region Initialization
 
@@ -49,126 +38,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Envent Handlers
 
-    private void OnSeriesCollectionChecked( object sender, RoutedEventArgs e )
-    {
-      this.AddDefaultSeries();
-    }
 
-    private void OnSeriesCollectionUnchecked( object sender, RoutedEventArgs e )
-    {
-      this.CleanDefaultSeries();
-    }
 
-    private void OnLayoutSelectionChanged( object sender, RoutedEventArgs e )
-    {
-      if( _seriesCollectionCheckBox.IsChecked.HasValue && _seriesCollectionCheckBox.IsChecked.Value )
-      {
-        this.CleanDefaultSeries();
-        this.AddDefaultSeries();
-      }
-    }
 
-    #endregion
-#endif
 
     #region Implementation
 
-#if !OPEN_SOURCE
 
-    private void CleanDefaultSeries()
-    {
-      if( _area1.Series.Contains( _pieSeries ) )
-      {
-        _area1.Series.Remove( _pieSeries );
-      }
-      if( _area1.Series.Contains( _areaSeries ) )
-      {
-        _area1.Series.Remove( _areaSeries );
-      }
-      if( _area1.Series.Contains( _columnSeries ) )
-      {
-        _area1.Series.Remove( _columnSeries );
-      }
-      if( _area1.Series.Contains( _lineSeries ) )
-      {
-        _area1.Series.Remove( _lineSeries );
-      }
-    }
 
-    private void AddDefaultSeries()
-    {
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Pie )
-      {
-        if( _pieSeries == null )
-        {
-          //init pieSeries
-          _pieSeries = new Series();
-          _pieSeries.DataPoints.Add( new DataPoint( 0, 1, "Cars" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 1, 2, "Toys" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 2, 2.5, "Trees" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 3, 4, "Pens" ) );
-          _pieSeries.Layout = new PieLayout();
-          _pieSeries.Title = "Pie Series";
-          _pieSeries.ShowPointsInLegend = true;
-          _pieSeries.DefaultInterior = Brushes.YellowGreen;
-        }
-        _area1.Series.Add( _pieSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Area )
-      {
-        if( _areaSeries == null )
-        {
-          //init areaSeries
-          _areaSeries = new Series();
-          _areaSeries.DataPoints.Add( new DataPoint( -2, 0 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 0, 3.5 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 3, 1 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 5, 2.8 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 4, 1.5 ) );
-          _areaSeries.Layout = new AreaLayout();
-          _areaSeries.Title = "Area Series";
-          _areaSeries.DefaultInterior = Brushes.Orange;
-        }
-        _area1.Series.Add( _areaSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Column )
-      {
-        if( _columnSeries == null )
-        {
-          //init columnSeries
-          _columnSeries = new Series();
-          _columnSeries.DataPoints.Add( new DataPoint( 1, 1 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 2, 2 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 2.5, 4 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 4, 3 ) );
-          _columnSeries.Title = "Column Series";
-          _columnSeries.DefaultInterior = Brushes.Red;
-        }
-        _area1.Series.Add( _columnSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Line )
-      {
-        if( _lineSeries == null )
-        {
-          //init lineSeries
-          _lineSeries = new Series();
-          _lineSeries.DataPoints.Add( new DataPoint( 1, 1 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 2, 1 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 0.5, 1.5 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 3, 3 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 6, 2 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 5, 0.5 ) );
-          _lineSeries.Layout = new LineLayout();
-          _lineSeries.Title = "Line Series";
-          _lineSeries.DefaultInterior = Brushes.Black;
-        }
-        _area1.Series.Add( _lineSeries );
-      }
-    }
-#endif
 
     #endregion
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
index ee214143..e9fa3b03 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,139 +25,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>A series contains DataPoint objects and are layed out in an area (Area class) of a chart. They can be displayed with predefined layouts, such as column (bar), line, area, or pie, or they can be displayed using a custom layout (not implemented in this sample).</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="SeriesLayout" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:PredefinedLayoutTypes" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <conv:LayoutEngineToPredefinedLayoutConverter x:Key="LayoutEngineToPredefinedLayoutConverter" />
-        <conv:PredefinedLayoutToPropertyEnabledConverter x:Key="PredefinedLayoutToPropertyEnabledConverter" />
-        <conv:LineLengthToPropertyEnabledConverter x:Key="LineLengthToPropertyEnabledConverter" />
-        <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-               
-        <Style x:Key="ComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding}" Value="Custom">
-                    <Setter Property="IsEnabled" Value="False"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Layout: " VerticalAlignment="Center" />
-            <ComboBox x:Name="_layoutComboBox" Grid.Column="1" SelectedValue="{Binding Layout, ElementName=_series, Converter={StaticResource LayoutEngineToPredefinedLayoutConverter}}" SelectedValuePath="Content" ItemContainerStyle="{StaticResource ComboBoxItemStyle}" SelectionChanged="OnLayoutSelectionChanged" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Area}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Column}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Line}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Pie}" />
-            </ComboBox>
-            <TextBlock Grid.Row="1" Text="Title: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_title}"/>
-            <TextBox x:Name="_title" Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_series, UpdateSourceTrigger=PropertyChanged}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=title}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Grid.Row="2" Text="Default Interior: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_defaultInterior}"/>
-            <xctk:ColorPicker x:Name="_defaultInterior" Grid.Row="2" Grid.Column="1"  SelectedColor="{Binding DefaultInterior, ElementName=_series, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=defaultInterior}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 2nd column-->
-            <TextBlock Grid.Column="2" Text="Show Hint Labels: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_showHintLabels}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox x:Name="_showHintLabels" Grid.Column="3" IsChecked="{Binding ShowHintLabels, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showHintLabels}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Grid.Row="1" Grid.Column="2" Text="Show Points in Legend: " IsEnabled="{Binding IsEnabled, ElementName=_showPointsInLegend}" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox x:Name="_showPointsInLegend" Grid.Row="1" Grid.Column="3" IsChecked="{Binding ShowPointsInLegend, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showPointsInLegend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />         
-            
-            <!-- 3rd column-->
-            <TextBlock Grid.Column="4" Text="Hint Line Length: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_hintLineLength}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <xctk:IntegerUpDown x:Name="_hintLineLength" Grid.Column="5" Minimum="0" Maximum="200" Value="{Binding HintLineLength, ElementName=_series}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
-                <xctk:IntegerUpDown.IsEnabled>
-                    <MultiBinding Converter="{StaticResource LineLengthToPropertyEnabledConverter}">
-                        <Binding Path="SelectedItem" ElementName="_layoutComboBox" Converter="{StaticResource PredefinedLayoutToPropertyEnabledConverter}" ConverterParameter="hintLineLength" />
-                        <Binding Path="IsChecked" ElementName="_showHintLabels" />
-                    </MultiBinding>
-                </xctk:IntegerUpDown.IsEnabled>
-            </xctk:IntegerUpDown>
-            <TextBlock Grid.Row="1" Grid.Column="4" Text="Spacing: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_spacing}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <xctk:IntegerUpDown x:Name="_spacing" Grid.Row="1" Grid.Column="5" Minimum="0" Maximum="100" Value="{Binding Spacing, ElementName=_series}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=spacing}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock  Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="200">
-            <xctk:Chart.Areas>
-               <xctk:Area x:Name="_area1" Title="Area #1">
-                  <xctk:Area.Series>
-                        <xctk:Series x:Name="_series"
-                                    DefaultInterior="BlueViolet"
-                                    Spacing="20"
-                                    Title="Average"
-                                    ShowPointsInLegend="false"
-                                    ShowHintLabels="false"
-                                    HintLineLength="20">
-                           <xctk:Series.Layout>
-                              <xctk:LineLayout />
-                           </xctk:Series.Layout>
-                           <xctk:Series.DataPoints>
-                              <xctk:DataPoint X="1" Y="1" Label="Oct" />
-                              <xctk:DataPoint X="2" Y="2" Label="Jan"/>
-                              <xctk:DataPoint X="2.5" Y="1.5" Label="Feb" />
-                              <xctk:DataPoint X="4" Y="1" Label="Jun"/>
-                              <xctk:DataPoint X="1.5" Y="3" Label="Dec"/>
-                              <xctk:DataPoint X="5" Y="5" Label="Apr"/>
-                              <xctk:DataPoint X="3" Y="1" Label="Nov"/>
-                              <xctk:DataPoint X="4.5" Y="7" Label="Jul"/>
-                              <xctk:DataPoint X="3.5" Y="4.5" Label="Aug"/>
-                           </xctk:Series.DataPoints>
-                        </xctk:Series>
-                  </xctk:Area.Series>
-               </xctk:Area>
-            </xctk:Chart.Areas>
-      </xctk:Chart>
-          
-      <TextBlock Grid.Row="3" Text="A collection of Series instances can be added to an Area. Use the following Checkbox to display 3 new Series along with the current one." TextWrapping="Wrap" Margin="0,15,0,5" />
-      <CheckBox Grid.Row="4" x:Name="_seriesCollectionCheckBox" IsChecked="False" Checked="OnSeriesCollectionChecked" Unchecked="OnSeriesCollectionUnchecked" Content="Display 4 Series in one Area" Margin="0,0,0,10" />
-   </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartBasicTypes.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt
index 34d193c6..638b00b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt
index 3eb9ddd4..6b7dca83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,57 +26,17 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The DataPoint objects of a chart's series can be set by binding with the Series.DataPointsSource property. From there, a DataPointBinding can be set on the X, Y, or Label property of a DataPoint.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xced Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sample:Persons x:Key="Persons"/>
-        <CollectionViewSource x:Key="PersonCollection" Source="{Binding Source={StaticResource Persons}, Path=PersonList}" />
-    </local:DemoView.Resources>
-    
-   <Grid Margin="10">
-        <xctk:Chart MinHeight="300" ShowLegend="False">
-            <xctk:Chart.Areas>
-                <xctk:Area>
-                    <xctk:Area.XAxis>
-						<xctk:Axis Title="Persons" GraduationMode="Manual" LabelsType="Labels"/>
-					</xctk:Area.XAxis>
-                     <xctk:Area.YAxis>
-						<xctk:Axis Title="Skill Level" />
-					</xctk:Area.YAxis>
-                    <xctk:Area.Series>
-                        <xctk:Series DataPointsSource="{Binding Source={StaticResource PersonCollection}}">
-                            <xctk:Series.DataPointBindings>
-								<xctk:BindingInfo PropertyName="Y">
-									<xctk:BindingInfo.Binding>
-										<Binding Path="Skill"/>
-									</xctk:BindingInfo.Binding>
-								</xctk:BindingInfo>
-								<xctk:BindingInfo PropertyName="Label">
-									<xctk:BindingInfo.Binding>
-										<Binding Path="Name"/>
-									</xctk:BindingInfo.Binding>
-								</xctk:BindingInfo>
-							</xctk:Series.DataPointBindings>
-                        </xctk:Series>
-                    </xctk:Area.Series>
-                </xctk:Area>
-            </xctk:Chart.Areas>
-        </xctk:Chart>
 
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
     <Image Source="..\OpenSourceImages\ChartSeriesDataPointsBinding.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt
index a78475e2..62b6964d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt
index 1350727e..a48b9fe8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,178 +24,32 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample shows how AxesGrid elements can be styled using a DataTemplate.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <DataTemplate x:Key="BackgroundTemplate">
-			<Rectangle Margin="-5,-5,-5,-5" RadiusX="25" RadiusY="25" StrokeThickness="3" Stroke="Blue" Fill="#FFFFE1">
-				<Rectangle.BitmapEffect>
-					<DropShadowBitmapEffect/>
-				</Rectangle.BitmapEffect>
-			</Rectangle>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="AxisTitleTemplate">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="White" Offset="0.0" />
-						<GradientStop Color="SkyBlue" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				            HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="GridTemplateX">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Polyline Points="{Binding Path=Points}" StrokeThickness="1" Stroke="Red" StrokeDashArray="1 5 1 1" />
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="GridTemplateY">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-                <Polyline  Points="{Binding Path=Points}" StrokeThickness="1" Stroke="Green" StrokeDashArray="8 3 1 3"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="TickTemplateX">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Line X1="{Binding Path=XStart}" Y1="{Binding Path=YStart}" X2="{Binding Path=XEnd}" Y2="{Binding Path=YEnd}" StrokeThickness="5" Stroke="Red"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="TickTemplateY">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Line  X1="{Binding Path=XStart}" Y1="{Binding Path=YStart}" X2="{Binding Path=XEnd}" Y2="{Binding Path=YEnd}" StrokeThickness="5" Stroke="Green"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="ArrowTemplate">
-			<Polyline Points="{Binding Path=Points}"
-					  StrokeThickness="2" Stroke="Blue"/>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="LabelTemplateX">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="Yellow" Offset="0.0" />
-						<GradientStop Color="Red" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				  HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="LabelTemplateY">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="Yellow" Offset="0.0" />
-						<GradientStop Color="LimeGreen" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				  HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="AxisTemplate">
-			<Polyline Points="{Binding Path=Points}"
-				  StrokeThickness="2" Stroke="Blue"/>
-		</DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-            <xctk:Chart MinHeight="300" ShowLegend="False">
-                <xctk:Chart.Areas>
-                    <xctk:Area BackgroundTemplate="{StaticResource BackgroundTemplate}" Margin="25,25,25,25">
-                        <xctk:Area.XAxis>
-						    <xctk:Axis AxisTitleTemplate="{StaticResource AxisTitleTemplate}"
-                                        GridTemplate="{StaticResource GridTemplateX}"
-                                        TickTemplate="{StaticResource TickTemplateX}"
-                                        ArrowTemplate="{StaticResource ArrowTemplate}"
-                                        LabelTemplate="{StaticResource LabelTemplateX}">
-                                <xctk:Axis.Template>
-								    <ControlTemplate TargetType="{x:Type xctk:Axis}">
-									    <ContentPresenter ContentTemplate="{StaticResource AxisTemplate}"/>
-								    </ControlTemplate>
-							    </xctk:Axis.Template>
-                                
-                                <xctk:Axis.Arrow>
-								    <xctk:Arrow Length="20" Thickness="10"/>
-							    </xctk:Axis.Arrow>
-                            </xctk:Axis>
-					    </xctk:Area.XAxis>
-
-                        <xctk:Area.YAxis>
-                            <xctk:Axis Reversed="true"
-                                        AxisTitleTemplate="{StaticResource AxisTitleTemplate}"
-                                        GridTemplate="{StaticResource GridTemplateY}"
-                                        TickTemplate="{StaticResource TickTemplateY}"
-                                        ArrowTemplate="{StaticResource ArrowTemplate}"
-                                        LabelTemplate="{StaticResource LabelTemplateY}">
-                                <xctk:Axis.Template>
-								    <ControlTemplate TargetType="{x:Type xctk:Axis}">
-									    <ContentPresenter ContentTemplate="{StaticResource AxisTemplate}"/>
-								    </ControlTemplate>
-							    </xctk:Axis.Template>
-                                
-                                <xctk:Axis.Arrow>
-								    <xctk:Arrow Length="20" Thickness="10"/>
-							    </xctk:Axis.Arrow>
-                            </xctk:Axis>
-                        </xctk:Area.YAxis>
-
-                        <xctk:Area.Series>
-						    <xctk:Series>
-							    <xctk:Series.DataPoints>
-								    <xctk:DataPoint X="1" Y="1" />
-								    <xctk:DataPoint X="2" Y="3"/>
-								    <xctk:DataPoint X="3" Y="2"/>
-								    <xctk:DataPoint X="4" Y="5"/>
-								    <xctk:DataPoint X="5" Y="4"/>
-							    </xctk:Series.DataPoints>
-							    <xctk:Series.Layout>
-								    <xctk:LineLayout/>
-							    </xctk:Series.Layout>
-						    </xctk:Series>
-					    </xctk:Area.Series>
-                    </xctk:Area>
-                </xctk:Chart.Areas>
-            </xctk:Chart>
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingAxesGrid.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt
index 3ff2ac56..60a4bb3d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt
index 16aa5efa..d6dc938a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,175 +25,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample shows how a series with a column layout type and a legend can be styled using DataTemplates.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move mouse on line and markers to see simple effects.</Run>
-            <!--##END-->
-            
-       <!--##INCLUDE_OPEN_SOURCE
+
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sample:Persons x:Key="persons"/>
-        <CollectionViewSource x:Key="PersonCollection" Source="{Binding Source={StaticResource persons}, Path=PersonList}"/>
-        
-        <DataTemplate x:Key="legendTemplate">
-          <DockPanel VerticalAlignment="Center">
-            <Image Source="{Binding Path=Photo}" Width="32"  Height="32" Margin="5,1,1,1"/>
-            <TextBlock Text="{Binding Path=Name}" FontSize="11" VerticalAlignment="Center" Margin="5,1,2,1"/>
-          </DockPanel>
-        </DataTemplate>
-        
-        <Style  x:Key="TextBoxTextStyle" TargetType="TextBlock">
-          <Setter Property="HorizontalAlignment" Value="Center" />
-          <Setter Property="FontFamily" Value="Comic Sans MS"/>
-          <Setter Property="FontSize" Value="12"/>
-          <Style.Triggers>
-            <EventTrigger RoutedEvent="Mouse.MouseEnter">
-              <EventTrigger.Actions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetProperty="FontSize" To="19" Duration="0:0:0.4"/>
-                  </Storyboard>
-                </BeginStoryboard>
-              </EventTrigger.Actions>
-            </EventTrigger>
-
-            <EventTrigger RoutedEvent="Mouse.MouseLeave">
-              <EventTrigger.Actions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetProperty="FontSize" To="12" Duration="0:0:0.4" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </EventTrigger.Actions>
-            </EventTrigger>
-          </Style.Triggers>
-        </Style>
-        
-         <Style TargetType="Button">
-           <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <ContentPresenter/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-             
-             <Setter Property="ContentTemplate">
-                <Setter.Value>
-                   <DataTemplate>
-			           <Grid Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" 
-                             Height="{Binding Path=ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}">
-				           <Rectangle RadiusX="5" RadiusY="5" >
-					            <Rectangle.Triggers>
-						            <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							            <EventTrigger.Actions>
-								            <BeginStoryboard>
-									            <Storyboard>
-										            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.5" Duration="0:0:0.4"/>
-									            </Storyboard>
-								            </BeginStoryboard>
-							            </EventTrigger.Actions>
-						            </EventTrigger>
-
-						            <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							            <EventTrigger.Actions>
-								            <BeginStoryboard>
-									            <Storyboard>
-										            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.4" />
-									            </Storyboard>
-								            </BeginStoryboard>
-							            </EventTrigger.Actions>
-						            </EventTrigger>
-					            </Rectangle.Triggers>
-					
-					            <Rectangle.Fill>
-						            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-							            <GradientStop Color="Yellow" Offset="0.0" />
-							            <GradientStop Color="Orange" Offset="0.25" />
-							            <GradientStop Color="CornflowerBlue" Offset="0.75" />
-							            <GradientStop Color="LimeGreen" Offset="1.0" />
-						            </LinearGradientBrush>
-					            </Rectangle.Fill>
-				            </Rectangle> 
-                           <ContentPresenter VerticalAlignment="Center" Content="{Binding Path=Content, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"/>
-			           </Grid>
-		            </DataTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        
-        <DataTemplate x:Key="seriesTemplate">
-          <Button x:Name="Bar">
-            <StackPanel>
-              <DockPanel>
-                <TextBlock Text="Name: " Style="{StaticResource TextBoxTextStyle}" />
-                <TextBlock Text="{Binding Path=Content.Name}" Style="{StaticResource TextBoxTextStyle}" />
-              </DockPanel>
-              <DockPanel>
-                <TextBlock Text="Skill: " Style="{StaticResource TextBoxTextStyle}" />
-                <TextBlock Text="{Binding Path=Content.Skill}" Style="{StaticResource TextBoxTextStyle}" />
-              </DockPanel>
-              <TextBlock Text="Photo:" Style="{StaticResource TextBoxTextStyle}"/>
-              <Image Source="{Binding Path=Content.Photo}"/>
-            </StackPanel>
-          </Button>
-       </DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart MinHeight="400">
-        <xctk:Chart.Legend>
-            <xctk:Legend ItemTemplate="{StaticResource legendTemplate}" ItemsSource="{Binding Source={StaticResource PersonCollection}}" Title="Persons"/>
-        </xctk:Chart.Legend>
-        <xctk:Chart.Areas>
-            <xctk:Area >
-                <xctk:Area.XAxis>
-                    <xctk:Axis GraduationMode="Manual" LabelsType="Labels"/>
-                </xctk:Area.XAxis>
-                <xctk:Area.YAxis>
-                    <xctk:Axis Title="Skill"/>
-                </xctk:Area.YAxis>
-                
-                <xctk:Area.Series>
-					<xctk:Series DataPointsSource="{Binding Source={StaticResource PersonCollection}}"
-                                  Template="{StaticResource seriesTemplate}"
-                                  ShowPointsInLegend="true">
-						<xctk:Series.DataPointBindings>
-                            <xctk:BindingInfo PropertyName="X">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Age"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                            <xctk:BindingInfo PropertyName="Y">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Skill"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                            <xctk:BindingInfo PropertyName="Label">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Name"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                          </xctk:Series.DataPointBindings>
-				    </xctk:Series>
-			    </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingColumnSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt
index a46ed469..0e783e8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System.Windows;
@@ -34,16 +31,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    #region Event Handler
 
-    private void LegendButtonClick( object sender, RoutedEventArgs e )
-    {
-      Random r = new Random();
-      _series.DataPoints.Add( new DataPoint( _series.DataPoints.Count, r.NextDouble() ) );
-    }
 
-    #endregion
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt
index 94fc0dcf..80a7b183 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,144 +24,23 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample demonstrates how a series with a line layout type and a legend can be styled via DataTemplates. The legend contains a button to add new DataPoints.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move mouse along the line and over the markers to see simple effects.</Run>
-            <!--##END-->
-            
-       <!--##INCLUDE_OPEN_SOURCE
+
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <DataTemplate x:Key="legendTemplate">
-			<DockPanel VerticalAlignment="Center">
-				<Path Width="32" Height="32" StrokeThickness="3" Data="M 0,24 Q 8,0 16,16 Q 24,32 32,8" >
-					<Path.Stroke>
-						<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-							<GradientStop Color="Green" Offset="1" />
-							<GradientStop Color="Yellow" Offset="0.5" />
-							<GradientStop Color="Red" Offset="0" />
-						</LinearGradientBrush>
-					</Path.Stroke>
-				</Path>
-				<TextBlock Text="{Binding Path=Text}" FontSize="11" VerticalAlignment="Center" Margin="5,1,2,1"/>
-                <Button Click="LegendButtonClick">Add DataPoint</Button>
-			</DockPanel>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="seriesTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Polyline Points="{Binding Path=Points}" StrokeThickness="10" >
-					<Polyline.Triggers>
-						<EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="20" Duration="0:0:0.4"/>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-
-						<EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="10" Duration="0:0:0.4" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-					</Polyline.Triggers>
-					
-					<Polyline.Stroke>
-						<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-							<GradientStop Color="Green" Offset="1" />
-							<GradientStop Color="Yellow" Offset="0.75" />
-							<GradientStop Color="Red" Offset="0" />
-						</LinearGradientBrush>
-					</Polyline.Stroke>
-				</Polyline>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="markerTemplate">
-			<Ellipse Width="20" Height="20" >
-				<Ellipse.Triggers>
-					<EventTrigger RoutedEvent="Mouse.MouseEnter">
-						<EventTrigger.Actions>
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetProperty="Width" To="30" Duration="0:0:0.4"/>
-									<DoubleAnimation Storyboard.TargetProperty="Height"	To="30" Duration="0:0:0.4"/>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger.Actions>
-					</EventTrigger>
-
-					<EventTrigger RoutedEvent="Mouse.MouseLeave">
-						<EventTrigger.Actions>
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetProperty="Width" To="20" Duration="0:0:0.4" />
-									<DoubleAnimation Storyboard.TargetProperty="Height"	To="20" Duration="0:0:0.4"/>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger.Actions>
-					</EventTrigger>
-				</Ellipse.Triggers>
-				
-				<Ellipse.Fill>
-					<RadialGradientBrush Center="0.3, 0.3" RadiusX="0.6" RadiusY="0.6">
-						<GradientStop Color="LightBlue" Offset="0" />
-						<GradientStop Color="Blue" Offset="1" />
-					</RadialGradientBrush>
-				</Ellipse.Fill>			
-		</Ellipse>
-		</DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart MinHeight="300">
-        <xctk:Chart.Legend>
-            <xctk:Legend ItemTemplate="{StaticResource legendTemplate}"/>
-        </xctk:Chart.Legend>
-        <xctk:Chart.Areas>
-            <xctk:Area Title="Area1">
-                <xctk:Area.Series>
-					<xctk:Series x:Name="_series"
-                                  Title="Average/Month"
-                                  Template="{StaticResource seriesTemplate}"
-                                  MarkerTemplate="{StaticResource markerTemplate}">
-						<xctk:Series.DataPoints>
-						    <xctk:DataPoint X="0" Y="0" />
-						    <xctk:DataPoint X="1" Y="0.1" />
-						    <xctk:DataPoint X="2" Y="0.3" />
-						    <xctk:DataPoint X="3" Y="0.5" />
-						    <xctk:DataPoint X="4" Y="0.88" />
-						    <xctk:DataPoint X="5" Y="0.9" />
-						    <xctk:DataPoint X="6" Y="0.95" />
-					    </xctk:Series.DataPoints>
-					    <xctk:Series.Layout>
-						    <xctk:LineLayout/>
-					    </xctk:Series.Layout>
-				    </xctk:Series>
-			    </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-   </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingLineSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt
index 44ccffeb..805b5484 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt
index b43180a5..0380e45a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,175 +24,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample demonstrates how a series with a pie layout type can be styled via DataTemplates. The series, hint line, and hint label are all styled.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move the mouse over the pie slices to view the tooltips of the pie layout DataTemplate.</Run>
-            <!--##END-->
 
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sys:String x:Key="Name1">Mary</sys:String>
-        <sys:String x:Key="Name2">Brad</sys:String>
-        <sys:String x:Key="Name3">Anne</sys:String>
-        <sys:String x:Key="Name4">Eric</sys:String>
-        <sys:String x:Key="Name5">Lisa</sys:String>
-        <sys:String x:Key="Name6">Carl</sys:String>
-        <sys:String x:Key="Name7">Whole Team</sys:String>
-
-        <DataTemplate x:Key="GridBackgroundTemplate">
-			<Rectangle Width="{Binding Path=W}" Height="{Binding Path=H}" Margin="-5,-5,-5,-5"
-					   RadiusX="25" RadiusY="25" StrokeThickness="1" Stroke="Gray" Fill="#FFFFE1">
-				<Rectangle.BitmapEffect>
-					<DropShadowBitmapEffect/>
-				</Rectangle.BitmapEffect>
-			</Rectangle>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="PieTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Path x:Name="PieSlice" Stroke="Gray" StrokeThickness="2" Data="{Binding Path=Geometry}" Fill="{Binding Path=Interior}">
-					<Path.ToolTip>
-						<ToolTip>
-							<StackPanel Orientation="Vertical">
-								<TextBlock Text="Name:"/>
-								<TextBlock Text="{Binding Path=DataPoint.Label}"/>
-								<TextBlock Text="Skills:"/>
-								<TextBlock Text="{Binding Path=DataPoint.Y}"/>
-							</StackPanel>
-						</ToolTip>
-					</Path.ToolTip>
-					<Path.Triggers>
-						<EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.3" Duration="0:0:0.4"/>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-
-						<EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.4" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-					</Path.Triggers>
-				</Path>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="HintLineTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-                <Polyline Points="{Binding Path=Points}" StrokeThickness="3" StrokeDashArray="2 1">
-                     <Polyline.Stroke>
-                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                              <GradientStop Color="Orange" Offset="1" />
-                              <GradientStop Color="Blue" Offset="0.50" />
-                              <GradientStop Color="Green" Offset="0" />
-                        </LinearGradientBrush>
-                  </Polyline.Stroke>
-                </Polyline>
-            </Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="HintLabelTemplate">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4">
-				<Border.BorderBrush>
-					<SolidColorBrush Color="Gray"/>
-				</Border.BorderBrush>
-				<Border.Background>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="White" Offset="0.0" />
-                        <GradientStop Color="SkyBlue" Offset="1.0" />
-                    </LinearGradientBrush>
-                </Border.Background>
-
-                <StackPanel>
-				    <TextBlock FontFamily="Sans Serif" FontSize="18" FontStyle="Oblique" Margin="2,2,2,1"
-				               HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=DataPoint.Label}"/>
-                    <Image x:Name="_image" Width="20" Height="20"/>
-                </StackPanel>
-			</Border>
-            
-            <DataTemplate.Triggers>
-                 <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name1}">
-                    <Setter Property="Source" Value="../Photo/1.bmp" TargetName="_image" />
-                 </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name2}">
-                   <Setter Property="Source" Value="../Photo/2.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name3}">
-                   <Setter Property="Source" Value="../Photo/3.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name4}">
-                   <Setter Property="Source" Value="../Photo/4.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name5}">
-                   <Setter Property="Source" Value="../Photo/5.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name6}">
-                   <Setter Property="Source" Value="../Photo/6.bmp" TargetName="_image" />
-                </DataTrigger>
-            </DataTemplate.Triggers>
-		</DataTemplate>
-
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart  MinHeight="400">
-        <xctk:Chart.Areas >
-            <xctk:Area Title="Area1" BackgroundTemplate="{StaticResource GridBackgroundTemplate}" Margin="10,25,20,25">
-               <xctk:Area.XAxis>
-                    <xctk:Axis ShowAxisLabel="false" ShowGridLines="false" ShowAxis="false" ShowArrow="false" ShowTickLabels="false" ShowTicks="false" />
-                </xctk:Area.XAxis>
-				   <xctk:Area.YAxis>
-                    <xctk:Axis ShowAxisLabel="false" ShowGridLines="false" ShowAxis="false" ShowArrow="false" ShowTickLabels="false" ShowTicks="false" />
-                </xctk:Area.YAxis>
-                
-               <xctk:Area.Series>
-					   <xctk:Series Title="Family Members"
-                                 ShowPointsInLegend="true"
-                                 Template="{StaticResource PieTemplate}"
-                                 ShowHintLabels="true"
-                                 HintLineTemplate="{StaticResource HintLineTemplate}"
-                                 HintLabelTemplate="{StaticResource HintLabelTemplate}"
-                                 HintLineLength="30">
-						   <xctk:Series.DataPoints>
-						       <xctk:DataPoint Y="-3" Label="{StaticResource Name1}" />
-							   <xctk:DataPoint Y="-2" Label="{StaticResource Name2}" />
-							   <xctk:DataPoint Y="-1" Label="{StaticResource Name3}" />
-							   <xctk:DataPoint Y="1" Label="{StaticResource Name4}"/>
-							   <xctk:DataPoint Y="1" Label="{StaticResource Name5}"/>
-							   <xctk:DataPoint Y="2" Label="{StaticResource Name6}"/>
-							   <xctk:DataPoint Y="5" Label="{StaticResource Name7}"/>
-					       </xctk:Series.DataPoints>
-					       <xctk:Series.Layout>
-						       <xctk:PieLayout/>
-					       </xctk:Series.Layout>
-				       </xctk:Series>
-			       </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-    </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingPieSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt
index e5a3beca..cefb3341 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/CheckListsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt
index 15d7ed74..9dd7a1c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,7 @@
             The CheckListBox and CheckComboBox controls represent a list of selected items that are displayed as CheckBoxes. Besides the common SelectedItem and SelectedItems properties, these controls give developers more alternatives for managing and handling selections.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <x:Array x:Key="personProperties" Type="s:String">
          <s:String>ID</s:String>
@@ -34,7 +34,7 @@
          <s:String>LastName</s:String>
       </x:Array>
    </local:DemoView.Resources>
-   
+
    <Grid >
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -56,7 +56,7 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            
+
             <TextBlock Grid.Row="0" Grid.Column="0" 
                        Text="Delimiter:" 
                        Margin="2,5,5,5"/>
@@ -98,7 +98,7 @@
                      HorizontalAlignment="Left"
                      IsEnabled="False"
                      Text="IsSelected" />
-            
+
             <TextBlock Grid.Row="0" Grid.Column="2" 
                        Text="DisplayMemberPath:" 
                        Margin="5"/>
@@ -149,12 +149,12 @@
             </StackPanel>
          </Grid>
       </GroupBox>
-      
+
       <GroupBox Header="Item Models" Grid.Row="1" Margin="5">
          <ListBox DisplayMemberPath="ModelDisplay" FontFamily="Global Monospace"
                   ItemsSource="{Binding}"/>
       </GroupBox>
-      
+
       <Grid Grid.Row="2">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt
index 542141db..8ab0b09c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ChildWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt
index 3c6b85f9..c639a093 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,7 +25,6 @@
      <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The ChildWindow control can be used to create a window that is displayed within the bounds of a specific parent container.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <LineBreak />
             <Run>In addition to the following features, the "Plus" version allows ChildWindow to be resizable and to use a Maximize/Restore button.</Run>
@@ -33,14 +32,13 @@
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
 
    <local:DemoView.Resources>
       <conv:IntToBoolConverter x:Key="IntToBoolConverter" />
       <xctkconv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter" Inverted="True"/>
-       
+
       <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
                           ObjectType="{x:Type sys:Enum}">
          <ObjectDataProvider.MethodParameters>
@@ -54,7 +52,7 @@
          </ObjectDataProvider.MethodParameters>
       </ObjectDataProvider>
    </local:DemoView.Resources>
-    
+
 
    <Grid>
       <Grid.RowDefinitions>
@@ -84,7 +82,7 @@
 
             <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_txtTop}" Style="{StaticResource DisableGrayText}"/>
             <xctk:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
-             
+
             <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="10,2,2,2" Grid.Column="2" />
             <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt
index 5516efb8..d5055d4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ColorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt
index e54b7228..4dd5e575 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,318 +20,325 @@
                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 Title="Color">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.
-      </Paragraph>
-   </local:DemoView.Description>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.
+    </Paragraph>
+  </local:DemoView.Description>
 
-   <local:DemoView.Resources>
-      <Style x:Key="controlInError"
-             TargetType="xctk:IntegerUpDown">
-         <Style.Triggers>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-               <Setter Property="ToolTip"
-                       Value="{Binding RelativeSource={x:Static RelativeSource.Self},
+  <local:DemoView.Resources>
+    <Style x:Key="controlInError"
+           TargetType="xctk:IntegerUpDown">
+      <Style.Triggers>
+        <Trigger Property="Validation.HasError"
+                 Value="true">
+          <Setter Property="ToolTip"
+                  Value="{Binding RelativeSource={x:Static RelativeSource.Self},
                             Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
-      
-      <ObjectDataProvider x:Key="ColorModeOptions" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:ColorMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
+        </Trigger>
+      </Style.Triggers>
+    </Style>
 
-      <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
+    <ObjectDataProvider x:Key="ColorModeOptions"
                         MethodName="GetValues"
                         ObjectType="{x:Type sys:Enum}">
-        <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:ColorSortingMode" />
-        </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="*" />
-         <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:ColorMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
 
-      <Grid Grid.Column="0"
-            Margin="5">
-         <Grid.RowDefinitions>
+    <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:ColorSortingMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+
+    <Grid Grid.Column="0"
+          Margin="5">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Grid.Column="0"
+                Grid.Row="0"
+                Header="ColorCanvas Features"
+                HorizontalAlignment="Stretch">
+        <Grid>
+          <Grid.Resources>
+            <Style x:Key="alignStyle"
+                   TargetType="{x:Type FrameworkElement}">
+              <Setter Property="Margin"
+                      Value="5" />
+            </Style>
+
+            <Style TargetType="{x:Type TextBlock}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type TextBox}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type CheckBox}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type xctk:IntegerUpDown}"
+                   BasedOn="{StaticResource alignStyle}">
+              <Setter Property="Width"
+                      Value="45" />
+              <Setter Property="Minimum"
+                      Value="0" />
+              <Setter Property="Maximum"
+                      Value="255" />
+            </Style>
+          </Grid.Resources>
+          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0"
-                   Grid.Row="0"
-                   Header="ColorCanvas Features"
-                   HorizontalAlignment="Stretch">
-            <Grid>
-               <Grid.Resources>
-                  <Style x:Key="alignStyle"
-                         TargetType="{x:Type FrameworkElement}">
-                     <Setter Property="Margin"
-                             Value="5" />
-                  </Style>
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
 
-                  <Style TargetType="{x:Type TextBlock}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type TextBox}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type CheckBox}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type xctk:IntegerUpDown}"
-                         BasedOn="{StaticResource alignStyle}">
-                     <Setter Property="Width"
-                             Value="45" />
-                     <Setter Property="Minimum"
-                             Value="0" />
-                     <Setter Property="Maximum"
-                             Value="255" />
-                  </Style>
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
+          <StackPanel Grid.Row="0"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      Orientation="Horizontal">
+            <TextBlock Text="R:" />
+            <xctk:IntegerUpDown x:Name="_R"
+                                Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="G:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_G"
+                                Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="B:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_B"
+                                Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="A:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_A"
+                                Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+          </StackPanel>
 
-               <StackPanel Grid.Row="0"
-                           Grid.Column="0"
-                           Grid.ColumnSpan="2"
-                           HorizontalAlignment="Stretch"
-                           Orientation="Horizontal">
-                  <TextBlock Text="R:" />
-                  <xctk:IntegerUpDown x:Name="_R"
-                                      Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="G:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_G"
-                                      Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="B:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_B"
-                                      Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="A:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_A"
-                                      Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-               </StackPanel>
+          <TextBlock Grid.Column="0"
+                     Grid.Row="1"
+                     Text="UsingAlphaChannel: " />
+          <CheckBox Grid.Column="1"
+                    Grid.Row="1"
+                    x:Name="_usingAlphaChannel"
+                    IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="2"
+                     Text="HexadecimalString: " />
+          <TextBox Grid.Column="1"
+                   Grid.Row="2"
+                   IsEnabled="False"
+                   Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}" />
+        </Grid>
+      </GroupBox>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="UsingAlphaChannel: " />
-               <CheckBox Grid.Column="1"
-                         Grid.Row="1"
-                         x:Name="_usingAlphaChannel"
-                         IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="HexadecimalString: " />
-               <TextBox Grid.Column="1"
+      <TextBlock Text="ColorCanvas Usage: "
+                 Grid.Row="1"
+                 Margin="0,10,0,0"
+                 Style="{StaticResource Header}" />
+      <xctk:ColorCanvas x:Name="_colorCanvas"
                         Grid.Row="2"
-                        IsEnabled="False"
-                        Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}" />
-            </Grid>
-         </GroupBox>
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Stretch" />
 
-         <TextBlock Text="ColorCanvas Usage: "
-                    Grid.Row="1"
-                    Margin="0,10,0,0"
-                    Style="{StaticResource Header}" />
-         <xctk:ColorCanvas x:Name="_colorCanvas"
-                           Grid.Row="2"
-                           VerticalAlignment="Top"
-                           HorizontalAlignment="Stretch" />
+    </Grid>
 
-      </Grid>
+    <Grid Grid.Column="1"
+          Margin="5">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
 
-      <Grid Grid.Column="1"
-            Margin="5">
-         <Grid.RowDefinitions>
+      <GroupBox Grid.Column="0"
+                Grid.Row="0"
+                Header="ColorPicker Features"
+                HorizontalAlignment="Stretch"
+                Margin="10">
+        <Grid>
+          <Grid.Resources>
+            <Style TargetType="{x:Type TextBlock}">
+              <Setter Property="Margin"
+                      Value="3" />
+              <Setter Property="VerticalAlignment"
+                      Value="Center" />
+            </Style>
+            <Style TargetType="{x:Type TextBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+            <Style TargetType="{x:Type CheckBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+            <Style TargetType="{x:Type ComboBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+          </Grid.Resources>
+          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0"
-                   Grid.Row="0"
-                   Header="ColorPicker Features"
-                   HorizontalAlignment="Stretch"
-                   Margin="10">
-            <Grid>
-               <Grid.Resources>
-                  <Style TargetType="{x:Type TextBlock}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                     <Setter Property="VerticalAlignment"
-                             Value="Center" />
-                  </Style>
-                  <Style TargetType="{x:Type TextBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-                  <Style TargetType="{x:Type CheckBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-                   <Style TargetType="{x:Type ComboBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="ColorMode:" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
-                         SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
-                         Height="22"/>
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="AvailableColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="1"
-                        Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="RecentColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="2"
-                        Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="3"
-                          Text="StandardColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="3"
-                        Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="4"
-                          Text="AvailableColorsSortingMode:" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="4"
-                         ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
-                         SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
-                         Height="22" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="0"
+                     Text="ColorMode:" />
+          <ComboBox Grid.Column="1"
+                    Grid.Row="0"
+                    ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
+                    SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
+                    Height="22" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="1"
+                     Text="AvailableColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="1"
+                   Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="2"
+                     Text="RecentColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="2"
+                   Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="3"
+                     Text="StandardColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="3"
+                   Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="4"
+                     Text="AvailableColorsSortingMode:" />
+          <ComboBox Grid.Column="1"
+                    Grid.Row="4"
+                    ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
+                    SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
+                    Height="22" />
 
-               <CheckBox Grid.Column="0"
-                         Grid.Row="5"
-                         Grid.ColumnSpan="2"
-                         Content="DisplayColorAndName"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="6"
-                         Grid.ColumnSpan="2"
-                         Content="ShowTabHeaders"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="7"
-                         Grid.ColumnSpan="2"
-                         Content="ShowAvailableColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="8"
-                         Grid.ColumnSpan="2"
-                         Content="ShowDropDownButton"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="9"
-                         Grid.ColumnSpan="2"
-                         Content="ShowRecentColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="10"
-                         Grid.ColumnSpan="2"
-                         Content="ShowStandardColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="11"
-                         Grid.ColumnSpan="2"
-                         Content="UsingAlphaChannel"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="12"
-                          Text="MaxDropDownWidth:" />
-               <xctk:IntegerUpDown Grid.Column="1"
-                                   Grid.Row="12"
-                                   Minimum="50"
-                                   Maximum="550"
-                                   Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="13"
-                          Text="AdvancedButtonHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="13"
-                        Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="14"
-                          Text="StandardButtonHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="14"
-                        Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="15"
-                          Text="SelectedColorText:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="15"
-                        IsEnabled="False"
-                        Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
-            </Grid>
-         </GroupBox>
+          <CheckBox Grid.Column="0"
+                    Grid.Row="5"
+                    Grid.ColumnSpan="2"
+                    Content="DisplayColorAndName"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="6"
+                    Grid.ColumnSpan="2"
+                    Content="DisplayColorTooltip"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorTooltip, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="7"
+                    Grid.ColumnSpan="2"
+                    Content="ShowTabHeaders"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="8"
+                    Grid.ColumnSpan="2"
+                    Content="ShowAvailableColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="9"
+                    Grid.ColumnSpan="2"
+                    Content="ShowDropDownButton"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="10"
+                    Grid.ColumnSpan="2"
+                    Content="ShowRecentColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="11"
+                    Grid.ColumnSpan="2"
+                    Content="ShowStandardColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="12"
+                    Grid.ColumnSpan="2"
+                    Content="UsingAlphaChannel"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="13"
+                     Text="MaxDropDownWidth:" />
+          <xctk:IntegerUpDown Grid.Column="1"
+                              Grid.Row="13"
+                              Minimum="50"
+                              Maximum="550"
+                              Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="14"
+                     Text="AdvancedButtonHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="14"
+                   Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="15"
+                     Text="StandardButtonHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="15"
+                   Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="16"
+                     Text="SelectedColorText:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="16"
+                   IsEnabled="False"
+                   Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
+        </Grid>
+      </GroupBox>
 
-         <TextBlock Text="ColorPicker Usage: "
-                    Grid.Row="1"
-                    Style="{StaticResource Header}" />
-         <xctk:ColorPicker x:Name="_colorPicker"
-                           Grid.Row="2"
-                           VerticalAlignment="Top" />
-      </Grid>
-   </Grid>
+      <TextBlock Text="ColorPicker Usage: "
+                 Grid.Row="1"
+                 Style="{StaticResource Header}" />
+      <xctk:ColorPicker x:Name="_colorPicker"
+                        Grid.Row="2"
+                        VerticalAlignment="Top" />
+    </Grid>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
index d15a488c..c380b492 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
index 40e13ff5..fa6d2f2e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -33,12 +33,12 @@
             </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"
@@ -59,13 +59,13 @@
             </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"
@@ -82,9 +82,9 @@
                        VerticalAlignment="Center" />
          </StackPanel>
       </DataTemplate>
-           
+
    </local:DemoView.Resources>
-   
+
     <Grid>
         <Grid.Resources>
             <xcdg:DataGridCollectionViewSource x:Key="cvsOrders" 
@@ -109,38 +109,38 @@
                              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" />
@@ -148,7 +148,7 @@
                 <xcdg:Column FieldName="ShipPostalCode"
                              Title="Postal Code"
                              Width="120" />
-               
+
                 <xcdg:Column FieldName="RequiredDate"
                              Title="Required Date"
                              Width="140" />
@@ -156,7 +156,7 @@
                 <xcdg:Column FieldName="ShippedDate"
                              Title="Shipped Date"
                              Width="140" />               
-               
+
                 <xcdg:Column FieldName="ShipName"
                               Visible="False" />
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt
index 70d1f576..5c68a282 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DateTimeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
index aa693294..886b1a48 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,7 @@
             The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
       <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
       <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt
index 34a83eec..667ee531 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt
@@ -10,8 +10,8 @@
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
     using System;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -23,15 +23,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class DisplayLocalizationRes {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal DisplayLocalizationRes() {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -59,7 +59,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Details.
         /// </summary>
@@ -68,7 +68,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("DetailsCategory", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 1 (no DisplayName).
         /// </summary>
@@ -77,7 +77,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor1", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to This property&apos;s type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method..
         /// </summary>
@@ -86,7 +86,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor1Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 2 (with DisplayName).
         /// </summary>
@@ -95,7 +95,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to This property&apos;s type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized..
         /// </summary>
@@ -104,7 +104,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor2Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 3.
         /// </summary>
@@ -113,7 +113,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to &quot;(Not listed)&quot; enum value shows that enum values can also be localized..
         /// </summary>
@@ -122,7 +122,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor3Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to First name.
         /// </summary>
@@ -131,7 +131,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FirstName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to First name of that person.
         /// </summary>
@@ -140,7 +140,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FirstNameDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Information.
         /// </summary>
@@ -149,7 +149,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("InfoCategory", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Last name.
         /// </summary>
@@ -158,7 +158,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("LastName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Usually the familly name of the person.
         /// </summary>
@@ -167,7 +167,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("LastNameDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to (Not listed).
         /// </summary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt
new file mode 100644
index 00000000..3c7a52ca
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DetailsCategory" xml:space="preserve">
+    <value>Détails</value>
+  </data>
+  <data name="FavoriteActor1" xml:space="preserve">
+    <value>Acteur favori 1 (aucun DisplayName)</value>
+  </data>
+  <data name="FavoriteActor1Desc" xml:space="preserve">
+    <value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeurs affichées sont retournées par la méthode ToString().</value>
+  </data>
+  <data name="FavoriteActor2" xml:space="preserve">
+    <value>Acteur favori 2 (avec DisplayName)</value>
+  </data>
+  <data name="FavoriteActor2Desc" xml:space="preserve">
+    <value>Le type de cette propriété est un enum où les valeurs sont décorés avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifiées par l'attribut ExtendedDisplayName.</value>
+  </data>
+  <data name="FavoriteActor3" xml:space="preserve">
+    <value>Acteur favori 3</value>
+  </data>
+  <data name="FavoriteActor3Desc" xml:space="preserve">
+    <value>La valeur "(Non proposé)" démontre que les valeurs des enums peuvent aussi être localisées.</value>
+  </data>
+  <data name="FirstName" xml:space="preserve">
+    <value>Prénom</value>
+  </data>
+  <data name="FirstNameDesc" xml:space="preserve">
+    <value>Prénom de la personne</value>
+  </data>
+  <data name="InfoCategory" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="LastName" xml:space="preserve">
+    <value>Nom de famille</value>
+  </data>
+  <data name="LastNameDesc" xml:space="preserve">
+    <value>Le nom de famille de la personne</value>
+  </data>
+  <data name="NotListed" xml:space="preserve">
+    <value>(Non proposé)</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt
new file mode 100644
index 00000000..c38138ff
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DetailsCategory" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="FavoriteActor1" xml:space="preserve">
+    <value>Favorite actor 1 (no DisplayName)</value>
+  </data>
+  <data name="FavoriteActor1Desc" xml:space="preserve">
+    <value>This property's type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method.</value>
+  </data>
+  <data name="FavoriteActor2" xml:space="preserve">
+    <value>Favorite actor 2 (with DisplayName)</value>
+  </data>
+  <data name="FavoriteActor2Desc" xml:space="preserve">
+    <value>This property's type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized.</value>
+  </data>
+  <data name="FavoriteActor3" xml:space="preserve">
+    <value>Favorite actor 3</value>
+  </data>
+  <data name="FavoriteActor3Desc" xml:space="preserve">
+    <value>"(Not listed)" enum value shows that enum values can also be localized.</value>
+  </data>
+  <data name="FirstName" xml:space="preserve">
+    <value>First name</value>
+  </data>
+  <data name="FirstNameDesc" xml:space="preserve">
+    <value>First name of that person</value>
+  </data>
+  <data name="InfoCategory" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="LastName" xml:space="preserve">
+    <value>Last name</value>
+  </data>
+  <data name="LastNameDesc" xml:space="preserve">
+    <value>Usually the familly name of the person</value>
+  </data>
+  <data name="NotListed" xml:space="preserve">
+    <value>(Not listed)</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt
index 514308b9..583db23c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DropDownSplitButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt
index 251e4035..a6bab569 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,124 +20,145 @@
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="DropDown and Split Buttons">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            <Run>The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
-        </Paragraph>
-    </local:DemoView.Description>
-   <local:DemoView.Resources>
-      <ObjectDataProvider x:Key="DropDownPlacementMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="PlacementMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-
-               <TextBlock Text="MaxDropDownHeight:"
-                          VerticalAlignment="Center"/>
-               <xctk:DoubleUpDown x:Name="maxDropDownHeight"
-                                  Grid.Column="1"
-                                  Width="60"
-                                  Value="500"
-                                  AllowInputSpecialValues="PositiveInfinity"
-                                  Minimum="0"
-                                  VerticalAlignment="Center"
-                                  Margin="5"/>
-
-               <TextBlock Text="DropDown Position: "
-                          Grid.Row="1"
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="dropDownPosition"
-                         Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
-                         SelectedIndex="2"
-                         HorizontalAlignment="Left"
-                         Width="110"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="DropDownButton Usage:"
-                          Style="{StaticResource Header}" />
-               <xctk:DropDownButton x:Name="_dropDownButton"
-                                    Grid.Row="1"
-                                    Margin="10"
-                                    Width="150"
-                                    HorizontalAlignment="Left"
-                                    Content="Click Me"
-                                    MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                                    DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                                    Click="DropDownButton_Click">
-                  <xctk:DropDownButton.DropDownContent>
-                     <StackPanel>
-                        <xctk:ColorCanvas />
-                        <Button Click="Button_Click"
-                                Margin="10">OK</Button>
-                     </StackPanel>
-                  </xctk:DropDownButton.DropDownContent>
-               </xctk:DropDownButton>
-
-               <TextBlock Text="SplitButton Usage:"
-                          Grid.Column="1"
-                          Style="{StaticResource Header}" />
-               <xctk:SplitButton x:Name="_splitButton"
-                                 Grid.Row="1"
-                                 Grid.Column="1"
-                                 Margin="10"
-                                 Width="150"
-                                 HorizontalAlignment="Left"
-                                 Content="Click Me"
-                                 MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                                 DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                                 Click="SplitButton_Click">
-                  <xctk:SplitButton.DropDownContent>
-                     <StackPanel>
-                        <xctk:ColorCanvas />
-                        <Button Click="Button_Click"
-                                Margin="10">OK</Button>
-                     </StackPanel>
-                  </xctk:SplitButton.DropDownContent>
-               </xctk:SplitButton>
-            </Grid>
-         </StackPanel>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+  <local:DemoView.Resources>
+    <xctk:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+    <ObjectDataProvider x:Key="DropDownPlacementMode"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="PlacementMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+
+  <Grid>
+    <StackPanel Margin="10">
+
+      <GroupBox Header="Features"
+                Margin="0,5,0,5">
+        <Grid Margin="5">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+
+          <!-- 1st Column-->
+          <TextBlock Text="MaxDropDownHeight:"
+                     VerticalAlignment="Center" />
+          <xctk:DoubleUpDown x:Name="maxDropDownHeight"
+                             Grid.Column="1"
+                             Width="60"
+                             Value="500"
+                             AllowInputSpecialValues="PositiveInfinity"
+                             Minimum="0"
+                             HorizontalAlignment="Left"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+
+          <TextBlock Text="DropDown Position: "
+                     Grid.Row="1"
+                     VerticalAlignment="Center" />
+          <ComboBox x:Name="dropDownPosition"
+                    Grid.Column="1"
+                    Grid.Row="1"
+                    ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
+                    SelectedIndex="2"
+                    HorizontalAlignment="Left"
+                    Width="110"
+                    VerticalAlignment="Center"
+                    Margin="5" />
+
+          <!-- 2nd Column-->
+          <TextBlock Text="DropDownContentBackground:"
+                     VerticalAlignment="Center" 
+                     Grid.Column="2"/>
+          <xctk:ColorPicker x:Name="dropDownContentBackground"
+                            Grid.Column="3"
+                            Width="60"
+                            SelectedColor="LightGray"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Margin="5" />
+        </Grid>
+      </GroupBox>
+
+      <StackPanel>
+        <TextBlock Text="Usage:"
+                   Style="{StaticResource Header}" />
+
+        <Grid>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+
+          <TextBlock Text="DropDownButton Usage:"
+                     Style="{StaticResource Header}" />
+          <xctk:DropDownButton x:Name="_dropDownButton"
+                               Grid.Row="1"
+                               Margin="10"
+                               Width="150"
+                               HorizontalAlignment="Left"
+                               Content="Click Me"
+                               MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
+                               DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
+                               DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                               Click="DropDownButton_Click">
+            <xctk:DropDownButton.DropDownContent>
+              <StackPanel>
+                <xctk:ColorCanvas Margin="10"/>
+                <Button Click="Button_Click"
+                        Margin="10">OK</Button>
+              </StackPanel>
+            </xctk:DropDownButton.DropDownContent>
+          </xctk:DropDownButton>
+
+          <TextBlock Text="SplitButton Usage:"
+                     Grid.Column="1"
+                     Style="{StaticResource Header}" />
+          <xctk:SplitButton x:Name="_splitButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="10"
+                            Width="150"
+                            HorizontalAlignment="Left"
+                            Content="Click Me"
+                            MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
+                            DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
+                            DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                            Click="SplitButton_Click">
+            <xctk:SplitButton.DropDownContent>
+              <StackPanel>
+                <xctk:ColorCanvas Margin="10"/>
+                <Button Click="Button_Click"
+                        Margin="10">OK</Button>
+              </StackPanel>
+            </xctk:SplitButton.DropDownContent>
+          </xctk:SplitButton>
+        </Grid>
       </StackPanel>
-   </Grid>
+    </StackPanel>
+  </Grid>
 
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt
index 81539c11..6fe084df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,18 +28,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
     public FilePickerView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      _filePicker.SelectedFiles.CollectionChanged += this.SelectedFiles_CollectionChanged;
-#endif
     }
 
-#if !OPEN_SOURCE
-    private void SelectedFiles_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      //Refresh PrimitiveTypeCollectionControl.ItemsSource to be up to date with FilePicker.SelectedFiles.
-      _primitiveTypeCollectionControl.ItemsSource = null;
-      _primitiveTypeCollectionControl.ItemsSource = _filePicker.SelectedFiles;
-    }
-#endif
   }
-}
\ No newline at end of file
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt
index 42b66f1c..79701472 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The FilePicker is a control that can be used to select one or more files in a browsing window.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,189 +33,26 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <x:Array x:Key="FilterStrings"
-               Type="sys:String">
-         <sys:String>All files |*.*</sys:String>
-         <sys:String>Text Files |*.txt</sys:String>
-         <sys:String>Office Files |*.docx;*.xlsx;*.pptx</sys:String>
-         <sys:String>Image files |*.jpg;*.jpeg</sys:String>
-      </x:Array>
-
-      <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-      <Style TargetType="TextBlock">
-         <Style.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-               <Setter Property="Foreground"
-                       Value="Gray" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="5">
-            <Grid.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="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st Column -->
-            <TextBlock Text="Filter: "
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      Width="187"
-                      ToolTip="Gets/Sets the type of files to show when Dialog is opened."
-                      ItemsSource="{StaticResource FilterStrings}"
-                      SelectedItem="{Binding Filter, ElementName=_filePicker}" />            
-
-            <TextBlock Text="Use Full Path: "
-                       Grid.Row="1"
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Column="1"
-                      Grid.Row="1"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets if the full path should be used for SelectedFile and SelectedFiles."
-                      IsChecked="{Binding UseFullPath, ElementName=_filePicker}" />
-            
-            <TextBlock Text="Multi Select: "
-                       Grid.Row="2"
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Column="1"
-                      Grid.Row="2"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets if the browsing window permits to do multi-selection of files."
-                      IsChecked="{Binding MultiSelect, ElementName=_filePicker}" />
-
-            <TextBlock Text="Selected File: "
-                       Grid.Row="3"
-                       VerticalAlignment="Center"
-                       IsEnabled="{Binding MultiSelect, ElementName=_filePicker, Converter={StaticResource InverseBoolConverter}}"/>
-            <TextBox Grid.Column="1"
-                     Grid.Row="3"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the file that is selected when MultiSelect is false."
-                     Text="{Binding SelectedFile, ElementName=_filePicker}"
-                     IsEnabled="{Binding MultiSelect, ElementName=_filePicker, Converter={StaticResource InverseBoolConverter}}"/>
-
-            <TextBlock Text="Selected Files: "
-                       Grid.Row="4"
-                       VerticalAlignment="Center"
-                       IsEnabled="{Binding MultiSelect, ElementName=_filePicker}"/>
-            <xctk:PrimitiveTypeCollectionControl x:Name="_primitiveTypeCollectionControl"
-                                                 Grid.Column="1"
-                                                 Grid.Row="4"
-                                                 HorizontalAlignment="Stretch"
-                                                 VerticalAlignment="Center"
-                                                 Margin="5"
-                                                 ToolTip="Gets/Sets the files that are selected when MultiSelect is true."
-                                                 Content="Selected Files"
-                                                 ItemsSource="{Binding SelectedFiles, ElementName=_filePicker}"
-                                                 ItemType="{x:Type sys:String}"
-                                                 IsEnabled="{Binding MultiSelect, ElementName=_filePicker}"/>
-
-            <!-- 2nd Column -->
-            <TextBlock Text="Watermark: "
-                       Grid.Column="2"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="3"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the watermark when there are no file selected."
-                     Text="{Binding Watermark, ElementName=_filePicker}" />
-            
-            <TextBlock Text="Title: "
-                       Grid.Row="1"
-                       Grid.Column="2"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Row="1"
-                     Grid.Column="3"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the tile of the window browser."
-                     Text="{Binding Title, ElementName=_filePicker}" />
-
-            <TextBlock Text="Initial Directory: "
-                       Grid.Row="2"
-                       Grid.Column="2"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Row="2"
-                     Grid.Column="3"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the current directory of the window browser."
-                     Text="{Binding InitialDirectory, ElementName=_filePicker}" />
-
-            <TextBlock Text="Browse Content: "
-                       Grid.Row="3"
-                       Grid.Column="2"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Row="3"
-                     Grid.Column="3"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the content of the Browse Button."
-                     Text="{Binding BrowseContent, ElementName=_filePicker, UpdateSourceTrigger=PropertyChanged}" />            
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-        
-         <xctk:FilePicker x:Name="_filePicker"
-                          Filter="All files |*.*" 
-                          Title="The FilePicker"
-                          UseFullPath="True" 
-                          MultiSelect="False"
-                          InitialDirectory="C:\"
-                          BrowseContent=". . ."
-                          Watermark="Choose your file(s)..."/>
-      </StackPanel>
-   </Grid>
-
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\FilePicker.png" Width="600" Height="400"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt
index 35a96f62..e1726617 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/IconButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt
index a75428cd..9c5633db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                  Title="IconButton">
      <local:DemoView.Description>
-        <!-- #// TODODOC -->
         <Paragraph FontSize="14" FontFamily="Segoe">
             The IconButton control is a Button that contains an icon and some data. The Foreground, Background and BorderBrush can be easily modified with properties while the Icon location is customizable.
         </Paragraph>
@@ -29,7 +28,7 @@
 
    <local:DemoView.Resources>
       <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      
+
       <Image x:Key="Image1"
              Source="../Resources/PencilTool16.png"
              Width="20"
@@ -47,7 +46,7 @@
          </ObjectDataProvider.MethodParameters>
       </ObjectDataProvider>
    </local:DemoView.Resources>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -96,7 +95,7 @@
                       SelectedItem="{Binding IconLocation, ElementName=_iconButton}"
                       Margin="5"
                       VerticalContentAlignment="Center" />
-            
+
             <!-- 2nd Column -->
             <TextBlock Text="MouseOver Foreground:"
                        Grid.Column="2"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt
index 896d994b..35b9b36b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,17 +32,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views
 
     public ListBoxView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
 
       InitializeComponent();
 
-#if !OPEN_SOURCE
-      //Add the default GroupDescriptions to the ListBox's GroupDescriptions collection.
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCountryGroupDescription" ] as GroupDescription );
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCityGroupDescription" ] as GroupDescription );
-#endif
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt
index 456a2e24..4b87996c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -29,7 +29,6 @@
          <LineBreak />
          <LineBreak />
          <Run>Supports implicit styles, so the entire listbox can be styled in minutes with a couple of lines of code. Also supports explicit styles and Expression Blend.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <LineBreak />
             <Run>The listBox items can be animated, dragged-and-dropped, filtered, grouped, selected in various ways, and sorted. Plus, all of the ListBox components can be styled or themed. In addition, different ways of presenting the listBox items are available, such as horizontal or vertical scrolling and following specific or circle paths.</Run>
@@ -38,1009 +37,105 @@
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->         
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##INCLUDE_OPEN_SOURCE
     <Image Source="..\OpenSourceImages\ListBox.png" Width="600" Height="400"/>
-##END-->   
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-       <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/ItemTemplates.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-          
-           <LinearGradientBrush x:Key="WpfThemeListBoxDefaultBorderBrush"
-                        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="WpfThemeToolPaneBackgroundBrush"
-                              StartPoint="0.5,0"
-                              EndPoint="0.5,1">
-            <GradientStop Offset="0"
-                          Color="#FFE2E2E2" />
-            <GradientStop Offset="1"
-                          Color="White" />
-         </LinearGradientBrush>
-          
-           <LinearGradientBrush x:Key="WpfThemeListBoxGroupHearderItemBackgroundBrush"
-                              EndPoint="0.5,1"
-                              StartPoint="0.5,0">
-            <GradientStop Color="#EBEDEF"
-                          Offset="1" />
-
-            <GradientStop Color="#FBFBFB"
-                          Offset="0" />
-         </LinearGradientBrush>
-          
-           <LinearGradientBrush x:Key="WpfThemeGroupNavigationControlButtonDefaultBorderBrush"
-                              EndPoint="0.5,1"
-                              StartPoint="0.5,0">
-            <GradientStop Color="#FFCFD0D0"
-                          Offset="0" />
-
-            <GradientStop Color="#FFC9CACA"
-                          Offset="1" />
-         </LinearGradientBrush>
-          
-           <LinearGradientBrush x:Key="WpfThemeGroupNavigationControlButtonDefaultBackgroundBrush"
-                              StartPoint="0.5,0"
-                              EndPoint="0.5,1">
-            <GradientStop Color="#FFFBFBFB"
-                          Offset="0" />
-
-            <GradientStop Color="#FFD6DBDF"
-                          Offset="1" />
-         </LinearGradientBrush>
-          
-           <LinearGradientBrush x:Key="WpfThemeGroupNavigationControlButtonPressedBackgroundBrush"
-                              StartPoint="0.5,0"
-                              EndPoint="0.5,1.04">
-            <GradientStop Color="#FFe1ecf6"
-                          Offset="0" />
-
-            <GradientStop Color="#FFd5e5f2"
-                          Offset="0.3" />
-
-            <GradientStop Color="#FFaecee8"
-                          Offset="0.5" />
-
-            <GradientStop Color="#FF75abd8"
-                          Offset="1" />
-         </LinearGradientBrush>
-          
-           <Style TargetType="ScrollViewer" x:Key="WpfThemeScrollViewerStyle">
-            <Setter Property="HorizontalContentAlignment"
-                    Value="Left" />
-
-            <Setter Property="VerticalContentAlignment"
-                    Value="Top" />
-
-            <Setter Property="VerticalScrollBarVisibility"
-                    Value="Visible" />
-
-            <Setter Property="BorderBrush"
-                    Value="Transparent" />
-
-            <Setter Property="BorderThickness"
-                    Value="0" />
-
-            <Setter Property="Background"
-                    Value="Transparent" />
-         </Style>
-          
-           <Style x:Key="WpfThemeLicensingStateRichTextBoxStyle" TargetType="RichTextBox">
-            <Setter Property="HorizontalAlignment"
-                    Value="Left" />
-            <Setter Property="FontSize"
-                    Value="13.333" />
-            <Setter Property="Foreground"
-                    Value="White" />
-            <Setter Property="VerticalAlignment"
-                    Value="Top" />
-            <Setter Property="IsReadOnly"
-                    Value="True" />
-            <Setter Property="IsTabStop"
-                    Value="False" />
-            <Setter Property="CaretBrush"
-                    Value="Transparent" />
-
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="RichTextBox">
-                     <ScrollViewer x:Name="PART_ContentHost"
-                                   BorderThickness="0"
-                                   BorderBrush="Transparent"
-                                   Background="Transparent"/>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-          
-           <Style x:Key="WpfThemeNavigationButtonStyle"
-                TargetType="Button">
-            <Setter Property="Foreground"
-                    Value="#6B6A6B" />
-
-            <Setter Property="Height"
-                    Value="21" />
-
-            <Setter Property="Width"
-                    Value="29" />
-
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="Button">
-                     <Grid x:Name="grid">
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="00:00:00.200" />
-
-                                 <VisualTransition From="MouseOver"
-                                                   To="Pressed" />
-                              </VisualStateGroup.Transitions>
-
-                              <VisualState x:Name="Normal" />
-
-                              <VisualState x:Name="MouseOver">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="00:00:00.000"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="Over" />
-                                 </Storyboard>
-                              </VisualState>
-
-                              <VisualState x:Name="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="00:00:00.000"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="Pressed1" />
-                                 </Storyboard>
-                              </VisualState>
-
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="00:00:00.000"
-                                                     To="0.5"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="grid" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="FocusStates">
-                              <VisualState x:Name="Focused" />
-
-                              <VisualState x:Name="Unfocused" />
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Border x:Name="Background"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{StaticResource WpfThemeGroupNavigationControlButtonDefaultBorderBrush}"
-                                Background="{StaticResource WpfThemeGroupNavigationControlButtonDefaultBackgroundBrush}" />
-
-                        <Border x:Name="Over"
-                                Opacity="0"
-                                BorderThickness="1">
-                           <Border.Background>
-                              <LinearGradientBrush StartPoint="0.5,0"
-                                                   EndPoint="0.5,1">
-                                 <GradientStop Color="#FFfbfcfd"
-                                               Offset="0" />
-
-                                 <GradientStop Color="#FFeef4f9"
-                                               Offset="0.36" />
-
-                                 <GradientStop Color="#FFa4c7e5"
-                                               Offset="1" />
-                              </LinearGradientBrush>
-                           </Border.Background>
-                        </Border>
-
-                        <Border x:Name="Pressed1"
-                                Opacity="0"
-                                BorderThickness="1"
-                                Background="{StaticResource WpfThemeGroupNavigationControlButtonPressedBackgroundBrush}" />
-
-                        <ContentPresenter x:Name="contentPresenter"
-                                          Margin="{TemplateBinding Padding}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          Content="{TemplateBinding Content}"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-          
-           <DataTemplate x:Key="WpfThemeDataNavigationIcon">
-            <Grid HorizontalAlignment="Center"
-                  VerticalAlignment="Center"
-                  Margin="0">
-               <Grid.Effect>
-                  <DropShadowEffect BlurRadius="2"
-                                    ShadowDepth="1"
-                                    Color="White" />
-               </Grid.Effect>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="4" />
-                  <RowDefinition Height="3" />
-                  <RowDefinition Height="4" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="5" />
-                  <ColumnDefinition Width="7" />
-                  <ColumnDefinition Width="5" />
-               </Grid.ColumnDefinitions>
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFC1CBD7"
-                          Width="5"
-                          Height="3"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="0,0,0,1" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFC1CBD7"
-                          Width="5"
-                          Height="3"
-                          Grid.Column="1"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="1,0,1,1" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFC1CBD7"
-                          Width="5"
-                          Height="3"
-                          Margin="0,0,0,1"
-                          Grid.Column="2"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFB1BDCD"
-                          Width="5"
-                          Height="3"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Grid.Row="1" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFB1BDCD"
-                          Width="5"
-                          Height="3"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="1,0" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FF1A69D6"
-                          Width="5"
-                          Height="3"
-                          Grid.Row="1"
-                          Grid.Column="2"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="0" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFA4B2C5"
-                          Width="5"
-                          Height="3"
-                          Grid.Row="2"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="0,1,0,0" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFA4B2C5"
-                          Width="5"
-                          Height="3"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="1,1,1,0" />
-               <Rectangle StrokeThickness="0"
-                          Fill="#FFA4B2C5"
-                          Width="5"
-                          Height="3"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Grid.Row="2"
-                          Grid.Column="2"
-                          Margin="0,1,0,0" />
-            </Grid>
-         </DataTemplate>
-          
-          <!-- Custom ListBox Style -->
-         <Style TargetType="xclb:ListBox">
-
-            <Setter Property="BorderThickness"
-                    Value="1" />
-
-            <Setter Property="BorderBrush"
-                    Value="{StaticResource WpfThemeListBoxDefaultBorderBrush}" />
-
-            <Setter Property="Background"
-                    Value="White" />
-
-            <Setter Property="Foreground"
-                    Value="Black" />
-
-            <Setter Property="Padding"
-                    Value="1" />
-
-            <Setter Property="IsTabStop"
-                    Value="False" />
-
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="xclb:ListBox">
-                     <Border BorderBrush="{TemplateBinding BorderBrush}"
-                             BorderThickness="{TemplateBinding BorderThickness}"
-                             Background="{TemplateBinding Background}">
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="Disabled" />
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="ResquestStatus">
-
-                              <VisualState x:Name="NoPendingRequests" />
-
-                              <VisualState x:Name="RequestsPending">
-                                 <Storyboard>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="loadingIndicator"
-                                                                   Storyboard.TargetProperty="RequestsPending">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:00.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <sys:Boolean>
-                                                True
-                                             </sys:Boolean>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition From="RequestsPending"
-                                                   To="NoPendingRequests">
-                                    <Storyboard>
-                                       <ObjectAnimationUsingKeyFrames Storyboard.TargetName="loadingIndicator"
-                                                                      Storyboard.TargetProperty="RequestsPending">
-                                          <DiscreteObjectKeyFrame KeyTime="00:00:00.0">
-                                             <DiscreteObjectKeyFrame.Value>
-                                                <sys:Boolean>
-                                                   False
-                                                </sys:Boolean>
-                                             </DiscreteObjectKeyFrame.Value>
-                                          </DiscreteObjectKeyFrame>
-                                       </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                 </VisualTransition>
-                              </VisualStateGroup.Transitions>
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="LicensingStates">
-                              <VisualState x:Name="Licensed" />
-
-                              <VisualState x:Name="NotLicensed">
-                                 <Storyboard>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="licensingMessage"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Visible</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="DataNavigationPaneStates">
-                              <VisualState x:Name="DataNavigationPaneHidden">
-                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="DataNavPane"
-                                                     Storyboard.TargetProperty="Opacity"
-                                                     To="0"
-                                                     Duration="00:00:00.150" />
-
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DataNavPane"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.150">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Collapsed</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-
-
-                              <VisualState x:Name="DataNavigationPaneVisible">
-                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="DataNavPane"
-                                                     Storyboard.TargetProperty="Opacity"
-                                                     From="0"
-                                                     To="1"
-                                                     Duration="00:00:00.150" />
-
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DataNavPane"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Visible</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition />
-                              <ColumnDefinition Width="Auto" />
-                           </Grid.ColumnDefinitions>
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="Auto" />
-                              <RowDefinition />
-                           </Grid.RowDefinitions>
-                           <Grid Grid.Column="0"
-                                 Grid.ColumnSpan="2"
-                                 Grid.Row="0"
-                                 Height="50"
-                                 Background="{StaticResource WpfThemeToolPaneBackgroundBrush}"
-                                 Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ToolPaneVisibility}">
-                              <Border Opacity="1">
-                                 <Border.Background>
-                                    <LinearGradientBrush StartPoint="320,0"
-                                                         EndPoint="353.127,51.434"
-                                                         SpreadMethod="Repeat"
-                                                         MappingMode="Absolute">
-                                       <GradientStop Color="#FF637FA5"
-                                                     Offset="0.5" />
-                                       <GradientStop Offset="0.5"
-                                                     Color="#FF596E89" />
-                                       <GradientStop Offset="1"
-                                                     Color="#FF596E89" />
-                                       <GradientStop Color="#FF617CA1" />
-                                    </LinearGradientBrush>
-                                 </Border.Background>
-                              </Border>
-
-                              <xclb:FilterControl x:Name="FilterControl"
-                                                  HorizontalAlignment="Left"
-                                                  Margin="10,0,0,0"
-                                                  Height="28"
-                                                  Width="225"
-                                                  DataSourceFilterExpression="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FilterExpression, Mode=TwoWay}"
-                                                  xclb:SearchTextBox.FilteredFieldNames="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xclb:SearchTextBox.FilteredFieldNames)}"
-                                                  xclb:SearchTextBox.TooComplexText="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xclb:SearchTextBox.TooComplexText)}"
-                                                  xclb:SearchTextBox.IsCaseSensitive="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xclb:SearchTextBox.IsCaseSensitive)}"/>
-                              
-                              <Rectangle Height="1"
-                                         VerticalAlignment="Bottom"
-                                         Fill="#FF8399A9" />
-                           </Grid>
-
-                           <ScrollViewer x:Name="ScrollViewer"
-                                         IsTabStop="False"
-                                         Grid.Column="0"
-                                         Grid.Row="1"
-                                         HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                                         VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"
-                                         Padding="{TemplateBinding Padding}"
-                                         Style="{StaticResource WpfThemeScrollViewerStyle}">
-                              <xclb:ItemsPresenter />
-                           </ScrollViewer>
-
-                           <xclb:LoadingIndicator x:Name="loadingIndicator"
-                                                  Grid.Column="0"
-                                                  Grid.Row="1" />
-
-                           <Grid x:Name="licensingMessage"
-                                 Grid.RowSpan="3"
-                                 Grid.ColumnSpan="2"
-                                 Visibility="Collapsed"
-                                 Background="#80FFFFFF">
-                              <Grid HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Width="250">
-                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="0.27*" />
-                                    <RowDefinition Height="1" />
-                                    <RowDefinition Height="0.69*" />
-                                 </Grid.RowDefinitions>
-                                 <Border CornerRadius="6"
-                                         Grid.RowSpan="3">
-                                    <Border.Background>
-                                       <LinearGradientBrush EndPoint="0.5,1"
-                                                            StartPoint="0.5,0">
-                                          <GradientStop Color="#FFCA4800"
-                                                        Offset="1" />
-                                          <GradientStop Color="#FFFF9B09" />
-                                       </LinearGradientBrush>
-                                    </Border.Background>
-                                 </Border>
-                                 <Border BorderBrush="#66000000"
-                                         BorderThickness="1"
-                                         CornerRadius="6"
-                                         Grid.RowSpan="3" />
-                                 <Border BorderBrush="#33FFFFFF"
-                                         BorderThickness="1"
-                                         CornerRadius="5"
-                                         Margin="1"
-                                         Grid.RowSpan="3" />
-                                 <Border Opacity="0.08"
-                                         CornerRadius="6"
-                                         Grid.RowSpan="3">
-                                    <Border.Background>
-                                       <LinearGradientBrush StartPoint="-0.015,0.1"
-                                                            EndPoint="9.187,9.236"
-                                                            SpreadMethod="Repeat"
-                                                            MappingMode="Absolute">
-                                          <GradientStop Offset="0"
-                                                        Color="Transparent" />
-                                          <GradientStop Color="Transparent"
-                                                        Offset="0.5" />
-                                          <GradientStop Offset="0.5"
-                                                        Color="White" />
-                                          <GradientStop Offset="1"
-                                                        Color="White" />
-                                       </LinearGradientBrush>
-                                    </Border.Background>
-                                 </Border>
-                                 <Border Background="#66000000"
-                                         Grid.Row="1"
-                                         Margin="10,0" />
-                                 <TextBlock HorizontalAlignment="Left"
-                                            Margin="10,6,0,0"
-                                            TextWrapping="Wrap"
-                                            Text="Invalid License / Trial Expired"
-                                            VerticalAlignment="Bottom"
-                                            Foreground="White"
-                                            FontSize="16" />
-                                 <RichTextBox x:Name="LicensingMessageRichTextBox"
-                                              Style="{StaticResource WpfThemeLicensingStateRichTextBoxStyle}"
-                                              Margin="10,6,0,10"
-                                              Grid.Row="2" />
-                              </Grid>
-                           </Grid>
-
-                           <Grid x:Name="DataNavPane"
-                                 Visibility="Collapsed"
-                                 Grid.Row="1"
-                                 Grid.RowSpan="2">
-
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="32" />
-                                 <RowDefinition />
-                              </Grid.RowDefinitions>
-                              <Border Background="{StaticResource WpfThemeListBoxGroupHearderItemBackgroundBrush}"
-                                      Grid.RowSpan="2" />
-
-                              <xclb:DataNavigationControl x:Name="DataNavControl"
-                                                          DataNavigationHost="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                                          Grid.Row="1" />
-
-                              <Button x:Name="HidePaneButton"
-                                      Grid.Row="0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      Padding="5"
-                                      Margin="5"
-                                      Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                      Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HideDataNavigationPaneCommand}">
-                                 <Path Height="9.33"
-                                       Width="9.33"
-                                       Stretch="Fill"
-                                       Data="M 7.333343505859375,-0.6666641235351562 C7.333343505859375,-0.6666641235351562 4,2.6650009155273438 4,2.6650009155273438 4,2.6650009155273438 0.666656494140625,-0.6666641235351562 0.666656494140625,-0.6666641235351562 0.666656494140625,-0.6666641235351562 -0.666656494140625,0.6666641235351562 -0.666656494140625,0.6666641235351562 -0.666656494140625,0.6666641235351562 2.665008544921875,4 2.665008544921875,4 2.665008544921875,4 -0.666656494140625,7.333335876464844 -0.666656494140625,7.333335876464844 -0.666656494140625,7.333335876464844 0.666656494140625,8.666664123535156 0.666656494140625,8.666664123535156 0.666656494140625,8.666664123535156 4,5.334999084472656 4,5.334999084472656 4,5.334999084472656 7.333343505859375,8.666664123535156 7.333343505859375,8.666664123535156 7.333343505859375,8.666664123535156 8.666656494140625,7.333335876464844 8.666656494140625,7.333335876464844 8.666656494140625,7.333335876464844 5.334991455078125,4 5.334991455078125,4 5.334991455078125,4 8.666656494140625,0.6666641235351562 8.666656494140625,0.6666641235351562 8.666656494140625,0.6666641235351562 7.333343505859375,-0.6666641235351562 7.333343505859375,-0.6666641235351562 z"
-                                       Fill="#A6A6A6" />
-                              </Button>
-                           </Grid>
-                        </Grid>
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-          
-          <!-- Custom GroupHeader Style -->
-         <Style TargetType="xclb:ListBoxGroupHeader">
-            <Setter Property="Background"
-                    Value="{StaticResource WpfThemeListBoxGroupHearderItemBackgroundBrush}" />
-
-            <Setter Property="BorderThickness"
-                    Value="1" />
-
-            <Setter Property="BorderBrush"
-                    Value="#C9CACA" />
-
-            <Setter Property="Foreground"
-                    Value="#7691B4" />
-
-            <Setter Property="Padding"
-                    Value="5,0,0,0" />
-
-            <Setter Property="MinHeight"
-                    Value="34" />
-
-            <Setter Property="HorizontalContentAlignment"
-                    Value="Stretch" />
-
-            <Setter Property="VerticalContentAlignment"
-                    Value="Center" />
-
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="xclb:ListBoxGroupHeader">
-                     <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="contentPresenter"
-                                                     Storyboard.TargetProperty="Opacity"
-                                                     Duration="0"
-                                                     To=".55" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="MouseOver" />
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="FocusStates">
-                              <VisualState x:Name="Unfocused" />
-                              <VisualState x:Name="Focused" />
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="SelectionStates">
-                              <VisualState x:Name="Unselected" />
-                              <VisualState x:Name="SelectedUnfocused" />
-                              <VisualState x:Name="Selected" />
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="LoadingStates">
-                              <VisualState x:Name="Loaded">
-                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="contentPresenter"
-                                                     Storyboard.TargetProperty="Opacity"
-                                                     Duration="00:00:00.0"
-                                                     To="1" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Loading">
-                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="contentPresenter"
-                                                     Storyboard.TargetProperty="Opacity"
-                                                     Duration="0"
-                                                     To="0" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-
-                           <VisualStateGroup x:Name="LayoutModeStates">
-                              <VisualState x:Name="Vertical" />
-                              <VisualState x:Name="Horizontal">
-                                 <Storyboard>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalLayoutGrid"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Visible</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalLayoutGrid"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Collapsed</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Floating">
-                                 <Storyboard>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalLayoutGrid"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Visible</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalLayoutGrid"
-                                                                   Storyboard.TargetProperty="Visibility"
-                                                                   Duration="00:00:0.0">
-                                       <DiscreteObjectKeyFrame KeyTime="00:00:0.0">
-                                          <DiscreteObjectKeyFrame.Value>
-                                             <Visibility>Collapsed</Visibility>
-                                          </DiscreteObjectKeyFrame.Value>
-                                       </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="VerticalLayoutGrid"
-                              Visibility="Visible">
-                           <Border x:Name="rootBorder"
-                                   BorderBrush="{TemplateBinding BorderBrush}"
-                                   BorderThickness="{TemplateBinding BorderThickness}"
-                                   Background="{TemplateBinding Background}">
-                              <Grid>
-                                 <Border Opacity="1">
-                                    <Border.Background>
-                                       <LinearGradientBrush StartPoint="355,0"
-                                                            EndPoint="388.127,51.434"
-                                                            SpreadMethod="Repeat"
-                                                            MappingMode="Absolute">
-                                          <GradientStop Color="#FFCCD8E9"
-                                                        Offset="0.5" />
-                                          <GradientStop Offset="0.5"
-                                                        Color="#FFB8CCE5" />
-                                          <GradientStop Offset="1"
-                                                        Color="#FFB8CCE5" />
-                                          <GradientStop Color="#FFCCD8E9" />
-                                       </LinearGradientBrush>
-                                    </Border.Background>
-                                 </Border>
-
-                                 <xclb:HierarchicalGroupValueControl x:Name="contentPresenter"
-                                                                     Margin="{TemplateBinding Padding}"
-                                                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                     GroupValueDataTemplates="{TemplateBinding GroupValueDataTemplates}"
-                                                                     ItemsSource="{Binding Path=FieldNameValuePairs}"
-                                                                     xclb:ListBoxContainer.LayoutMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xclb:ListBoxContainer.LayoutMode)}">
-                                    <xclb:HierarchicalGroupValueControl.ItemsPanel>
-                                       <ItemsPanelTemplate>
-                                          <StackPanel Orientation="Horizontal"></StackPanel>
-                                       </ItemsPanelTemplate>
-                                    </xclb:HierarchicalGroupValueControl.ItemsPanel>
-                                 </xclb:HierarchicalGroupValueControl>
-                              </Grid>
-                           </Border>
-                           <StackPanel Orientation="Horizontal"
-                                       HorizontalAlignment="Right"
-                                       Margin="0,0,5,0">
-
-                              <Button Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                      ContentTemplate="{StaticResource WpfThemeDataNavigationIcon}"
-                                      Margin="0,5,10,5"
-                                      Padding="5"
-                                      Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ParentListBox.ShowDataNavigationPaneCommand}" />
-
-                              <Button x:Name="PreviousButton"
-                                      BorderThickness="1"
-                                      IsTabStop="False"
-                                      Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NavigateToPreviousGroupCommand}"
-                                      Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                      Margin="0,5,3,5"
-                                      Padding="5">
-                                 <Path Margin="3,1"
-                                       RenderTransformOrigin="0.5,0.5"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Height="7"
-                                       Width="14"
-                                       Stretch="Fill"
-                                       Opacity="1"
-                                       Data="M 7,0 C7,0 0,7 0,7 0,7 14,7 14,7 14,7 7,0 7,0 z"
-                                       UseLayoutRounding="False">
-                                    <Path.Effect>
-                                       <DropShadowEffect BlurRadius="2"
-                                                         ShadowDepth="1"
-                                                         Color="White" />
-                                    </Path.Effect>
-                                    <Path.Fill>
-                                       <LinearGradientBrush EndPoint="0.5,1"
-                                                            StartPoint="0.5,0">
-                                          <GradientStop Color="#FF9EADC1"
-                                                        Offset="1" />
-                                          <GradientStop Color="#FFC6CFDA" />
-                                       </LinearGradientBrush>
-                                    </Path.Fill>
-                                 </Path>
-                              </Button>
-
-                              <Button x:Name="NextButton"
-                                      IsTabStop="False"
-                                      Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NavigateToNextGroupCommand}"
-                                      Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                      Margin="0,5,0,5"
-                                      Padding="5">
-                                 <Path Margin="3,1"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Height="7"
-                                       Width="14"
-                                       Stretch="Fill"
-                                       Opacity="1"
-                                       Data="M 7,7 C7,7 14,0 14,0 14,0 0,0 0,0 0,0 7,7 7,7 z"
-                                       UseLayoutRounding="False">
-                                    <Path.Effect>
-                                       <DropShadowEffect BlurRadius="2"
-                                                         ShadowDepth="1"
-                                                         Color="White" />
-                                    </Path.Effect>
-                                    <Path.Fill>
-                                       <LinearGradientBrush EndPoint="0.5,1"
-                                                            StartPoint="0.5,0">
-                                          <GradientStop Color="#FF9EADC1"
-                                                        Offset="1" />
-                                          <GradientStop Color="#FFC6CFDA" />
-                                       </LinearGradientBrush>
-                                    </Path.Fill>
-                                 </Path>
-                              </Button>
-                           </StackPanel>
-
-                        </Grid>
-
-                        <Grid x:Name="HorizontalLayoutGrid"
-                              Visibility="Collapsed">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="*" />
-                              <ColumnDefinition Width="40" />
-                              <ColumnDefinition Width="*" />
-                           </Grid.ColumnDefinitions>
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="*" />
-                              <RowDefinition Height="Auto" />
-                           </Grid.RowDefinitions>
-
-                           <Border x:Name="HorizontalRootBorder"
-                                   Grid.RowSpan="2"
-                                   Grid.ColumnSpan="3"
-                                   BorderBrush="{TemplateBinding BorderBrush}"
-                                   BorderThickness="{TemplateBinding BorderThickness}"
-                                   Background="{TemplateBinding Background}" />
-
-                           <Button x:Name="HorizontalPreviousButton"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   BorderThickness="1,1,0,1"
-                                   IsTabStop="False"
-                                   Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NavigateToPreviousGroupCommand}"
-                                   Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                   Padding="5">
-                              <Path Margin="6"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Height="15"
-                                    Width="7"
-                                    Stretch="Fill"
-                                    Opacity="1"
-                                    Data="M 306,597 C306,597 313,590 313,590 313,590 313,605 313,605 313,605 306,597 306,597 z"
-                                    UseLayoutRounding="False">
-                                 <Path.Effect>
-                                    <DropShadowEffect BlurRadius="2"
-                                                      ShadowDepth="1"
-                                                      Color="White" />
-                                 </Path.Effect>
-                                 <Path.Fill>
-                                    <LinearGradientBrush EndPoint="0.5,1"
-                                                         StartPoint="0.5,0">
-                                       <GradientStop Color="#FF9EADC1"
-                                                     Offset="1" />
-                                       <GradientStop Color="#FFC6CFDA" />
-                                    </LinearGradientBrush>
-                                 </Path.Fill>
-                              </Path>
-                           </Button>
-
-                           <Button x:Name="HorizontalNextButton"
-                                   Grid.Row="1"
-                                   Grid.Column="2"
-                                   IsTabStop="False"
-                                   Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NavigateToNextGroupCommand}"
-                                   Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                   Padding="5">
-                              <Path Margin="6"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Height="15"
-                                    Width="7"
-                                    Stretch="Fill"
-                                    Opacity="1"
-                                    Data="M 401,598 C401,598 394,605 394,605 394,605 394,590 394,590 394,590 401,598 401,598 z"
-                                    UseLayoutRounding="False">
-                                 <Path.Effect>
-                                    <DropShadowEffect BlurRadius="2"
-                                                      ShadowDepth="1"
-                                                      Color="White" />
-                                 </Path.Effect>
-                                 <Path.Fill>
-                                    <LinearGradientBrush EndPoint="0.5,1"
-                                                         StartPoint="0.5,0">
-                                       <GradientStop Color="#FF9EADC1"
-                                                     Offset="1" />
-                                       <GradientStop Color="#FFC6CFDA" />
-                                    </LinearGradientBrush>
-                                 </Path.Fill>
-                              </Path>
-                           </Button>
-
-                           <Button Style="{StaticResource WpfThemeNavigationButtonStyle}"
-                                   Grid.Row="1"
-                                   Grid.Column="1"
-                                   ContentTemplate="{StaticResource WpfThemeDataNavigationIcon}"
-                                   Padding="5"
-                                   Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ParentListBox.ShowDataNavigationPaneCommand}" />
-
-                           <xclb:HierarchicalGroupValueControl x:Name="HorizontalContentPresenter"
-                                                               Grid.Row="0"
-                                                               Grid.Column="0"
-                                                               Grid.ColumnSpan="3"
-                                                               Margin="{TemplateBinding Padding}"
-                                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                               GroupValueDataTemplates="{TemplateBinding GroupValueDataTemplates}"
-                                                               ItemsSource="{Binding Path=FieldNameValuePairs}"
-                                                               xclb:ListBoxContainer.LayoutMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xclb:ListBoxContainer.LayoutMode)}">
-                              <xclb:HierarchicalGroupValueControl.ItemsPanel>
-                                 <ItemsPanelTemplate>
-                                    <StackPanel Orientation="Vertical"></StackPanel>
-                                 </ItemsPanelTemplate>
-                              </xclb:HierarchicalGroupValueControl.ItemsPanel>
-                           </xclb:HierarchicalGroupValueControl>
-
-                        </Grid>
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-          
-          <xclb:FieldNameList x:Key="filteredFieldNameList">
-            <sys:String>ShipName</sys:String>
-         </xclb:FieldNameList>
-
-         <PropertyGroupDescription x:Key="shipCountryGroupDescription"
-                                   PropertyName="ShipCountry"/>
-
-         <PropertyGroupDescription x:Key="shipCityGroupDescription"
-                                   PropertyName="ShipCity" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <xclb:ListBox x:Name="_listBox"
-                    ItemsSource="{Binding}" 
-                    ItemTemplate="{StaticResource orderListBoxItemTemplate}"
-                    xclb:SearchTextBox.FilteredFieldNames="{StaticResource filteredFieldNameList}"
-                    xclb:SearchTextBox.IsCaseSensitive="False">
-      </xclb:ListBox>
-   </Grid >
-   <!--##END-->
-</local:DemoView>
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt
index 22026220..4375dee6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MagnifierView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt
index 56b6fa03..c25cbc93 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaskedTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt
index e4c3d607..88b5a14e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaskedTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt
index 0479ffed..b6b70eee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,7 +25,7 @@
            The MaskedTextBox control lets you display and edit values based on a mask.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
 
       <Grid.RowDefinitions>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt
index 4e281da5..588221a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -31,13 +31,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void ModeComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      materialButton.Content = e.AddedItems[ 0 ].Equals( MaterialButtonModeEnum.Circle )
-                                ? ((ComboBoxItem)contentComboBox.Items.GetItemAt( 1 )).Tag
-                                : ((ComboBoxItem)contentComboBox.Items.GetItemAt( 0 )).Tag;
-    }
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt
index 5314c036..e2c40a4c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialButton">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A Button with a raised animation on mouse over and a customizable ink animation on MousePress. It uses the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,168 +31,18 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
-   
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      
-         <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-         <ObjectDataProvider x:Key="ButtonEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="xctk:MaterialButtonModeEnum" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
-         
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Is Raised Active: "
-                          VerticalAlignment="Center" />
-               <CheckBox Grid.Column="1"
-                         IsChecked="{Binding IsRaisedActive, ElementName=materialButton}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Mode: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource ButtonEnumData}}"
-                         SelectedItem="{Binding Mode, ElementName=materialButton}"
-                         SelectionChanged="ModeComboBox_SelectionChanged"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Content: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="contentComboBox"
-                         Grid.Column="1"
-                         Grid.Row="2"
-                         SelectedValue="{Binding Content, ElementName=materialButton}"
-                         SelectedValuePath="Tag"
-                         VerticalAlignment="Center"
-                         Margin="5">
-                  <ComboBoxItem Content="A string"
-                                Tag="PRIMARY" />
-                  <ComboBoxItem Content="An image">
-                     <ComboBoxItem.Tag>
-                        <Image Source="../Resources/WhitePen.png"
-                               Width="30"
-                               Height="30" />
-                     </ComboBoxItem.Tag>
-                  </ComboBoxItem>
-               </ComboBox>
-               <TextBlock Grid.Column="0"
-                          Grid.Row="3"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="3"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialButton}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Is Ink Effect Active: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <CheckBox x:Name="inkEffectActiveCheckBox"
-                         Grid.Column="3"
-                         Grid.Row="0"
-                         IsChecked="{Binding IsInkEffectActive, ElementName=materialButton}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Ink Effect Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:ColorPicker Grid.Column="3"
-                                 Grid.Row="1"
-                                 SelectedColor="{Binding InkEffectBrush, ElementName=materialButton, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                 DisplayColorAndName="True"
-                                 VerticalAlignment="Center"
-                                 Width="125"
-                                 Margin="5"
-                                 IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Ink Effect Opacity: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="2"
-                                  Value="{Binding InkEffectOpacity, ElementName=materialButton}"
-                                  Minimum="0"
-                                  Maximum="1"
-                                  Increment="0.05"
-                                  FormatString="N2"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <xctk:MaterialButton x:Name="materialButton"
-                                 Content="PRIMARY"
-                                 Margin="20"
-                                 Padding="20"
-                                 IsRaisedActive="True"
-                                 IsInkEffectActive="True"
-                                 InkEffectBrush="White"
-                                 InkEffectOpacity="0.25"
-                                 Mode="Rectangle"
-                                 HorizontalAlignment="Center" />
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialButton.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt
index ef00f889..38e34326 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialCheckBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt
index fbebe6a1..6cac7952 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A CheckBox with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -32,91 +31,16 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
 
-         <xctk:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
-         <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-   
-   <Grid>
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
 
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Corner Radius: "
-                          VerticalAlignment="Center" />
-               <xctk:DoubleUpDown Grid.Column="1"
-                                  Value="{Binding CornerRadius, ElementName=materialCheckBox, Converter={StaticResource CornerRadiusToDoubleConverter}}"
-                                  Minimum="0"
-                                  Maximum="10"
-                                  Increment="1"
-                                  Margin="5"
-                                  VerticalContentAlignment="Center" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialCheckBox}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
 
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Text="Check Mark Brush: "
-                          VerticalAlignment="Center" 
-                          Margin="10,0,0,0"/>
-               <xctk:ColorPicker Grid.Column="3"
-                                 SelectedColor="{Binding CheckMarkBrush, ElementName=materialCheckBox, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                 DisplayColorAndName="True"
-                                 Margin="5"
-                                 Width="150"
-                                 VerticalContentAlignment="Center" />
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <xctk:MaterialCheckBox x:Name="materialCheckBox"
-                                   HorizontalAlignment="Center"
-                                   IsChecked="True"
-                                   Content="Accept conditions"
-                                   IsThreeState="True"/>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialCheckBox.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt
index 6e9d0ea9..af1f7e8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt
index 431d839d..b0809e0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,6 @@
          <Run>MaterialComboBox is a ComboBox that is using the Material Brushes and contains MaterialComboBoxItems.</Run>
          <LineBreak />
          <Run>MaterialComboBoxItems are ComboBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,157 +33,16 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
 
-         <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-   
-   <Grid>
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="135" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
 
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialComboBox}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Line Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding LineBrush, ElementName=materialComboBox}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Line Focus Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="2"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding LineFocusBrush, ElementName=materialComboBox}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Text="Is Using fade Animation: "
-                          Grid.Row="3"
-                          Grid.Column="0"
-                          VerticalAlignment="Center" />
-               <CheckBox Grid.Column="1"
-                         Grid.Row="3"
-                         IsChecked="{Binding IsUsingFadeAnimation, ElementName=materialComboBox}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
 
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Is Ink Effect Active: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <CheckBox x:Name="inkEffectActiveCheckBox"
-                         Grid.Column="3"
-                         Grid.Row="0"
-                         IsChecked="{Binding IsInkEffectActive, ElementName=materialComboBox}"
-                         VerticalAlignment="Center"
-                         Margin="5"
-                         ToolTip="Can be set a MaterialComboBox control or individually on each MaterialComboBoxItem." />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Ink Effect Brush: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}"
-                          Margin="10,0,0,0"/>
-               <xctk:ColorPicker Grid.Column="3"
-                                 Grid.Row="1"
-                                 SelectedColor="{Binding InkEffectBrush, ElementName=materialComboBox, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                 DisplayColorAndName="True"
-                                 VerticalAlignment="Center"
-                                 Width="125"
-                                 Margin="5"
-                                 IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                                 ToolTip="Can be set a MaterialComboBox control or individually on each MaterialComboBoxItem." />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Ink Effect Opacity: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" 
-                          Margin="10,0,0,0"/>
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="2"
-                                  Value="{Binding InkEffectOpacity, ElementName=materialComboBox}"
-                                  Minimum="0"
-                                  Maximum="1"
-                                  Increment="0.05"
-                                  FormatString="N2"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                                  ToolTip="Can be set a MaterialComboBox control or individually on each MaterialComboBoxItem." />
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <xctk:MaterialComboBox x:Name="materialComboBox"
-                                   HorizontalAlignment="Center"
-                                   IsInkEffectActive="True"
-                                   IsUsingFadeAnimation="True"
-                                   LineBrush="{Binding MaterialBrushes[17], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Width="150">
-               <xctk:MaterialComboBoxItem Content="First Item" />
-               <xctk:MaterialComboBoxItem Content="Second Item"
-                                          IsSelected="True" />
-               <xctk:MaterialComboBoxItem Content="Third Item" />
-               <xctk:MaterialComboBoxItem Content="Fourth Item" />
-               <xctk:MaterialComboBoxItem Content="Fifth Item" />
-            </xctk:MaterialComboBox>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialComboBox.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt
index 1c12f905..81972001 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -19,12 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-#if !OPEN_SOURCE
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.MaterialControls;
-#endif
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
@@ -32,15 +26,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
   /// </summary>
   public partial class MaterialControlsView : MaterialDemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Storyboard _toastStoryboard = new Storyboard();
-    private Random _rand = new Random();
-    private List<MaterialToast> _toastList = new List<MaterialToast>();
 
-    #endregion
-#endif
 
     #region Constructors
 
@@ -51,130 +38,22 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 
     #endregion
 
-#if !OPEN_SOURCE
 
-    #region Private Methods
 
-    private int GetRandomInteger( int max )
-    {
-      return _rand.Next( max );
-    }
 
-    private void PopToast()
-    {
-      MaterialAccentEnum accent;
-      MaterialToastLocationEnum location;
-      string text;
-
-      switch( this.GetRandomInteger( 8 ) )
-      {
-        case 0: accent = MaterialAccentEnum.Blue; break;
-        case 1: accent = MaterialAccentEnum.LightBlue; break;
-        case 2: accent = MaterialAccentEnum.Cyan; break;
-        case 3: accent = MaterialAccentEnum.Teal; break;
-        case 4: accent = MaterialAccentEnum.Green; break;
-        case 5: accent = MaterialAccentEnum.LightGreen; break;
-        case 6: accent = MaterialAccentEnum.Lime; break;
-        default: accent = MaterialAccentEnum.Yellow; break;
-      }
-      switch( this.GetRandomInteger( 6 ) )
-      {
-        case 0: location = MaterialToastLocationEnum.Bottom; break;
-        case 1: location = MaterialToastLocationEnum.BottomLeft; break;
-        case 2: location = MaterialToastLocationEnum.BottomRight; break;
-        case 3: location = MaterialToastLocationEnum.Top; break;
-        case 4: location = MaterialToastLocationEnum.TopLeft; break;
-        default: location = MaterialToastLocationEnum.TopRight; break;
-      }
-      switch( this.GetRandomInteger( 6 ) )
-      {
-        case 0: text = "Warning"; break;
-        case 1: text = "New Appointments"; break;
-        case 2: text = "New Mail"; break;
-        case 3: text = "New Message"; break;
-        case 4: text = "Times Up!"; break;
-        default: text = "Task Completed!";break;
-      }
-      var materialToast = new MaterialToast( _toastGrid );
-      materialToast.MaterialAccent = accent;
-      materialToast.Location = location;
-      materialToast.Content = text;
-      materialToast.DisplayTime = System.TimeSpan.FromMilliseconds( 3000 );
-      materialToast.HideCompleted += this.MaterialToast_HideCompleted;
-      _toastList.Add( materialToast );
-      materialToast.ShowToast();
-    }
 
-    private void StartToastCircularProgressBar()
-    {
-      Storyboard storyboard = new Storyboard();
 
-      var valueAnim = new DoubleAnimation( 0d, 100d, System.TimeSpan.FromMilliseconds( 3000 ) );
-      Storyboard.SetTarget( valueAnim, _toastProgressBarCircular );
-      Storyboard.SetTargetProperty( valueAnim, new PropertyPath( MaterialProgressBarCircular.ValueProperty ) );
-      storyboard.Children.Add( valueAnim );
 
-      storyboard.Completed += this.ToastCircularPropgressBarAnimation_Completed;
-      storyboard.Begin( _toastProgressBarCircular );
-    }
 
-    #endregion
 
-    #region Event Handlers
 
-    private void MaterialProgressBar_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      var progressBar = sender as MaterialProgressBarBase;
-      if( progressBar != null )
-      {
-        var storyboard = new Storyboard();
-
-        // Animate ProgressBar
-        var valueAnim = new DoubleAnimation( progressBar.Minimum, progressBar.Maximum, System.TimeSpan.FromMilliseconds( 4000 ) );
-        Storyboard.SetTarget( valueAnim, progressBar );
-        Storyboard.SetTargetProperty( valueAnim, new PropertyPath( MaterialProgressBarBase.ValueProperty ) );
-        storyboard.Children.Add( valueAnim );
-
-        storyboard.Begin( this );
-      }
-    }
 
-    private void MaterialTabControl_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      var materialTabItem = e.AddedItems[ 0 ] as MaterialTabItem;
-      if( (materialTabItem != null) && materialTabItem.Equals( _materialTabItem5 ) )
-      {
-        this.StartToastCircularProgressBar();
-      }
-      else
-      {
-        foreach( var toast in _toastList )
-        {
-          toast.HideToast();
-        }
-      }
-    }
 
-    private void MaterialToast_HideCompleted( object sender, RoutedEventArgs e )
-    {
-      _toastList.Remove( sender as MaterialToast );
-    }
 
-    private void MaterialToastButton_Click( object sender, RoutedEventArgs e )
-    {
-      this.PopToast();
-    }
 
-    private void ToastCircularPropgressBarAnimation_Completed( object sender, EventArgs e )
-    {
-      if( _materialTabControl.SelectedItem.Equals( _materialTabItem5 ) )
-      {
-        this.PopToast();
-        this.StartToastCircularProgressBar();
-      }
-    }
 
-    #endregion
-#endif
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt
index 2a609163..4bc64041 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,6 @@
          <LineBreak />
          <LineBreak />
          <Run>The Material controls include a set of complimentary accent brush and foreground.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -35,945 +34,23 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
 
-      <Path x:Key="IconVolumeUp"
-            Data="M17.071346,6.6599999C17.78875,8.1508932 18.122005,9.9854851 17.917633,11.917816 17.780151,13.210711 17.415701,14.404805 16.885771,15.449L15.177,14.644304C15.617841,13.787608 15.9243,12.790113 16.036884,11.719817 16.208162,10.105325 15.913901,8.568861 15.306683,7.365747z M20.566984,5.2669997C21.512329,7.3320866 21.947803,9.7617378 21.678318,12.318976 21.49543,14.033849 21.006458,15.634024 20.297501,17.052L18.59,16.251213C19.210964,15.018133 19.637339,13.622355 19.796829,12.11588 20.034515,9.8762961 19.647739,7.7448602 18.813787,5.9662089z M13.335,0L13.335,21.334999 5.6516771,14.88951 0,14.88951 0,6.4454007 5.6543674,6.4454007z"
-            Stretch="Uniform"
-            Fill="#FFFFFFFF"
-            Width="36"
-            Height="36"
-            Margin="0,0,0,0"
-            RenderTransformOrigin="0.5,0.5" />
-      <Path x:Key="IconVolumeDown"
-            Data="M17.069859,6.6599998C17.78598,8.1508932 18.11929,9.9855452 17.916285,11.917816 17.779579,13.210711 17.413668,14.404805 16.884953,15.449L15.174,14.644304C15.615413,13.787608 15.922723,12.790213 16.034725,11.719917 16.207932,10.105325 15.910922,8.568861 15.305504,7.365747z M13.333,0L13.333,21.333 5.6509034,14.889021 0,14.889021 0,6.445189 5.6522733,6.445189z"
-            Stretch="Uniform"
-            Fill="#FFFFFFFF"
-            Width="36"
-            Height="36"
-            Margin="0,0,0,0"
-            RenderTransformOrigin="0.5,0.5" />
-      <Path x:Key="IconVolumeMinus"
-            Data="M16.92,9.7449998L25.690001,9.7449998 25.690001,11.589 16.92,11.589z M11.066152,4.8618717L6.4789848,8.7133774 2.2655792,8.7133774 2.2655792,12.622222 6.4737949,12.622222 11.066152,16.473669z M13.333,0L13.333,21.333 5.6508131,14.889091 0,14.889091 0,6.4452193 5.6522131,6.4452193z"
-            Stretch="Uniform"
-            Fill="#FFFFFFFF"
-            Width="24"
-            Height="24"
-            Margin="0,0,0,0"
-            RenderTransformOrigin="0.5,0.5" />
-      <Path x:Key="IconVolumeMute"
-            Data="M17.648219,6.9439999L20.472552,9.7694447 23.299285,6.9439999 24.802002,8.4505004 21.97767,11.275985 24.799303,14.09623 23.294185,15.6014 20.472552,12.778555 17.648219,15.604001 16.143001,14.098829 18.968634,11.275985 16.143001,8.4505004z M11.066151,4.8619084L6.479044,8.7121162 2.2668591,8.7121162 2.2668591,12.622163 6.4750738,12.622163 11.066151,16.473691z M13.333,0L13.333,21.332999 5.6509323,14.88902 0,14.88902 0,6.4451885 5.6534328,6.4451885z"
-            Stretch="Uniform"
-            Fill="#FFFFFFFF"
-            Width="18"
-            Height="18"
-            Margin="0,0,0,0"
-            RenderTransformOrigin="0.5,0.5" />
 
-      <Style x:Key="ToolTipTextStyle"
-             TargetType="{x:Type TextBlock}">
-         <Setter Property="FontWeight"
-                 Value="Bold" />
-         <Setter Property="HorizontalAlignment"
-                 Value="Left" />
-         <Setter Property="VerticalAlignment"
-                 Value="Top" />
-         <Setter Property="Foreground"
-                 Value="Black" />
-         <Style.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-               <Setter Property="Foreground"
-                       Value="{Binding Tag, RelativeSource={RelativeSource Self}}" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
 
-   </local:DemoView.Resources>
 
-   <Grid>
-      <xctk:MaterialTabControl x:Name="_materialTabControl"
-                               MaterialAccent="LightBlue"
-                               SelectionChanged="MaterialTabControl_SelectionChanged">
-         <xctk:MaterialTabItem Header="Controls Page 1"
-                               Padding="20"
-                               FontSize="12">
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
 
-               <xctk:MaterialFrame Margin="16"
-                                   VerticalContentAlignment="Top"
-                                   Z="4">
-                  <StackPanel Orientation="Vertical"
-                              HorizontalAlignment="Left"
-                              Margin="20">
-                     <TextBlock Text="Buttons : " />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 1"
-                                          MaterialAccent="Blue" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 2"
-                                          MaterialAccent="LightBlue" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 3"
-                                          MaterialAccent="Cyan" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 4"
-                                          MaterialAccent="Teal" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 5"
-                                          MaterialAccent="Green" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 6"
-                                          MaterialAccent="LightGreen" />
-                     <xctk:MaterialButton Margin="0,8,0,0"
-                                          Height="28"
-                                          Width="120"
-                                          Content="Button 7"
-                                          MaterialAccent="Lime" />
 
-                  </StackPanel>
-               </xctk:MaterialFrame>
 
-               <xctk:MaterialFrame Margin="16"
-                                   VerticalContentAlignment="Top"
-                                   Z="4">
-                  <StackPanel Orientation="Vertical"
-                              HorizontalAlignment="Left"
-                              Margin="20">
-                     <TextBlock Text="Round Buttons : " />
-                     <xctk:MaterialButton  Margin="0,8,0,0"
-                                           Mode="Circle"
-                                           Height="64"
-                                           Width="64"
-                                           Content="{StaticResource IconVolumeUp}"
-                                           MaterialAccent="Blue" />
-                     <xctk:MaterialButton  Margin="0,8,0,0"
-                                           Mode="Circle"
-                                           Height="48"
-                                           Width="48"
-                                           Content="{StaticResource IconVolumeDown}"
-                                           MaterialAccent="LightBlue" />
-                     <xctk:MaterialButton  Margin="0,8,0,0"
-                                           Mode="Circle"
-                                           Height="36"
-                                           Width="36"
-                                           Content="{StaticResource IconVolumeMinus}"
-                                           MaterialAccent="Cyan" />
-                     <xctk:MaterialButton  Margin="0,8,0,0"
-                                           Mode="Circle"
-                                           Height="24"
-                                           Width="24"
-                                           Content="{StaticResource IconVolumeMute}"
-                                           MaterialAccent="Teal" />
-                     <xctk:MaterialButton  Margin="0,8,0,0"
-                                           Mode="Circle"
-                                           Height="18"
-                                           Width="18"
-                                           Content=""
-                                           MaterialAccent="Green" />
-                  </StackPanel>
-               </xctk:MaterialFrame>
 
-               <xctk:MaterialFrame Margin="16"
-                                   VerticalContentAlignment="Top"
-                                   Z="4">
-                  <StackPanel Orientation="Vertical"
-                              HorizontalAlignment="Left"
-                              Margin="20">
-                     <TextBlock Text="Radio Buttons : " />
-                     <xctk:MaterialRadioButton Content="Option 1"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Blue" />
-                     <xctk:MaterialRadioButton Content="Option 2"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="LightBlue" />
-                     <xctk:MaterialRadioButton Content="Option 3"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Cyan" />
-                     <xctk:MaterialRadioButton Content="Option 4"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Teal" />
-                     <xctk:MaterialRadioButton Content="Option 5"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Green" />
-                     <xctk:MaterialRadioButton Content="Option 6"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="LightGreen" />
-                     <xctk:MaterialRadioButton Content="Option 7"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Lime" />
-                     <xctk:MaterialRadioButton Content="Option 8"
-                                               Margin="0,8,0,0"
-                                               MaterialAccent="Yellow" />
-                  </StackPanel>
-               </xctk:MaterialFrame>
-            </StackPanel >
-         </xctk:MaterialTabItem>
-         <xctk:MaterialTabItem Header="Controls Page 2"
-                               Padding="20"
-                               FontSize="12">
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   Margin="16">
-                  <StackPanel Orientation="Vertical"
-                              Margin="20"
-                              Width="260">
-                     <TextBlock Text="TextFields : " />
-                     <xctk:MaterialTextField Watermark="First Name"
-                                             Margin="0,36,0,0"
-                                             MaterialAccent="Blue" />
-                     <xctk:MaterialTextField Watermark="Last Name"
-                                             Margin="0,36,0,0"
-                                             MaterialAccent="Blue" />
-                     <xctk:MaterialTextField Watermark="Company Name"
-                                             Margin="0,36,0,0"
-                                             MaterialAccent="Blue" />
-                     <xctk:MaterialTextField Watermark="Address"
-                                             Margin="0,36,0,0"
-                                             MaterialAccent="Blue" />
-                     <xctk:MaterialTextField Watermark="Address Line 2"
-                                             Margin="0,36,0,0"
-                                             MaterialAccent="Blue" />
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                    Margin="16"
-                                    VerticalContentAlignment="Top">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="CheckBoxes: " />
-                     <xctk:MaterialCheckBox Content="Option 1"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Blue"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 2"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="LightBlue"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 3"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Cyan"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 4"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Teal"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 5"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Green"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 6"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="LightGreen"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 7"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Lime"
-                                             IsChecked="True" />
-                     <xctk:MaterialCheckBox Content="Option 8"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Yellow"
-                                             IsChecked="True" />
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                    Margin="16"
-                                    VerticalContentAlignment="Top">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="DropDowns: " />
-                     <xctk:MaterialDropDown Content="DropDown Button 1"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Blue">
-                        <xctk:MaterialDropDown.DropDownContent>
-                           <Border CornerRadius="2"
-                                    Height="46"
-                                    Width="160">
-                              <TextBlock Text="DropDown Content"
-                                          Foreground="Black"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                           </Border>
-                        </xctk:MaterialDropDown.DropDownContent>
-                     </xctk:MaterialDropDown>
-                     <xctk:MaterialDropDown Content="DropDown Button 2"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="LightBlue">
-                        <xctk:MaterialDropDown.DropDownContent>
-                           <Border CornerRadius="2"
-                                    Height="46"
-                                    Width="160">
-                              <TextBlock Text="DropDown Content"
-                                          Foreground="Black"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                           </Border>
-                        </xctk:MaterialDropDown.DropDownContent>
-                     </xctk:MaterialDropDown>
-                     <xctk:MaterialDropDown Content="DropDown Button 3"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Cyan">
-                        <xctk:MaterialDropDown.DropDownContent>
-                           <Border CornerRadius="2"
-                                    Height="46"
-                                    Width="160">
-                              <TextBlock Text="DropDown Content"
-                                          Foreground="Black"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                           </Border>
-                        </xctk:MaterialDropDown.DropDownContent>
-                     </xctk:MaterialDropDown>
-                     <xctk:MaterialDropDown Content="DropDown Button 4"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Teal">
-                        <xctk:MaterialDropDown.DropDownContent>
-                           <Border CornerRadius="2"
-                                    Height="46"
-                                    Width="160">
-                              <TextBlock Text="DropDown Content"
-                                          Foreground="Black"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                           </Border>
-                        </xctk:MaterialDropDown.DropDownContent>
-                     </xctk:MaterialDropDown>
-                     <xctk:MaterialDropDown Content="DropDown Button 5"
-                                             Margin="0,8,0,0"
-                                             MaterialAccent="Green">
-                        <xctk:MaterialDropDown.DropDownContent>
-                           <Border CornerRadius="2"
-                                    Height="46"
-                                    Width="160">
-                              <TextBlock Text="DropDown Content"
-                                          Foreground="Black"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                           </Border>
-                        </xctk:MaterialDropDown.DropDownContent>
-                     </xctk:MaterialDropDown>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-            </StackPanel>
-         </xctk:MaterialTabItem>
-         <xctk:MaterialTabItem Header="Controls Page 3"
-                               Padding="20"
-                               FontSize="12">
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="Switches : " />
-                     <xctk:MaterialSwitch Width="80"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="Blue"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="90"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="LightBlue"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="100"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="Cyan"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="110"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="Teal"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="120"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="Green"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="130"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="LightGreen"
-                                          IsChecked="True" />
-                     <xctk:MaterialSwitch Width="140"
-                                          Margin="0,12,0,0"
-                                          MaterialAccent="Lime"
-                                          IsChecked="True" />
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="15">
-                     <TextBlock Text="Sliders : " />
-                     <Grid TextElement.Foreground="Black">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="Auto" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
 
-                        <TextBlock Text="Volume:"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="Blue"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Bass:"
-                                   Grid.Row="1"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="1"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="LightBlue"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Treble:"
-                                   Grid.Row="2"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="2"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="Cyan"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Mid:"
-                                   Grid.Row="3"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="3"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="Teal"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Master:"
-                                   Grid.Row="4"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="4"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="Green"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Equalizer:"
-                                   Grid.Row="5"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="5"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="LightGreen"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                        <TextBlock Text="Balance:"
-                                   Grid.Row="6"
-                                   Margin="0,15,0,15" />
-                        <xctk:MaterialSlider Grid.Row="6"
-                                             Grid.Column="1"
-                                             Width="120"
-                                             MaterialAccent="Lime"
-                                             Minimum="0"
-                                             Maximum="10"
-                                             VerticalAlignment="Center" />
-                     </Grid>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="15">
-                     <TextBlock Text="ToolTips : "/>
-                     <Grid Margin="0,15,0,0">
-                        <Image Source="../Resources/italy.4.gif"
-                               Stretch="Fill"
-                               Height="328"
-                               Width="204" />
-                        <TextBlock Text="Venice"
-                                   Margin="49,50,0,0"
-                                   Tag="{Binding MaterialBrushes[6], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="LightBlue"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 270,660" />
-                                    <TextBlock Text="Avg Temp: 13.0°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="Genoa"
-                                   Margin="15,76,0,0"
-                                   Tag="{Binding MaterialBrushes[7], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="Cyan"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 594,904" />
-                                    <TextBlock Text="Avg Temp: 15.7°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="San Marino"
-                                   Margin="100,92,0,0"
-                                   Tag="{Binding MaterialBrushes[8], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="Teal"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 32,576" />
-                                    <TextBlock Text="Avg Temp: 18.1°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="Florence"
-                                   Margin="58,113,0,0"
-                                   Tag="{Binding MaterialBrushes[9], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="Green"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 379,180" />
-                                    <TextBlock Text="Avg Temp: 14.9°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="Rome"
-                                   Margin="62,167,0,0"
-                                   Tag="{Binding MaterialBrushes[15], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="DeepOrange"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 4,321,244" />
-                                    <TextBlock Text="Avg Temp: 20.4°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="Brindisi"
-                                   Margin="149,180,0,0"
-                                   Tag="{Binding MaterialBrushes[16], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="Brown"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 89,846" />
-                                    <TextBlock Text="Avg Temp: 17.2°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                        <TextBlock Text="Palermo"
-                                   Margin="72,237,0,0"
-                                   Tag="{Binding MaterialBrushes[18], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                   Style="{StaticResource ToolTipTextStyle}">
-                           <TextBlock.ToolTip>
-                              <xctk:MaterialToolTip MaterialAccent="BlueGray"
-                                                    FontWeight="Light">
-                                 <StackPanel>
-                                    <TextBlock Text="Pop: 1,200,000" />
-                                    <TextBlock Text="Avg Temp: 18.5°C" />
-                                 </StackPanel>
-                              </xctk:MaterialToolTip>
-                           </TextBlock.ToolTip>
-                        </TextBlock>
-                     </Grid>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-            </StackPanel>
-         </xctk:MaterialTabItem>
-         <xctk:MaterialTabItem Header="Controls Page 4"
-                               Padding="20"
-                               FontSize="12">
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="ProgressBars : " />
-                     <TextBlock Text="(Click to animate progressBars)"
-                                Foreground="Black"
-                                FontSize="11" />
 
-                     <Grid Margin="0,15,0,10">
-                        <xctk:MaterialProgressBar x:Name="firstMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="Blue"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=firstMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"/>
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="secondMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="LightBlue"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=secondMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="thirdMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="Cyan"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=thirdMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="fourthMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="Teal"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=fourthMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="fifthMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="Green"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=fifthMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="sixthMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="LightGreen"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=sixthMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,10,0,10">
-                        <xctk:MaterialProgressBar x:Name="seventhMaterialProgressBar"
-                                                  Width="160"
-                                                  MaterialAccent="Lime"
-                                                  Minimum="0"
-                                                  Maximum="100"
-                                                  Height="20"
-                                                  MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=seventhMaterialProgressBar, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="Circular ProgressBars : " />
-                     <TextBlock Text="(Click to animate progressBars)"
-                                Foreground="Black"
-                                FontSize="11"/>
 
-                     <Grid Margin="0,15,0,6">
-                        <xctk:MaterialProgressBarCircular x:Name="firstMaterialProgressBarCircular"
-                                                          Width="75"
-                                                          Height="75"
-                                                          MaterialAccent="Blue"
-                                                          Background="LightGray"
-                                                          Minimum="0"
-                                                          Maximum="100"
-                                                          Thickness="15"
-                                                          MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=firstMaterialProgressBarCircular, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,6,0,6">
-                        <xctk:MaterialProgressBarCircular x:Name="secondMaterialProgressBarCircular"
-                                                          Width="75"
-                                                          Height="75"
-                                                          Background="LightGray"
-                                                          MaterialAccent="LightBlue"
-                                                          Minimum="0"
-                                                          Maximum="100"
-                                                          Thickness="15"
-                                                          MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=secondMaterialProgressBarCircular, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,6,0,6">
-                        <xctk:MaterialProgressBarCircular x:Name="thirdMaterialProgressBarCircular"
-                                                          Width="75"
-                                                          Height="75"
-                                                          Background="LightGray"
-                                                          MaterialAccent="Cyan"
-                                                          Minimum="0"
-                                                          Maximum="100"
-                                                          Thickness="15"
-                                                          MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=thirdMaterialProgressBarCircular, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                     <Grid Margin="0,6,0,6">
-                        <xctk:MaterialProgressBarCircular x:Name="fourthMaterialProgressBarCircular"
-                                                          Width="75"
-                                                          Height="75"
-                                                          Background="LightGray"
-                                                          MaterialAccent="Teal"
-                                                          Minimum="0"
-                                                          Maximum="100"
-                                                          Thickness="15"
-                                                          MouseLeftButtonDown="MaterialProgressBar_MouseLeftButtonDown" />
-                        <TextBlock Text="{Binding Value, ElementName=fourthMaterialProgressBarCircular, StringFormat={}{0:N0}%}"
-                                   Foreground="Black"
-                                   IsHitTestVisible="False"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Center" />
-                     </Grid>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Margin="20">
-                     <TextBlock Text="ListBoxes : " />
-                     <xctk:MaterialListBox Margin="0,15,0,0"
-                                           MaterialAccent="Blue">
-                        <xctk:MaterialListBoxItem Content="New York" 
-                                                  Padding="10,0,10,0"/>
-                        <xctk:MaterialListBoxItem Content="Tokyo"
-                                                  Padding="10,0,10,0"/>
-                        <xctk:MaterialListBoxItem Content="Paris"
-                                                  IsSelected="True"
-                                                  Padding="10,0,10,0"/>
-                        <xctk:MaterialListBoxItem Content="Sydney"
-                                                  Padding="10,0,10,0" />
-                     </xctk:MaterialListBox>
-                     <xctk:MaterialListBox Margin="0,15,0,0"
-                                           MaterialAccent="LightBlue">
-                        <xctk:MaterialListBoxItem Content="Brazil"
-                                                  Padding="10,0,10,0"/>
-                        <xctk:MaterialListBoxItem Content="USA"
-                                                  IsSelected="True"
-                                                  Padding="10,0,10,0" />
-                        <xctk:MaterialListBoxItem Content="China"
-                                                  Padding="10,0,10,0"/>
-                     </xctk:MaterialListBox>
-                     <xctk:MaterialListBox Margin="0,15,0,0"
-                                           MaterialAccent="Cyan">
-                        <xctk:MaterialListBoxItem Content="English"
-                                                  IsSelected="True"
-                                                  Padding="10,0,10,0"/>
-                        <xctk:MaterialListBoxItem Content="French"
-                                                  Padding="10,0,10,0"/>
-                     </xctk:MaterialListBox>
-                     <xctk:MaterialListBox Margin="0,15,0,0"
-                                           MaterialAccent="Teal">
-                        <xctk:MaterialListBoxItem Content="Red"
-                                                  Padding="10,0,10,0" />
-                        <xctk:MaterialListBoxItem Content="Green"
-                                                  Padding="10,0,10,0" />
-                        <xctk:MaterialListBoxItem Content="Blue"
-                                                  IsSelected="True"
-                                                  Padding="10,0,10,0" />
-                     </xctk:MaterialListBox>
-                     <xctk:MaterialListBox Margin="0,15,0,0"
-                                           MaterialAccent="Green">
-                        <xctk:MaterialListBoxItem Content="True"
-                                                  IsSelected="True"
-                                                  Padding="10,0,10,0" />
-                        <xctk:MaterialListBoxItem Content="False"
-                                                  Padding="10,0,10,0" />
-                     </xctk:MaterialListBox>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-            </StackPanel>
-         </xctk:MaterialTabItem>
-         <xctk:MaterialTabItem Header="Controls Page 5"
-                               x:Name="_materialTabItem5"
-                               Padding="20"
-                               FontSize="12" >
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Stretch"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <Grid x:Name="_toastGrid"
-                        Width="350">
-                     <TextBlock Text="Toasts : "
-                                Margin="20"/>
- 
-                     <Grid Margin="0,16,0,0"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
 
-                        <xctk:MaterialButton Content="Pop a toast"
-                                             Click="MaterialToastButton_Click"
-                                             Padding="15"
-                                             HorizontalAlignment="Center"/>
 
-                        <Grid Grid.Row="1"
-                              Margin="0,25,0,0"
-                              Width="100"
-                              Height="100">
-                           <xctk:MaterialProgressBarCircular x:Name="_toastProgressBarCircular"
-                                                               Background="LightGray"
-                                                               Thickness="10"
-                                                               Minimum="0"
-                                                               Maximum="100" />
-                           <TextBlock Text="Toast&#x0a;Timer"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"/>
-                        </Grid>
-                     </Grid>
-                  </Grid>
-               </xctk:MaterialFrame>
-               <xctk:MaterialFrame Z="4"
-                                   VerticalContentAlignment="Top"
-                                   HorizontalContentAlignment="Left"
-                                   Margin="16">
-                  <StackPanel Orientation="Vertical"
-                              Margin="20"
-                              Width="200">
-                     <TextBlock Text="ComboBoxes : " />
-                     <xctk:MaterialComboBox Margin="0,36,0,0"
-                                            MaterialAccent="Blue">
-                        <xctk:MaterialComboBoxItem Content="TV" />
-                        <xctk:MaterialComboBoxItem Content="Computer"
-                                                   IsSelected="True" />
-                        <xctk:MaterialComboBoxItem Content="Cell phone" />
-                        <xctk:MaterialComboBoxItem Content="Camera" />
-                        <xctk:MaterialComboBoxItem Content="Radio" />
-                     </xctk:MaterialComboBox>
-                     <xctk:MaterialComboBox Margin="0,36,0,0"
-                                            MaterialAccent="LightBlue">
-                        <xctk:MaterialComboBoxItem Content="Over 3000$" />
-                        <xctk:MaterialComboBoxItem Content="From 2000$ - 3000$"
-                                                   IsSelected="True" />
-                        <xctk:MaterialComboBoxItem Content="From 1000$ - 2000$" />
-                        <xctk:MaterialComboBoxItem Content="From 500$ - 1000$" />
-                        <xctk:MaterialComboBoxItem Content="Under 500$" />
-                     </xctk:MaterialComboBox>
-                     <xctk:MaterialComboBox Margin="0,36,0,0"
-                                            MaterialAccent="Cyan">
-                        <xctk:MaterialComboBoxItem Content="Sony" />
-                        <xctk:MaterialComboBoxItem Content="Dell" />
-                        <xctk:MaterialComboBoxItem Content="Samsung"
-                                                   IsSelected="True" />
-                        <xctk:MaterialComboBoxItem Content="Toshiba" />
-                        <xctk:MaterialComboBoxItem Content="Sharp" />
-                     </xctk:MaterialComboBox>
-                     <xctk:MaterialComboBox Margin="0,36,0,0"
-                                            MaterialAccent="Teal">
-                        <xctk:MaterialComboBoxItem Content="Over 100kg" />
-                        <xctk:MaterialComboBoxItem Content="From 50 - 100kg" />
-                        <xctk:MaterialComboBoxItem Content="From 30 - 50kg"
-                                                   IsSelected="True" />
-                        <xctk:MaterialComboBoxItem Content="From 10 - 30kg" />
-                        <xctk:MaterialComboBoxItem Content="Under 10kg" />
-                     </xctk:MaterialComboBox>
-                     <xctk:MaterialComboBox Margin="0,36,0,0"
-                                            MaterialAccent="Green">
-                        <xctk:MaterialComboBoxItem Content="Fed Ex" />
-                        <xctk:MaterialComboBoxItem Content="UPS" />
-                        <xctk:MaterialComboBoxItem Content="Regular Post"
-                                                   IsSelected="True" />
-                     </xctk:MaterialComboBox>
-                  </StackPanel>
-               </xctk:MaterialFrame>
-            </StackPanel>
-         </xctk:MaterialTabItem>
-      </xctk:MaterialTabControl>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialControls.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Converters/ZeroToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
similarity index 59%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Converters/ZeroToBoolConverter.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
index 9477bc5c..40d958bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Converters/ZeroToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
@@ -1,26 +1,41 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2016 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Converters
-{
-
-
-
-
-}
+/**************************************************************************************
+
+   Toolkit for WPF
+
+   Copyright (C) 2007-2017 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer
+{
+  public class MaterialDemoView : DemoView
+  {
+    #region Constructor
+
+    public MaterialDemoView()
+    {
+
+    }
+
+    #endregion
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt
index 2a62c10c..b6b907e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialDropDownView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt
index d11c5ecb..791c5136 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A DropDownButton from the Xceed Wpf Toolkit with animations when opening the popup. It uses the MaterialButton animations and the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -32,147 +31,19 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <ObjectDataProvider x:Key="DropDownPlacementMode"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="PlacementMode" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
-
-         <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>   
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="120" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Text="DropDown Position: "
-                          VerticalAlignment="Center"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
-                         SelectedItem="{Binding DropDownPosition, ElementName=materialDropDown}"
-                         HorizontalAlignment="Left"
-                         Width="110"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialDropDown}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <TextBlock Text="Is Using fade Animation: "
-                          Grid.Row="2"
-                          Grid.Column="0"
-                          VerticalAlignment="Center"/>
-               <CheckBox Grid.Column="1"
-                         Grid.Row="2"
-                         IsChecked="{Binding IsUsingFadeAnimation, ElementName=materialDropDown}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Is Ink Effect Active: "
-                          VerticalAlignment="Center" 
-                          Margin="10,0,0,0"/>
-               <CheckBox x:Name="inkEffectActiveCheckBox"
-                         Grid.Column="3"
-                         Grid.Row="0"
-                         IsChecked="{Binding IsInkEffectActive, ElementName=materialDropDown}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Ink Effect Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:ColorPicker Grid.Column="3"
-                                 Grid.Row="1"
-                                 SelectedColor="{Binding InkEffectBrush, ElementName=materialDropDown, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                 DisplayColorAndName="True"
-                                 VerticalAlignment="Center"
-                                 Width="125"
-                                 Margin="5"
-                                 IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Ink Effect Opacity: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="2"
-                                  Value="{Binding InkEffectOpacity, ElementName=materialDropDown}"
-                                  Minimum="0"
-                                  Maximum="1"
-                                  Increment="0.05"
-                                  FormatString="N2"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <xctk:MaterialDropDown x:Name="materialDropDown"
-                                   Content="Click Me"
-                                   HorizontalAlignment="Center"
-                                   DropDownPosition="Bottom"
-                                   IsUsingFadeAnimation="True"
-                                   IsInkEffectActive="True">
-               <xctk:DropDownButton.DropDownContent>
-                  <xctk:ColorCanvas Foreground="Black"/>
-               </xctk:DropDownButton.DropDownContent>
-            </xctk:MaterialDropDown>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialDropDown.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt
index 566212a8..052f0a7d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialFrameView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt
index 06ea15a7..eaa02dff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,11 +22,9 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="MaterialFrame">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A ContentControl with a fully customizable shadow that can be modified through Shadow properties or with a Z property that enables predefined shadows.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,174 +32,16 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <conv:EqualsMinusOneConverter x:Key="EqualsMinusOneConverter" />
-      <xctk:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
-   </local:DemoView.Resources>   
 
-   <Grid>
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
 
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Z: "
-                          VerticalAlignment="Center" />
-               <xctk:IntegerUpDown Grid.Column="1"
-                                   Value="{Binding Z, ElementName=materialFrame}"
-                                   Minimum="-1"
-                                   Maximum="7"
-                                   VerticalAlignment="Center"
-                                   Margin="5"
-                                   ToolTip="When the Z property is greater than 0, the shadow effects will be built using the default shadows."/>
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="CornerRadius: "
-                          VerticalAlignment="Center" />
-               <xctk:DoubleUpDown Grid.Column="1"
-                                  Grid.Row="1"
-                                  Value="{Binding CornerRadius, ElementName=materialFrame, Converter={StaticResource CornerRadiusToDoubleConverter}}"
-                                  Minimum="0"
-                                  Maximum="30"
-                                  VerticalAlignment="Center"
-                                  Margin="5"/>
 
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Shadow Direction: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"
-                          Style="{StaticResource DisableGrayText}"/>
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="0"
-                                  Value="{Binding ShadowDirection, ElementName=materialFrame}"
-                                  Minimum="0"
-                                  Maximum="360"
-                                  Increment="5"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  ToolTip="The Z property should equal -1 in order to build the shadow from MaterialFrame Shadow properties."
-                                  IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"/>
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Shadow Depth: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"
-                          Style="{StaticResource DisableGrayText}"/>
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="1"
-                                  Value="{Binding ShadowDepth, ElementName=materialFrame}"
-                                  Minimum="0"
-                                  Maximum="40"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  ToolTip="The Z property should equal -1 in order to build the shadow from MaterialFrame Shadow properties."
-                                  IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"/>
-               <!--Third Column-->
-               <TextBlock Grid.Column="4"
-                          Grid.Row="0"
-                          Text="Shadow Blur Radius: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"
-                          Style="{StaticResource DisableGrayText}"/>
-               <xctk:DoubleUpDown Grid.Column="5"
-                                  Grid.Row="0"
-                                  Value="{Binding ShadowBlurRadius, ElementName=materialFrame}"
-                                  Minimum="0"
-                                  Maximum="100"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  ToolTip="The Z property should equal -1 in order to build the shadow from MaterialFrame Shadow properties."
-                                  IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"/>
-               <TextBlock Grid.Column="4"
-                          Grid.Row="1"
-                          Text="Shadow Opacity: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"
-                          Style="{StaticResource DisableGrayText}"/>
-               <xctk:DoubleUpDown Grid.Column="5"
-                                  Grid.Row="1"
-                                  Value="{Binding ShadowOpacity, ElementName=materialFrame}"
-                                  Minimum="0"
-                                  Maximum="1"
-                                  Increment="0.1"
-                                  FormatString="N1"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  ToolTip="The Z property should equal -1 in order to build the shadow from MaterialFrame Shadow properties."
-                                  IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"/>
 
-               <!--Fourth Column-->
-               <TextBlock Grid.Column="6"
-                          Grid.Row="0"
-                          Text="Shadow Color: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:ColorPicker Grid.Column="7"
-                                 Grid.Row="0"
-                                 SelectedColor="{Binding ShadowColor, ElementName=materialFrame}"
-                                 VerticalAlignment="Center"
-                                 Width="90"
-                                 Margin="5"
-                                 ToolTip="The Z property should equal -1 in order to build the shadow from MaterialFrame Shadow properties."
-                                 IsEnabled="{Binding Z, ElementName=materialFrame, Converter={StaticResource EqualsMinusOneConverter}}"/>
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <xctk:MaterialFrame x:Name="materialFrame"
-                                Margin="20"
-                                HorizontalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                Width="400"
-                                Height="300"
-                                Z="2"
-                                ShadowDirection="315"
-                                ShadowDepth="10"
-                                ShadowBlurRadius="20"
-                                ShadowOpacity="0.7"
-                                ShadowColor="Blue">
-               <TextBlock Text="This is a MaterialFrame"/>
-            </xctk:MaterialFrame>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
     <Image Source="..\OpenSourceImages\MaterialFrame.png" Width="600" Height="400"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt
index 2bee2ede..9b6fc8b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -33,79 +33,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 
     #endregion
 
-#if !OPEN_SOURCE
 
-    #region EventHandlers
 
-    private void CheckedContentComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( materialHamburger == null )
-        return;
-
-      if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) )
-      {
-        var selection = e.AddedItems[ 0 ] as ComboBoxItem;
-        if( selection != null )
-        {
-          if( selection.Tag != null )
-          {
-            materialHamburger.CheckedContent = selection.Tag;
-          }
-          else
-          {
-            materialHamburger.ClearValue( MaterialHamburger.CheckedContentProperty );
-          }
-        }
-      }
-    }
 
-    private void UncheckedContentComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( materialHamburger == null )
-        return;
-
-      if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) )
-      {
-        var selection = e.AddedItems[ 0 ] as ComboBoxItem;
-        if( selection != null )
-        {
-          if( selection.Tag != null )
-          {
-            materialHamburger.UncheckedContent = selection.Tag;
-          }
-          else
-          {
-            materialHamburger.ClearValue( MaterialHamburger.UncheckedContentProperty );
-          }
-        }
-      }
-    }
 
-    private void MenuLocationComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) )
-      {
-        var menuLocation = ( HamburgerLocation )e.AddedItems[ 0 ];
-        materialHamburgerMenu.CloseButtonLocation = ( menuLocation == HamburgerLocation.Right ) ? Location.Left : Location.Right;
-      }
-    }
 
-    private void IconButton_Click( object sender, RoutedEventArgs e )
-    {
-      var button = sender as IconButton;
-      if( button != null )
-      {
-        Process.Start( new ProcessStartInfo( button.Tag as string ) );
-      }
-    }
 
-    private void ApplyButton_Click( object sender, RoutedEventArgs e )
-    {
-      materialHamburger.IsChecked = false;
-    }
 
-    #endregion
 
-#endif
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt
index 1e8ac673..b49fd2d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,11 +22,9 @@
                         xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters"
                         Title="MaterialHamburger">
   <local:DemoView.Description>
-    <!-- TODODOC-->
     <Paragraph FontSize="14"
                FontFamily="Segoe">
       <Run>A ToggleButton that pops a menu from left, right, top or bottom of a Window (or any FrameworkElement). The menu can be an animated HamburgerMenu or any customized content. It uses the Material Brushes.</Run>
-      <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,577 +32,42 @@
          <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>
-       ##END-->
     </Paragraph>
   </local:DemoView.Description>
 
-  <!--##EXCLUDE_OPEN_SOURCE-->
-  <local:DemoView.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-
-      <ObjectDataProvider x:Key="HamburgerLocationEnumData"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-        <ObjectDataProvider.MethodParameters>
-          <x:Type TypeName="xctk:HamburgerLocation" />
-        </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <ObjectDataProvider x:Key="LocationEnumData"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-        <ObjectDataProvider.MethodParameters>
-          <x:Type TypeName="xctk:Location" />
-        </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <conv:ZeroToBoolConverter x:Key="ZeroToBoolConverter" />
-
-      <ContentControl x:Key="CheckedContent1"
-                      Content="Close" />
-      <ContentControl x:Key="UncheckedContent1"
-                      Content="Open" />
-
-      <DataTemplate x:Key="MenuHeaderTemplate1">
-        <StackPanel Margin="20">
-          <TextBlock Text="{Binding}"
-                     Margin="5" />
-          <Button Content="Test"
-                  Margin="5" />
-        </StackPanel>
-      </DataTemplate>
-
-      <Path x:Key="LeftArrowPath"
-            x:Shared="False"
-            Data="F1M-218.342,2910.79L-234.066,2926.52 -233.954,2926.63 -225.428,2926.63 -210.87,2912.07 -206.495,2907.7 -225.313,2888.88 -234.066,2888.88 -218.342,2904.6 -259.829,2904.6 -259.829,2910.79 -218.342,2910.79z"
-            Stretch="Uniform"
-            Fill="White"
-            Width="16"
-            Height="16"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <ScaleTransform ScaleX="-1"
-                          ScaleY="1" />
-        </Path.RenderTransform>
-      </Path>
-
-      <Path x:Key="RightArrowPath"
-            x:Shared="False"
-            Data="F1M-218.342,2910.79L-234.066,2926.52 -233.954,2926.63 -225.428,2926.63 -210.87,2912.07 -206.495,2907.7 -225.313,2888.88 -234.066,2888.88 -218.342,2904.6 -259.829,2904.6 -259.829,2910.79 -218.342,2910.79z"
-            Stretch="Uniform"
-            Fill="White"
-            Width="16"
-            Height="16">
-      </Path>
-
-      <Path x:Key="TopArrowPath"
-            x:Shared="False"
-            Data="F1M-218.342,2910.79L-234.066,2926.52 -233.954,2926.63 -225.428,2926.63 -210.87,2912.07 -206.495,2907.7 -225.313,2888.88 -234.066,2888.88 -218.342,2904.6 -259.829,2904.6 -259.829,2910.79 -218.342,2910.79z"
-            Stretch="Uniform"
-            Fill="White"
-            Width="16"
-            Height="16"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <RotateTransform Angle="-90" />
-        </Path.RenderTransform>
-      </Path>
-
-      <Path x:Key="BottomArrowPath"
-            x:Shared="False"
-            Data="F1M-218.342,2910.79L-234.066,2926.52 -233.954,2926.63 -225.428,2926.63 -210.87,2912.07 -206.495,2907.7 -225.313,2888.88 -234.066,2888.88 -218.342,2904.6 -259.829,2904.6 -259.829,2910.79 -218.342,2910.79z"
-            Stretch="Uniform"
-            Fill="White"
-            Width="16"
-            Height="16"
-            RenderTransformOrigin="0.5,0.5">
-        <Path.RenderTransform>
-          <RotateTransform Angle="90" />
-        </Path.RenderTransform>
-      </Path>
-
-      <Style x:Key="DefaultHamburgerMenuCloseButtonStyle"
-             TargetType="{x:Type Button}">
-        <Setter Property="Content"
-                Value="{StaticResource LeftArrowPath}" />
-        <Setter Property="Foreground"
-                Value="White" />
-        <Setter Property="Margin"
-                Value="4" />
-        <Setter Property="Background"
-                Value="Transparent" />
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Cursor"
-                Value="Hand" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Button}">
-              <Border Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <ContentPresenter HorizontalAlignment="Center"
-                                  VerticalAlignment="Center" />
-              </Border>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-          <!--Right Arrow when Menu is positionned on right-->
-          <DataTrigger Binding="{Binding MenuLocation, RelativeSource={RelativeSource AncestorType={x:Type xctk:MaterialHamburgerMenu}}}"
-                       Value="Right">
-            <Setter Property="Content"
-                    Value="{StaticResource RightArrowPath}" />
-          </DataTrigger>
-          <!--Top Arrow when Menu is positionned on top-->
-          <DataTrigger Binding="{Binding MenuLocation, RelativeSource={RelativeSource AncestorType={x:Type xctk:MaterialHamburgerMenu}}}"
-                       Value="Top">
-            <Setter Property="Content"
-                    Value="{StaticResource TopArrowPath}" />
-          </DataTrigger>
-          <!--Bottom Arrow when Menu is positionned on Bottom-->
-          <DataTrigger Binding="{Binding MenuLocation, RelativeSource={RelativeSource AncestorType={x:Type xctk:MaterialHamburgerMenu}}}"
-                       Value="Bottom">
-            <Setter Property="Content"
-                    Value="{StaticResource BottomArrowPath}" />
-          </DataTrigger>
-        </Style.Triggers>
-      </Style>
-
-      <Style x:Key="HamburgerMenuCloseButtonStyle1"
-             TargetType="{x:Type Button}">
-        <Setter Property="Content"
-                Value="OK" />
-      </Style>
-
-      <Border x:Key="CustomizedHamburgerContent"
-              Background="White"
-              BorderBrush="Black"
-              BorderThickness="1"
-              Margin="5">
-        <StackPanel>
-          <xctk:MaterialTextField Text="Mike"
-                                  Watermark="Your Name"
-                                  Margin="10,30,10,10" />
-          <StackPanel Orientation="Horizontal"
-                      Margin="10">
-            <TextBlock Text="Volume:"
-                       Margin="3" />
-            <xctk:MaterialComboBox SelectedIndex="1"
-                                   Width="130">
-              <xctk:MaterialComboBoxItem Content="High" />
-              <xctk:MaterialComboBoxItem Content="Medium" />
-              <xctk:MaterialComboBoxItem Content="Low" />
-              <xctk:MaterialComboBoxItem Content="Vibration" />
-            </xctk:MaterialComboBox>
-          </StackPanel>
-          <StackPanel Orientation="Horizontal"
-                      Margin="10">
-            <TextBlock Text="Music: "
-                       Margin="5" />
-            <xctk:MaterialRadioButton GroupName="Choice"
-                                      IsChecked="True"
-                                      Content="On"
-                                      Margin="5" />
-            <xctk:MaterialRadioButton GroupName="Choice"
-                                      Content="Off"
-                                      Margin="5" />
-          </StackPanel>
-          <StackPanel Orientation="Horizontal"
-                      Margin="10">
-            <TextBlock Text="Plane Mode:"
-                       Margin="5,0,5,0" />
-            <xctk:MaterialSwitch />
-          </StackPanel>
-          <StackPanel Orientation="Horizontal"
-                      Margin="10">
-            <xctk:MaterialCheckBox IsChecked="True"
-                                   Content="English"
-                                   Margin="0,5,5,5" />
-            <xctk:MaterialCheckBox IsChecked="False"
-                                   Content="French"
-                                   Margin="5" />
-          </StackPanel>
-          <xctk:MaterialButton Content="Apply"
-                               Margin="10"
-                               Padding="8"
-                               Click="ApplyButton_Click" />
-        </StackPanel>
-      </Border>
-
-      <Style x:Key="IconButtonStyle"
-             TargetType="{x:Type xctk:IconButton}">
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="MouseOverForeground"
-                Value="{Binding MaterialAccentBrush, RelativeSource={RelativeSource AncestorType={x:Type xctk:MaterialHamburgerMenu}}}" />
-        <Setter Property="MousePressedForeground"
-                Value="{Binding MaterialAccentBrush, RelativeSource={RelativeSource AncestorType={x:Type xctk:MaterialHamburgerMenu}}}" />
-        <Setter Property="Background"
-                Value="White" />
-        <Setter Property="MouseOverBackground"
-                Value="White" />
-        <Setter Property="MousePressedBackground"
-                Value="White" />
-        <Setter Property="IconLocation"
-                Value="Left" />
-        <Setter Property="HorizontalAlignment"
-                Value="Left" />
-        <Setter Property="Margin"
-                Value="5" />
-      </Style>
-    </ResourceDictionary>
-  </local:DemoView.Resources>
-
-  <Grid>
-    <StackPanel Margin="10,5,10,5">
-
-      <GroupBox Header="Features"
-                Margin="0,3,0,3">
-        <Grid Margin="3">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="190" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="160" />
-          </Grid.ColumnDefinitions>
-
-          <!-- First Column -->
-          <TextBlock Text="MaterialHamburger:"
-                     Foreground="#FFC72035"
-                     Grid.ColumnSpan="2" />
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="1"
-                     Text="Material Accent Brush: "
-                     VerticalAlignment="Center" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="1"
-                    ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                    SelectedItem="{Binding MaterialAccentBrush, ElementName=materialHamburger}"
-                    ItemTemplate="{StaticResource ColorItemTemplate}"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3" />
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="2"
-                     Text="MenuLocation: "
-                     VerticalAlignment="Center" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="2"
-                    ItemsSource="{Binding Source={StaticResource HamburgerLocationEnumData}}"
-                    SelectedItem="{Binding MenuLocation, ElementName=materialHamburger}"
-                    SelectionChanged="MenuLocationComboBox_SelectionChanged"
-                    Margin="5,3,5,3"
-                    VerticalContentAlignment="Center" />
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="3"
-                     Text="Checked Content: "
-                     VerticalAlignment="Center" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="3"
-                    Margin="5,3,5,3"
-                    VerticalContentAlignment="Center"
-                    SelectedIndex="0"
-                    SelectionChanged="CheckedContentComboBox_SelectionChanged">
-            <ComboBoxItem Content="Default"
-                          Tag="{x:Null}" />
-            <ComboBoxItem Content="Content 1"
-                          Tag="{StaticResource CheckedContent1}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="4"
-                     Text="Unchecked Content: "
-                     VerticalAlignment="Center" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="4"
-                    Margin="5,3,5,3"
-                    VerticalContentAlignment="Center"
-                    SelectedIndex="0"
-                    SelectionChanged="UncheckedContentComboBox_SelectionChanged">
-            <ComboBoxItem Content="Default"
-                          Tag="{x:Null}" />
-            <ComboBoxItem Content="Content 1"
-                          Tag="{StaticResource UncheckedContent1}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="5"
-                     Text="Menu Owner: "
-                     VerticalAlignment="Center" />
-          <ComboBox x:Name="toastOwnerComboBox"
-                    Grid.Column="1"
-                    Grid.Row="5"
-                    Margin="5,3,5,3"
-                    SelectedValue="{Binding MenuOwner, ElementName=materialHamburger}"
-                    SelectedValuePath="Tag"
-                    VerticalContentAlignment="Center">
-            <ComboBoxItem Content="Sample Window"
-                          Tag="{x:Null}" />
-            <ComboBoxItem Content="LightBlue Border"
-                          Tag="{Binding ElementName=LightBlueBorder}" />
-            <ComboBoxItem Content="LightGreen Border"
-                          Tag="{Binding ElementName=LightGreenBorder}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="6"
-                     Text="Menu Content: "
-                     VerticalAlignment="Center" />
-          <ComboBox x:Name="menuContentComboBox"
-                    Grid.Column="1"
-                    Grid.Row="6"
-                    Margin="5,3,5,3"
-                    SelectedIndex="0"
-                    VerticalContentAlignment="Center">
-            <ComboBoxItem Content="HamburgerMenu with items">
-              <ComboBoxItem.Tag>
-                <xctk:MaterialHamburgerMenu x:Name="materialHamburgerMenu"
-                                            Header="Xceed Products"
-                                            HeaderTemplate="{x:Null}"
-                                            CloseButtonLocation="Right"
-                                            Padding="0"
-                                            CloseButtonStyle="{StaticResource DefaultHamburgerMenuCloseButtonStyle}"
-                                            IsAnimatingItems="True">
-                  <TextBlock Text="WPF Controls"
-                             Foreground="Gray"
-                             HorizontalAlignment="Center"
-                             Margin="5" />
-                  <xctk:IconButton Content="DataGrid For WPF"
-                                   Tag="https://xceed.com/xceed-datagrid-for-wpf/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/DataGrid.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                  <xctk:IconButton Content="Toolkit For WPF"
-                                   Tag="https://xceed.com/xceed-toolkit-plus-for-wpf/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/Toolkit.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                  <xctk:IconButton Content="Business Suite For WPF"
-                                   Tag="https://xceed.com/xceed-business-suite-for-wpf/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/Business.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                  <Separator Margin="0,20" />
-                  <TextBlock Text=".NET Libraries"
-                             HorizontalAlignment="Center"
-                             Foreground="Gray"
-                             Margin="5,0,5,5" />
-                  <xctk:IconButton Content="Zip For .NET"
-                                   Tag="https://xceed.com/xceed-zip-for-net/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/Zip.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                  <xctk:IconButton Content="SFTP For .NET"
-                                   Tag="https://xceed.com/xceed-sftp-for-net/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/SFTP.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                  <xctk:IconButton Content="Real-Time Zip For .NET"
-                                   Tag="https://xceed.com/xceed-real-time-zip-for-net/"
-                                   Click="IconButton_Click"
-                                   Style="{StaticResource IconButtonStyle}">
-                    <xctk:IconButton.Icon>
-                      <Image Source="../Resources/Zip.png"
-                             Width="20"
-                             Margin="5" />
-                    </xctk:IconButton.Icon>
-                  </xctk:IconButton>
-                </xctk:MaterialHamburgerMenu>
-              </ComboBoxItem.Tag>
-            </ComboBoxItem>
-            <ComboBoxItem Content="Customized content"
-                          Tag="{StaticResource CustomizedHamburgerContent}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="0"
-                     Grid.Row="7"
-                     Text="Can Resize Menu: "
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Column="1"
-                    Grid.Row="7"
-                    Margin="5,3,5,3"
-                    IsChecked="{Binding CanResizeMenu, ElementName=materialHamburger}"
-                    VerticalContentAlignment="Center" />
-
-          <!-- Second Column -->
-          <TextBlock Text="MaterialHamburgerMenu:"
-                     Foreground="#FFC72035"
-                     Grid.Column="2"
-                     Grid.ColumnSpan="2"
-                     Margin="10,0,0,0" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="1"
-                     Text="Material Accent Brush: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <ComboBox Grid.Column="3"
-                    Grid.Row="1"
-                    ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                    SelectedItem="{Binding MaterialAccentBrush, ElementName=materialHamburgerMenu}"
-                    ItemTemplate="{StaticResource ColorItemTemplate}"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3"
-                    IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                    Style="{StaticResource DisableGrayComboBox}" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="2"
-                     Text="Header: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <TextBox Grid.Column="3"
-                   Grid.Row="2"
-                   Text="{Binding Header, ElementName=materialHamburgerMenu}"
-                   VerticalAlignment="Center"
-                   Margin="5,3,5,3"
-                   IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="3"
-                     Text="Header Template: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <ComboBox Grid.Column="3"
-                    Grid.Row="3"
-                    SelectedValue="{Binding HeaderTemplate, ElementName=materialHamburgerMenu}"
-                    SelectedValuePath="Tag"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3"
-                    IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                    Style="{StaticResource DisableGrayComboBox}">
-            <ComboBoxItem Content="Default"
-                          Tag="{x:Null}" />
-            <ComboBoxItem Content="Template 1"
-                          Tag="{StaticResource MenuHeaderTemplate1}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="4"
-                     Text="Close Button Location: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <ComboBox Grid.Column="3"
-                    Grid.Row="4"
-                    ItemsSource="{Binding Source={StaticResource LocationEnumData}}"
-                    SelectedItem="{Binding CloseButtonLocation, ElementName=materialHamburgerMenu}"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3"
-                    IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                    Style="{StaticResource DisableGrayComboBox}" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="5"
-                     Text="Close Button Style: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <ComboBox Grid.Column="3"
-                    Grid.Row="5"
-                    SelectedValue="{Binding CloseButtonStyle, ElementName=materialHamburgerMenu}"
-                    SelectedValuePath="Tag"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3"
-                    IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                    Style="{StaticResource DisableGrayComboBox}">
-            <ComboBoxItem Content="Default"
-                          Tag="{StaticResource DefaultHamburgerMenuCloseButtonStyle}" />
-            <ComboBoxItem Content="Style 1"
-                          Tag="{StaticResource HamburgerMenuCloseButtonStyle1}" />
-          </ComboBox>
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="6"
-                     Text="Is Animating Items: "
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0"
-                     IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}"
-                     Style="{StaticResource DisableGrayText}" />
-          <CheckBox Grid.Column="3"
-                    Grid.Row="6"
-                    IsChecked="{Binding IsAnimatingItems, ElementName=materialHamburgerMenu}"
-                    VerticalAlignment="Center"
-                    Margin="5,3,5,3"
-                    IsEnabled="{Binding SelectedIndex, ElementName=menuContentComboBox, Converter={StaticResource ZeroToBoolConverter}}" />
-        </Grid>
-      </GroupBox>
-
-      <StackPanel>
-        <TextBlock Text="Usage:"
-                   Style="{StaticResource Header}" />
-
-        <xctk:MaterialHamburger x:Name="materialHamburger"
-                                Margin="5"
-                                MenuContent="{Binding SelectedItem.Tag, ElementName=menuContentComboBox}" />
-
-        <StackPanel Orientation="Horizontal">
-          <Border x:Name="LightBlueBorder"
-                  Background="LightBlue"
-                  Width="335"
-                  Height="330"
-                  Margin="5" />
-          <Border x:Name="LightGreenBorder"
-                  Background="LightGreen"
-                  Width="335"
-                  Height="330"
-                  Margin="5" />
-        </StackPanel>
-      </StackPanel>
-    </StackPanel>
-  </Grid>
-  <!--##END-->
-
-  <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialHamburger.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt
index 50e178ea..a16fd422 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt
index 84e9cfb2..5b19c65b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,13 +21,11 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialListBox &amp; MaterialListBoxItem">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>MaterialListBox is a ListBox that is using the Material Brushes and contains MaterialListBoxItems.</Run>
          <LineBreak />
          <Run>MaterialListBoxItems are ListBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -35,122 +33,17 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>   
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="135" />
-               </Grid.ColumnDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Is Ink Effect Active: "
-                          VerticalAlignment="Center" />
-               <CheckBox x:Name="inkEffectActiveCheckBox"
-                         Grid.Column="1"
-                         Grid.Row="0"
-                         IsChecked="{Binding IsInkEffectActive, ElementName=materialListBox}"
-                         VerticalAlignment="Center"
-                         Margin="5"
-                         ToolTip="Can be set a MaterialListBox control or individually on each MaterialListBoxItem." />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Ink Effect Brush: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:ColorPicker Grid.Column="1"
-                                 Grid.Row="1"
-                                 SelectedColor="{Binding InkEffectBrush, ElementName=materialListBox, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                 DisplayColorAndName="True"
-                                 VerticalAlignment="Center"
-                                 Width="125"
-                                 Margin="5"
-                                 IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                                 ToolTip="Can be set a MaterialListBox control or individually on each MaterialListBoxItem." />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Ink Effect Opacity: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:DoubleUpDown Grid.Column="1"
-                                  Grid.Row="2"
-                                  Value="{Binding InkEffectOpacity, ElementName=materialListBox}"
-                                  Minimum="0"
-                                  Maximum="1"
-                                  Increment="0.05"
-                                  FormatString="N2"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                                  ToolTip="Can be set a MaterialListBox control or individually on each MaterialListBoxItem." />   
-               
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <ComboBox Grid.Column="3"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialListBox}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <xctk:MaterialListBox x:Name="materialListBox"
-                                  Margin="20"
-                                  HorizontalAlignment="Center"
-                                  SelectionMode="Extended"
-                                  IsInkEffectActive="True">
-               <xctk:MaterialListBoxItem Content="First Item"/>
-               <xctk:MaterialListBoxItem Content="Second Item" />
-               <xctk:MaterialListBoxItem Content="Third Item" />
-               <xctk:MaterialListBoxItem Content="Fourth Item" />
-               <xctk:MaterialListBoxItem Content="Fifth Item" />
-            </xctk:MaterialListBox>
-
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialListBox.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt
index b349681f..ea5af713 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -33,45 +33,18 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
     {
       InitializeComponent();
 
-#if !OPEN_SOURCE
-      this.Loaded += this.MaterialProgressBarCircularView_Loaded;
-#endif
     }
 
     #endregion
 
-#if !OPEN_SOURCE
 
-    #region Private Methods
 
-    private void AnimateDeterminateProgressBar()
-    {
-      var storyboard = new Storyboard();
 
-      // Animate Determinate Circular ProgressBar
-      DoubleAnimation valueAnim = new DoubleAnimation( materialDeterminateProgressBarCircular.Minimum, materialDeterminateProgressBarCircular.Maximum, System.TimeSpan.FromMilliseconds( 4000 ) );
-      Storyboard.SetTarget( valueAnim, materialDeterminateProgressBarCircular );
-      Storyboard.SetTargetProperty( valueAnim, new PropertyPath( MaterialProgressBarCircular.ValueProperty ) );
-      storyboard.Children.Add( valueAnim );
 
-      storyboard.Begin( this );
-    }
 
-    #endregion
 
-    #region Event Handlers
 
-    private void MaterialProgressBarCircularView_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.AnimateDeterminateProgressBar();
-    }
 
-    private void ResetButton_Click( object sender, RoutedEventArgs e )
-    {
-      this.AnimateDeterminateProgressBar();
-    }
 
-    #endregion
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt
index ab1b5d57..4522cd82 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialProgressBarCircular">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A circular ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,7 +31,6 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
@@ -45,181 +42,18 @@
       </ResourceDictionary>
    </local:DemoView.Resources>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-               </Grid.RowDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Thickness: "
-                          VerticalAlignment="Center" />
-               <xctk:DoubleUpDown x:Name="thicknessDoubleUpDown"
-                                  Grid.Column="1"
-                                  Value="25"
-                                  Minimum="1"
-                                  Maximum="40"
-                                  Margin="5"
-                                  VerticalContentAlignment="Center" />
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialDeterminateProgressBarCircular}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Indeterminate Indicator Max Length: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <xctk:DoubleUpDown x:Name="inteterminateIndicatorMaxLengthUpDown"
-                                  Grid.Column="3"
-                                  Grid.Row="0"
-                                  Value="{Binding IndeterminateIndicatorMaxLength, ElementName=materialIndeterminateProgressBarCircular}"
-                                  Minimum="{Binding Value, ElementName=inteterminateIndicatorMinLengthUpDown}"
-                                  Maximum="1"
-                                  Increment="0.01"
-                                  Margin="5"
-                                  Width="50"
-                                  FormatString="N2"
-                                  VerticalContentAlignment="Center"
-                                  ToolTip="The maximum percentage of the progress bar's size that the indicator will accept. Must be between 0 and 1."/>
-
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Indeterminate Indicator Min Length: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <xctk:DoubleUpDown x:Name="inteterminateIndicatorMinLengthUpDown"
-                                  Grid.Column="3"
-                                  Grid.Row="1"
-                                  Value="{Binding IndeterminateIndicatorMinLength, ElementName=materialIndeterminateProgressBarCircular}"
-                                  Minimum="0"
-                                  Maximum="{Binding Value, ElementName=inteterminateIndicatorMaxLengthUpDown}"
-                                  Increment="0.01"
-                                  Margin="5"
-                                  Width="50"
-                                  FormatString="N2"
-                                  VerticalContentAlignment="Center"
-                                  ToolTip="The minimum percentage of the progress bar's size that the indicator will accept. Must be between 0 and 1."/>
-
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Indeterminate Indicator Speed Ratio: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="2"
-                                  Value="{Binding IndeterminateIndicatorSpeedRatio, ElementName=materialIndeterminateProgressBarCircular}"
-                                  Minimum="0.1"
-                                  Maximum="5"
-                                  Increment="0.5"
-                                  Margin="5"
-                                  VerticalContentAlignment="Center" />
-               
-               <TextBlock Grid.Column="2"
-                          Grid.Row="3"
-                          Text="Indeterminate Rotation Speed Ratio: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="3"
-                                  Value="{Binding IndeterminateRotationSpeedRatio, ElementName=materialIndeterminateProgressBarCircular}"
-                                  Minimum="0.1"
-                                  Maximum="5"
-                                  Increment="0.5"
-                                  Margin="5"
-                                  VerticalContentAlignment="Center" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <Grid HorizontalAlignment="Center">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="Determinate:" />
-               <Grid Grid.Row="0"
-                     Grid.Column="1"
-                     Margin="20">
-                  <xctk:MaterialProgressBarCircular x:Name="materialDeterminateProgressBarCircular"
-                                                    IsIndeterminate="False"
-                                                    Thickness="{Binding Value, ElementName=thicknessDoubleUpDown}"
-                                                    Width="125"
-                                                    Height="125"
-                                                    Minimum="0"
-                                                    Maximum="100" />
-                  <TextBlock Text="{Binding Value, ElementName=materialDeterminateProgressBarCircular, StringFormat={}{0:N0}%}"
-                             FontSize="15"
-                             VerticalAlignment="Center"
-                             HorizontalAlignment="Center" />
-               </Grid>
-               <Button Grid.Row="0"
-                       Grid.Column="2"
-                       Content="Reset"
-                       Click="ResetButton_Click"
-                       VerticalAlignment="Center"
-                       Padding="10" />
-
-               <TextBlock Grid.Row="1"
-                          Grid.Column="0"
-                          Text="Indeterminate:" />
-               <xctk:MaterialProgressBarCircular x:Name="materialIndeterminateProgressBarCircular"
-                                                 Grid.Row="1"
-                                                 Grid.Column="1"
-                                                 IsIndeterminate="True"
-                                                 Thickness="{Binding Value, ElementName=thicknessDoubleUpDown}"
-                                                 MaterialAccentBrush="{Binding MaterialAccentBrush, ElementName=materialDeterminateProgressBarCircular}"
-                                                 IndeterminateIndicatorSpeedRatio="1"
-                                                 IndeterminateRotationSpeedRatio="1"
-                                                 IndeterminateIndicatorMaxLength="0.75"
-                                                 IndeterminateIndicatorMinLength="0.04"
-                                                 Width="125"
-                                                 Height="125"
-                                                 Margin="20" />
-            </Grid>
-
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialProgressBarCircular.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt
index 83bf8eaa..a878cab4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,46 +32,19 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
     public MaterialProgressBarView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      this.Loaded += this.MaterialProgressBarView_Loaded;
-#endif
     }
 
     #endregion
 
-#if !OPEN_SOURCE
 
-    #region Private Methods
 
-    private void AnimateDeterminateProgressBar()
-    {
-      var storyboard = new Storyboard();
 
-      // Animate Determinate ProgressBar
-      DoubleAnimation valueAnim = new DoubleAnimation( materialDeterminateProgressBar.Minimum, materialDeterminateProgressBar.Maximum, System.TimeSpan.FromMilliseconds( 4000 ) );
-      Storyboard.SetTarget( valueAnim, materialDeterminateProgressBar );
-      Storyboard.SetTargetProperty( valueAnim, new PropertyPath( MaterialProgressBarCircular.ValueProperty ) );
-      storyboard.Children.Add( valueAnim );
 
-      storyboard.Begin( this );
-    }
 
-    #endregion
 
-    #region Event Handlers
 
-    private void MaterialProgressBarView_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.AnimateDeterminateProgressBar();
-    }
 
-    private void ResetButton_Click( object sender, RoutedEventArgs e )
-    {
-      this.AnimateDeterminateProgressBar();
-    }
 
-    #endregion
 
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt
index b3f19334..eda31f43 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialProgressBar">   
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A linear ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,10 +31,9 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
-   
+
    <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
@@ -45,150 +42,15 @@
       </ResourceDictionary>
    </local:DemoView.Resources>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-               </Grid.RowDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Indeterminate Indicator Max Length: "
-                          VerticalAlignment="Center"/>
-               <xctk:DoubleUpDown x:Name="inteterminateIndicatorMaxLengthUpDown"
-                                  Grid.Column="1"
-                                  Grid.Row="0"
-                                  Value="{Binding IndeterminateIndicatorMaxLength, ElementName=materialIndeterminateProgressBar}"
-                                  Minimum="{Binding Value, ElementName=inteterminateIndicatorMinLengthUpDown}"
-                                  Maximum="1"
-                                  Increment="0.01"
-                                  Margin="5"
-                                  Width="50"
-                                  FormatString="N2"
-                                  VerticalContentAlignment="Center"
-                                  ToolTip="The maximum percentage of the progress bar's size that the indicator will accept. Must be between 0 and 1."/>
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Indeterminate Indicator Min Length: "
-                          VerticalAlignment="Center"/>
-               <xctk:DoubleUpDown x:Name="inteterminateIndicatorMinLengthUpDown"
-                                  Grid.Column="1"
-                                  Grid.Row="1"
-                                  Value="{Binding IndeterminateIndicatorMinLength, ElementName=materialIndeterminateProgressBar}"
-                                  Minimum="0"
-                                  Maximum="{Binding Value, ElementName=inteterminateIndicatorMaxLengthUpDown}"
-                                  Increment="0.01"
-                                  Margin="5"
-                                  Width="50"
-                                  FormatString="N2"
-                                  VerticalContentAlignment="Center"
-                                  ToolTip="The minimum percentage of the progress bar's size that the indicator will accept. Must be between 0 and 1."/>
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Indeterminate Indicator Speed Ratio: "
-                          VerticalAlignment="Center"/>
-               <xctk:DoubleUpDown Grid.Column="1"
-                                  Grid.Row="2"
-                                  Value="{Binding IndeterminateIndicatorSpeedRatio, ElementName=materialIndeterminateProgressBar}"
-                                  Minimum="0.1"
-                                  Maximum="5"
-                                  Increment="0.5"
-                                  Margin="5"
-                                  VerticalContentAlignment="Center" />
-               
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialDeterminateProgressBar}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <Grid HorizontalAlignment="Center">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="Determinate:" />
-               <StackPanel Grid.Row="0"
-                           Grid.Column="1"
-                           Orientation="Horizontal">
-                  <xctk:MaterialProgressBar x:Name="materialDeterminateProgressBar"
-                                            IsIndeterminate="False"
-                                            Width="400"
-                                            Height="10"
-                                            Maximum="100"
-                                            Minimum="0"
-                                            Margin="20" />
-                  <TextBlock Text="{Binding Value, ElementName=materialDeterminateProgressBar, StringFormat={}{0:N0}%}"
-                             FontSize="15"
-                             Width="45"
-                             VerticalAlignment="Center"
-                             HorizontalAlignment="Center"/>
-               </StackPanel>
-               <Button Grid.Row="0"
-                       Grid.Column="2"
-                       Content="Reset"
-                       Click="ResetButton_Click"
-                       VerticalAlignment="Center"
-                       Padding="10" />
-
-               <TextBlock Grid.Row="1"
-                          Grid.Column="0"
-                          Text="Indeterminate:" />
-               <xctk:MaterialProgressBar x:Name="materialIndeterminateProgressBar"
-                                         Grid.Row="1"
-                                         Grid.Column="1"
-                                         IsIndeterminate="True"
-                                         IndeterminateIndicatorSpeedRatio="1"
-                                         IndeterminateIndicatorMaxLength="0.25"
-                                         IndeterminateIndicatorMinLength="0"
-                                         MaterialAccentBrush="{Binding MaterialAccentBrush, ElementName=materialDeterminateProgressBar}"
-                                         Width="400"
-                                         Height="10"
-                                         Margin="20"
-                                         HorizontalAlignment="Left"/>
-            </Grid>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialProgressBar.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt
index af4d695b..050091bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialRadioButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt
index 4149f075..a857899b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialRadioButton">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A RadioButton with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,78 +31,15 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>  
 
-   <Grid>
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-               </Grid.ColumnDefinitions>
 
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Check Mark Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         VerticalAlignment="Center"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding CheckMarkBrush, ElementName=materialRadioButton}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         Margin="5"/>
-               
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" 
-                          Margin="10,0,0,0"/>
-               <ComboBox Grid.Column="3"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialRadioButton}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <StackPanel HorizontalAlignment="Center">
-               <xctk:MaterialRadioButton x:Name="materialRadioButton"
-                                         GroupName="Choice"
-                                         IsChecked="True"
-                                         Content="First" />
-               <xctk:MaterialRadioButton x:Name="materialRadioButton2"
-                                         GroupName="Choice"
-                                         Content="Second"
-                                         CheckMarkBrush="{Binding CheckMarkBrush, ElementName=materialRadioButton}"
-                                         MaterialAccentBrush="{Binding MaterialAccentBrush, ElementName=materialRadioButton}"/>
-            </StackPanel>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialRadioButton.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt
index 5bff6963..6bb26b7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt
index 941489f6..b4c4a15a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,12 +21,10 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         xmlns:winConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
                         Title="MaterialSlider">
-   <local:DemoView.Description>
-      <!-- TODODOC-->
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,310 +32,31 @@
          <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>
-       ##END-->
-      </Paragraph>
-   </local:DemoView.Description>
+    </Paragraph>
+  </local:DemoView.Description>
+
+
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
 
-         <winConv:IntToBoolConverter x:Key="IntToBoolConverter" />
-         <xctk:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-         <ObjectDataProvider x:Key="SliderEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="xctk:MaterialSliderModeEnum" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
 
-         <ObjectDataProvider x:Key="SliderBubbleLocationEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="xctk:MaterialSliderBubbleLocationEnum" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
 
-         <ObjectDataProvider x:Key="SliderOrientationEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="Orientation" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
 
-         <DataTemplate x:Key="MaterialSliderBubbleTemplate1">
-            <Border Background="Black"
-                    Padding="7">
-               <TextBlock Text="{Binding ., StringFormat=N1}"
-                          FontSize="12"
-                          Foreground="White"
-                          HorizontalAlignment="Center" />
-            </Border>
-         </DataTemplate>
 
-         <DataTemplate x:Key="MaterialSliderBubbleTemplate2">
-            <Grid>
-               <Ellipse Fill="Red"
-                        Width="60"
-                        Height="60"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center" />
-               <TextBlock Text="{Binding ., StringFormat=N2}"
-                          FontSize="20"
-                          Foreground="Yellow"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center" />
-            </Grid>
-         </DataTemplate>
 
-         <Style x:Key="MaterialSliderThumbStyle1"
-                TargetType="{x:Type Thumb}">
-            <Setter Property="VerticalAlignment"
-                    Value="Center" />
-            <Setter Property="Width"
-                    Value="10" />
-            <Setter Property="Height"
-                    Value="10" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type Thumb}">
-                     <Grid>
-                        <Border x:Name="border"
-                                Width="{TemplateBinding Width}"
-                                Height="{TemplateBinding Height}"
-                                HorizontalAlignment="Center"
-                                BorderBrush="Orange"
-                                BorderThickness="2"
-                                Background="Black" />
-                     </Grid>
-                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                                     Value="True">
-                           <Setter Property="BorderBrush"
-                                   Value="Green"
-                                   TargetName="border" />
-                        </DataTrigger>
-                     </ControlTemplate.Triggers>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
 
-         <Style x:Key="MaterialSliderThumbStyle2"
-                TargetType="{x:Type Thumb}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type Thumb}">
-                     <Grid>
-                        <Image Source="..\Resources\PencilTool16.png"
-                               Stretch="None" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-   
-   <Grid>
 
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="100" />
-               </Grid.ColumnDefinitions>
 
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Mode: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="modeComboBox"
-                         Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding Source={StaticResource SliderEnumData}}"
-                         SelectedItem="{Binding Mode, ElementName=materialSlider}"
-                         Width="100"
-                         VerticalAlignment="Center"
-                         Margin="5" />
 
-               <TextBlock x:Name="bubbleTemplateTextBlock"
-                          Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Bubble Template: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding SelectedIndex, ElementName=modeComboBox, Converter={StaticResource IntToBoolConverter}}"
-                          Style="{StaticResource DisableGrayText}" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         SelectedValue="{Binding BubbleTemplate, ElementName=materialSlider}"
-                         SelectedValuePath="Tag"
-                         VerticalAlignment="Center"
-                         Margin="5"
-                         IsEnabled="{Binding SelectedIndex, ElementName=modeComboBox, Converter={StaticResource IntToBoolConverter}}"
-                         Style="{StaticResource DisableGrayComboBox}">
-                  <ComboBoxItem Content="Default"
-                                Tag="{x:Null}" />
-                  <ComboBoxItem Content="Template 1"
-                                Tag="{StaticResource MaterialSliderBubbleTemplate1}" />
-                  <ComboBoxItem Content="Template 2"
-                                Tag="{StaticResource MaterialSliderBubbleTemplate2}" />
-               </ComboBox>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Bubble Location: "
-                          VerticalAlignment="Center"
-                          IsEnabled="{Binding SelectedIndex, ElementName=modeComboBox, Converter={StaticResource IntToBoolConverter}}"
-                          Style="{StaticResource DisableGrayText}" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="2"
-                         ItemsSource="{Binding Source={StaticResource SliderBubbleLocationEnumData}}"
-                         SelectedItem="{Binding BubbleLocation, ElementName=materialSlider}"
-                         VerticalAlignment="Center"
-                         Margin="5"
-                         IsEnabled="{Binding SelectedIndex, ElementName=modeComboBox, Converter={StaticResource IntToBoolConverter}}"
-                         Style="{StaticResource DisableGrayComboBox}"
-                         ToolTip="The location of the Slider's bubble. If its orientation is Vertical : Over will be on the left and under will be on the right of the slider."/>
 
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Thumb Style: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="0"
-                         SelectedValue="{Binding ThumbStyle, ElementName=materialSlider}"
-                         SelectedValuePath="Tag"
-                         VerticalAlignment="Center"
-                         HorizontalAlignment="Left"
-                         Width="70"
-                         Margin="5">
-                  <ComboBoxItem Content="Default"
-                                Tag="{x:Null}" />
-                  <ComboBoxItem Content="Style 1"
-                                Tag="{StaticResource MaterialSliderThumbStyle1}" />
-                  <ComboBoxItem Content="Style 2"
-                                Tag="{StaticResource MaterialSliderThumbStyle2}" />
-               </ComboBox>
 
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Thumb Resize Scale Factor: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"
-                          IsEnabled="{Binding IsEnabled, ElementName=bubbleTemplateTextBlock, Converter={StaticResource InverseBoolConverter}}"
-                          Style="{StaticResource DisableGrayText}" />
-               <xctk:DoubleUpDown Grid.Column="3"
-                                  Grid.Row="1"
-                                  Value="{Binding ThumbResizeScaleFactor, ElementName=materialSlider}"
-                                  Minimum="0.6"
-                                  Maximum="4"
-                                  Increment="0.1"
-                                  FormatString="N1"
-                                  VerticalAlignment="Center"
-                                  Margin="5"
-                                  IsEnabled="{Binding IsEnabled, ElementName=bubbleTemplateTextBlock, Converter={StaticResource InverseBoolConverter}}" />
 
-               <!--Third Column-->
-               <TextBlock Grid.Column="4"
-                          Grid.Row="0"
-                          Text="Show Ticks: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <CheckBox Grid.Column="5"
-                         Grid.Row="0"
-                         IsChecked="{Binding ShowTicks, ElementName=materialSlider}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               
-               <TextBlock Grid.Column="4"
-                          Grid.Row="1"
-                          Text="Orientation: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="5"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource SliderOrientationEnumData}}"
-                         SelectedItem="{Binding Orientation, ElementName=materialSlider}"
-                         VerticalAlignment="Center"
-                         Width="90"
-                         Margin="5" />
 
-               <TextBlock Grid.Column="4"
-                          Grid.Row="2"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="5"
-                         Grid.Row="2"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialSlider}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <xctk:MaterialSlider x:Name="materialSlider"
-                                 Maximum="10"
-                                 Minimum="0"
-                                 Value="2"
-                                 Margin="20"
-                                 ShowTicks="True"
-                                 Mode="WithBubble"
-                                 BubbleTemplate="{x:Null}"
-                                 ThumbStyle="{x:Null}"
-                                 Orientation="Horizontal">
-               <xctk:MaterialSlider.Resources>
-                  <Style TargetType="xctk:MaterialSlider">
-                     <Style.Triggers>
-                        <Trigger Property="Orientation"
-                                 Value="Horizontal">
-                           <Setter Property="Width"
-                                   Value="500" />
-                        </Trigger>
-                        <Trigger Property="Orientation"
-                                 Value="Vertical">
-                           <Setter Property="Height"
-                                   Value="300" />
-                        </Trigger>
-                     </Style.Triggers>
-                  </Style>
-               </xctk:MaterialSlider.Resources>
-            </xctk:MaterialSlider>
-         </StackPanel>
-      </StackPanel>
 
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
     <Image Source="..\OpenSourceImages\MaterialSlider.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt
index 9f323d8a..850a3059 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt
index 0d9efca9..de0f18c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialSwitch">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A ToggleSwitch from the Xceed WPF Toolkit with thumb animations when Checked state is changed and that is using the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,99 +31,17 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <Path x:Key="UnPinPath"
-               Data="M537.76,0L767,237.883 699.552,307.874 654.177,260.828 449.89,472.781 460.135,483.414 447.983,639.291 336.562,523.67 0,767 265.122,449.537 154.528,334.849 304.815,322.276 311.431,329.066 336,303.562 336,300 339.432,300 515.648,117.076 470.311,69.9921z"
-               Stretch="Uniform"
-               Margin="6"
-               Fill="White" />
-
-         <Path x:Key="PinPath"
-               Data="M537.76,0L767,237.883 699.552,307.874 654.177,260.828 449.89,472.781 460.135,483.414 447.983,639.291 336.562,523.67 0,767 265.122,449.537 154.528,334.849 304.815,322.276 311.431,329.066 336,303.562 336,300 339.432,300 515.648,117.076 470.311,69.9921z"
-               Stretch="Uniform"
-               Margin="6"
-               Fill="White"
-               RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-               <RotateTransform Angle="-45" />
-            </Path.RenderTransform>
-         </Path>
-      </ResourceDictionary>
-   </local:DemoView.Resources>   
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="95" />
-               </Grid.ColumnDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialSwitch}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Thumb Checked Background: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0"/>
-               <ComboBox Grid.Column="3"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding ThumbCheckedBackground, ElementName=materialSwitch}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         ToolTip="Background used when MaterialSwitch is checked. ThumbBackground property will be used when unchecked."
-                         Margin="5"/>
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <xctk:MaterialSwitch x:Name="materialSwitch"
-                                 Margin="20"
-                                 HorizontalAlignment="Center"
-                                 Width="60"
-                                 MinHeight="18"
-                                 ThumbBackground="Gray"
-                                 ThumbLeftContent="{StaticResource UnPinPath}"
-                                 ThumbRightContent="{StaticResource PinPath}"/>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialSwitch.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt
index 9ddba865..eb49597e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialTabsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt
index 72a11a1c..af95f6d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,13 +21,11 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialTabControl &amp; MaterialTabItem">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is is using the Material Brushes and contains MaterialTabItems.</Run>
+         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is uses the Material Brushes and contains MaterialTabItems.</Run>
          <LineBreak />
-         <Run>MaterialTabItems are TabItems that are using the Material Brushes and who contains customizable ink animations on mouse press.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
+         <Run>MaterialTabItems are TabItems that use the Material Brushes and contain customizable ink animations on mouse press.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -35,220 +33,24 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>  
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition />
-               <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-
-            <GroupBox Header="MaterialTabControl Features"
-                      Margin="0,5,0,5">
-               <Grid Margin="5">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="95" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="0"
-                             Text="Is Ink Bar Active: "
-                             VerticalAlignment="Center" />
-                  <CheckBox x:Name="inkBarActiveCheckBox"
-                            Grid.Column="1"
-                            Grid.Row="0"
-                            IsChecked="{Binding IsInkBarActive, ElementName=materialTabControl}"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="1"
-                             Text="Ink Bar Brush: "
-                             VerticalAlignment="Center"
-                             IsEnabled="{Binding IsChecked, ElementName=inkBarActiveCheckBox}"
-                             Style="{StaticResource DisableGrayText}" />
-                  <ComboBox Grid.Column="1"
-                            Grid.Row="1"
-                            ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                            SelectedItem="{Binding InkBarBrush, ElementName=materialTabControl}"
-                            ItemTemplate="{StaticResource ColorItemTemplate}"
-                            IsEnabled="{Binding IsChecked, ElementName=inkBarActiveCheckBox}"
-                            Margin="5" />
-
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="2"
-                             Text="Is Sliding Animation Active: "
-                             VerticalAlignment="Center" />
-                  <CheckBox Grid.Column="1"
-                            Grid.Row="2"
-                            IsChecked="{Binding IsSlidingAnimationActive, ElementName=materialTabControl}"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-               </Grid>
-            </GroupBox>
-
-            <GroupBox Header="MaterialTabItem Features"
-                      Grid.Column="1"
-                      Margin="10,5,0,5">
-               <Grid Margin="5">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="95" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="0"
-                             Text="Is Ink Effect Active: "
-                             VerticalAlignment="Center" />
-                  <CheckBox x:Name="inkEffectActiveCheckBox"
-                            Grid.Column="1"
-                            Grid.Row="0"
-                            IsChecked="{Binding IsInkEffectActive, ElementName=materialTabControl}"
-                            VerticalAlignment="Center"
-                            Margin="5"
-                            ToolTip="Can be set on a MaterialTabControl control or individually on each MaterialTabItem." />
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="1"
-                             Text="Ink Effect Brush: "
-                             VerticalAlignment="Center"
-                             IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                             Style="{StaticResource DisableGrayText}" />
-                  <ComboBox Grid.Column="1"
-                            Grid.Row="1"
-                            ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                            SelectedItem="{Binding InkEffectBrush, ElementName=materialTabControl}"
-                            ItemTemplate="{StaticResource ColorItemTemplate}"
-                            IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                            Margin="5"
-                            ToolTip="Can be set on a MaterialTabControl control or individually on each MaterialTabItem." />
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="2"
-                             Text="Ink Effect Opacity: "
-                             VerticalAlignment="Center"
-                             IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                             Style="{StaticResource DisableGrayText}" />
-                  <xctk:DoubleUpDown Grid.Column="1"
-                                     Grid.Row="2"
-                                     Value="{Binding InkEffectOpacity, ElementName=materialTabControl}"
-                                     Minimum="0"
-                                     Maximum="1"
-                                     Increment="0.05"
-                                     FormatString="N2"
-                                     VerticalAlignment="Center"
-                                     Margin="5"
-                                     IsEnabled="{Binding IsChecked, ElementName=inkEffectActiveCheckBox}"
-                                     ToolTip="Can be set on a MaterialTabControl control or individually on each MaterialTabItem." />
-                  <TextBlock Grid.Column="0"
-                             Grid.Row="3"
-                             Text="Selected Foreground: "
-                             VerticalAlignment="Center" />
-                  <ComboBox Grid.Column="1"
-                            Grid.Row="3"
-                            ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                            SelectedItem="{Binding SelectedForeground, ElementName=materialTabControl}"
-                            ItemTemplate="{StaticResource ColorItemTemplate}"
-                            Margin="5"
-                            ToolTip="Can be set on a MaterialTabControl control or individually on each MaterialTabItem." />
-               </Grid>
-            </GroupBox>
-         </Grid>
-
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <StackPanel Orientation="Horizontal">
-               <TextBlock Text="TabStripPlacement is Top:"
-                          Margin="20" />
-
-               <xctk:MaterialTabControl x:Name="materialTabControl"
-                                        TabStripPlacement="Top"
-                                        IsInkEffectActive="True"
-                                        IsInkBarActive="True"
-                                        IsSlidingAnimationActive="True">
-                  <xctk:MaterialTabItem Header="First"
-                                        HorizontalContentAlignment="Center"
-                                        Content="MaterialTabItem #1" />
-                  <xctk:MaterialTabItem Header="Second"
-                                        HorizontalContentAlignment="Center"
-                                        Content="MaterialTabItem #2" />
-                  <xctk:MaterialTabItem Header="Third"
-                                        HorizontalContentAlignment="Center"
-                                        Content="MaterialTabItem #3" />
-                  <xctk:MaterialTabItem Header="Fourth"
-                                        HorizontalContentAlignment="Center"
-                                        Content="MaterialTabItem #4" />
-                  <xctk:MaterialTabItem Header="Fifth"
-                                        HorizontalContentAlignment="Center"
-                                        Content="MaterialTabItem #5" />
-               </xctk:MaterialTabControl>
-            </StackPanel>
-
-            <StackPanel Orientation="Horizontal"
-                        Margin="0,40,0,0">
-               <TextBlock Text="TabStripPlacement is Left:"
-                          Margin="20" />
-
-               <xctk:MaterialTabControl x:Name="leftMaterialTabs"
-                                        TabStripPlacement="Left"
-                                        IsInkEffectActive="{Binding IsInkEffectActive, ElementName=materialTabControl}"
-                                        InkEffectBrush="{Binding InkEffectBrush, ElementName=materialTabControl}"
-                                        InkEffectOpacity="{Binding InkEffectOpacity, ElementName=materialTabControl}"
-                                        InkBarBrush="{Binding InkBarBrush, ElementName=materialTabControl}"
-                                        SelectedForeground="{Binding SelectedForeground, ElementName=materialTabControl}"
-                                        IsInkBarActive="{Binding IsInkBarActive, ElementName=materialTabControl}"
-                                        IsSlidingAnimationActive="{Binding IsSlidingAnimationActive, ElementName=materialTabControl}">
-                  <xctk:MaterialTabItem Header="First"
-                                        VerticalContentAlignment="Center"
-                                        Content="MaterialTabItem #1" />
-                  <xctk:MaterialTabItem Header="Second"
-                                        VerticalContentAlignment="Center"
-                                        Content="MaterialTabItem #2" />
-                  <xctk:MaterialTabItem Header="Third"
-                                        VerticalContentAlignment="Center"
-                                        Content="MaterialTabItem #3" />
-                  <xctk:MaterialTabItem Header="Fourth"
-                                        VerticalContentAlignment="Center"
-                                        Content="MaterialTabItem #4" />
-                  <xctk:MaterialTabItem Header="Fifth"
-                                        VerticalContentAlignment="Center"
-                                        Content="MaterialTabItem #5" />
-               </xctk:MaterialTabControl>
-            </StackPanel>
-
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialTabs.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt
index 7a82b92d..54005b25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialTextFieldView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt
index f92121c0..529e5eef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,11 +22,9 @@
                         xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data"
                         Title="MaterialTextField">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A TextBox containing a customizable animated watermark that remains active when text is entered. It uses the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,207 +32,24 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <ObjectDataProvider x:Key="TextFieldEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="xctk:MaterialTextFieldModeEnum" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
-
-         <DataTemplate x:Key="TextFieldTemplate1">
-            <Border Background="#FF49A9F5">
-               <TextBlock Text="{Binding}"
-                          Foreground="White" />
-            </Border>
-         </DataTemplate>
-
-         <DataTemplate x:Key="TextFieldTemplate2">
-            <StackPanel Orientation="Horizontal">
-               <Image Source="..\Resources\building16.png"
-                      Stretch="None" />
-               <TextBlock Text="{Binding}"
-                          Foreground="Black"
-                          Margin="4,0,0,0" />
-            </StackPanel>
-         </DataTemplate>
-      </ResourceDictionary>
-   </local:DemoView.Resources>  
-
-   <Grid>
-
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="100" />
-               </Grid.ColumnDefinitions>
-
-               <!-- First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Watermark: "
-                          VerticalAlignment="Center" />
-               <TextBox Grid.Column="1"
-                        Text="{Binding Watermark, ElementName=materialTextField, UpdateSourceTrigger=PropertyChanged}"
-                        VerticalAlignment="Center"
-                        Width="250"
-                        Margin="5" />
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Watermark Mode: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource TextFieldEnumData}}"
-                         SelectedItem="{Binding WatermarkMode, ElementName=materialTextField}"
-                         Width="95"
-                         HorizontalAlignment="Left"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Watermark Template: "
-                          VerticalAlignment="Center" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="2"
-                         SelectedValue="{Binding WatermarkTemplate, ElementName=materialTextField}"
-                         SelectedValuePath="Tag"
-                         Width="95"
-                         VerticalAlignment="Center"
-                         HorizontalAlignment="Left"
-                         Margin="5">
-                  <ComboBoxItem Content="None"
-                                Tag="{x:Null}" />
-                  <ComboBoxItem Content="Template1"
-                                Tag="{StaticResource TextFieldTemplate1}" />
-                  <ComboBoxItem Content="Template2"
-                                Tag="{StaticResource TextFieldTemplate2}" />
-               </ComboBox>
-
-               <TextBlock Grid.Column="0"
-                          Grid.Row="3"
-                          Text="Watermark Scale Factor: "
-                          VerticalAlignment="Center" />
-               <xctk:DoubleUpDown Grid.Column="1"
-                                  Grid.Row="3"
-                                  Value="{Binding WatermarkScaleFactor, ElementName=materialTextField}"
-                                  Minimum="0"
-                                  Maximum="5"
-                                  Increment="0.1"
-                                  FormatString="N1"
-                                  Width="70"
-                                  HorizontalAlignment="Left"
-                                  VerticalAlignment="Center"
-                                  Margin="5" />
-
-               <!-- Second Column-->
-               <TextBlock Grid.Column="2"
-                          Grid.Row="0"
-                          Text="Watermark Foreground: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes,RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding WatermarkForeground, ElementName=materialTextField}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Watermark Focus Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="1"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding WatermarkFocusBrush, ElementName=materialTextField}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Line Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="2"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding LineBrush, ElementName=materialTextField}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="3"
-                          Text="Line Focus Brush: "
-                          VerticalAlignment="Center"
-                          Margin="10,0,0,0" />
-               <ComboBox Grid.Column="3"
-                         Grid.Row="3"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding LineFocusBrush, ElementName=materialTextField}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <xctk:MaterialTextField x:Name="materialTextField"
-                                    Watermark="Company"
-                                    Width="250"
-                                    Margin="100"
-                                    WatermarkForeground="{Binding MaterialBrushes[17], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                                    WatermarkScaleFactor="0.7"
-                                    WatermarkMode="OnFocus"
-                                    LineBrush="{Binding MaterialBrushes[17], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}">
-               <xctk:MaterialTextField.Text>
-                  <Binding Path="Text"
-                           ElementName="testTextBox"
-                           UpdateSourceTrigger="PropertyChanged">
-                     <Binding.ValidationRules>
-                        <sample:RequiredRule />
-                     </Binding.ValidationRules>
-                  </Binding>
-               </xctk:MaterialTextField.Text>
-            </xctk:MaterialTextField>
-
-            <TextBox x:Name="testTextBox"
-                     Visibility="Collapsed" />
-         </StackPanel>
-      </StackPanel>
-
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MaterialTextField.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt
index 6c38ff2f..06aae47e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -30,21 +30,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void ToastButton_Click( object sender, RoutedEventArgs e )
-    {
-      var materialToast = new MaterialToast( ( ( ComboBoxItem )toastOwnerComboBox.SelectedItem ).Tag as FrameworkElement );
-      materialToast.MaterialAccentBrush = (SolidColorBrush)toastMaterialAccentBrushComboBox.SelectedItem;
-      materialToast.Location = ( MaterialToastLocationEnum )toastLocationComboBox.SelectedItem;
-      materialToast.SlidingDirection = ( Orientation )toastSlidingDirectionComboBox.SelectedItem;
-      materialToast.Content = "Simple Toast";
-      materialToast.DisplayTime = System.TimeSpan.FromMilliseconds( toastDisplayTimeIntegerUpDown.Value.Value );
-      materialToast.HideOnClick = toastHideOnclickCheckBox.IsChecked.Value;
-      materialToast.IsCloseButtonVisible = toastIsCloseButtonVisibleCheckBox.IsChecked.Value;
-      materialToast.CloseButtonStyle = ( ( ComboBoxItem )toastClosebuttonStyleComboBox.SelectedItem ).Tag as Style;
-      materialToast.CornerRadius = new CornerRadius( toastCornerRadiusIntegerUpDown.Value.Value );
-      materialToast.ShowToast();
-    }
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt
index 0b6dc052..b1e287d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialToast">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It is using the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
+         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It uses the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,296 +31,26 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
 
-         <ObjectDataProvider x:Key="ToastLocationEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="xctk:MaterialToastLocationEnum" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
 
-         <ObjectDataProvider x:Key="ToastSlidingDirectionEnumData"
-                             MethodName="GetValues"
-                             ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-               <x:Type TypeName="Orientation" />
-            </ObjectDataProvider.MethodParameters>
-         </ObjectDataProvider>
 
-         <Style x:Key="MaterialToastCloseButtonStyle1"
-                TargetType="{x:Type Button}">
-            <Setter Property="Margin"
-                    Value="2" />
-            <Setter Property="Content"
-                    Value="OK" />
-            <Setter Property="Foreground"
-                    Value="Yellow" />
-            <Setter Property="Background"
-                    Value="Transparent" />
-            <Setter Property="BorderBrush"
-                    Value="Transparent" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type Button}">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="{TemplateBinding BorderBrush}"
-                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter HorizontalAlignment="Center"
-                                          VerticalAlignment="Center" />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsMouseOver"
-                        Value="True">
-                  <Setter Property="Background"
-                          Value="Green" />
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </ResourceDictionary>
 
-   </local:DemoView.Resources>
-   
-   <Grid>
-      <StackPanel Margin="10">         
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
 
-               <!--First Column-->
-               <TextBlock Grid.Column="0"
-                          Text="Owner: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="toastOwnerComboBox"
-                         Grid.Column="1"
-                         SelectedIndex="0"
-                         Width="125"
-                         Margin="5"
-                         VerticalContentAlignment="Center"
-                         HorizontalAlignment="Left">
-                  <ComboBoxItem Content="LightBlue Border"
-                                Tag="{Binding ElementName=lightBlueBorder}" />
-                  <ComboBoxItem Content="LightGreen Border"
-                                Tag="{Binding ElementName=greenBlueBorder}" />
-                  <ComboBoxItem Content="Sample Window"
-                                Tag="{x:Null}" />
-               </ComboBox>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="Location: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="toastLocationComboBox"
-                         Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource ToastLocationEnumData}}"
-                         SelectedIndex="0"
-                         Margin="5"
-                         VerticalContentAlignment="Center" />
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="Sliding Direction: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="toastSlidingDirectionComboBox"
-                         Grid.Column="1"
-                         Grid.Row="2"
-                         ItemsSource="{Binding Source={StaticResource ToastSlidingDirectionEnumData}}"
-                         Tag="{Binding SelectedItem, ElementName=toastLocationComboBox}"
-                         Margin="5"
-                         VerticalContentAlignment="Center">
-                  <ComboBox.Style>
-                     <Style TargetType="{x:Type ComboBox}">
-                        <Setter Property="SelectedIndex"
-                                Value="1" />
-                        <Setter Property="IsEnabled"
-                                Value="True" />
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}"
-                                        Value="{x:Static xctk:MaterialToastLocationEnum.Right}">
-                              <Setter Property="SelectedIndex"
-                                      Value="0" />
-                              <Setter Property="IsEnabled"
-                                      Value="False" />
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}"
-                                        Value="{x:Static xctk:MaterialToastLocationEnum.Left}">
-                              <Setter Property="SelectedIndex"
-                                      Value="0" />
-                              <Setter Property="IsEnabled"
-                                      Value="False" />
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}"
-                                        Value="{x:Static xctk:MaterialToastLocationEnum.Top}">
-                              <Setter Property="SelectedIndex"
-                                      Value="1" />
-                              <Setter Property="IsEnabled"
-                                      Value="False" />
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}"
-                                        Value="{x:Static xctk:MaterialToastLocationEnum.Bottom}">
-                              <Setter Property="SelectedIndex"
-                                      Value="1" />
-                              <Setter Property="IsEnabled"
-                                      Value="False" />
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ComboBox.Style>
-               </ComboBox>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="3"
-                          Text="Corner Radius: "
-                          VerticalAlignment="Center" />
-               <xctk:IntegerUpDown x:Name="toastCornerRadiusIntegerUpDown"
-                                   Grid.Column="1"
-                                   Grid.Row="3"
-                                   Value="2"
-                                   Minimum="0"
-                                   Maximum="30"
-                                   Increment="1"
-                                   Margin="5"
-                                   VerticalContentAlignment="Center" />
 
-               <!-- Second Column -->
-               <TextBlock Grid.Column="2"
-                          Text="Display Time: "
-                          VerticalAlignment="Center"
-                          Margin="7,0,0,0" />
-               <xctk:IntegerUpDown x:Name="toastDisplayTimeIntegerUpDown"
-                                   Grid.Column="3"
-                                   Value="3000"
-                                   Minimum="0"
-                                   Maximum="10000"
-                                   Increment="500"
-                                   Margin="5"
-                                   VerticalContentAlignment="Center"
-                                   ToolTip="Duration in milliseconds for displaying a toast after it's completely popped in and before it starts popping out. 0 will keep the toast popped in." />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="1"
-                          Text="Hide On Click: "
-                          VerticalAlignment="Center"
-                          Margin="7,0,0,0" />
-               <CheckBox x:Name="toastHideOnclickCheckBox"
-                         Grid.Column="3"
-                         Grid.Row="1"
-                         IsChecked="False"
-                         Margin="5"
-                         VerticalContentAlignment="Center"
-                         ToolTip="When true, clicking anywhere on a toast will close it." />
-               <TextBlock Grid.Column="2"
-                          Grid.Row="2"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center"
-                          Margin="7,0,0,0"/>
-               <ComboBox x:Name="toastMaterialAccentBrushComboBox"
-                         Grid.Column="3"
-                         Grid.Row="2"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialBrushes[6], RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         Width="95"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         Margin="5"/>               
 
-               <!-- Third Column-->
-               <TextBlock Grid.Column="4"
-                          Grid.Row="0"
-                          Text="Is Close Button Visible: "
-                          VerticalAlignment="Center"
-                          Margin="7,0,0,0" />
-               <CheckBox x:Name="toastIsCloseButtonVisibleCheckBox"
-                         Grid.Column="5"
-                         Grid.Row="0"
-                         IsChecked="False"
-                         Margin="5"
-                         VerticalContentAlignment="Center" />
 
-               <TextBlock Grid.Column="4"
-                          Grid.Row="1"
-                          Text="Close Button Style: "
-                          VerticalAlignment="Center"
-                          Margin="7,0,0,0"
-                          IsEnabled="{Binding IsChecked, ElementName=toastIsCloseButtonVisibleCheckBox}"
-                          Style="{StaticResource DisableGrayText}" />
-               <ComboBox x:Name="toastClosebuttonStyleComboBox"
-                         Grid.Column="5"
-                         Grid.Row="1"
-                         Width="85"
-                         Margin="5"
-                         SelectedIndex="0"
-                         HorizontalAlignment="Left"
-                         VerticalContentAlignment="Center"
-                         IsEnabled="{Binding IsChecked, ElementName=toastIsCloseButtonVisibleCheckBox}"
-                         Style="{StaticResource DisableGrayComboBox}">
-                  <ComboBoxItem Content="Default"
-                                Tag="{x:Null}" />
-                  <ComboBoxItem Content="OK Button"
-                                Tag="{StaticResource MaterialToastCloseButtonStyle1}" />
-               </ComboBox>
 
-               <Button Grid.Row="2"
-                       Grid.Column="4"
-                       Grid.ColumnSpan="2"
-                       Content="Pop Toast!"
-                       Margin="7,0,0,0"
-                       Padding="5"
-                       Click="ToastButton_Click" />
-            </Grid>
-         </GroupBox>
 
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Center">
 
-               <Border x:Name="lightBlueBorder"
-                       Background="LightBlue"
-                       Width="300"
-                       Height="280"
-                       Margin="20" />
-               <Border x:Name="greenBlueBorder"
-                       Background="LightGreen"
-                       Width="300"
-                       Height="280"
-                       Margin="20" />
-            </StackPanel>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialToast.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt
index be593d5a..c7069f4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialToolTipView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt
index f63d5407..3cac9b4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialToolTip">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>A ToolTip with animations when opening. It is using the Material Brushes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
+         <Run>A ToolTip with animations when opening. It uses the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,10 +31,9 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
-   
+
    <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
@@ -45,70 +42,10 @@
       </ResourceDictionary>
    </local:DemoView.Resources>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <StackPanel Margin="10">
 
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
 
-               <!--First Column-->
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="Material Accent Brush: "
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="materialAccentBrushComboBox"
-                         Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding MaterialBrushes, RelativeSource={RelativeSource AncestorType={x:Type local:MaterialDemoView}}}"
-                         SelectedItem="{Binding MaterialAccentBrush, ElementName=materialButton}"
-                         ItemTemplate="{StaticResource ColorItemTemplate}"
-                         Width="95"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-         
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <xctk:MaterialButton x:Name="materialButton"
-                                 Content="MaterialButton using MaterialToolTip"
-                                 Margin="20"
-                                 Padding="5"
-                                 HorizontalAlignment="Center">
-               <xctk:MaterialButton.ToolTip>
-                  <xctk:MaterialToolTip Placement="Mouse"
-                                        DataContext="{Binding Path=PlacementTarget, RelativeSource={RelativeSource Self}}"
-                                        MaterialAccentBrush="{Binding MaterialAccentBrush}">
-                     <StackPanel Orientation="Horizontal">
-                        <ContentControl>
-                           <ContentControl.Content>
-                              <Path Data="M17.071346,6.6599999C17.78875,8.1508932 18.122005,9.9854851 17.917633,11.917816 17.780151,13.210711 17.415701,14.404805 16.885771,15.449L15.177,14.644304C15.617841,13.787608 15.9243,12.790113 16.036884,11.719817 16.208162,10.105325 15.913901,8.568861 15.306683,7.365747z M20.566984,5.2669997C21.512329,7.3320866 21.947803,9.7617378 21.678318,12.318976 21.49543,14.033849 21.006458,15.634024 20.297501,17.052L18.59,16.251213C19.210964,15.018133 19.637339,13.622355 19.796829,12.11588 20.034515,9.8762961 19.647739,7.7448602 18.813787,5.9662089z M13.335,0L13.335,21.334999 5.6516771,14.88951 0,14.88951 0,6.4454007 5.6543674,6.4454007z"
-                                    Stretch="Uniform"
-                                    Fill="{Binding MaterialAccentBrush}"
-                                    Width="15"
-                                    Height="15" />
-                           </ContentControl.Content>
-                        </ContentControl>
-                        <TextBlock Text="Press to increment volume."
-                                   Margin="5,0,0,0"/>
-                     </StackPanel>                    
-                  </xctk:MaterialToolTip>
-               </xctk:MaterialButton.ToolTip>
-            </xctk:MaterialButton>
-         </StackPanel>
-      </StackPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
     <Image Source="..\OpenSourceImages\MaterialToolTip.png" Width="600" Height="400"/>
-   ##END-->
 </local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
index afec49a0..e6f2523b 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
@@ -28,100 +28,18 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
   {
     public MultiCalendarView()
     {
-#if !OPEN_SOURCE
-      this.Initialized += new EventHandler( this.MultiCalendarView_Initialized );
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void MultiCalendarView_Initialized( object sender, EventArgs e )
-    {
-      int year = System.DateTime.Now.Year;
-      int month = System.DateTime.Now.Month;
-      _multiCalendar.DisplayDateStart = new System.DateTime( year - 1, 1, 1 );
-      _multiCalendar.DisplayDateEnd = new System.DateTime( year + 3, 12, 31 );
-
-      _multiCalendar2.DisplayDateStart = new System.DateTime( year, month, 1 );
-      var endYear = (month <= 9) ? year : year + 1;
-      var endMonth = (month + 3) % 12;
-      var endDay = System.DateTime.DaysInMonth( endYear, endMonth );
-      var endDate = new System.DateTime( endYear, endMonth, endDay );
-      _multiCalendar2.DisplayDateEnd = endDate;
-      _multiCalendar2.HighlightedDates.Add( new System.DateTime( year, month, 12 ) );
-      _multiCalendar2.HighlightedDates.Add( new System.DateTime( year, month, 20 ) );
-      _multiCalendar2.SelectedDates.Add( new System.DateTime( year, month, 21 ) );
-      _multiCalendar2.SelectedDates.Add( new System.DateTime( year, month, 22 ) );
-      _multiCalendar2.SelectedDates.Add( new System.DateTime( year, month, 23 ) );
-      var blackoutStart = _multiCalendar2.DisplayDateStart.AddMonths( 1 );
-      blackoutStart.AddDays( 10 );
-      _multiCalendar2.BlackoutDates.Add( new CalendarDateRange( blackoutStart.AddDays( 10 ), blackoutStart.AddDays( 15 ) ) );
-    }
 
-    private void BlackoutDates_Click( object sender, RoutedEventArgs e )
-    {
-      var cb = sender as CheckBox;
-      _multiCalendar.BlackoutDates.Clear();
-
-      if( cb.IsChecked.HasValue && cb.IsChecked.Value )
-      {
-        //We don't want to blackout selected dates
-        _multiCalendar.SelectedDates.Clear();
-
-        var firstDate = _multiCalendar.FirstDisplayedDate;
-        // Current Month
-        var startDate = new System.DateTime( firstDate.Year, firstDate.Month, 8 );
-        var endDate = new System.DateTime( firstDate.Year, firstDate.Month, 14 );
-        _multiCalendar.BlackoutDates.Add( new CalendarDateRange( startDate, endDate ) );
-
-        // Next Month
-        startDate = startDate.AddMonths( 1 );
-        endDate = endDate.AddMonths( 1 );
-        _multiCalendar.BlackoutDates.Add( new CalendarDateRange( startDate, endDate ) );
-      }
-    }
 
-    private void HighlightedDates_Click( object sender, RoutedEventArgs e )
-    {
-      var cb = sender as CheckBox;
-      _multiCalendar.HighlightedDates.Clear();
-
-      if( cb.IsChecked.HasValue && cb.IsChecked.Value )
-      {
-        for( int i = 0; i < 3; i++ )
-        {
-          System.DateTime date = _multiCalendar.FirstDisplayedDate.AddMonths( i );
-
-          for( int j = 1; j < 5; j++ )
-          {
-            _multiCalendar.HighlightedDates.Add( new System.DateTime( date.Year, date.Month, j * 5 ) );
-          }
-        }
-      }
-    }
 
-    private void MonthlyBackgrounds_Click( object sender, RoutedEventArgs e )
-    {
-      var cb = sender as CheckBox;
-      _multiCalendar2.MonthlyBackgrounds.Clear();
-
-      if( cb.IsChecked.HasValue && cb.IsChecked.Value )
-      {
-        // TODO : Replace these test images with our own custom examples
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 1,  new SolidColorBrush( System.Windows.Media.Color.FromArgb(128, 0, 0, 255 ) ) ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 2, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/February.jpg", UriKind.RelativeOrAbsolute ), 0.2 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 3, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/March.jpg", UriKind.RelativeOrAbsolute ), 0.5 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 4, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/April.jpg", UriKind.RelativeOrAbsolute ), 0.2 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 5, new SolidColorBrush( System.Windows.Media.Color.FromArgb( 128, 0, 255, 0 ) ) ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 6, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/June.jpg", UriKind.RelativeOrAbsolute ), 0.5 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 7, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/July.jpg", UriKind.RelativeOrAbsolute ), 0.2 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 8, new SolidColorBrush( System.Windows.Media.Color.FromArgb( 128, 255, 0, 0 ) ) ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 9, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/September.jpg", UriKind.RelativeOrAbsolute ), 0.5 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 10, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/October.jpg", UriKind.RelativeOrAbsolute ), 0.2 ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 11, new SolidColorBrush( System.Windows.Media.Color.FromArgb( 128, 255, 255, 255 ) ) ) );
-        _multiCalendar2.MonthlyBackgrounds.Add( new MonthlyBackgroundData( 12, new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/MultiCalendar/Resources/December.jpg", UriKind.RelativeOrAbsolute ), 0.5 ) );
-      }
-    }
-#endif
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt
index d7f1cb9f..b93d15b2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,12 +25,10 @@
    <local:DemoView.Description>
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <!-- //# TODODOC-->
          <Run>The MultiCalendar combines X Microsoft Calendars that can be positioned in a grid with rows and columns. The selected dates, blackout dates and highlighted dates can be chosen from any calendar. The MultiCalendar will have a fast response no matter how many CalendarDayButtons are selected.</Run>
          <LineBreak />
          <LineBreak />
          <Run>The Background/Foreground of any CalendarDayButton can be easily customized based on its state(selected/highlighted/blackout/mouseOver/focused/today) and the background of any Calendar can be customized with an image or a brush.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -38,728 +36,72 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter"/>
-      <conv:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter"/>
-      
-      <ObjectDataProvider x:Key="SelectModes"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="CalendarSelectionMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <ObjectDataProvider x:Key="OrientationModes"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="Orientation" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <Style x:Key="ButtonStyle1Base"
-             TargetType="Button">
-         <Setter Property="Background"
-                 Value="Green" />
-         <Setter Property="Foreground"
-                 Value="White" />
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type Button}">
-                  <Border Cursor="Hand"
-                          Background="{TemplateBinding Background}"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center">
-                     <ContentPresenter Margin="2" />
-                  </Border>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsEnabled"
-                              Value="False">
-                        <Setter Property="Opacity"
-                                Value="0.5" />
-                     </Trigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-         <Style.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-               <Setter Property="Background"
-                       Value="LightGreen" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
-
-      <Style x:Key="NextButtonStyle1"
-             TargetType="Button"
-             BasedOn="{StaticResource ButtonStyle1Base}">
-         <Setter Property="Content"
-                 Value="Next"/>
-      </Style>
-
-      <Style x:Key="PreviousButtonStyle1"
-             TargetType="Button"
-             BasedOn="{StaticResource ButtonStyle1Base}">
-         <Setter Property="Content"
-                 Value="Prev" />
-      </Style>
-
-      <Style x:Key="ButtonStyle2Base"
-             TargetType="Button"
-             BasedOn="{StaticResource ButtonStyle1Base}">
-         <Setter Property="Background"
-                 Value="Blue" />
-         <Style.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-               <Setter Property="Background"
-                       Value="LightBlue" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
-
-      <Style x:Key="NextButtonStyle2"
-             TargetType="Button"
-             BasedOn="{StaticResource ButtonStyle2Base}">
-         <Setter Property="Content">
-            <Setter.Value>
-               <Path Stroke="White"
-                     Data="M 3 10 L 8 5 L 3 0"
-                     Stretch="Uniform" 
-                     Margin="3"/>
-            </Setter.Value>
-         </Setter>
-      </Style>      
-
-      <Style x:Key="PreviousButtonStyle2"
-             TargetType="Button"
-             BasedOn="{StaticResource ButtonStyle2Base}">
-         <Setter Property="Content">
-            <Setter.Value>
-               <Path Stroke="White"
-                     Data="M 3 10 L -2 5 L 3 0"
-                     Stretch="Uniform"
-                     Margin="3" />
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HeaderButtonStyle1"
-             TargetType="Button">
-         <Setter Property="FontWeight"
-                 Value="Bold" />
-         <Setter Property="Focusable"
-                 Value="False" />
-         <Setter Property="FontSize"
-                 Value="15" />
-         <Setter Property="Background"
-                 Value="Green" />
-         <Setter Property="Foreground"
-                 Value="White" />
-         <Setter Property="Margin"
-                 Value="1" />
-         <Setter Property="HorizontalContentAlignment"
-                 Value="Center" />
-         <Setter Property="VerticalContentAlignment"
-                 Value="Center" />
-         <Setter Property="HorizontalAlignment"
-                 Value="Center" />
-         <Setter Property="VerticalAlignment"
-                 Value="Center" />
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type Button}">
-                  <Border Cursor="Hand"
-                          BorderBrush="Yellow"
-                          BorderThickness="2"
-                          CornerRadius="3"
-                          Background="{TemplateBinding Background}">
-                     <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Margin="1"/>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter Property="Background"
-                                Value="Gray" />
-                     </Trigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-      
-      <Style x:Key="HeaderButtonStyle2"
-             TargetType="Button">
-         <Setter Property="Focusable"
-                 Value="False" />
-         <Setter Property="Background"
-                 Value="Transparent"/>
-         <Setter Property="BorderThickness"
-                 Value="0"/>
-         <Setter Property="FontStyle"
-                 Value="Italic"/>
-         <Setter Property="Foreground"
-                 Value="Blue" />
-         <Setter Property="Margin"
-                 Value="1" />
-      </Style>
-
-      <DataTemplate x:Key="DayTitleTemplate1">
-         <TextBlock Foreground="#FF333333"
-                    FontWeight="Bold"
-                    FontSize="9.5"
-                    FontFamily="Verdana"
-                    Margin="0,6,0,6"
-                    Text="{Binding}"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center" />
-      </DataTemplate>
-
-      <DataTemplate x:Key="DayTitleTemplate2">
-         <TextBlock Foreground="Green"
-                    FontWeight="Bold"
-                    FontSize="15"
-                    FontStyle="Italic"
-                    Text="{Binding}"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center" />
-      </DataTemplate>
-
-      <DataTemplate x:Key="BlackoutTemplate1">
-         <Border Background="Red"
-                 Margin="5,4" />
-      </DataTemplate>
-
-      <DataTemplate x:Key="BlackoutTemplate2">
-         <Path Margin="3"
-               Fill="Red"
-               Stretch="Fill"
-               Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" />
-
-      </DataTemplate>
-
-      <DataTemplate x:Key="BlackoutDefaultTemplate">
-         <Path Opacity="0.2"
-               Margin="3"
-               Fill="#FF000000"
-               Stretch="Fill"
-               Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" />
-      </DataTemplate>
-   </local:DemoView.Resources>
-
-   <TabControl>
-      <TabItem Header="Main">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition />
-               <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <GroupBox Header="Features"
-                      Margin="5">
-
-               <GroupBox.Resources>
-
-                  <Style x:Key="TextBlockStyle"
-                         TargetType="TextBlock">
-                     <Setter Property="Width"
-                             Value="130" />
-                     <Setter Property="Margin"
-                             Value="0,10,0,0" />
-                     <Setter Property="VerticalAlignment"
-                             Value="Center" />
-                  </Style>
-               </GroupBox.Resources>
-
-               <Grid Margin="5">
-
-                  <Grid.RowDefinitions>
-                     <RowDefinition />
-                     <RowDefinition />
-                  </Grid.RowDefinitions>
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="*" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-
-                  <!--first Column-->
-                  <StackPanel Grid.Column="0">
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Selection Mode:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="110"
-                                  ItemsSource="{Binding Source={StaticResource SelectModes}}"
-                                  SelectedItem="{Binding SelectionMode, ElementName=_multiCalendar}"
-                                  ToolTip="Gets/Sets the Selection mode used for the control."
-                                  Margin="0,10,0,0" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Orientation:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox VerticalAlignment="Center"
-                                  Width="110"
-                                  Margin="0,10,0,0"
-                                  ToolTip="Gets/Sets the Orientation used for the control."
-                                  ItemsSource="{Binding Source={StaticResource OrientationModes}}"
-                                  SelectedItem="{Binding Orientation, ElementName=_multiCalendar}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Month Count:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:IntegerUpDown Minimum="1"
-                                            Maximum="36"
-                                            VerticalAlignment="Center"
-                                            Margin="0,10,0,0"
-                                            ToolTip="Gets/Sets how many calendars are displayed."
-                                            Value="{Binding MonthCount, ElementName=_multiCalendar}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Row Count:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:IntegerUpDown Minimum="1"
-                                            Maximum="18"
-                                            VerticalAlignment="Center"
-                                            Margin="0,10,0,0"
-                                            ToolTip="Gets/Sets how many rows are used to display the calendars."
-                                            Value="{Binding RowCount, ElementName=_multiCalendar}" />
-                        <TextBlock Text=" *"
-                                   Style="{StaticResource TextBlockStyle}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Column Count:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:IntegerUpDown Minimum="1"
-                                            Maximum="18"
-                                            VerticalAlignment="Center"
-                                            Margin="0,10,0,0"
-                                            ToolTip="Gets/Sets how many columns are used to display the calendars."
-                                            Value="{Binding ColumnCount, ElementName=_multiCalendar}" />
-                        <TextBlock Text=" *"
-                                   Style="{StaticResource TextBlockStyle}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Display Date Start:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <DatePicker Width="110"
-                                    Margin="0,10,0,0"
-                                    HorizontalContentAlignment="Left"
-                                    ToolTip="Gets/Sets the first Calendar of the MultiCalendar control."
-                                    SelectedDate="{Binding DisplayDateStart, ElementName=_multiCalendar}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Display Date End:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <DatePicker Width="110"
-                                    Margin="0,10,0,0"
-                                    HorizontalContentAlignment="Left"
-                                    ToolTip="Gets/Sets the last Calendar of the MultiCalendar control."
-                                    SelectedDate="{Binding DisplayDateEnd, ElementName=_multiCalendar}" />
-                     </StackPanel>
-
-                  </StackPanel>
-
-                  <!--Second Column-->
-                  <StackPanel Grid.Column="1">
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Selected Date:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <TextBlock Style="{StaticResource TextBlockStyle}"
-                                   ToolTip="Gets/Sets the selected date of the MultiCalendar control."
-                                   Text="{Binding SelectedDate, ElementName=_multiCalendar, UpdateSourceTrigger=PropertyChanged}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Selected Dates:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ListBox Height="100"
-                                 Width="150"
-                                 Margin="0,10,0,0"
-                                 ToolTip="Gets/Sets the Selected dates collection of the MultiCalendar control."
-                                 ItemsSource="{Binding SelectedDates, ElementName=_multiCalendar, UpdateSourceTrigger=PropertyChanged}" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="BlackoutDates:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <CheckBox Width="80"
-                                  Margin="0,10,0,0"
-                                  ToolTip="Gets/Sets the blackout dates collection of the MultiCalendar control."
-                                  Click="BlackoutDates_Click" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="HighlightedDates:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <CheckBox Width="80"
-                                  Margin="0,10,0,0"
-                                  ToolTip="Gets/Sets the highlighted dates collection of the MultiCalendar control."
-                                  Click="HighlightedDates_Click" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Hide Inactive Dates:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <CheckBox Width="80"
-                                  Margin="0,10,0,0"
-                                  ToolTip="Gets/Sets if inactive dates are hidden."
-                                  IsChecked="{Binding HideInactiveDates, ElementName=_multiCalendar}" />
-                     </StackPanel>
-
-                  </StackPanel>
-
-                  <!-- //# TODODOC-->
-                  <TextBlock Grid.Row="1"
-                              Grid.ColumnSpan="2"
-                              Margin="0,10,0,0"
-                              TextWrapping="WrapWithOverflow"
-                              Text="* The value is adjusted automatically when MonthCount changes. However, as soon as a custom value is assigned manually, this custom value will remain and no longer be adjusted automatically." />
-
-               </Grid>
-            </GroupBox>
-
-            <StackPanel Grid.Row="1"
-                        Margin="10">
-
-               <TextBlock Text="Usage:"
-                          Style="{StaticResource Header}" />
-
-               <ScrollViewer HorizontalScrollBarVisibility="Auto"
-                             VerticalScrollBarVisibility="Auto"
-                             MaxHeight="400">
-                  <xctk:MultiCalendar x:Name="_multiCalendar"
-                                      MonthCount="3"
-                                      Orientation="Horizontal"
-                                      SelectionMode="SingleRange" />
-               </ScrollViewer>
-
-            </StackPanel>
-
-         </Grid>
-      </TabItem>
-
-      <TabItem Header="Customization">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition />
-               <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <GroupBox Header="Features"
-                      Margin="5">
-
-               <GroupBox.Resources>
-
-                  <Style x:Key="TextBlockStyle"
-                         TargetType="TextBlock">
-                     <Setter Property="Width"
-                             Value="180" />
-                     <Setter Property="Margin"
-                             Value="0,5,0,0" />
-                     <Setter Property="VerticalAlignment"
-                             Value="Center" />
-                  </Style>
-
-                  <Style x:Key="TextBlockStyle2"
-                         TargetType="TextBlock"
-                         BasedOn="{StaticResource TextBlockStyle}">
-                     <Setter Property="Width"
-                             Value="230" />
-                  </Style>
-               </GroupBox.Resources>
-
-               <Grid Margin="5,0,5,5">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="*" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-
-                  <!-- first Column-->
-                  <StackPanel Grid.Column="0">
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendars Background:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Background used for each individual calendar of the MultiCalendar control. MonthlyBackgrounds property should not be set in order to use this property."
-                                          SelectedColor="{Binding CalendarsBackground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendars BorderBrush:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the BorderBrush used for each individual calendar of the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarsBorderBrush, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendars BorderThickness:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <xctk:DoubleUpDown Width="85"
-                                           ToolTip="Gets/Sets the BorderThickness used for each individual calendar of the MultiCalendar control."
-                                           Value="{Binding CalendarsBorderThickness, ElementName=_multiCalendar2, Converter={StaticResource ThicknessToDoubleConverter}}"
-                                           Maximum="5"
-                                           Minimum="0"
-                                           Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Header Button Style:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the Header Button style used for each individual calendar of the MultiCalendar control."
-                                  SelectedValue="{Binding CalendarHeaderButtonStyle, ElementName=_multiCalendar2}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Tag="{StaticResource HeaderButtonStyle1}"
-                                         Content="Style1" />
-                           <ComboBoxItem Tag="{StaticResource HeaderButtonStyle2}"
-                                         Content="Style2" />
-                           <ComboBoxItem Tag="{x:Null}"
-                                         Content="Default" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Day Title DataTemplate:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the day dataTemplate used in each individual calendar of the MultiCalendar control."
-                                  SelectedValue="{Binding CalendarDayTitleDataTemplate, ElementName=_multiCalendar2}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Tag="{StaticResource DayTitleTemplate1}"
-                                         Content="Default" />
-                           <ComboBoxItem Tag="{StaticResource DayTitleTemplate2}"
-                                         Content="Template1" />
-                           <ComboBoxItem Tag="{x:Null}"
-                                         Content="Null" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Next Button Style:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the Next Button style of the MultiCalendar control."
-                                  SelectedValue="{Binding NextButtonStyle, ElementName=_multiCalendar2}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Tag="{StaticResource NextButtonStyle1}"
-                                         Content="Style1"/>
-                           <ComboBoxItem Tag="{StaticResource NextButtonStyle2}"
-                                         Content="Style2" />
-                           <ComboBoxItem Tag="{x:Null}"
-                                         Content="Default" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Previous Button Style:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the Previous Button style of the MultiCalendar control."
-                                  SelectedValue="{Binding PreviousButtonStyle, ElementName=_multiCalendar2}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Tag="{StaticResource PreviousButtonStyle1}"
-                                         Content="Style1" />
-                           <ComboBoxItem Tag="{StaticResource PreviousButtonStyle2}"
-                                         Content="Style2" />
-                           <ComboBoxItem Tag="{x:Null}"
-                                         Content="Default" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Monthly Backgrounds:"
-                                   Style="{StaticResource TextBlockStyle}" />
-                        <!-- //# TODODOC-->
-                        <CheckBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the monthly backgrounds collection of the MultiCalendar control."
-                                  Click="MonthlyBackgrounds_Click" />
-                     </StackPanel>
-                  </StackPanel>
-
-                  <!--second column-->
-                  <StackPanel Grid.Column="1">
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Hightlighted Background:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Background used for highlighted dates in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonHighlightedBackground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Hightlighted Foreground:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Foreground used for highlighted dates in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonHighlightedForeground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Selected Background:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Background used for selected dates in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonSelectedBackground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Selected Foreground:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Foreground used for selected dates in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonSelectedForeground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Today Background:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Background used for today date in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonTodayBackground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Today Foreground:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Foreground used for today date in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonTodayForeground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button MouseOver Background:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Background used for the date under the mouse in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonMouseOverBackground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button MouseOver Foreground:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the Foreground used for the date under the mouse in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonMouseOverForeground, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button CurrentDate BorderBrush:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <xctk:ColorPicker Width="85"
-                                          ToolTip="Gets/Sets the BorderBrush used for the current date in the MultiCalendar control."
-                                          SelectedColor="{Binding CalendarButtonCurrentDateBorderBrush, ElementName=_multiCalendar2, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Margin="0,5,0,0" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Calendar Button Blackout DataTemplate:"
-                                   Style="{StaticResource TextBlockStyle2}" />
-                        <!-- //# TODODOC-->
-                        <ComboBox Width="85"
-                                  Margin="0,5,0,0"
-                                  ToolTip="Gets/Sets the Blackout DataTemplate used for the Blackout dates in the MultiCalendar control."
-                                  SelectedValue="{Binding CalendarButtonBlackoutDataTemplate, ElementName=_multiCalendar2}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Tag="{StaticResource BlackoutTemplate1}"
-                                         Content="Template1" />
-                           <ComboBoxItem Tag="{StaticResource BlackoutTemplate2}"
-                                         Content="Template2" />
-                           <ComboBoxItem Tag="{StaticResource BlackoutDefaultTemplate}"
-                                         Content="Default" />
-                        </ComboBox>
-                     </StackPanel>
-
-                  </StackPanel>
-               </Grid>
-            </GroupBox>
-
-            <StackPanel Grid.Row="1"
-                        Margin="10">
-
-               <TextBlock Text="Usage:"
-                          Style="{StaticResource Header}" />
-
-               <ScrollViewer HorizontalScrollBarVisibility="Auto"
-                             VerticalScrollBarVisibility="Auto"
-                             MaxHeight="400">
-                  <xctk:MultiCalendar x:Name="_multiCalendar2"
-                                      SelectionMode="SingleRange"
-                                      MonthCount="3"
-                                      CalendarsBackground="White"
-                                      CalendarsBorderBrush="Blue"
-                                      CalendarsBorderThickness="0"
-                                      NextButtonStyle="{x:Null}"
-                                      PreviousButtonStyle="{x:Null}"
-                                      CalendarHeaderButtonStyle="{x:Null}"
-                                      CalendarDayTitleDataTemplate="{StaticResource DayTitleTemplate1}"
-                                      CalendarButtonHighlightedBackground="Yellow"
-                                      CalendarButtonHighlightedForeground="Black"
-                                      CalendarButtonSelectedBackground="Blue"
-                                      CalendarButtonSelectedForeground="White"
-                                      CalendarButtonTodayBackground="Gray"
-                                      CalendarButtonTodayForeground="White"
-                                      CalendarButtonMouseOverBackground="LightBlue"
-                                      CalendarButtonMouseOverForeground="Black"
-                                      CalendarButtonCurrentDateBorderBrush="DarkOrange"
-                                      CalendarButtonBlackoutDataTemplate="{StaticResource BlackoutDefaultTemplate}"/>
-               </ScrollViewer>
-
-            </StackPanel>
-
-         </Grid>
-      </TabItem>
-   </TabControl>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MultiCalendar.png" Width="600" Height="400"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt
index 3db0c23c..e32ef1f5 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -30,32 +30,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
   {
     public MultiColumnComboBoxView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void OnGroupCheck( object sender, System.Windows.RoutedEventArgs e )
-    {
-      DataGridCollectionView collectionView = ( DataGridCollectionView )_combo.ItemsSource;
-      bool isChecked = ( ( CheckBox )sender ).IsChecked.GetValueOrDefault( false );
-      bool isGrouped = ( collectionView.GroupDescriptions.Count > 0 );
-
-      if( isGrouped != isChecked )
-      {
-        if( isChecked )
-        {
-          collectionView.GroupDescriptions.Add( new PropertyGroupDescription( "ShipCountry" ) );
-          collectionView.GroupDescriptions.Add( new PropertyGroupDescription( "ShipCity" ) );
-        }
-        else
-        {
-          collectionView.GroupDescriptions.Clear();
-        }
-      }
-    }
-#endif
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt
index 2d2e6136..eb469522 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,137 +24,25 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The multi-column combo box uses the power of Xceed's datagrid control to create an advanced ComboBox.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This Control is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <xcdg:DataGridCollectionViewSource x:Key="cvsOrder" 
-                                         Source="{Binding}" >
-         <xcdg:DataGridCollectionViewSource.GroupDescriptions>
-            <PropertyGroupDescription PropertyName="ShipCountry" />
-            <PropertyGroupDescription PropertyName="ShipCity" />
-         </xcdg:DataGridCollectionViewSource.GroupDescriptions>
-      </xcdg:DataGridCollectionViewSource>
-      
-      <!--Important! Base the style on the predefined default style for the DataGrid-->
-      <Style x:Key="baseStyle" TargetType="{x:Type xcdg:DataGridControl}"
-                   BasedOn="{StaticResource {x:Static xcdg:MultiColumnComboBox.DefaultDataGridStyleResourceKey}}">
-          <Setter Property="View">
-            <Setter.Value>
-               <!-- Setting a view to allow group drop-down navigation. -->
-               <!-- Because it declare a new view, this style can only -->
-               <!-- be used by one MultiColumnComboBox instance -->
-               <xcdg:TableflowView />
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="coloredDataGridStyle" TargetType="{x:Type xcdg:DataGridControl}" BasedOn="{StaticResource baseStyle}" >
-         <Style.Resources>
-            <Style TargetType="{x:Type xcdg:DataRow}">
-               <Setter Property="Background" Value="LemonChiffon" />
-            </Style>
-         </Style.Resources>
-      </Style>
- 
-      <conv:FlagPathConverter x:Key="flagPathConverter" />
-      
-       <!-- 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>
-   <StackPanel>
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition />
-               <RowDefinition />
-            </Grid.RowDefinitions>
-            <!-- Show headers option -->
-            <TextBlock  Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                        Text="ShowColumnHeaders: "/>
-            <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Margin="5"
-                      IsChecked="{Binding ShowColumnHeaders, ElementName=_combo}" />
-
-            <!-- Show GroupBy control option -->
-            <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                       Text="ShowGroupByControl: " />
-            <CheckBox Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5"
-                      IsChecked="{Binding ShowGroupByControl, ElementName=_combo}" />
-
-            <!-- Group source option -->
-            <TextBlock  Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"
-                        Text="Grouped: " />
-            <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Margin="5"
-                      IsChecked="True"
-                      Click="OnGroupCheck"/>
-
-            <!-- DataGrid Styling -->
-            <TextBlock  Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"
-                        Text="Applied DataGrid Style: "/>
-            <ComboBox x:Name="styles" Grid.Row="1" Grid.Column="3" SelectedIndex="0" Width="225" VerticalAlignment="Center" Margin="5">
-               <ComboBoxItem Content="No Style" Tag="{StaticResource baseStyle}" />
-               <ComboBoxItem Content="Styled with yellow row background" Tag="{StaticResource coloredDataGridStyle}" />
-            </ComboBox>
-
-         </Grid>
-      </GroupBox>
-      <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-      <xcdg:MultiColumnComboBox x:Name="_combo" 
-                                Width="200" 
-                                HorizontalAlignment="Left" 
-                                AutoCreateColumns="False"
-                                ItemsSource="{Binding Source={StaticResource cvsOrder}}" 
-                                DataGridStyle="{Binding ElementName=styles, Path=SelectedItem.Tag}">
-         <xcdg:MultiColumnComboBox.Columns>
-            <xcdg:Column FieldName="OrderID" Title="Order ID" />
-            <xcdg:Column FieldName="CustomerID" Title="Customer ID" />
-            <xcdg:Column FieldName="ShipCountry" Title="Ship Country" CellContentTemplate="{StaticResource countryDataTemplate}"/>
-            <xcdg:Column FieldName="ShipCity" Title="Ship City" />
-         </xcdg:MultiColumnComboBox.Columns>
-         <xcdg:MultiColumnComboBox.ItemTemplate>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding OrderID}" />
-                  <TextBlock Margin="10,0,0,0"
-                             Text="{Binding CustomerID, StringFormat= ({0})}"/>
-               </StackPanel>
-            </DataTemplate>
-         </xcdg:MultiColumnComboBox.ItemTemplate>
-      </xcdg:MultiColumnComboBox>
-   </StackPanel>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MultiColumnsComboBox.png" Width="500" Height="300"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt
index 2ee57a64..c2fba5d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MultiLineTextEditorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt
index 7cd51930..ac9d417e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,7 @@
            The MultiLineTextEditor is a TextBox that allows you to edit text that is too long to display in a regular TextBox. The popup is resizable to accommodate any text.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <DataTemplate x:Key="multiLineTextEditorStyle" >
             <xctk:MultiLineTextEditor
@@ -38,7 +38,7 @@
                Height="24" />
         </DataTemplate>
     </local:DemoView.Resources>
-    
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt
index 96052e7f..3a973d11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/NumericView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt
index 274ad159..29e3ca18 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -35,7 +35,7 @@
             <Run>All these numeric types support the following properties.</Run>
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <x:Array x:Key="FormatStringComboBox" Type="numeric:FormatObject">
             <numeric:FormatObject Value="C2" DisplayValue="Currency" />
@@ -57,7 +57,7 @@
                 <x:Type TypeName="xctk:AllowedSpecialValues" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
-       
+
         <ObjectDataProvider x:Key="ButtonSpinnerLocationComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="xctk:Location" />
@@ -78,12 +78,12 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        
+
         <sys:String x:Key="allowInputSpecialValuesTooltip">Infinity and -Infinity input will not be accepted if Maximum and/or Minimum values does not allow them.</sys:String>
         <sys:String x:Key="parsingNumberStyleTooltip">HexNumber is not a valid choice when used with a DoubleUpDown (current control used in this sample). It will work with the following controls: IntegerUpDown, ByteUpDown, LongUpDown, and ShortUpDown.</sys:String>
 
     </local:DemoView.Resources>
-    
+
    <StackPanel>
       <Grid>
            <Grid.RowDefinitions>
@@ -115,7 +115,7 @@
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="125" />
                    </Grid.ColumnDefinitions>
-                   
+
                    <!-- 1st column -->
                    <TextBlock Text="Mouse Wheel:" Grid.Row="0" VerticalAlignment="Center" />
                    <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding MouseWheelActiveTrigger, ElementName=_doubleUpDown}" Margin="5" VerticalAlignment="Center" >
@@ -127,21 +127,21 @@
 
                    <TextBlock Text="Show Button Spinner:" Grid.Row="1" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding ShowButtonSpinner, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-                  
+
                    <TextBlock Text="Is Read Only:" Grid.Row="2" VerticalAlignment="Center" ToolTip="Prevent from using button spinners or editing text." />
                    <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding IsReadOnly, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
 
                    <TextBlock Text="Allow Spin:" Grid.Row="3" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding AllowSpin, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center"
                              IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-                  
+
                    <TextBlock Text="Allow TextInput:" Grid.Row="4" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding AllowTextInput, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center"
                              IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}"/>
-                  
+
                    <TextBlock Text="Clip Value to Min Max:" Grid.Row="5"  VerticalAlignment="Center" />
                    <CheckBox Grid.Row="5" Grid.Column="1" IsChecked="{Binding ClipValueToMinMax, ElementName=_doubleUpDown, Mode=TwoWay}" ClickMode="Press" Margin="5" VerticalAlignment="Center"/>
-                  
+
                    <TextBlock Text="DisplayDefaultValueOnEmptyText:" Grid.Row="6" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="6" Grid.Column="1" IsChecked="{Binding DisplayDefaultValueOnEmptyText, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
 
@@ -160,11 +160,11 @@
 
                    <TextBlock Grid.Column="2" Grid.Row="4" Text="Maximum" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <xctk:DoubleUpDown Grid.Column="3" Grid.Row="4" Value="{Binding Maximum, ElementName=_doubleUpDown}" AllowInputSpecialValues="PositiveInfinity" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
-     
+
                    <!-- 3rd column -->
                    <TextBlock Grid.Column="4" Text="ButtonSpinnerLocation:" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <ComboBox Grid.Column="5" ItemsSource="{Binding Source={StaticResource ButtonSpinnerLocationComboBox}}" SelectedValue="{Binding ButtonSpinnerLocation, ElementName=_doubleUpDown}" HorizontalAlignment="Stretch" Margin="5" />
-                  
+
                    <TextBlock Grid.Column="4" Grid.Row="1" Text="ParsingNumberStyle:" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <ComboBox Grid.Column="5" Grid.Row="1" ItemsSource="{Binding Source={StaticResource ParsingNumberStyleComboBox}}" SelectedValue="{Binding ParsingNumberStyle, ElementName=_doubleUpDown}" ToolTip="{StaticResource parsingNumberStyleTooltip}" HorizontalAlignment="Stretch" Margin="5" />
 
@@ -179,7 +179,7 @@
 
                    <TextBlock Text="Text:" Grid.Column="4" Grid.Row="5" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <TextBox Grid.Column="5" Grid.Row="5" Text="{Binding Text, ElementName=_doubleUpDown}" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
-                   
+
                    <!-- last rows -->
                    <TextBlock Text="(DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property)" Grid.Row="7" Grid.ColumnSpan="6" VerticalAlignment="Center" Margin="0,5,0,0"/>
                    <TextBlock Text="Allow Input Special Values:" VerticalAlignment="Center" Grid.Row="8" Grid.ColumnSpan="2"/>
@@ -210,11 +210,11 @@
                                   DefaultValue="10"
                                   Value="25" />
          </StackPanel>
-          
+
            <TextBlock Grid.Row="2" Margin="10,15,0,0"
                       Text="CalculatorUpDown is a DecimalUpDown with all the properties from a NumericUpDown. It provides a Calculator dropdown which allows you to perform mathematical calculations."
                       TextWrapping="Wrap" />
-          
+
            <GroupBox Header="CalculatorUpDown Features" Grid.Row="3" Margin="5,15,0,0">
                 <StackPanel Orientation="Horizontal" Margin="5" HorizontalAlignment="Left">
                     <TextBlock Text="Enter closes calculator:" VerticalAlignment="Center" />
@@ -223,7 +223,7 @@
                     <xctk:IntegerUpDown Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="{Binding Precision, ElementName=_calculatorUpDown}" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
                 </StackPanel>
             </GroupBox>
-          
+
            <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="10" HorizontalAlignment="Left">
              <TextBlock Text="CalculatorUpDown Usage:" Style="{StaticResource Header}" />
              <xctk:CalculatorUpDown x:Name="_calculatorUpDown"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt
index 3eba50ec..a07464e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PieChartView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
index 17cb2e39..6bfe94ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,8 +25,8 @@
             Obviously, the Pie control can be used to create a pie chart.
         </Paragraph>
     </local:DemoView.Description>
-    
-   
+
+
    <local:DemoView.Resources>
       <XmlDataProvider x:Key="XMLData">
          <x:XData>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt
index 23092687..1554aa94 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PieProgressView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt
index 176c6cb1..aacf2ed9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
             The Pie control properties can be animated to create various effects and controls like this circular progress bar.
         </Paragraph>
     </local:DemoView.Description>
-   
+
    <local:DemoView.Resources>
       <ControlTemplate x:Key="PieProgressTemplate"
                        TargetType="{x:Type ProgressBar}">
@@ -69,7 +69,7 @@
          </DoubleAnimationUsingKeyFrames>
       </Storyboard>
    </local:DemoView.Resources>
-   
+
    <local:DemoView.Triggers>
       <EventTrigger RoutedEvent="ButtonBase.Click"
                     SourceName="SimulateProgressButton">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt
index 9a1b8e2e..6a6d2329 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PieView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt
index 2185ead5..47684bc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,7 +25,7 @@
             The Pie shape is a WPF shape that represents a portion of an ellipse.  It is in the same shape as a slice of pie (hence the name).  More precisely, the Pie shape is represented as either a full ellipse (Slice = 1.0), nothing (Slice = 0.0), or an arc of an ellipse joined to its center by two line segments.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <xctk:ColorToSolidColorBrushConverter x:Key="colorConverter" />
    </local:DemoView.Resources>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt
index fd31a350..61624b9b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -37,140 +37,30 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views
 
     public PileFlowPanelView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.SharedEmployees;
-#endif
 
       InitializeComponent();
-#if !OPEN_SOURCE
-      _pileFlowPanel.PileFlowItemActivated += new Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowItemActivatedHandler( this.PileFlowItemActivated );
-      _pileFlowPanel.PileFlowItemDeactivated += new Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowItemDeactivatedHandler( this.PileFlowItemDeactivated );
-
-      ObservableCollection<Product> products = SampleDataProvider.GetProducts();
-      foreach( Product product in products )
-      {
-        this.AddImage( product );
-      }
-#endif
+
     }
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Event Handlers
 
-    private void PileFlowItemActivated( object sender, Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowActivationEventArgs e )
-    {
-      //# Modify the text label.
-      _pileFlowPanel.ContentLabel.Visibility = Visibility.Visible;
-      _pileFlowLabel.Text = e.Item.Element.Tag as string;
-
-      //# Enable the first PileFlowItem.
-      if( object.Equals( ( ( PileFlowItem )sender ).Element, _employeesPileFlowCard ) )
-      {
-        _employeeListBox.IsEnabled = true;
-      }
-    }
 
-    private void PileFlowItemDeactivated( object sender, EventArgs e )
-    {
-      //# Hide the text Label.
-      _pileFlowPanel.ContentLabel.Visibility = Visibility.Collapsed;
-      _pileFlowLabel.Text = null;
-
-      //# Enable the first PileFlowItem.
-      if( object.Equals( ( ( PileFlowItem )sender ).Element, _employeesPileFlowCard ) )
-      {
-        _employeeListBox.IsEnabled = false;
-      }
-    }
 
-    private void OnEmployeeButtonPress( object sender, EventArgs e )
-    {
-      Xceed.Wpf.Toolkit.MessageBox.Show( "Employee data has been saved.", "Employee", MessageBoxButton.OK, MessageBoxImage.Asterisk);
-    }
 
-    private void OnShowReflectionsClick( object sender, RoutedEventArgs e )
-    {
-      CheckBox checkBox = ( CheckBox )sender;
-      foreach( UIElement item in _pileFlowPanel.Children )
-      {
-        if( item is PileFlowCard )
-        {
-          (( PileFlowCard )item).ShowReflection = ( bool )checkBox.IsChecked;
-        }
-      }
-    }
 
-    private void OnBeginReflectionOpacityChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      this.ModifyReflection( sender, true );      
-    }
 
-    private void OnEndReflectionOpacityChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      this.ModifyReflection( sender, false );        
-    }
-    
-    #endregion
 
-#endif
+
+
+
 
     #region Implementation
 
-#if !OPEN_SOURCE
-    private void ModifyReflection( object sender, bool isBeginReflectionOpacity )
-    {
-      if( _pileFlowPanel != null )
-      {
-        DoubleUpDown opacity = ( DoubleUpDown )sender;
-        foreach( UIElement item in _pileFlowPanel.Children )
-        {
-          if( item is PileFlowCard )
-          {
-            PileFlowCard card = ( PileFlowCard )item;
-            double opacityValue = ( opacity.Value != null ) ? ( double )opacity.Value : 0d;
-            if( isBeginReflectionOpacity )
-            {
-              card.BeginReflectionOpacity = opacityValue;
-            }
-            else
-            {
-              card.EndReflectionOpacity = opacityValue;
-            }
-          }
-        }
-      }
-    }
 
-    private void AddImage( Product product )
-    {
-      BitmapImage imageSource = null;
-      byte[] imageBytes = product.Photo;
-      if( imageBytes != null )
-      {
-        Stream imageStream = new MemoryStream( imageBytes );
-        imageSource = new BitmapImage();
-        imageSource.BeginInit();
-        imageSource.CacheOption = BitmapCacheOption.OnLoad;
-        imageSource.StreamSource = imageStream;
-        imageSource.EndInit();
-
-        //# Use a border to delimit the photos
-        Border border = new Border();
-        border.BorderBrush = new SolidColorBrush( Colors.Black );
-        border.BorderThickness = new Thickness( 2 );        
-        border.Background = new ImageBrush( imageSource );
-
-        //# Use a PileFlowCard to use Reflection.
-        PileFlowCard card = new PileFlowCard();
-        card.Child = border;
-        card.Tag = product.ProductName;
-
-        _pileFlowPanel.Children.Add( card );
-      }
-    }
-#endif
+
+
+
 
     #endregion
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt
index dfd09d68..1dd5d9d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -31,308 +31,40 @@
             <LineBreak />
             <Run>
                 The PileFlowPanel class also contains a label that can be configured to display the PileFlowItem data via the property ContentLabel. When the PileFlowPanel has focus, this sample lets the arrow buttons or the mouse wheel modify the selection.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <Style TargetType="{x:Type Border}" x:Key="BorderStyle">
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderBrush">
-        <Setter.Value>
-          <SolidColorBrush Color="Black"/>
-        </Setter.Value>
-      </Setter>
-    </Style>
-      
-      <conv:SizeToIntegerConverter x:Key="SizeToIntegerConverter" />
-      <conv:FullNameStringConverter x:Key="FullNameStringConverter" />
-      
-      <SolidColorBrush x:Key="mouseOverBrush" Color="Blue" />
-      <SolidColorBrush x:Key="mouseOverLabelBrush" Color="LightBlue" />
-      <SolidColorBrush x:Key="normalLabelBrush" Color="Snow" />
-      
-      <DataTemplate x:Key="seriesTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-            <Rectangle x:Name="rect" RadiusX="5" RadiusY="5" Width="{Binding Path=W}" Height="{Binding Path=H}" Fill="{Binding Path=Interior}">
-               <Rectangle.Triggers>
-                  <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="rect" Storyboard.TargetProperty="Fill">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource mouseOverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-                  
-                  <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="rect" Storyboard.TargetProperty="Fill">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{Binding Path=Interior}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-               </Rectangle.Triggers>
-            </Rectangle>
-			</Canvas>
-		</DataTemplate>
-      
-       <DataTemplate x:Key="LabelTemplate">
-			<Border x:Name="border" DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4" Background="{StaticResource normalLabelBrush}">
-			   <Border.BorderBrush>
-				   <SolidColorBrush Color="Black"/>
-			   </Border.BorderBrush>
-
-			   <TextBlock FontFamily="Sans Serif" FontSize="12" Margin="2,2,2,1"
-			     HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-				   <TextBlock.Foreground>
-					   <SolidColorBrush Color="Navy"/>
-				   </TextBlock.Foreground>
-			   </TextBlock>
-            
-            <Border.Triggers>
-                  <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="Background">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource mouseOverLabelBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-                  
-                  <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="Background">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource normalLabelBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-               </Border.Triggers>
-		   </Border>
-		</DataTemplate>
-      
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto" />
-         <ColumnDefinition Width="*"/>
-      </Grid.ColumnDefinitions>
-
-      <GroupBox Header="PileFlowPanel Features" Grid.Row="0" Margin="0,5,0,5">
-         <Grid Margin="0,5,5,5" HorizontalAlignment="Left">
-            <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="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column -->
-            <TextBlock Text="Content Label Offset Y: " VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Column="1" Minimum="-150" Maximum="170" Value="{Binding ContentLabelOffsetY, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Content Label Size X: " Grid.Row="1" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="500" Value="{Binding ContentLabelSize, ElementName=_pileFlowPanel, Converter={StaticResource SizeToIntegerConverter}, ConverterParameter=width}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Content Label Size Y: " Grid.Row="2" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="500" Value="{Binding ContentLabelSize, ElementName=_pileFlowPanel, Converter={StaticResource SizeToIntegerConverter}, ConverterParameter=height}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Animation Duration: " Grid.Row="3" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" Minimum="0" Maximum="3000" Increment="10" Value="{Binding AnimationDuration, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Last Move decelarion Ratio: " Grid.Row="4" VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" FormatString="N1" Minimum="0" Maximum="1" Increment="0.1" Value="{Binding LastMoveDecelerationRatio, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Center Offset X " Grid.Row="5" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="5" Grid.Column="1" Minimum="0" Maximum="300" Increment="2" Value="{Binding CenterOffsetX, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 2nd column -->            
-            <TextBlock Text="Flow Items Count: " Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Column="3" Minimum="1" Value="{Binding FlowItemsCount, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Items Ratio: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding FlowItemRatio, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Item Width: " Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="2" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding ItemWidth, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Item Height: " Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding ItemHeight, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Offset X " Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="4" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding FlowOffsetX, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Offset Y " Grid.Row="5" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="5" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding FlowOffsetY, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-          </Grid>
-      </GroupBox>
-      
-      <GroupBox Header="PileFlowCard Features" Grid.Row="0" Grid.Column="1" Margin="0,5,2,5">
-         <Grid Margin="0,5,2,5" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Show Reflection: " VerticalAlignment="Center" />
-            <CheckBox x:Name="_showReflection" Grid.Column="1" IsChecked="True" Click="OnShowReflectionsClick" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-            <TextBlock Text="Begin Reflection Opacity: " Grid.Row="1" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="1" Increment="0.02" AllowInputSpecialValues="None" Value="0.58" ValueChanged="OnBeginReflectionOpacityChanged" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-            <TextBlock Text="End Reflection Opacity: " Grid.Row="2" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="1" Increment="0.02" AllowInputSpecialValues="None" Value="0" ValueChanged="OnEndReflectionOpacityChanged" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-         </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" />
-
-      <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Visible" CanContentScroll="true">
-         <!-- For MVVM : An ItemsControl can be used :
-         <ItemsControl ItemsSource="{Binding TheItems}">
-            <ItemsControl.ItemsPanel>
-               <ItemsPanelTemplate>
-                  <xctk:PileFlowPanel />
-               </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-         </ItemsControl>-->
-         <xctk:PileFlowPanel x:Name="_pileFlowPanel" 
-                              MinHeight="175"
-                              ContentLabelOffsetY="100" 
-                              ContentLabelSize="200,28" 
-                              AnimationDuration="1000" 
-                              LastMoveDecelerationRatio="0.6" 
-                              FlowItemsCount="6" 
-                              FlowItemRatio="70" 
-                              ItemWidth="200" 
-                              ItemHeight="200" 
-                              FlowOffsetX="20" 
-                              FlowOffsetY="20" 
-                              CenterOffsetX="30">
-            <xctk:PileFlowPanel.ContentLabel>
-               <Border Background="#ffff50" DockPanel.Dock="Left" Style="{StaticResource BorderStyle}">
-                  <TextBlock x:Name="_pileFlowLabel" Margin="0,5,0,0" TextAlignment="Center" />
-
-                  <Border.BitmapEffect>
-                     <DropShadowBitmapEffect />
-                  </Border.BitmapEffect>
-
-               </Border>
-            </xctk:PileFlowPanel.ContentLabel>
-
-            <xctk:PileFlowCard x:Name="_employeesPileFlowCard" Tag="Employees">
-               <StackPanel>
-                  <TextBlock Text="List of Employees" TextAlignment="Center" />
-                  <xctk:CheckListBox x:Name="_employeeListBox" ItemsSource="{Binding}" DisplayMemberPath="LastName" />
-               </StackPanel>
-            </xctk:PileFlowCard>
-
-            <xctk:PileFlowCard>
-               <xctk:PileFlowCard.Tag>
-                  <MultiBinding Converter="{StaticResource FullNameStringConverter}">
-                     <Binding Path="[0].FirstName" />
-                     <Binding Path="[0].LastName" />
-                  </MultiBinding>
-               </xctk:PileFlowCard.Tag>
-               <Border Background="Beige">
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="Auto" />
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-
-                     <Image Grid.RowSpan="5" Source="{Binding Path=[0].Photo}" VerticalAlignment="Center" />
-                     <TextBlock Grid.Column="1" Text="{Binding Path=[0].FirstName}" />
-                     <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=[0].LastName}" />
-                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=[0].Title}" />
-                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=[0].Title}" />
-                     <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=[0].HomePhone}" />
-                     <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=[0].Address}" />
-                     <TextBlock Grid.Row="5" Grid.ColumnSpan="2" Text="This employee has been working at IBM since March 10, 1999." TextWrapping="Wrap" />
-                     <Button Grid.Row="6" Grid.ColumnSpan="2" Content="Save" Width="75" Click="OnEmployeeButtonPress" />
-                  </Grid>
-               </Border>
-            </xctk:PileFlowCard>
-
-            <xctk:PileFlowCard Tag="sale's price relative to distance">
-               <Border Background="LightGray">
-                  <xctk:Chart>
-                     <xctk:Chart.Legend>
-                        <xctk:Legend Visibility="Collapsed" />
-                     </xctk:Chart.Legend>
-                     <xctk:Chart.Areas>
-                        <xctk:Area>
-                           <xctk:Area.XAxis>
-                              <xctk:Axis AxisLabelsLayout="ShowToFit" ShowAxisLabel="False" LabelTemplate="{StaticResource LabelTemplate}"/>
-                           </xctk:Area.XAxis>
-                           <xctk:Area.YAxis>
-                              <xctk:Axis AxisLabelsLayout="ShowToFit" ShowAxisLabel="False" LabelTemplate="{StaticResource LabelTemplate}"/>
-                           </xctk:Area.YAxis>
-                           <xctk:Area.Series>
-                              <xctk:Series DefaultInterior="Red" Template="{StaticResource seriesTemplate}">
-                                 <xctk:Series.DataPoints>
-                                    <xctk:DataPoint X="125" Y="6" />
-                                    <xctk:DataPoint X="150" Y="7" />
-                                    <xctk:DataPoint X="50" Y="4" />
-                                    <xctk:DataPoint X="25" Y="2" />
-                                 </xctk:Series.DataPoints>
-                                 <xctk:Series.Layout>
-                                    <xctk:ColumnLayout />
-                                 </xctk:Series.Layout>
-                              </xctk:Series>
-                           </xctk:Area.Series>
-                        </xctk:Area>
-                     </xctk:Chart.Areas>
-                  </xctk:Chart>
-               </Border>
-            </xctk:PileFlowCard>
-
-         </xctk:PileFlowPanel>
-      </ScrollViewer>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\PileFlowPanel.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt
index 74968e63..20a2b7d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -34,7 +34,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridAttributesView()
     {
       InitializeComponent();
-      
+
       var person = new Man();
       person.FirstName = "John";
       person.LastName = "Doe";
@@ -53,9 +53,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
   [CategoryOrder("Information", 0)]
   [CategoryOrder( "Conections", 1 )]
   [CategoryOrder( "Other", 2 )]
-#if !OPEN_SOURCE
-  [ExpandedCategory( "Conections", false )]
-#endif
   public abstract class Person : INotifyPropertyChanged
   {
     // All properties have their own "[Category(...)]" attribute to specify which category they
@@ -69,9 +66,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
     [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
-#if !OPEN_SOURCE
-    [DependsOn( "IsMale" )]
-#endif
     public string FirstName
     {
       get{ return _firstName; }
@@ -122,7 +116,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public string NameInParentheses { get; set; }
 
     [Category( "Other" )]
-    //# TODODOC
     [Description( "This property uses the [Browsable(false)] attribute to not display the property" )]
     [BrowsableAttribute( false )]
     public string InvisibleProperty
@@ -134,7 +127,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [Range(0d, 10d)]
     [Category( "Other" )]
     [DefaultValue(5d)]
-    //# TODODOC
     [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )]
     public double RangeDouble
     {
@@ -191,36 +183,16 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
   {
     public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
     {
-#if !OPEN_SOURCE
-      ComboBox comboBox = new ComboBox();
-      if( ( ( Person )propertyItem.Instance ).IsMale )
-      {
-        comboBox.Foreground = new SolidColorBrush( Colors.Green );
-        comboBox.ItemsSource = new List<string>() {"Tom", "Mark", "Bryan"};
-      }
-      else
-      {
-        comboBox.Foreground = new SolidColorBrush( Colors.Red );
-        comboBox.ItemsSource = new List<string>() { "Jane", "Christine", "Kathy" };
-      }
-      comboBox.SelectedIndex = 0;
-#else
       TextBox textBox = new TextBox();
       textBox.Background = new SolidColorBrush( Colors.Red );
-#endif
       //create the binding from the bound property item to the editor
       var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
       _binding.Source = propertyItem;
       _binding.ValidatesOnExceptions = true;
       _binding.ValidatesOnDataErrors = true;
       _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-#if !OPEN_SOURCE
-      BindingOperations.SetBinding( comboBox, ComboBox.SelectedItemProperty, _binding );
-      return comboBox;
-#else
       BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
       return textBox;
-#endif
     }
   }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt
index 117bcf15..6ef4390a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -71,7 +71,7 @@
          LocalizedDescriptionAttribute
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -89,11 +89,11 @@
                     FontStyle="Italic"
                     Margin="0,10,0,0"/>
       </StackPanel>
-      
+
       <xctk:PropertyGrid Grid.Row="1" x:Name="_propertyGrid" Width="450" MaxHeight="650" Margin="10" 
                          SelectedObject="{Binding}"
                          ShowDescriptionByTooltip="True">
       </xctk:PropertyGrid>      
-      
+
    </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt
index b5309292..22a7de24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridBindingToStructsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt
index 58ddc60d..83832349 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -31,13 +31,13 @@
    <local:DemoView.Resources>
       <conv:DimensionsConverter x:Key="DimensionsConverter" />
    </local:DemoView.Resources>
-   
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
          <RowDefinition Height="*" />
       </Grid.RowDefinitions>
-      
+
       <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
       <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="450" MaxHeight="250" Margin="10">
          <xctk:PropertyGrid.EditorDefinitions>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt
index 0e377dc8..b3668f36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridCategoryOrderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
index 4db4c1c0..9a3728a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -31,7 +31,7 @@
             <Run>The PropertyGrid on the right uses the CategoryOrder attribute to order the categories in the desired order.</Run>
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="*" />
@@ -43,7 +43,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
          </Grid.RowDefinitions>
-         
+
          <TextBlock Text="Non-Ordered Categories:" FontSize="16" FontWeight="Bold" HorizontalAlignment="Stretch" Margin="10"/>
          <xctk:PropertyGrid x:Name="_propertyGrid1" Grid.Row="1" Width="290" MaxHeight="350" VerticalAlignment="Top" Margin="10"/>
       </Grid>
@@ -53,7 +53,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
          </Grid.RowDefinitions>
-         
+
          <TextBlock Grid.Column="1" Text="Ordered Categories:" FontSize="16" FontWeight="Bold" Margin="10"/>
          <xctk:PropertyGrid x:Name="_propertyGrid2" Grid.Row="1" Grid.Column="1" Width="290" MaxHeight="350" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"/>
       </Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt
index 016cd6f2..26d73f2c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridCustomEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt
index 0f831a45..50b13b1b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,7 @@
             This example demonstrates the various methods of assigning custom editors to the properties. You can supply your own editor DataTemplate based on a Type, a property name, or both. To supply your own editor for a property, you must create an EditorDefinition for the PropertyGrid.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -56,7 +56,7 @@
                         <TextBox Background="Green"  Text="{Binding Value}" />
                         <!-- 
                         When using SelectedObject[s] bind to the "Value" property 
-                        
+
                         When using PropertiesSource or Properties to specify your items,
                         your DataContext will be the item itself, so bind directly to the 
                         property of your underlying item, hence, probably the same path as 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt
index b9f09590..b55e83c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -35,16 +35,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     }
   }
 
-#if !OPEN_SOURCE
-  public struct Coords
-  {
-    public int X { get; set; }
-    public int Y { get; set; }
 
-    public override string ToString()
-    {
-      return string.Format( "{0}, {1}", X, Y );
-    }
-  }
-#endif
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt
index 55a64317..9d5be674 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,10 +22,10 @@
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Custom Properties">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
-         <!--##INCLUDE_OPEN_SOURCE
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,25 +33,19 @@
             <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>
-        ##END-->           
-      </Paragraph>
-    </local:DemoView.Description>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      <StackPanel Grid.Row="0" Margin="10">
-         <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
-                    TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
-      </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <StackPanel Grid.Row="0"
+                Margin="10">
+      <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
+                 TextWrapping="Wrap" />
+    </StackPanel>
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -60,57 +54,10 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-<!--##EXCLUDE_OPEN_SOURCE-->
-      <!-- 
-      No assignement of either PropertyNameBinding or PropertyValueBinding. CustomProperties
-      will each have all the values directly set.
-      -->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="350" MaxHeight="280">
-         <xctk:PropertyGrid.EditorDefinitions>
-            <xctk:EditorTextDefinition TargetProperties="firstName,lastName" 
-                                       FontWeight="Bold" 
-                                       FontStyle="Italic"/>
-         </xctk:PropertyGrid.EditorDefinitions>
-         <xctk:PropertyGrid.Properties>
-            <!--Use CustomPropertyItem to control each of their characteristics. -->
-            <!--Here we specify a DefinitionKey to assign a specific CUSTOM editor. -->
-            <xctk:CustomPropertyItem DisplayName="First Name" Value="Nancy" Category="Name"
-                                     DefinitionKey="firstName" />
-            <xctk:CustomPropertyItem DisplayName="Last Name" Value="Davolio" Category="Name"
-                                     DefinitionKey="lastName"/>
 
-            <!-- Here we specify a DefinitionKey to assign a specific DEFAULT editor. -->
-            <!-- Since the XAML parser will parse "29" as a string, the TypeConverter defined
-            on Int32 struct will automatically make the conversion. -->
-            <xctk:CustomPropertyItem DisplayName="Age" Value="29" Category="Other"
-                                     DefinitionKey="{x:Type s:Int32}" />
-            
-            <!-- For thoses values where no TypeConverter supporting strings is defined, you must
-            use property element syntax to define the value. -->
-            <xctk:CustomPropertyItem DisplayName="Coordinates" Category="Other" 
-                                     Description="Location on the state map">
-               <xctk:CustomPropertyItem.Value>
-                  <v:Coords X="12" Y="15"/>
-               </xctk:CustomPropertyItem.Value>
-            </xctk:CustomPropertyItem>
 
-            <!--Here we define a specific editor directly. No value -->
-            <xctk:CustomPropertyItem DisplayName="Picture" Category="Other">
-               <xctk:CustomPropertyItem.Editor>
-                  <Image Source="/Samples/PropertyGrid/Resources/woman.png" 
-                         Stretch="None"
-                         HorizontalAlignment="Left"/>
-               </xctk:CustomPropertyItem.Editor>
-            </xctk:CustomPropertyItem>
-            
-         </xctk:PropertyGrid.Properties>
-         
-         <!-- You must specify that the grouping is based on the value of "Category" property. -->
-         <xctk:PropertyGrid.CategoryGroupDescription>
-            <PropertyGroupDescription PropertyName="Category"/>
-         </xctk:PropertyGrid.CategoryGroupDescription>
-      </xctk:PropertyGrid>
-<!--##END-->      
-   </Grid>      
+
+
+
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt
index 645b28ca..75bd2ed0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -64,9 +64,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       selectedObject.UInt16 = (ushort)9;
       selectedObject.UInt32 = (uint)10;
       selectedObject.UInt64 = (ulong)11;
-#if !OPEN_SOURCE
-      selectedObject.File = new FileInfo( "c:\\MyFile.txt" );
-#endif
 
       this.DataContext = selectedObject;
     }
@@ -146,11 +143,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a Char as the default editor." )]
       public Char Char { get; set; }
-#if !OPEN_SOURCE
-      [Category( "Non-Numeric Editors" )]
-      [Description( "This property uses a FilePicker as the default editor." )]
-      public FileInfo File { get; set; }
-#endif
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
       public List<string> ListOfStrings { get; set; }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
index 27f54865..9ec0fdf4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,7 +28,7 @@
            IList&lt;T&gt; (primtive type), IList&lt;T&gt; (custom type),
       </Paragraph>
     </local:DemoView.Description>
-   
+
    <DockPanel>
       <TextBlock DockPanel.Dock="Top" 
                  Text="Click on each property and see the description for details on the underlying editor."
@@ -36,5 +36,5 @@
       <xctk:PropertyGrid x:Name="_propertyGrid" SelectedObject="{Binding}"  Width="450" Margin="10,30,0,0" />
    </DockPanel>
 
-   
+
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt
index 99e498eb..909af452 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,26 +28,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridDefinitionKeyView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE      
-      var person = new Person();
-      person.FirstName = "John";
-      person.LastName = "Smith";
-      person.ReferenceNo = 252521;
-
-      this.DataContext = person;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private class Person
-    {
-      [DefinitionKey( "nameType" )]
-      public string FirstName { get; set; }
-      [DefinitionKey( "nameType" )]
-      public string LastName { get; set; }
-      [DefinitionKey( typeof( int? ) )]
-      public object ReferenceNo { get; set; }
     }
-#endif
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt
index bc18056b..8a04084b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,7 +32,6 @@
          <LineBreak/>
          <LineBreak/>
            It can also be used to specify a specific default editor when a property type does not resolve to a valid editor (e.g., Object).
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -40,7 +39,6 @@
             <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>
-        ##END-->
       </Paragraph>
     </local:DemoView.Description>
 
@@ -56,13 +54,7 @@
          <TextBlock Text="The ReferenceNo property, declare a DefinitionKey to 'int?' to displayed the content with a IntegerUpDown dispite it's type is 'object'" 
                     TextWrapping="Wrap"
                     Margin="0,0,0,10"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click XAML and Code tabs to see details)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -73,15 +65,5 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" HorizontalAlignment="Stretch" Width="350" MaxHeight="200"
-                         SelectedObject="{Binding}">
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- This EditorDefinition will be used for FirstName and LastName -->
-            <xctk:EditorTextDefinition TargetProperties="nameType" FontStyle="Italic" FontWeight="Bold" />
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
    </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt
index e4eddcbd..0d9c5818 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,9 +20,6 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Core.Attributes;
-#endif
 using Xceed.Wpf.Toolkit.Core;
 using System.Windows.Controls;
 using System.Globalization;
@@ -41,90 +38,16 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridDisplayLocalizationView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var person = new Person();
-      person.FirstName = "John";
-      person.LastName = "Doe";
-      person.FavoriteActor1 = ActorNoDisplayName.billcosby;
-      person.FavoriteActor2 = ActorWithDisplayName.bradpitt;
-      person.FavoriteActor3 = ActorWithDisplayName.NotInThisList;
-
-      _propertyGrid.SelectedObject = person;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private void ComboBox_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
-    {
-      DisplayLocalizationRes.Culture = object.Equals(( ( ComboBox )sender ).SelectedItem,"French" )
-        ? new CultureInfo( "fr" )
-        : CultureInfo.InvariantCulture;
-
-      // This will refresh the PropertyGrid.
-      if( _propertyGrid != null )
-      {
-        var selected = _propertyGrid.SelectedObject;
-        _propertyGrid.SelectedObject = null;
-        _propertyGrid.SelectedObject = selected;
-      }
     }
 
-    public enum ActorNoDisplayName
-    {
-      alpacino,
-      arnoldschwarzenegger,
-      benaffleck,
-      billcosby,
-      bradpitt,
-      NotInThisList
-    };
-
-    [TypeConverter(typeof(EnumDisplayNameConverter))]
-    public enum ActorWithDisplayName
-    {
-      [ExtendedDisplayName( "Al Pacino" )]
-      alpacino,
-      [ExtendedDisplayName( "Arnold Schwarzenegger" )]
-      arnoldschwarzenegger,
-      [ExtendedDisplayName( "Ben Affleck" )]
-      benaffleck,
-      [ExtendedDisplayName( "Bill Cosby" )]
-      billcosby,
-      [ExtendedDisplayName( "Brad Pitt" )]
-      bradpitt,
-      [LocalizedDisplayName( "NotListed", typeof(DisplayLocalizationRes) )]
-      NotInThisList
-    };
-
-    [CategoryOrder( "InfoCategory", 1 )]
-    [CategoryOrder( "DetailsCategory", 2 )]
-    public class Person
-    {
-      [LocalizedDisplayName( "FirstName", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FirstNameDesc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "InfoCategory", typeof( DisplayLocalizationRes ) )]
-      public string FirstName { get; set; }
-
-      [LocalizedDisplayName( "LastName", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "LastNameDesc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "InfoCategory", typeof( DisplayLocalizationRes ) )]
-      public string LastName { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor1", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor1Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorNoDisplayName FavoriteActor1 { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor2", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor2Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorWithDisplayName FavoriteActor2 { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor3", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor3Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorWithDisplayName FavoriteActor3 { get; set; }
-    }
-#endif
+
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt
index 3bf1112b..2d1e7504 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -31,46 +31,17 @@
             <Run>LocalizedDisplayName, LocalizedDescription, LocalizedCategory:</Run>
             <LineBreak/>
             <Run>Theses attributes allow to easily localize the DisplayName, Description, and Category attributes values using standard Resx resource files.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      
-      <TextBlock Text="In this sample, the properties names and descriptions where localized.&#x0a;Select 'Favorite Actor' properties and see description:" />
-      <Grid Grid.Row="1" VerticalAlignment="Top">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-         
-         <StackPanel Orientation="Horizontal" Margin="30" Width="450" Height="22">
-            <TextBlock Text="Language:" Margin="0,0,5,30" />
-            <ComboBox SelectionChanged="ComboBox_SelectionChanged" SelectedIndex="0" Width="150">
-               <ComboBox.Items>
-                  <s:String>English (Default)</s:String>
-                  <s:String>French</s:String>
-               </ComboBox.Items>
-            </ComboBox>
-         </StackPanel>
-         <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" NameColumnWidth="250" Width="450" MaxHeight="280" />
-      </Grid>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
     <Image Source="..\OpenSourceImages\Localization.png" Width="400" Height="300"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt
index 57a3a257..eee49ab8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,58 +32,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridEditorDefinitionsView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var selectedObject = new EditorDefinitionsSampleObject();
-      selectedObject.Boolean = true;
-      selectedObject.Color = Colors.Red;
-      selectedObject.ColorCombo = Colors.Blue;
-      selectedObject.DateTime = System.DateTime.Now;
-      selectedObject.Int32 = 42;
-      selectedObject.PersonTemplate = new Person() { FirstName = "John", LastName = "Smith" };
-      selectedObject.String = "This is a string";
-      selectedObject.StringCombo = "String Value 1";
-      selectedObject.File = new FileInfo("MyFile.txt");
 
-      this.DataContext = selectedObject;
-#endif
     }
 
-#if !OPEN_SOURCE
-    public class EditorDefinitionsSampleObject
-    {
-      [PropertyOrder( 0 )]
-      public string String { get; set; }
-      [PropertyOrder( 1 )]
-      public bool Boolean { get; set; }
-      [PropertyOrder( 2 )]
-      public int Int32 { get; set; }
-      [PropertyOrder( 3 )]
-      public System.DateTime DateTime { get; set; }
-      [PropertyOrder( 4 )]
-      public System.Windows.Media.Color? Color { get; set; }
-      [PropertyOrder( 5 )]
-      public string StringCombo { get; set; }
-      [PropertyOrder( 6 )]
-      public System.Windows.Media.Color? ColorCombo { get; set; }
-      [PropertyOrder( 7 )]
-      public Person PersonTemplate { get; set; }
-      [PropertyOrder( 8 )]
-      public FileInfo File { get; set; }
-    }
 
-    public class Person
-    {
-      public string FirstName { get; set; }
-      public string LastName { get; set; }
-    }
-#endif
-  }
-#if !OPEN_SOURCE
-  public class ColorSampleItem
-  {
-    public System.Windows.Media.Color? Color { get; set; }
-    public string DisplayString { get; set; }
   }
-#endif
 
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt
index d19de312..aaa65396 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,28 +24,10 @@
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Ready-to-use EditorDefinitions">
-<!--##EXCLUDE_OPEN_SOURCE-->   
-   <local:DemoView.Resources>
-      
-      <x:Array x:Key="comboSource1" Type="s:String" >
-         <s:String>String Value 1</s:String>
-         <s:String>String Value 2</s:String>
-         <s:String>String Value 3</s:String>
-      </x:Array>
-
-      <x:Array x:Key="comboSource2" Type="s:Object" >
-         <v:ColorSampleItem Color="{x:Null}" DisplayString="(No color selected)"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Red}" DisplayString="Red Color"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Green}" DisplayString="Green Color"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Blue}" DisplayString="Blue Color"/>
-      </x:Array>
-      
-      <Style x:Key="textBoxStyle" TargetType="TextBox">
-         <Setter Property="Background" Value="LightBlue"/>
-      </Style>
-      
-   </local:DemoView.Resources>
-<!--##END-->   
+
+
+
+
    <local:DemoView.Description>
       <Paragraph FontSize="14" FontFamily="Segoe">
          Using the various EditorDefinitions provided with the PropertyGrid, you can easily customize and reuse the existing default editor to suit your needs. Style the editing element or use one of the common properties directly provided on the editor definition class. The provided editor definitions are the following:
@@ -72,7 +54,6 @@
          EditorIntegerUpDownDefinition
          <LineBreak />
          EditorDoubleUpDownDefinition
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
          <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -80,7 +61,6 @@
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->
          etc.
       </Paragraph>
    </local:DemoView.Description>
@@ -89,13 +69,7 @@
       <StackPanel DockPanel.Dock="Top">
          <TextBlock Text="Each of the displayed properties has their display or behavior affected by an different EditorDefinition "
                  TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click XAML and Code tabs to see details)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
          <StackPanel>
@@ -103,72 +77,13 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->      
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      <xctk:PropertyGrid x:Name="_propertyGrid" SelectedObject="{Binding}"  Width="450" MaxHeight="320" Margin="10" >
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- 
-            Only the "integer" is demonstrated here. 
-            But all other numeric types are also supported (eg. EditorDoubleUpDownDefinition, etc.)  
-            -->
-            <xctk:EditorIntegerUpDownDefinition TargetProperties="{x:Type s:Int32}" 
-                                                TextAlignment="Right" />
-            <!-- CheckBox -->
-            <xctk:EditorCheckBoxDefinition TargetProperties="{x:Type s:Boolean}" 
-                                           IsThreeState="True" />
-
-            <!-- ColorPicker -->
-            <xctk:EditorColorPickerDefinition TargetProperties="{x:Type sm:Color}" 
-                                              DisplayColorAndName="False" 
-                                              ShowDropDownButton="False"/>
-
-            <!-- FilePicker -->
-            <xctk:EditorFilePickerDefinition TargetProperties="{x:Type sys:FileInfo}"
-                                             Filter="Text file | *.txt"
-                                             Title="Select your file"/>
-
-            <!-- DateTimeUpDown -->
-            <xctk:EditorDateTimeUpDownDefinition TargetProperties="{x:Type s:DateTime}" 
-                                                 Format="Custom" 
-                                                 FormatString="yyyy-MM" />
-
-            <!-- TextBox -->
-            <!-- On any EditorDefintion, you can use the "EditingElementStyle" to have a more complete customization 
-            of the underlying editor -->
-            <xctk:EditorTextDefinition TargetProperties="{x:Type s:String}" 
-                                       FontStyle="Italic" 
-                                       FontWeight="Bold" 
-                                       EditingElementStyle="{StaticResource textBoxStyle}" />
-
-            <!-- ComboBox (simple) -->
-            <!-- When using SelectedObject[s], the DataContext will be the PropertyItem. Bind to the "Value" property. -->
-            <xctk:EditorComboBoxDefinition TargetProperties="StringCombo"
-                                           ItemsSource="{StaticResource comboSource1}"
-                                           SelectedItemBinding="{Binding Value}" />
-
-            <!-- ComboBox (complex) -->
-            <xctk:EditorComboBoxDefinition TargetProperties="ColorCombo"
-                                           ItemsSource="{StaticResource comboSource2}"
-                                           DisplayMemberPath="DisplayString"
-                                           SelectedValuePath="Color"
-                                           SelectedValueBinding="{Binding Value}" />
-
-            <!-- Custom DataTemplate -->
-            <xctk:EditorTemplateDefinition TargetProperties="PersonTemplate">
-               <xctk:EditorTemplateDefinition.EditingTemplate>
-                  <DataTemplate>
-                     <StackPanel Orientation="Horizontal">
-                        <!-- When using SelectedObject[s], the DataContext will be the PropertyItem. Bind to the "Value" property. -->
-                        <TextBlock Text="{Binding Value.LastName}" FontWeight="Bold" />
-                        <TextBlock Text=", " />
-                        <TextBlock Text="{Binding Value.FirstName}" />
-                     </StackPanel>
-                  </DataTemplate>
-               </xctk:EditorTemplateDefinition.EditingTemplate>
-            </xctk:EditorTemplateDefinition>
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
+
+
+
+
+
+
+
    </DockPanel>
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt
index 33f86311..dad71a07 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -13,7 +13,7 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ************************************************************************************/
-  
+
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
@@ -28,185 +28,24 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     {
       InitializeComponent();
 
-#if !OPEN_SOURCE
-      var supervisor = new Supervisor()
-      {
-        Name = "Micheal Jones",
-        Department = DepartmentEnum.Production,
-        Managers = new List<Manager>()
-        {
-          new Manager()
-          {
-            Name = "Ken Clark",
-            Skills = "Negociation",
-            Workers = new ObservableCollection<Worker>()
-            {
-              new Worker()
-              {
-                Name = "Martina Kanes",
-                YearExperience = 5
-              },
-              new Worker()
-              {
-                Name = "Kelly Stewart",
-                YearExperience = 3
-              },
-              new Worker()
-              {
-                Name = "Mark Applebum",
-                YearExperience = 7
-              }
-            }
-          },
-          new Manager()
-          {
-            Name = "Julia Benetton",
-            Skills = "Creative",
-            Workers = new ObservableCollection<Worker>()
-            {
-              new Worker()
-              {
-                Name = "John Quick",
-                YearExperience = 1
-              },
-              new Worker()
-              {
-                Name = "Martha Adrian",
-                YearExperience = 2
-              },
-              new Worker()
-              {
-                Name = "Kevin Stevens",
-                YearExperience = 5
-              }
-            }
-          }
-        },
-        Info = new Info()
-        {
-          Address = "64 Main Street",
-          City = "New York",
-          Country = "USA",
-          Phone = "1-800-555-9636"
-        }
-      };
-
-      this.DataContext = supervisor;
-#endif
+
     }
   }
 
-#if !OPEN_SOURCE
-  public enum DepartmentEnum
-  {
-    Production,
-    Marketing,
-    Sales,
-    Accounting
-  }
 
-  public class Supervisor
-  {
-    public string Name
-    {
-      get;
-      set;
-    }
 
-    public DepartmentEnum Department
-    {
-      get;
-      set;
-    }
 
-    public List<Manager> Managers
-    {
-      get;
-      set;
-    }
 
-    public Info Info
-    {
-      get;
-      set;
-    }
-  }
 
-  public class Manager
-  {
-    public string Name
-    {
-      get;
-      set;
-    }
 
-    public string Skills
-    {
-      get;
-      set;
-    }
 
-    public ObservableCollection<Worker> Workers
-    {
-      get;
-      set;
-    }
 
-    public override string ToString()
-    {
-      return this.Name;
-    }
-  }
 
-  public class Worker
-  {
-    public string Name
-    {
-      get;
-      set;
-    }
 
-    public int YearExperience
-    {
-      get;
-      set;
-    }
 
-    public override string ToString()
-    {
-      return this.Name;
-    }
-  }
 
-  public class Info
-  {
-    public string Address
-    {
-      get;
-      set;
-    }
 
-    public string Phone
-    {
-      get;
-      set;
-    }
 
-    public string City
-    {
-      get;
-      set;
-    }
 
-    public string Country
-    {
-      get; set;
-    }
 
-    public override string ToString()
-    {
-      return "Info";
-    }
-  }
-#endif
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt
index 6fd7f912..677711f1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,72 +22,24 @@
                 VerticalScrollBarVisibility="Disabled"
                 Title="PropertyGrid">
    <local:DemoView.Description>
-      <!-- //# TODODOC -->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          The PropertyGrid allows you to expand non-primitive type properties from the SelectedObject to view or edit their sub-properties. It also allows you to expand collections or lists properties to view their items and drill down on these items properties, directly from the propertyGrid, instead of passing by the CollectionEditor.
-         <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
 
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
 
-            <!-- 1st column-->
-            <TextBlock Text="Is Expanding Non Primitive Types:"
-                       VerticalAlignment="Center" />
-            <!-- //# TODODOC -->
-            <CheckBox Grid.Column="1"
-                      IsChecked="{Binding IsExpandingNonPrimitiveTypes, ElementName=_propertyGrid}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Expand the the non-primitive type properties on the SelectedObject." />
-         </Grid>
-      </GroupBox>
 
-      <DockPanel Grid.Row="1"
-                 Margin="10">
 
-         <TextBlock DockPanel.Dock="Top"
-                    Text="Usage:"
-                    Style="{StaticResource Header}" />
-        
-         <Grid Margin="10">
-            <xctk:PropertyGrid x:Name="_propertyGrid"
-                                 SelectedObject="{Binding}"
-                                 IsExpandingNonPrimitiveTypes="True"
-                                 Width="500"
-                                 MaxHeight="650" />
-            
-         </Grid>
-      </DockPanel>
-   </Grid>
-   <!--##END-->
 
-   <!--##INCLUDE_OPEN_SOURCE
+
+
     <Image Source="..\OpenSourceImages\ExpandingNonPrimitives.png" Width="660" Height="430"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt
index e7a31ea8..71f78f25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -39,9 +39,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridMultiSelectedObjectsView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      _propertyGrid.SelectedObjectsOverride = new List<object>() { _textBox, _button, _comboBox };
-#endif
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt
index 1c1f634c..01ccccb0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,51 +24,18 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>When many objects are assigned to a PropertyGrid, the PpropertyGrid will show all the common properties so that they can be changed simultaneously on each object.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
- 
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <x:Array Type="sys:String" x:Key="_comboBoxSource" >
-            <sys:String>Green</sys:String>
-            <sys:String>Red</sys:String>
-            <sys:String>Blue</sys:String>
-        </x:Array>
-    </local:DemoView.Resources>
 
-        <Grid Margin="10">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
 
-        <StackPanel >
-            <TextBlock Text="Selected Object 1 : a TextBox" />
-            <TextBox x:Name="_textBox" Text="This is my TextBox" Margin="10" Width="150" Foreground="Red"/>
-            <TextBlock Text="Selected Object 2 : a Button"/>
-            <Button x:Name="_button" Content="My Button" Margin="10" Width="150" Foreground="Red"/>
-            <TextBlock Text="Selected Object 3 : a ComboBox" />
-            <ComboBox x:Name="_comboBox" ItemsSource="{StaticResource _comboBoxSource}" SelectedIndex="0" Margin="10" Width="150" Foreground="Red"/>
-        </StackPanel>
 
-         <xctk:PropertyGrid Grid.Column="1" x:Name="_propertyGrid" ShowAdvancedOptions="True" AutoGenerateProperties="False" MaxHeight="350" VerticalAlignment="Top">
-            <xctk:PropertyGrid.PropertyDefinitions>
-                  <xctk:PropertyDefinition 
-                     TargetProperties="FontSize,FontWeight,Foreground,Background,HorizontalContentAlignment,Width,Margin,ToolTip" />
-            </xctk:PropertyGrid.PropertyDefinitions>
-         </xctk:PropertyGrid>
-    </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
     <Image Source="..\OpenSourceImages\MultiSelectedObjects.png" Width="660" Height="430"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt
index 0afe6f3b..4b858199 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,59 +32,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridPropertiesSourceView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var list = new ObservableCollection<object>();
-      list.Add( new MyData( "string", "First text" ) );
-      list.Add( new MyData( "Second string", "Second text" ) );
-      list.Add( new MyData( "Color", Colors.Blue ) );
-      list.Add( new MyData( "DateTime", System.DateTime.Now ) );
-      list.Add( new MyData( "TimeSpan", System.TimeSpan.FromMinutes( 120 ) ) );
-      list.Add( new MyData( "HorizontalAlignment", System.Windows.HorizontalAlignment.Center ) );
-      list.Add( new MyData( "bool", true ) );
-      list.Add( new MyData( "decimal", ( decimal )1 ) );
-      list.Add( new MyData( "int", ( int )2 ) );
-      list.Add( new MyData( "Second int", ( int )2 ) );
-      list.Add( new MyData( "short", ( short )3 ) );
-      list.Add( new MyData( "long", ( long )4 ) );
-      list.Add( new MyData( "float", ( float )5 ) );
-      list.Add( new MyData( "byte", ( byte )6 ) );
-      list.Add( new MyData( "sbyte", ( sbyte )7 ) );
-      list.Add( new MyData( "uint", ( uint )8 ) );
-      list.Add( new MyData( "ulong", ( ulong )8 ) );
-      list.Add( new MyData( "ushort", ( ushort )10 ) );
-      list.Add( new MyData( "FontFamily", Fonts.SystemFontFamilies.First() ) );
-      list.Add( new MyData( "FontStyle", FontStyles.Italic ) );
-      list.Add( new MyData( "FontStretch", FontStretches.ExtraExpanded ) );
-      
-      // PropertyGrid PropertiesSource property is bound to the DataContext
-      this.DataContext = list;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private void InsertProperty( object sender, RoutedEventArgs e )
-    {
-      ( ( IList<object> )this.DataContext ).Insert( 0, new MyData( "New string", "new data" ) );
     }
 
-    private void RemoveProperty( object sender, RoutedEventArgs e )
-    {
-      if( _propertyGrid.SelectedProperty != null )
-      {
-        ( ( IList<object> )this.DataContext ).Remove( _propertyGrid.SelectedProperty );
-      }
-    }
 
-    private class MyData
-    {
-      public MyData( string name, object value )
-      {
-        this.MyName = name;
-        this.MyValue = value;
-      }
-      public string MyName { get; set; }
-      public object MyValue { get; set; }
-    }
-#endif
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt
index 68522784..3375009d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,6 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
            When setting the PropertiesSource or Properties property, you can provide your own data to be displayed in the PropertyGrid. This allows you to easily insert and remove properties at runtime. The usage scheme is similar to the one used for the standard ItemsControl.
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -32,10 +31,9 @@
             <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>
-        ##END-->           
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -45,13 +43,7 @@
       <StackPanel Grid.Row="0" Margin="10">
          <TextBlock Text="This sample uses the 'PropertiesSource', 'PropertyNameBinding', and 'PropertyValueBinding', as well as collection of generic objects to display its properties."
                     TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="2" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -62,52 +54,11 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      
-      <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
-         <Button Content="Insert new property" Click="InsertProperty" Margin="20" Padding="5"/>
-         <Button Content="Remove selected property" Click="RemoveProperty" Margin="20" Padding="5"/>
-      </StackPanel>
-      
-      
-      <!-- 
-      The PropertyNameBinding and PropertyValueBinding properties provide the bindings that will be used
-      on each item of the properties' source in order to provide the Name and Value of each property.
-      -->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="2" Width="350" MaxHeight="600"
-                         IsCategorized="False"
-                         ShowSortOptions="False"
-                         PropertiesSource="{Binding}"
-                         PropertyNameBinding="{Binding MyName}"
-                         PropertyValueBinding="{Binding MyValue}" >
-         <xctk:PropertyGrid.Resources>
-            <xctk:EditorTimeSpanConverter x:Key="timeSpanConv"/>
-         </xctk:PropertyGrid.Resources>
-         
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- The property with the name "Second string" will have this special editor. -->
-            <xctk:EditorTextDefinition TargetProperties="Second string"
-                                       FontStyle="Italic"
-                                       FontWeight="Bold" >
-               <xctk:EditorTextDefinition.EditingElementStyle>
-                  <Style TargetType="{x:Type TextBox}"
-                        BasedOn="{StaticResource  {x:Type TextBox}}">
-                     <Setter Property="Background" Value="LightBlue"/>
-                  </Style>
-               </xctk:EditorTextDefinition.EditingElementStyle>
-               
-            </xctk:EditorTextDefinition>
 
-            <!-- All properties whose value type is TimeSpan will use this special editor. -->
-            <!--Here we use a DateTimeUpDown editor in conjunction with a built-in converter to 
-            create a TimeSpanEditor-->
-            <xctk:EditorDateTimeUpDownDefinition TargetProperties="{x:Type s:TimeSpan}"
-                                                 Format="Custom"
-                                                 FormatString="HH:mm"
-                                                 Binding="{Binding MyValue, Converter={StaticResource timeSpanConv}}" />
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
+
+
+
+
+
    </Grid>      
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt
index 988916fd..85dcbe38 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -34,17 +34,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       InitializeComponent();
     }
   }
-#if !OPEN_SOURCE
-  public class Employee
-  {
-    public string Name { get; set; }
-    public bool IsConfirmed { get; set; }
-    public string Department { get; set; }
-  }
 
-  public class Representent : Employee
-  {
-    public string Details { get; set; }
-  }
-#endif
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt
index ce9af76a..62cce170 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,7 +28,6 @@
          <LineBreak/>
          <LineBreak/>
            The sample also demonstrate the usage of CategoryGroupDescription to control the categorization of the elements.
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -36,10 +35,9 @@
             <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>
-        ##END-->           
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -48,13 +46,7 @@
       <StackPanel Grid.Row="0" Margin="10">
          <TextBlock Text="This sample adds Employee items directly under the Properties property and defines the editor through the DefaultEditorDefinition property."
                     TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -65,72 +57,11 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->      
-<!--##EXCLUDE_OPEN_SOURCE-->
-      <!-- 
-      PropertyNameBinding will be used to determine the property name's display text.
-      Value will be specified through DefaultEditorDefinition.
-      -->
-      <DockPanel Grid.Row="1">
-         <StackPanel DockPanel.Dock="Top" Margin="20" 
-                     Orientation="Horizontal">
-            <TextBlock Margin="0,0,10,0" VerticalAlignment="Center"
-                       Text="Category GroupDescription Property:" />
-            <ComboBox x:Name="categoryGroupCombo" Width="150"
-                      IsEnabled="{Binding IsCategorized, ElementName=_propertyGrid}"
-                      DisplayMemberPath="PropertyName"
-                      SelectedIndex="0">
-               <PropertyGroupDescription PropertyName="Department"/>
-               <PropertyGroupDescription PropertyName="IsConfirmed"/>
-            </ComboBox>
 
-         </StackPanel>
 
-         <xctk:PropertyGrid x:Name="_propertyGrid" Width="350" MaxHeight="275" VerticalAlignment="Top"
-                         PropertyNameBinding="{Binding Name}"
-                         CategoryGroupDescription="{Binding SelectedItem, ElementName=categoryGroupCombo}"
-                         SelectedObjectName="Meeting" >
-            <xctk:PropertyGrid.Properties>
-               <!--Here we define the items to be displayed in the property grid (a list of Employees). -->
-               <v:Employee Name="Tom" IsConfirmed="True" Department="Sales"/>
-               <v:Employee Name="John" IsConfirmed="false" Department="Management"/>
-               <v:Representent Name="Brad" IsConfirmed="True" 
-                            Department="Sales"
-                            Details="On the phone"/>
-               <v:Employee Name="Kevin" IsConfirmed="false" Department="Management"/>
-               <v:Employee Name="Jane" IsConfirmed="True" Department="Management"/>
-               <v:Employee Name="Sean" IsConfirmed="True" Department="Sales"/>
-            </xctk:PropertyGrid.Properties>
 
-            <xctk:PropertyGrid.DefaultEditorDefinition>
-               <!-- This editor will be the default editor for items of the property grid. -->
-               <xctk:EditorCheckBoxDefinition Binding="{Binding IsConfirmed}"/>
-            </xctk:PropertyGrid.DefaultEditorDefinition>
 
-            <xctk:PropertyGrid.EditorDefinitions>
-               <!--
-            Define a specific editor for the Representent with a "details" field.
-            
-            Since no PropertyValueBinding is defined, the type of the item itself
-            will be used as a key to detect the possible defined editor.
-            -->
-               <xctk:EditorTemplateDefinition TargetProperties="{x:Type v:Representent}">
-                  <xctk:EditorTemplateDefinition.EditingTemplate>
-                     <DataTemplate >
-                        <StackPanel HorizontalAlignment="Stretch">
-                           <CheckBox IsChecked="{Binding IsConfirmed}" Margin="5,0,0,0" />
-                           <DockPanel HorizontalAlignment="Stretch">
-                              <TextBlock DockPanel.Dock="Left" Text="Details: " VerticalAlignment="Center"/>
-                              <TextBox Text="{Binding Details}" FontStyle="Italic" HorizontalAlignment="Stretch" />
-                           </DockPanel>
-                        </StackPanel>
-                     </DataTemplate>
-                  </xctk:EditorTemplateDefinition.EditingTemplate>
-               </xctk:EditorTemplateDefinition>
 
-            </xctk:PropertyGrid.EditorDefinitions>
-         </xctk:PropertyGrid>
-      </DockPanel>
-<!--##END-->
+
    </Grid>      
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt
index ff12d900..8bd236a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -37,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 
       var selObject = new Person();
       selObject.Friend = new Person();
-      
+
       this.DataContext = selObject;
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
index 5f8ee0de..2294aa51 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -29,7 +29,7 @@
          <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt
index 7eb93046..696ff77e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridSelectedObjectView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
index 041f08fa..22b4ba0e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridSpecifyingPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt
index cb1ba151..32f17891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -87,8 +87,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
         set;
       }
 
-      //# TODODOC
-      //# Those attribute will be overrien in xaml
       [Category( "Information" )]
       [DisplayName( "Favorite Color" )]
       [Description( "This property uses the ColorPicker as the default editor." )]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt
index f37b7589..ce5ade6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,30 +26,17 @@
            By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>      
       <xctk:PropertyGrid x:Name="_propertyGrid"
                          Width="450" 
                          MaxHeight="245"
                          Margin="10"
                          AutoGenerateProperties="False">
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <!-- //# TODODOC
-         The following categories DisplayOrder will be overriden -->
-         <xctk:PropertyGrid.CategoryDefinitions>
-            <xctk:CategoryDefinition Name="Information"
-                                     DisplayOrder="0" />
-            <xctk:CategoryDefinition Name="Connections"
-                                     DisplayOrder="2" />
-            <xctk:CategoryDefinition Name="Clothes"
-                                     DisplayOrder="1" />
-         </xctk:PropertyGrid.CategoryDefinitions>
-         <!--##END-->
-         
+
          <xctk:PropertyGrid.PropertyDefinitions>
-            <!-- //# TODODOC 
-               The following properties will be displayed in the PropertyGrid 
-               Some data of properties will be overriden-->
+            <!-- The following properties will be displayed in the PropertyGrid 
+                 Some properties' data will be overriden-->
             <xctk:PropertyDefinition TargetProperties="FirstName,PetNames" DisplayOrder="0"/>
             <xctk:PropertyDefinition TargetProperties="FavoriteColor"
                                      DisplayName="Shirt Color"
@@ -63,9 +50,8 @@
             </xctk:PropertyDefinition>
             <!-- And all properties of type Boolean will be displayed in the PropertyGrid-->
             <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" DisplayOrder="1"/>
-            
-            <!-- //# TODODOC
-               This Property won't be displayed -->
+
+            <!-- This Property won't be displayed -->
              <xctk:PropertyDefinition TargetProperties="WritingHand" IsBrowsable="False"/>
          </xctk:PropertyGrid.PropertyDefinitions>
       </xctk:PropertyGrid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt
index 41492be8..063c4a3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt
index 0e641146..cddd8e63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -47,13 +47,14 @@
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <!-- 1st column-->
@@ -71,7 +72,7 @@
                                Grid.Column="1"
                                Width="175"
                                Watermark="Search"
-                               Text="{Binding Filter, ElementName=_propertyGrid}"
+                               Text="{Binding Filter, ElementName=_propertyGrid, UpdateSourceTrigger=PropertyChanged}"
                                VerticalAlignment="Center"
                                Margin="5"
                                ToolTip="Filters the properties within the PropertyGrid." />
@@ -85,21 +86,11 @@
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="Set the IsReadOnly property to true or false." />
-        <TextBlock Text="IsVirtualizing:"
+        <TextBlock Text="ShowPreview:"
                    VerticalAlignment="Center"
                    Grid.Row="3"
                    Grid.Column="0" />
         <CheckBox Grid.Row="3"
-                  Grid.Column="1"
-                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
-        <TextBlock Text="ShowPreview:"
-                   VerticalAlignment="Center"
-                   Grid.Row="4"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="4"
                   Grid.Column="1"
                   IsChecked="{Binding ShowPreview, ElementName=_propertyGrid}"
                   VerticalAlignment="Center"
@@ -149,19 +140,39 @@
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
+
+        <!--Third Column-->
+        <TextBlock Text="Show Horizontal ScrollBar:"
+                   VerticalAlignment="Center"
+                   Grid.Column="4"
+                   Margin="10,0,0,0" />
+        <CheckBox Grid.Column="5"
+                  IsChecked="{Binding ShowHorizontalScrollBar, ElementName=_propertyGrid}"
+                  VerticalAlignment="Center"
+                  Margin="5"
+                  ToolTip="Gets/Sets if the horizontal scrollBar will be showned." />
         <TextBlock Text="HideInheritedProperties:"
                    VerticalAlignment="Center"
-                   Grid.Row="4"
-                   Grid.Column="2"
+                   Grid.Row="1"
+                   Grid.Column="4"
                    Margin="10,0,0,0" />
-        <CheckBox Grid.Row="4"
-                  Grid.Column="3"
+        <CheckBox Grid.Row="1"
+                  Grid.Column="5"
                   IsChecked="{Binding HideInheritedProperties, ElementName=_propertyGrid}"
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="When True, inherited properties are hidden." />
-
-
+        <TextBlock Text="IsVirtualizing:"
+                   VerticalAlignment="Center"
+                   Grid.Row="2"
+                   Grid.Column="4"
+                   Margin="10,0,0,0" />
+        <CheckBox Grid.Row="2"
+                  Grid.Column="5"
+                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
+                  VerticalAlignment="Center"
+                  Margin="5"
+                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
       </Grid>
     </GroupBox>
 
@@ -198,6 +209,7 @@
                            IsMiscCategoryLabelHidden="False"
                            ShowPreview="True"
                            HideInheritedProperties="False"
+                           ShowHorizontalScrollBar="False"
                            SelectedObject="{Binding ElementName=_button}">
         </xctk:PropertyGrid>
       </Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt
index 025dbef0..51045945 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -32,32 +32,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void BackgroundPortionsButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.BGPortions;
-      diag.NewItemTypes = new List<System.Type>() { typeof( GaugePortion ) };
-      diag.ShowDialog();
-    }
 
-    private void BorderPortionsButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.BorderPortions;
-      diag.NewItemTypes = new List<System.Type>() { typeof( BorderGaugePortion ) };
 
-      diag.ShowDialog();
-    }
 
-    private void MarkersButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.Markers;
-      diag.NewItemTypes = new List<System.Type>() { typeof( Marker ) };
 
-      diag.ShowDialog();
-    }
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt
index 1ed76b7c..8517a855 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The RadialGauge is a fully customizable gauge that can be used to display a current value on a radial or partially radial scaled circle. Markers can be added to highlight specific values. Background portions or border portions of the Radial gauge can also be customized and the pointer can be animated when moving from one value to a new one.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -35,975 +34,61 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
-   
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../../../Resources/LiveExplorerScrollViewer.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-         <toolConv:PositionConverter x:Key="PositionConverter" />
-         <conv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter"
-                                         Inverted="True" />
-
-         <Style x:Key="PointerCapStyle1"
-                TargetType="xctk:PointerCap">
-            <Setter Property="Width"
-                    Value="25" />
-            <Setter Property="Height"
-                    Value="25" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="xctk:PointerCap">
-                     <Image Source="../Resources/smiley.png"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}" />
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-         <Style x:Key="PointerCapStyle2"
-                TargetType="xctk:PointerCap">
-            <Setter Property="Width"
-                    Value="25" />
-            <Setter Property="Height"
-                    Value="25" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="xctk:PointerCap">
-                     <Grid>
-                        <Ellipse Width="{TemplateBinding Width}"
-                                 Height="{TemplateBinding Height}"
-                                 Fill="Blue" />
-                        <Ellipse Width="18"
-                                 Height="18"
-                                 Fill="White" />
-                        <Ellipse Width="10"
-                                 Height="10"
-                                 Fill="Red" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-         <DataTemplate x:Key="NumericIndicatorTemplate1">
-            <Grid>
-               <TextBlock Text="{Binding StringFormat={}{0:N1}}"
-                          Foreground="Yellow"
-                          FontSize="12"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center" />
-            </Grid>
-         </DataTemplate>
-
-         <DataTemplate x:Key="NumericIndicatorTemplate2">
-            <Grid>
-               <Ellipse Fill="Gold"
-                        Width="60"
-                        Height="30" />
-               <TextBlock Text="{Binding StringFormat={}{0:N2}}"
-                          Foreground="Red"
-                          FontSize="17"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center" />
-            </Grid>
-         </DataTemplate>
-
-         <DataTemplate x:Key="PointerTemplate1">
-            <Rectangle Fill="Orange"
-                       Width="2"
-                       Height="125" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="PointerTemplate2">
-            <Image Source="../Resources/pointing.jpg"
-                   Height="100"
-                   Width="82" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MajorTickMarkTemplate1">
-            <Rectangle Fill="Aqua"
-                       Width="4"
-                       Height="20" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MajorTickMarkTemplate2">
-            <Polygon Fill="Red">
-               <Polygon.Points>
-                  <PointCollection>
-                     0,0 3,30 6,0
-                  </PointCollection>
-               </Polygon.Points>
-            </Polygon>
-         </DataTemplate>
-
-         <DataTemplate x:Key="MiddleTickMarkTemplate1">
-            <Rectangle Fill="Gray"
-                       Width="2"
-                       Height="15" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MiddleTickMarkTemplate2">
-            <Polygon Fill="LightBlue">
-               <Polygon.Points>
-                  <PointCollection>
-                     0,0 1,20 2,0
-                  </PointCollection>
-               </Polygon.Points>
-            </Polygon>
-         </DataTemplate>
-
-         <DataTemplate x:Key="MinorTickMarkTemplate1">
-            <Rectangle Fill="Aqua"
-                       Width="2"
-                       Height="10" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MinorTickMarkTemplate2">
-            <Polygon Fill="Red">
-               <Polygon.Points>
-                  <PointCollection>
-                     0,0 1,15 2,0
-                  </PointCollection>
-               </Polygon.Points>
-            </Polygon>
-         </DataTemplate>
-
-         <DataTemplate x:Key="MajorTickLabelTemplate1">
-            <TextBlock Text="{Binding ., StringFormat={}{0:N0}}"
-                       Foreground="Yellow"
-                       FontFamily="Book Antiqua"
-                       FontSize="14" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MajorTickLabelTemplate2">
-            <TextBlock Text="{Binding ., StringFormat={}{0:N2}}"
-                       Foreground="White"
-                       FontWeight="Bold"
-                       FontSize="10" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MarkerTemplate1">
-            <Rectangle Fill="Aqua"
-                       Width="4"
-                       Height="35" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="MarkerTemplate2">
-            <Image Source="../Resources/arrow.png"
-                   Height="55"
-                   Width="25" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="PointerTooltipTemplate1">
-            <Grid>
-               <Border Background="LightGray" />
-               <TextBlock Text="{Binding ., StringFormat={}{0:N6}}"
-                          Foreground="Blue"
-                          FontSize="10"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Padding="5" />
-            </Grid>
-         </DataTemplate>
-
-         <DataTemplate x:Key="PointerTooltipTemplate2">
-            <Grid>
-               <Ellipse Fill="Violet"
-                        StrokeThickness="2"
-                        Stroke="Orange" />
-               <TextBlock Text="{Binding ., StringFormat={}{0:N3}}"
-                          Foreground="Black"
-                          FontSize="12"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Padding="6" />
-            </Grid>
-         </DataTemplate>
-
-         <Style TargetType="{x:Type ScrollBar}"
-                BasedOn="{StaticResource ScrollBarStyle}" />
-
-         <Style x:Key="PreStyledPointerCap"
-                TargetType="{x:Type xctk:PointerCap}">
-            <Setter Property="Width"
-                    Value="16" />
-            <Setter Property="Height"
-                    Value="16" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type xctk:PointerCap}">
-                     <Ellipse Stroke="#ffffff"
-                              StrokeThickness="1"
-                              Width="{TemplateBinding Width}"
-                              Height="{TemplateBinding Height}">
-                        <Ellipse.Fill>
-                           <RadialGradientBrush Center="0.5,0.5">
-                              <GradientStop Color="Gray"
-                                            Offset="0" />
-                              <GradientStop Color="White"
-                                            Offset="3" />
-                           </RadialGradientBrush>
-                        </Ellipse.Fill>
-                     </Ellipse>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-         <DataTemplate x:Key="PreStyledPointerTemplate">
-            <Polygon Fill="Red"
-                     StrokeThickness="2"
-                     Stroke="White">
-               <Polygon.Points>
-                  <PointCollection>
-                     0,90 5,0 10,90
-                  </PointCollection>
-               </Polygon.Points>
-            </Polygon>
-         </DataTemplate>
-
-         <DataTemplate x:Key="PreStyledMajorTickMarkTemplate">
-            <Rectangle Fill="Red"
-                       Width="2"
-                       Height="10" />
-         </DataTemplate>
-
-         <DataTemplate x:Key="PreStyledMajorTickLabelTemplate">
-            <TextBlock Text="{Binding}"
-                       Foreground="White"
-                       FontFamily="Impact">
-               <TextBlock.Effect>
-                  <DropShadowEffect Color="Red"
-                                    Direction="180"
-                                    ShadowDepth="0"
-                                    Opacity="0.5" />
-               </TextBlock.Effect>
-            </TextBlock>
-         </DataTemplate>
-
-         <Style x:Key="PreStyledGauge"
-                TargetType="{x:Type xctk:RadialGauge}">
-            <Setter Property="Fill"
-                    Value="Black" />
-            <Setter Property="PointerCapStyle"
-                    Value="{StaticResource PreStyledPointerCap}" />
-            <Setter Property="IsFullCircleBackground"
-                    Value="False" />
-            <Setter Property="MajorTickCount"
-                    Value="10" />
-            <Setter Property="PointerTemplate"
-                    Value="{StaticResource PreStyledPointerTemplate}" />
-            <Setter Property="MajorTickMarkTemplate"
-                    Value="{StaticResource PreStyledMajorTickMarkTemplate}" />
-            <Setter Property="MajorTickLabelTemplate"
-                    Value="{StaticResource PreStyledMajorTickLabelTemplate}" />
-            <Setter Property="TickMarkOffset"
-                    Value="-30" />
-            <Setter Property="MajorTickLabelOffset"
-                    Value="-55" />
-            <Setter Property="MiddleTickCount"
-                    Value="1" />
-            <Setter Property="MinorTickCount"
-                    Value="2" />
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type xctk:RadialGauge}">
-                     <Grid>
-                        <xctk:GaugePie x:Name="_gaugePie"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}"
-                                       Stroke="{TemplateBinding Stroke}"
-                                       StrokeThickness="{TemplateBinding StrokeThickness}"
-                                       Fill="{TemplateBinding Fill}"
-                                       SweepDirection="{TemplateBinding SweepDirection}" />
-
-                        <xctk:GaugePie x:Name="_gaugeBorderPie"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}"
-                                       StrokeThickness="2"
-                                       Opacity="1"
-                                       SweepDirection="{TemplateBinding SweepDirection}">
-                           <xctk:GaugePie.Stroke>
-                              <LinearGradientBrush>
-                                 <GradientStop Color="#121212"
-                                               Offset="0" />
-                                 <GradientStop Color="#F0F0F0"
-                                               Offset="1" />
-                              </LinearGradientBrush>
-                           </xctk:GaugePie.Stroke>
-                        </xctk:GaugePie>
-
-                        <xctk:GaugePie x:Name="_gaugeLightBackground"
-                                       Margin="0,0,0,30"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}"
-                                       RenderTransformOrigin="0.5,0.5">
-                           <xctk:GaugePie.Fill>
-                              <LinearGradientBrush StartPoint="0.5,0"
-                                                   EndPoint="0.5,1"
-                                                   Opacity="0.2">
-                                 <GradientStop Color="Transparent"
-                                               Offset="0.5" />
-                                 <GradientStop Color="White"
-                                               Offset="1" />
-                              </LinearGradientBrush>
-                           </xctk:GaugePie.Fill>
-                           <xctk:GaugePie.RenderTransform>
-                              <ScaleTransform ScaleY="1"
-                                              ScaleX="0.85" />
-                           </xctk:GaugePie.RenderTransform>
-                        </xctk:GaugePie>
-
-                        <xctk:GaugePie x:Name="_gaugeLightBackground2"
-                                       Margin="0,0,0,30"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}"
-                                       RenderTransformOrigin="0.5,0.5">
-                           <xctk:GaugePie.Fill>
-                              <LinearGradientBrush StartPoint="0.5,0"
-                                                   EndPoint="0.5,1"
-                                                   Opacity="0.2">
-                                 <GradientStop Color="Transparent"
-                                               Offset="0.5" />
-                                 <GradientStop Color="White"
-                                               Offset="1" />
-                              </LinearGradientBrush>
-                           </xctk:GaugePie.Fill>
-                           <xctk:GaugePie.RenderTransform>
-                              <ScaleTransform ScaleY="1"
-                                              ScaleX="0.85" />
-                           </xctk:GaugePie.RenderTransform>
-                        </xctk:GaugePie>
-
-                        <xctk:GaugePie x:Name="_gaugePieBorder"
-                                       StrokeThickness="20"
-                                       Opacity="0.8"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}">
-                           <xctk:GaugePie.Stroke>
-                              <LinearGradientBrush StartPoint="0.5,1"
-                                                   EndPoint="0.5,0">
-                                 <GradientStop Color="White"
-                                               Offset="1.5" />
-                                 <GradientStop Color="Transparent"
-                                               Offset="-0.2" />
-                              </LinearGradientBrush>
-                           </xctk:GaugePie.Stroke>
-                        </xctk:GaugePie>
-
-                        <xctk:GaugePie x:Name="_gaugePieInnerBorder"
-                                       StrokeThickness="5"
-                                       Opacity="0.2"
-                                       Margin="20"
-                                       StartAngle="{TemplateBinding StartAngle}"
-                                       EndAngle="{TemplateBinding EndAngle}">
-                           <xctk:GaugePie.Stroke>
-                              <LinearGradientBrush StartPoint="0.5,1"
-                                                   EndPoint="0.5,0">
-                                 <GradientStop Color="White"
-                                               Offset="1" />
-                                 <GradientStop Color="Transparent"
-                                               Offset="0" />
-                              </LinearGradientBrush>
-                           </xctk:GaugePie.Stroke>
-                        </xctk:GaugePie>
-
-                        <Grid x:Name="PART_PortionsGrid" />
-
-                        <Image Source="{TemplateBinding BackgroundImage}"
-                               Stretch="None">
-                           <Image.RenderTransform>
-                              <TranslateTransform X="{Binding BackgroundImageOffsetX, RelativeSource={RelativeSource TemplatedParent}}"
-                                                  Y="{Binding BackgroundImageOffsetY, RelativeSource={RelativeSource TemplatedParent}}" />
-                           </Image.RenderTransform>
-                        </Image>
-
-                        <Grid x:Name="PART_TickGrid" />
-
-                        <Grid x:Name="PART_MarkersGrid" />
-
-                        <xctk:NumericIndicator Content="{TemplateBinding ActualValue}"
-                                                ContentTemplate="{TemplateBinding NumericIndicatorTemplate}"
-                                                Visibility="{Binding IsNumericIndicatorVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource VisibilityToBoolConverter}}">
-                           <xctk:NumericIndicator.Position>
-                              <MultiBinding Converter="{StaticResource PositionConverter}">
-                                 <Binding Path="NumericIndicatorOffsetX"
-                                          RelativeSource="{RelativeSource TemplatedParent}" />
-                                 <Binding Path="NumericIndicatorOffsetY"
-                                          RelativeSource="{RelativeSource TemplatedParent}" />
-                              </MultiBinding>
-                           </xctk:NumericIndicator.Position>
-                        </xctk:NumericIndicator>
-
-                        <xctk:Pointer x:Name="PART_Pointer"
-                                      ContentTemplate="{TemplateBinding PointerTemplate}"
-                                      Visibility="{Binding IsPointerVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource VisibilityToBoolConverter}}">
-                           <xctk:Pointer.ToolTip>
-                              <ToolTip>
-                                 <ToolTip.Template>
-                                    <ControlTemplate TargetType="{x:Type ToolTip}">
-                                       <ContentPresenter Content="{Binding ActualValue, RelativeSource={RelativeSource AncestorType={x:Type xctk:RadialGauge}}}"
-                                                         ContentTemplate="{Binding PointerTooltipTemplate, RelativeSource={RelativeSource AncestorType={x:Type xctk:RadialGauge}}}" />
-                                    </ControlTemplate>
-                                 </ToolTip.Template>
-                              </ToolTip>
-                           </xctk:Pointer.ToolTip>
-                        </xctk:Pointer>
-
-                        <xctk:PointerCap Style="{TemplateBinding PointerCapStyle}"
-                                         Visibility="{Binding IsPointerCapVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource VisibilityToBoolConverter}}" />
-
-                     </Grid>
-
-                     <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                           <MultiTrigger.Conditions>
-                              <Condition Property="IsFullCircleBackground"
-                                         Value="True" />
-                              <Condition Property="SweepDirection"
-                                         Value="Clockwise" />
-                           </MultiTrigger.Conditions>
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugePie"
-                                   Value="0" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugePie"
-                                   Value="360" />
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugeBorderPie"
-                                   Value="0" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugeBorderPie"
-                                   Value="360" />
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugePieBorder"
-                                   Value="0" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugePieBorder"
-                                   Value="360" />
-                        </MultiTrigger>
-
-                        <MultiTrigger>
-                           <MultiTrigger.Conditions>
-                              <Condition Property="IsFullCircleBackground"
-                                         Value="True" />
-                              <Condition Property="SweepDirection"
-                                         Value="CounterClockwise" />
-                           </MultiTrigger.Conditions>
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugePie"
-                                   Value="360" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugePie"
-                                   Value="0" />
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugeBorderPie"
-                                   Value="360" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugeBorderPie"
-                                   Value="0" />
-                           <Setter Property="StartAngle"
-                                   TargetName="_gaugePieBorder"
-                                   Value="360" />
-                           <Setter Property="EndAngle"
-                                   TargetName="_gaugePieBorder"
-                                   Value="0" />
-                        </MultiTrigger>
-                     </ControlTemplate.Triggers>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-      </ResourceDictionary>
-
-   </local:DemoView.Resources>
-
-   <TabControl>
-      <TabItem Header="Sample">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <!--//#TODODOC
-      Use the Height of the sample scrollviewer -->
-            <GroupBox x:Name="_groupBox"
-                      Header="Features"
-                      Margin="5"
-                      VerticalAlignment="Top"
-                      Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}}">
-               <GroupBox.Resources>
-                  <Style TargetType="TextBlock">
-                     <Setter Property="Width"
-                             Value="150" />
-                     <Setter Property="Margin"
-                             Value="0,5,0,5" />
-                  </Style>
-               </GroupBox.Resources>
-
-               <ScrollViewer CanContentScroll="True">
-                  <StackPanel Margin="5">
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsFullCircleBackground:" />
-                        <CheckBox IsChecked="{Binding IsFullCircleBackground, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="SweepDirection:" />
-                        <ComboBox Width="120"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding SweepDirection, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="CouterClockWise"
-                                         Tag="{x:Static SweepDirection.Counterclockwise}" />
-                           <ComboBoxItem Content="ClockWise"
-                                         Tag="{x:Static SweepDirection.Clockwise}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="StartAngle:" />
-                        <xctk:DoubleUpDown Value="{Binding StartAngle, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="EndAngle:" />
-                        <xctk:DoubleUpDown Value="{Binding EndAngle, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Minimum:" />
-                        <xctk:DoubleUpDown Value="{Binding Minimum, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Maximum:" />
-                        <xctk:DoubleUpDown Value="{Binding Maximum, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="StrokeThickness:" />
-                        <xctk:DoubleUpDown Value="{Binding StrokeThickness, ElementName=_gauge}"
-                                           Minimum="0"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Stroke:" />
-                        <xctk:ColorPicker SelectedColor="{Binding Stroke, ElementName=_gauge, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Width="100"
-                                          Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Fill:" />
-                        <xctk:ColorPicker SelectedColor="{Binding Fill, ElementName=_gauge, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                                          Width="100"
-                                          Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="Markers:" />
-                        <Button Content="Markers"
-                                Click="MarkersButton_Click"
-                                Width="90"
-                                Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MarkersTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding MarkersTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource MarkerTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource MarkerTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MarkerOffset:" />
-                        <xctk:DoubleUpDown Value="{Binding MarkerOffset, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="BGPortions:" />
-                        <Button Content="BGPortions"
-                                Click="BackgroundPortionsButton_Click"
-                                Width="90"
-                                Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="BorderPortions:" />
-                        <Button Content="Borders"
-                                Click="BorderPortionsButton_Click"
-                                Width="90"
-                                Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="ImageOffsetX:" />
-                        <xctk:DoubleUpDown Value="{Binding BackgroundImageOffsetX, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="ImageOffsetY:" />
-                        <xctk:DoubleUpDown Value="{Binding BackgroundImageOffsetY, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsPointerCapVisible:" />
-                        <CheckBox IsChecked="{Binding IsPointerCapVisible, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="PointerCapStyle:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding PointerCapStyle, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Style 1"
-                                         Tag="{StaticResource PointerCapStyle1}" />
-                           <ComboBoxItem Content="Style 2"
-                                         Tag="{StaticResource PointerCapStyle2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsPointerVisible:" />
-                        <CheckBox IsChecked="{Binding IsPointerVisible, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="PointerOffset:" />
-                        <xctk:DoubleUpDown Value="{Binding PointerOffset, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="PointerTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding PointerTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource PointerTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource PointerTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="PointerTooltipTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding PointerTooltipTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource PointerTooltipTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource PointerTooltipTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="ValueAnimation:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding ValueAnimation, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="None"
-                                         Tag="{x:Static xctk:ValueAnimationType.None}" />
-                           <ComboBoxItem Content="Linear"
-                                         Tag="{x:Static xctk:ValueAnimationType.Linear}" />
-                           <ComboBoxItem Content="BackEase"
-                                         Tag="{x:Static xctk:ValueAnimationType.BackEase}" />
-                           <ComboBoxItem Content="PowerEase"
-                                         Tag="{x:Static xctk:ValueAnimationType.PowerEase}" />
-                           <ComboBoxItem Content="ElasticEase"
-                                         Tag="{x:Static xctk:ValueAnimationType.ElasticEase}" />
-                           <ComboBoxItem Content="BounceEase"
-                                         Tag="{x:Static xctk:ValueAnimationType.BounceEase}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsNumericIndicatorVisible:" />
-                        <CheckBox IsChecked="{Binding IsNumericIndicatorVisible, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="NumericIndicatorOffsetX:" />
-                        <xctk:DoubleUpDown Value="{Binding NumericIndicatorOffsetX, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="NumericIndicatorOffsetY:" />
-                        <xctk:DoubleUpDown Value="{Binding NumericIndicatorOffsetY, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="NumericIndicatorTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding NumericIndicatorTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource NumericIndicatorTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource NumericIndicatorTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MajorTickCount:" />
-                        <xctk:IntegerUpDown Value="{Binding MajorTickCount, ElementName=_gauge}"
-                                            Minimum="1"
-                                            Width="100"
-                                            Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MajorTickMarkTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding MajorTickMarkTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource MajorTickMarkTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource MajorTickMarkTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MajorTickLabelTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding MajorTickLabelTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource MajorTickLabelTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource MajorTickLabelTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MajorTickLabelOffset:" />
-                        <xctk:DoubleUpDown Value="{Binding MajorTickLabelOffset, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MajorTickCustomLabels:" />
-                        <TextBox Text="{Binding MajorTickCustomLabels, ElementName=_gauge}"
-                                 Width="90"
-                                 Margin="0,5,0,5"
-                                 ToolTip="Gets/Sets the Custom Labels used for the Major Ticks, separated by ','" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsTickLabelVisible:" />
-                        <CheckBox IsChecked="{Binding IsTickLabelVisible, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsTickLabelRotated:" />
-                        <CheckBox IsChecked="{Binding IsTickLabelRotated, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MiddleTickCount:" />
-                        <xctk:IntegerUpDown Value="{Binding MiddleTickCount, ElementName=_gauge}"
-                                            Minimum="1"
-                                            Width="100"
-                                            Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MiddleTickMarkTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding MiddleTickMarkTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource MiddleTickMarkTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource MiddleTickMarkTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MinorTickCount:" />
-                        <xctk:IntegerUpDown Value="{Binding MinorTickCount, ElementName=_gauge}"
-                                            Minimum="1"
-                                            Width="100"
-                                            Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="MinorTickMarkTemplate:" />
-                        <ComboBox Width="100"
-                                  Margin="0,5,0,5"
-                                  SelectedValue="{Binding MinorTickMarkTemplate, ElementName=_gauge}"
-                                  SelectedValuePath="Tag">
-                           <ComboBoxItem Content="Default"
-                                         Tag="{x:Null}" />
-                           <ComboBoxItem Content="Template 1"
-                                         Tag="{StaticResource MinorTickMarkTemplate1}" />
-                           <ComboBoxItem Content="Template 2"
-                                         Tag="{StaticResource MinorTickMarkTemplate2}" />
-                        </ComboBox>
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="TickMarkOffset:" />
-                        <xctk:DoubleUpDown Value="{Binding TickMarkOffset, ElementName=_gauge}"
-                                           Width="100"
-                                           Margin="0,5,0,5" />
-                     </StackPanel>
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="IsTickMarkVisible:" />
-                        <CheckBox IsChecked="{Binding IsTickMarkVisible, ElementName=_gauge}"
-                                  Width="100"
-                                  Margin="0,5,0,5" />
-                     </StackPanel>
-                  </StackPanel>
-               </ScrollViewer>
-            </GroupBox>
-
-            <StackPanel Grid.Column="1">
-               <TextBlock Text="Usage:"
-                          Style="{StaticResource Header}"
-                          Margin="10" />
-
-               <StackPanel Margin="10"
-                           Orientation="Horizontal"
-                           HorizontalAlignment="Center">
-                  <TextBlock Text="Value:"
-                             Width="100" />
-                  <xctk:DoubleUpDown Value="{Binding Value, ElementName=_gauge}"
-                                     Minimum="{Binding Minimum, ElementName=_gauge}"
-                                     Maximum="{Binding Maximum, ElementName=_gauge}"
-                                     ClipValueToMinMax="True"
-                                     Width="100" />
-               </StackPanel>
-
-               <Border Width="300"
-                       Height="300"
-                       BorderBrush="Black"
-                       BorderThickness="1"
-                       VerticalAlignment="Top"
-                       Margin="15">
-                  <xctk:RadialGauge x:Name="_gauge"
-                                    StartAngle="225"
-                                    EndAngle="135"
-                                    Minimum="0"
-                                    Maximum="200"
-                                    Stroke="Gray"
-                                    StrokeThickness="10"
-                                    Fill="Black"
-                                    BackgroundImage="../Resources/fuel.jpg"
-                                    BackgroundImageOffsetX="50"
-                                    BackgroundImageOffsetY="0"
-                                    MajorTickCount="10"
-                                    MiddleTickCount="2"
-                                    MinorTickCount="2"
-                                    TickMarkOffset="-5"
-                                    MajorTickLabelOffset="-35"
-                                    IsTickLabelRotated="False"
-                                    IsNumericIndicatorVisible="True"
-                                    IsPointerCapVisible="True"
-                                    IsPointerVisible="True"
-                                    PointerOffset="0"
-                                    MarkerOffset="0"
-                                    NumericIndicatorOffsetX="0"
-                                    NumericIndicatorOffsetY="60"
-                                    Value="88"
-                                    IsFullCircleBackground="False"
-                                    IsTickMarkVisible="True"
-                                    IsTickLabelVisible="True"
-                                    PointerCapStyle="{x:Null}"
-                                    NumericIndicatorTemplate="{x:Null}"
-                                    PointerTemplate="{x:Null}"
-                                    PointerTooltipTemplate="{x:Null}"
-                                    MarkersTemplate="{x:Null}"
-                                    MajorTickMarkTemplate="{x:Null}"
-                                    MajorTickLabelTemplate="{x:Null}"
-                                    MiddleTickMarkTemplate="{x:Null}"
-                                    MinorTickMarkTemplate="{x:Null}">
-                     <xctk:RadialGauge.BorderPortions>
-                        <xctk:BorderGaugePortion PortionColor="Gold"
-                                                 PortionSize="33.3"
-                                                 StrokeThickness="5" />
-                        <xctk:BorderGaugePortion PortionColor="Orange"
-                                                 PortionSize="33.3"
-                                                 StrokeThickness="5" />
-                        <xctk:BorderGaugePortion PortionColor="DarkOrange"
-                                                 PortionSize="33.4"
-                                                 StrokeThickness="5" />
-                     </xctk:RadialGauge.BorderPortions>
-                     <xctk:RadialGauge.Markers>
-                        <xctk:Marker Value="34" />
-                        <xctk:Marker Value="95" />
-                     </xctk:RadialGauge.Markers>
-                  </xctk:RadialGauge>
-               </Border>
-            </StackPanel>
-         </Grid>
-      </TabItem>
-      
-      <TabItem Header="Styled Example">
-         <StackPanel>
-            <!--//# TODODOC-->
-            <TextBlock Text="This is an example of how the RadialGauge can look like when styled."
-                       Margin="20"/>
-            <TextBlock Text="Example:"
-                       Style="{StaticResource Header}"
-                       Margin="10" />
-            <xctk:RadialGauge Width="350"
-                              Height="350"
-                              StartAngle="225"
-                              EndAngle="135"
-                              Minimum="0"
-                              Maximum="100"
-                              Value="77"
-                              Style="{StaticResource PreStyledGauge}"
-                              Margin="30"/>
-         </StackPanel>
-      </TabItem>
-   </TabControl>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\Gauge.png" Width="600" Height="400"/>
-   ##END-->
 
-</local:DemoView>
\ No newline at end of file
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt
index 98969b08..aeb93258 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/RangeSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
index 0ffb7edd..3439c940 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -525,14 +525,13 @@
             <TextBlock Text="Step:"
                        Grid.Row="4"
                        VerticalAlignment="Center" />
-            <!-- #// TODODOC -->
             <xctk:DoubleUpDown Value="{Binding Step, ElementName=_rangeSlider}"
                                Grid.Row="4"
                                Grid.Column="1"
                                FormatString="0.00"
                                VerticalAlignment="Center"
                                Margin="5"
-                               ToolTip="Identify the RangeSlider's size of individual move, while clicking on the LowerRange or HigherRange."/>
+                               ToolTip="Identify the RangeSlider's size of individual move, when clicking on the LowerRange or HigherRange."/>
 
             <TextBlock Text="Orientation:"
                        Grid.Row="5"
@@ -607,14 +606,13 @@
                        Grid.Column="2"
                        VerticalAlignment="Center"
                        Margin="10,5,5,5" />
-            <!-- //# TODODOC -->
             <ComboBox Grid.Row="5"
                       Grid.Column="3"
                       ItemsSource="{Binding Source={StaticResource AutoToolTipPlacement}}"
                       SelectedItem="{Binding AutoToolTipPlacement, ElementName=_rangeSlider}"
                       VerticalAlignment="Center"
                       Margin="5"
-                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
+                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider's Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
             </ComboBox>
 
             <TextBlock Text="Auto ToolTip Precision:"
@@ -622,7 +620,6 @@
                        Grid.Column="2"
                        VerticalAlignment="Center"
                        Margin="10,5,5,5" />
-            <!-- //# TODODOC -->
             <xctk:IntegerUpDown Value="{Binding AutoToolTipPrecision, ElementName=_rangeSlider}"
                                 Grid.Row="6"
                                 Grid.Column="3"
@@ -630,7 +627,7 @@
                                 Maximum="10"
                                 VerticalAlignment="Center"
                                 Margin="5"
-                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider Thumb in a tooltip." />
+                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider's Thumb in a tooltip." />
 
             <!-- Column 3 -->
             <TextBlock Text="Lower Range Style:"
@@ -817,4 +814,4 @@
          </xctk:RangeSlider>
       </StackPanel>
    </Grid>
-</local:DemoView>
\ No newline at end of file
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt
index 4ebc75e5..ac3af92c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -30,40 +30,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void ValueType_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
-    {
-      if( _valueType.SelectedValue != null )
-      {
-        if( _valueType.SelectedValue.ToString() == RatingValueType.Exact.ToString() )
-        {
-          _rating.Value = 2.5;
-          _rating.ValueType = RatingValueType.Exact;
-          _value.Visibility = System.Windows.Visibility.Visible;
-          _percentage.Visibility = System.Windows.Visibility.Collapsed;
-        }
-        else
-        {
-          _rating.Value = 0.5;
-          _rating.ValueType = RatingValueType.Percentage;
-          _value.Visibility = System.Windows.Visibility.Collapsed;
-          _percentage.Visibility = System.Windows.Visibility.Visible;
-        }
-      }
-    }
 
-    private void RatingItemsButton_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _rating.Items;
-      diag.NewItemTypes = new List<System.Type>() { typeof( RatingItem ) };
-      diag.ShowDialog();
-    }
 
-    private void Rating_RatingValueChanged( object sender, System.Windows.RoutedPropertyChangedEventArgs<double> e )
-    {
-      // add custom handling here
-    }
-#endif
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt
index 9b20a497..8159f4b5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The Rating control fills icons to represent a value on a scale. It can be interactive and is also fully customizable.</Run>
-      <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,409 +33,38 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="5">
-            <!-- Add Rating Control properties-->
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="75" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="10" />
-               <ColumnDefinition Width="90" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="10" />
-               <ColumnDefinition Width="90" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="10" />
-            </Grid.ColumnDefinitions>
-
-            <!-- Column 1 -->
-            <TextBlock Text="Value Type:"
-                       VerticalAlignment="Center" />
-            <ComboBox x:Name="_valueType"
-                      Grid.Column="1"
-                      SelectionChanged="ValueType_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the ValueType used for the Rating control."
-                      SelectedValue="{Binding ValueType, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Exact"
-                             Tag="{x:Static xctk:RatingValueType.Exact}" />
-               <ComboBoxItem Content="Percentage"
-                             Tag="{x:Static xctk:RatingValueType.Percentage}" />
-            </ComboBox>
-
-            <TextBlock Text="Value:"
-                       VerticalAlignment="Center"
-                       Grid.Row="1" />
-            <xctk:DecimalUpDown x:Name="_value"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Minimum="0.00"
-                                Maximum="{Binding ItemCount, ElementName=_rating}"
-                                Increment="0.05"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Indicates the current Rating value (exact)."
-                                Value="{Binding Value, ElementName=_rating}" />
-            <xctk:DecimalUpDown x:Name="_percentage"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Minimum="0.00"
-                                Maximum="1.00"
-                                Increment="0.02"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Indicates the current Rating value (percentage)."
-                                Visibility="Collapsed"
-                                Value="{Binding Value, ElementName=_rating}" />
-
-            <TextBlock Text="Item Count:"
-                       VerticalAlignment="Center"
-                       Grid.Row="2" />
-            <xctk:IntegerUpDown x:Name="_itemCount"
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Minimum="0"
-                                Maximum="10"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Indicates the amount of elements in the Rating control."
-                                Value="{Binding ItemCount, ElementName=_rating}" />
-
-            <TextBlock Text="Stroke:"
-                       VerticalAlignment="Center"
-                       Grid.Row="3" />
-            <xctk:DoubleUpDown x:Name="_strokeThickness"
-                               Grid.Row="3"
-                               Grid.Column="1"
-                               Minimum="0"
-                               Maximum="5"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Gets/Sets the icon's stroke thickness."
-                               Value="{Binding IconStrokeThickness, ElementName=_rating}" />
-
-            <TextBlock Text="Precision:"
-                       VerticalAlignment="Center"
-                       Grid.Row="4" />
-            <ComboBox x:Name="_precision"
-                      Grid.Row="4"
-                      Grid.Column="1"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the Precision used for the Rating control."
-                      SelectedValue="{Binding Precision, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Full"
-                             Tag="{x:Static xctk:RatingPrecision.Full}" />
-               <ComboBoxItem Content="Half"
-                             Tag="{x:Static xctk:RatingPrecision.Half}" />
-               <ComboBoxItem Content="Exact"
-                             Tag="{x:Static xctk:RatingPrecision.Exact}" />
-            </ComboBox>
-
-            <TextBlock Text="Orientation:"
-                       VerticalAlignment="Center"
-                       Grid.Row="5" />
-            <ComboBox x:Name="_orientation"
-                      Grid.Row="5"
-                      Grid.Column="1"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the Orientation used for the Rating control."
-                      SelectedValue="{Binding Orientation, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Horizontal"
-                             Tag="{x:Static xctk:RatingOrientation.Horizontal}" />
-               <ComboBoxItem Content="Vertical"
-                             Tag="{x:Static xctk:RatingOrientation.Vertical}" />
-            </ComboBox>
-
-            <TextBlock Text="FillDirection:"
-                       VerticalAlignment="Center"
-                       Grid.Row="6" />
-            <ComboBox x:Name="_fillDirection"
-                      Grid.Row="6"
-                      Grid.Column="1"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the Layout Direction used for the Rating control."
-                      SelectedValue="{Binding FillDirection, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Right"
-                             Tag="{x:Static xctk:RatingFillDirection.Right}" />
-               <ComboBoxItem Content="Left"
-                             Tag="{x:Static xctk:RatingFillDirection.Left}" />
-               <ComboBoxItem Content="Up"
-                             Tag="{x:Static xctk:RatingFillDirection.Up}" />
-               <ComboBoxItem Content="Down"
-                             Tag="{x:Static xctk:RatingFillDirection.Down}" />
-            </ComboBox>
-
-            <TextBlock Text="Rating Items"
-                       VerticalAlignment="Center"
-                       Grid.Row="7" />
-            <Button x:Name="_ratingItemsButton"
-                    Grid.Row="7"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Margin="5"
-                    Content="Rating Items"
-                    Click="RatingItemsButton_Click" />
-
-
-            <!-- Column 2 -->
-            <TextBlock Text="ReadOnly:"
-                       VerticalAlignment="Center"
-                       Grid.Column="3" />
-            <CheckBox x:Name="_readOnly"
-                      Grid.Column="4"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      IsChecked="{Binding ReadOnly, ElementName=_rating}" />
-
-            <TextBlock Text="Height:"
-                       VerticalAlignment="Center"
-                       Grid.Row="1"
-                       Grid.Column="3" />
-            <xctk:IntegerUpDown x:Name="_height"
-                                Grid.Row="1"
-                                Grid.Column="4"
-                                Minimum="10"
-                                Maximum="100"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Indicates the height of the Rating control."
-                                Value="{Binding IconHeight, ElementName=_rating}" />
-
-            <TextBlock Text="Icon Padding:"
-                       VerticalAlignment="Center"
-                       Grid.Row="2"
-                       Grid.Column="3" />
-            <xctk:DecimalUpDown x:Name="_iconPadding"
-                                Grid.Row="2"
-                                Grid.Column="4"
-                                Minimum="0.0"
-                                Maximum="20.0"
-                                Increment="1.0"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Indicates the padding used between each icon."
-                                Value="{Binding IconPadding, ElementName=_rating}" />
-
-            <TextBlock Text="Icon Type:"
-                       VerticalAlignment="Center"
-                       Grid.Row="3"
-                       Grid.Column="3" />
-            <ComboBox x:Name="_iconType"
-                      Grid.Row="3"
-                      Grid.Column="4"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the IconType used for the Rating control."
-                      SelectedValue="{Binding IconType, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Star"
-                             Tag="{x:Static xctk:RatingIconType.Star}" />
-               <ComboBoxItem Content="Circle"
-                             Tag="{x:Static xctk:RatingIconType.Circle}" />
-               <ComboBoxItem Content="Square"
-                             Tag="{x:Static xctk:RatingIconType.Square}" />
-               <ComboBoxItem Content="Triangle"
-                             Tag="{x:Static xctk:RatingIconType.Triangle}" />
-               <ComboBoxItem Content="Custom"
-                             Tag="{x:Static xctk:RatingIconType.Custom}" />
-            </ComboBox>
-
-            <TextBlock Text="Custom Path:"
-                       VerticalAlignment="Center"
-                       Grid.Row="4"
-                       Grid.Column="3" />
-            <TextBox x:Name="_customPath"
-                     Grid.Row="4"
-                     Grid.Column="4"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     IsEnabled="False"
-                     ToolTip="Gets/Sets the path for the custom icon used for the Rating control."
-                     Text="{Binding CustomPath, ElementName=_rating}" />
-
-            <TextBlock Text="Value Tooltip"
-                       VerticalAlignment="Center"
-                       Grid.Row="5"
-                       Grid.Column="3" />
-            <CheckBox x:Name="_showTooltip"
-                      Grid.Row="5"
-                      Grid.Column="4"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      IsChecked="{Binding ShowValueTooltip, ElementName=_rating}" />
-
-            <TextBlock Text="Show Labels"
-                       VerticalAlignment="Center"
-                       Grid.Row="6"
-                       Grid.Column="3" />
-            <CheckBox x:Name="_showLabels"
-                      Grid.Row="6"
-                      Grid.Column="4"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      IsChecked="{Binding ShowLabels, ElementName=_rating}" />
-
-            <TextBlock Text="Label Position:"
-                       VerticalAlignment="Center"
-                       Grid.Row="7"
-                       Grid.Column="3" />
-            <ComboBox x:Name="_labelPosition"
-                      Grid.Row="7"
-                      Grid.Column="4"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets the Position for the Labels."
-                      SelectedValue="{Binding LabelPosition, ElementName=_rating}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Before"
-                             Tag="{x:Static xctk:RatingLabelPosition.Before}" />
-               <ComboBoxItem Content="After"
-                             Tag="{x:Static xctk:RatingLabelPosition.After}" />
-            </ComboBox>
-
-
-            <!-- Column 3 -->
-            <TextBlock Text="Active Border:"
-                       VerticalAlignment="Center"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_activeBorder"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's border [active state]."
-                              SelectedColor="{Binding ActiveBorderColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="Active Fill:"
-                       VerticalAlignment="Center"
-                       Grid.Row="1"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_activeFill"
-                              Grid.Row="1"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's fill [active state]."
-                              SelectedColor="{Binding ActiveFillColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="Inactive Border:"
-                       VerticalAlignment="Center"
-                       Grid.Row="2"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_inactiveBorder"
-                              Grid.Row="2"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's border [inactive state]."
-                              SelectedColor="{Binding InactiveBorderColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="Inactive Fill:"
-                       VerticalAlignment="Center"
-                       Grid.Row="3"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_inactiveFill"
-                              Grid.Row="3"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's fill [inactive state]."
-                              SelectedColor="{Binding InactiveFillColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="Hover Border:"
-                       VerticalAlignment="Center"
-                       Grid.Row="4"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_hoverBorder"
-                              Grid.Row="4"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's border [hover state]."
-                              SelectedColor="{Binding HoverBorderColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="Hover Fill:"
-                       VerticalAlignment="Center"
-                       Grid.Row="5"
-                       Grid.Column="6" />
-            <xctk:ColorPicker x:Name="_hoverFill"
-                              Grid.Row="5"
-                              Grid.Column="7"
-                              VerticalAlignment="Center"
-                              Margin="5"
-                              ToolTip="Gets/Sets the color of the icon's fill [hover state]."
-                              SelectedColor="{Binding HoverFillColor, ElementName=_rating, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <xctk:Rating Name="_rating"
-                      VerticalAlignment="top"
-                      HorizontalAlignment="Left"
-                      ValueType="Exact"
-                      ReadOnly="True"
-                      IconHeight="50"
-                      ItemCount="5"
-                      Value="2.5"
-                      Orientation="Horizontal"
-                      FillDirection="Right"
-                      Precision="Exact"
-                      IconType="Star"
-                      CustomPath="M 0,19 L 35,39 24,45 55,63 47,68 100,100 67,58 75,54 51,32 58,28 39,0 z"
-                      IconPadding="2"
-                      IconStrokeThickness="1"
-                      ActiveBorderColor="Black"
-                      ActiveFillColor="Orange"
-                      InactiveBorderColor="Blue"
-                      InactiveFillColor="AliceBlue"
-                      HoverBorderColor="Red"
-                      HoverFillColor="Yellow"
-                      ShowValueTooltip="False"
-                      RatingValueChanged="Rating_RatingValueChanged" />
-
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\Rating.png" Width="600" Height="400"/>
-   ##END-->
-</local:DemoView>
\ No newline at end of file
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt
index 9b0e1e96..0f97e22a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/RichTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt
index f46c2268..516f1751 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,7 @@
            The RichTextBox is a TextBox that allows you to edit formatted text based on TextFormatters. The RichTextBoxFormatBar is a contextual formatting toolbar that mimics the behavior of the Microsoft Office 2010 formatting bar on selection.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt
index e09ea951..80c1eacf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -38,29 +38,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views
         {
             InitializeComponent();
 
-#if !OPEN_SOURCE            
 
-            ObservableCollection<PictureItem> pictures = new ObservableCollection<PictureItem>();
-            for (int i = 1; i <= 9; i++)
-            {
-                BitmapImage image = new BitmapImage();
-                image.BeginInit();
-                string filename = ("pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/SlideShow/Resources/photo_" + i + ".jpg");
-                image.UriSource = new Uri(filename, UriKind.RelativeOrAbsolute);
-                pictures.Add(new PictureItem("Picture " + i , image));
-                image.EndInit();
-            }
-            foreach (PictureItem picItem in pictures)
-            {
-                SlideShowItem aSlideShowItem = new SlideShowItem();
-                Image image = new Image();
-                image.Source = picItem.Photo;
-                image.Stretch = Stretch.Fill;
-                aSlideShowItem.Item = image;
-                aSlideShowItem.Description = picItem.Description;
-                _slideShow.Items.Add(aSlideShowItem);
-            }
-#endif
         }
 
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
index 1777a20e..bfce3417 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The SlideShow is used to display SlideShowItems in a fashion similar to a diaporama. SlideShowItems are not limited to images and can be built using any UIElement.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,191 +33,28 @@
             <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>
-          ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <conv:CountToIndexConverter x:Key="CountToIndexConverter" />
-      <conv:IndexToPositionConverter x:Key="IndexToPositionConverter" />
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="0,5,10,5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="180" />
-               <ColumnDefinition Width="30" />
-               <ColumnDefinition Width="180" />
-               <ColumnDefinition Width="150" />
-               <ColumnDefinition Width="75" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st Column-->
-
-            <!--Display DisplayCountLabel-->
-            <TextBlock Text="DisplayCountLabel: "
-                       VerticalAlignment="Center" />
-            <CheckBox x:Name="_displayCountLabel"
-                      Grid.Column="1"
-                      IsChecked="{Binding DisplayCountLabel, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--Display Caption-->
-            <TextBlock Grid.Row="1"
-                       Text="Display Caption: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Row="1"
-                      x:Name="_displayCaption"
-                      Grid.Column="1"
-                      IsChecked="{Binding DisplayCaption, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--SliderNavigation Bar-->
-            <TextBlock Grid.Row="2"
-                       Text="Display SliderNavigationBar: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Row="2"
-                      x:Name="_displaySliderNavigationBar"
-                      Grid.Column="1"
-                      IsChecked="{Binding DisplaySliderNavigationBar, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--Navigation Bar-->
-            <TextBlock Grid.Row="3"
-                       Text="Display NavigationBar: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Row="3"
-                      x:Name="_displayNavigationBar"
-                      Grid.Column="1"
-                      IsChecked="{Binding DisplayNavigationBar, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--SideNavigation Bar-->
-            <TextBlock Grid.Row="4"
-                       Text="Display SideNavigationButtons: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Row="4"
-                      x:Name="_displaySideNavigationButtons"
-                      Grid.Column="1"
-                      IsChecked="{Binding DisplaySideNavigationButtons, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--2nd Column-->
-
-            <!--PauseSlideShowOnMouseOver-->
-            <TextBlock Grid.Row="0"
-                       Text="PauseSlideShowOnMouseOver: "
-                       Grid.Column="2"
-                       VerticalAlignment="Bottom"
-                       Margin="10,0,5,5" />
-            <CheckBox Grid.Row="0"
-                      x:Name="_pauseSlideShowOnMouseOver"
-                      Grid.Column="3"
-                      IsChecked="{Binding PauseSlideShowOnMouseOver, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--AllowLooping-->
-            <TextBlock Grid.Row="1"
-                       Text="Allow Looping: "
-                       Grid.Column="2"
-                       VerticalAlignment="Bottom"
-                       Margin="10,0,5,5" />
-            <CheckBox Grid.Row="1"
-                      x:Name="_allowRotation"
-                      Grid.Column="3"
-                      IsChecked="{Binding AllowLooping, ElementName=_slideShow}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,2,5" />
-
-            <!--Interval-->
-            <TextBlock Grid.Row="2"
-                       Text="TimeInterval: "
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:IntegerUpDown Grid.Row="2"
-                                x:Name="_interval"
-                                Grid.Column="3"
-                                Minimum="100"
-                                Maximum="10000"
-                                Value="{Binding TimeInterval, ElementName=_slideShow, Mode=TwoWay}"
-                                DisplayDefaultValueOnEmptyText="True"
-                                DefaultValue="500"
-                                Height="20"
-                                Width="50"
-                                Increment="100"
-                                Margin="5,5,16,5"
-                                HorizontalAlignment="Left" />
-
-            <!--TransitionMode-->
-            <TextBlock Grid.Row="3"
-                       Text="TransitionMode: "
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox Grid.Row="3"
-                      Grid.Column="3"
-                      SelectedIndex="0"
-                      Width="100"
-                      SelectedValue="{Binding TransitionMode, ElementName=_slideShow}"
-                      SelectedValuePath="Content"
-                      VerticalAlignment="Center"
-                      HorizontalAlignment="Left"
-                      Margin="5,5,16,5">
-               <ComboBoxItem Content="Sliding" />
-               <ComboBoxItem Content="Fading" />
-               <ComboBoxItem Content="None" />
-            </ComboBox>
-
-         </Grid>
-
-      </GroupBox>
-
-      <StackPanel Grid.Row="1">
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <xctk:SlideShow x:Name="_slideShow"
-                         Height="280"
-                         Margin="-10,0,0,0">
-         </xctk:SlideShow>
-
-      </StackPanel>
-
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\SlideShow.png" Width="600" Height="280"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt
index b47a0e54..e6a0d8ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -47,80 +47,28 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     private const string MessageBoxStyleKey = "messageBoxStyle";
     private const string WindowControlStyleKey = "windowControlStyle";
     private const string WindowButtonStyle = "FancyButtonStyle";
-#if OPEN_SOURCE
     private const string StyleableWindowMessage = "StyleableWindow is a standalone window that can be styled just like ChildWindow or MessageBox. This is a feature of the \"Plus\" version.";
-#else
-    private const string StyleableWindowNoStyleKey = "styleableWindowNoStyle";
-    private const string StyleableWindowStyleKey = "styleableWindowStyle";
-    private StyleableWindow _styleableWindow;
-#endif
 
     public StyleableWindowView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      this.Unloaded += new RoutedEventHandler( OnSampleUnloaded );
-#endif
       this.UpdateWindowsStyles(null,null);
     }
 
-#if !OPEN_SOURCE
-    private void OnSampleUnloaded( object sender, RoutedEventArgs e )
-    {
-      //# Be sure to close the window
-      if( _styleableWindow != null )
-      {
-        _styleableWindow.Close();
-      }
-    }
-#endif
 
     private void OnStyleableWindow_Click( object sender, RoutedEventArgs e )
     {
-#if OPEN_SOURCE
       var msgBox = new Xceed.Wpf.Toolkit.MessageBox();
       msgBox.DataContext = this.DataContext;
       msgBox.Text = StyleableWindowMessage;
       msgBox.Caption = StyledMsgBoxTitle;
       msgBox.Style = ( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) ? ( Style )this.Resources[ MessageBoxStyleKey ] : null;
       msgBox.ShowDialog();
-#else
-      if( _styleableWindow == null )
-      {
-        _styleableWindow = new StyleableWindow();
-        _styleableWindow.Width = 500;
-        _styleableWindow.Height = 300;
-        _styleableWindow.Title = StyleableWindowTitle;
-        _styleableWindow.DataContext = this.DataContext;
-        _styleableWindow.Left = Application.Current.MainWindow.Left + ( Application.Current.MainWindow.ActualWidth / 2 );
-        _styleableWindow.Top = Application.Current.MainWindow.Top + ( Application.Current.MainWindow.ActualHeight / 2 );
-        _styleableWindow.Closed += new EventHandler( OnStyleableWindowClosed );
-        _styleableWindow.Topmost = true;
-
-        _styleableWindow.Content = new TextBlock()
-        {
-          Text = StyleableWindowContent,
-          TextWrapping = TextWrapping.Wrap
-        };
-
-        _styleableWindow.Style = ( _enableStyleCheckBox.IsChecked.GetValueOrDefault() )
-          ? ( Style )this.Resources[ StyleableWindowStyleKey ]
-          : ( Style )this.Resources[ StyleableWindowNoStyleKey ];
-
-        _styleableWindow.Show();
-      }
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private void OnStyleableWindowClosed( object sender, EventArgs e )
-    {
-      _styleableWindow.Closed -= new EventHandler( OnStyleableWindowClosed );
-      _styleableWindow.Style = null;
-      _styleableWindow.DataContext = null;
-      _styleableWindow = null;
+
+
     }
-#endif
+
     private void StandardMessageBoxButton_Click( object sender, RoutedEventArgs e )
     {
       System.Windows.MessageBox.Show( StandardMsgBoxMessage, StandardMsgBoxTitle );
@@ -150,15 +98,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
       {
         _childWindow.ClearValue( ChildWindow.StyleProperty );
       }
-      
-#if !OPEN_SOURCE
-      if( _styleableWindow != null )
-      {
-        _styleableWindow.Style = ( styled )
-          ? ( Style )this.Resources[ StyleableWindowStyleKey ]
-          : ( Style )this.Resources[ StyleableWindowNoStyleKey ];
-      }
-#endif
+
     }
   }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
index fe426a29..abbf2cd5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -28,12 +28,10 @@
          <LineBreak />
          <LineBreak />
          <Run>The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
 
       </Paragraph>
    </local:DemoView.Description>
@@ -57,11 +55,6 @@
             <Setter Property="CaptionForeground" Value="{Binding TitleForeground}" />
             <Setter Property="CaptionShadowBrush" Value="{Binding TitleShadowBrush}" />
             <Setter Property="CloseButtonStyle" Value="{Binding CloseButtonStyle}" />
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Setter Property="MinimizeButtonStyle" Value="{Binding MinimizeButtonStyle}" />
-            <Setter Property="MaximizeButtonStyle" Value="{Binding MaximizeButtonStyle}" />
-            <Setter Property="RestoreButtonStyle" Value="{Binding RestoreButtonStyle}" />
-            <!--##END-->
          </Style>
 
          <!--Style for the MessageBox-->
@@ -73,35 +66,10 @@
             <Setter Property="NoButtonStyle" Value="{StaticResource FancyButtonStyle}" />
          </Style>
 
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <!--Style for the StyleableWindow-->
-         <Style x:Key="styleableWindowNoStyle" TargetType="xctk:StyleableWindow" >
-            <Setter Property="Icon" Value="..\Resources\xceed_icon.png" />
-            <Setter Property="CloseButtonVisibility" Value="{Binding CloseButtonVisibility}" />
-            <Setter Property="WindowStyleOverride" Value="{Binding WindowStyle}" />
-            <Setter Property="ResizeMode" Value="{Binding ResizeMode}" />
-            <Setter Property="Width" Value="375" />
-            <Setter Property="Height" Value="150" />
-         </Style>
-         <Style x:Key="styleableWindowStyle" TargetType="xctk:StyleableWindow" BasedOn="{StaticResource styleableWindowNoStyle}">
-            <Setter Property="WindowBackground" Value="{Binding WindowBackground}" />
-            <Setter Property="WindowBorderBrush" Value="{Binding WindowBorderBrush}" />
-            <Setter Property="WindowInactiveBackground" Value="{Binding WindowInactiveBackground}" />
-            <Setter Property="WindowBorderThickness" Value="{Binding WindowBorderThickness}" />
-            <Setter Property="WindowOpacity" Value="{Binding WindowOpacity}" />
-            <Setter Property="TitleFontSize" Value="{Binding TitleFontSize}" />
-            <Setter Property="TitleForeground" Value="{Binding TitleForeground}" />
-            <Setter Property="TitleShadowBrush" Value="{Binding TitleShadowBrush}" />
-            <Setter Property="CloseButtonStyle" Value="{Binding CloseButtonStyle}" />
-            <Setter Property="MinimizeButtonStyle" Value="{Binding MinimizeButtonStyle}" />
-            <Setter Property="MaximizeButtonStyle" Value="{Binding MaximizeButtonStyle}" />
-            <Setter Property="RestoreButtonStyle" Value="{Binding RestoreButtonStyle}" />
-         </Style>
-         <!--##END-->
       </ResourceDictionary>
    </local:DemoView.Resources>
-   
-  
+
+
 
    <local:DemoView.DataContext>
       <!--A model containing the brushes and other properties was created to share theses values
@@ -166,7 +134,6 @@
             <GroupBox Header="Styleable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
                <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
                        Content="Show" Click="OnStyleableWindow_Click" >
-                  <!--##INCLUDE_OPEN_SOURCE                  
                   <Button.ContentTemplate>
                      <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -178,7 +145,6 @@
                         </StackPanel>
                      </DataTemplate>
                   </Button.ContentTemplate>
-                  ##END-->
                </Button>
             </GroupBox>
             <GroupBox Header="ChildWindow" Margin="5">
@@ -192,11 +158,6 @@
                                     WindowState="Open" 
                                     CloseButtonVisibility="{Binding CloseButtonVisibility}"
                                     WindowStyle="{Binding WindowStyle}" >
-                        <!--##EXCLUDE_OPEN_SOURCE-->
-                        <xctk:ChildWindow.ResizeMode>
-                           <Binding Path="ResizeMode"/>
-                        </xctk:ChildWindow.ResizeMode>
-                        <!--##END-->
                         <TextBlock>
                            This is the content of the child window.
                         </TextBlock>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
index 2cccef5c..61c45dfd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,9 +24,7 @@ using Xceed.Wpf.Toolkit;
 using System.Text.RegularExpressions;
 using System.IO;
 using System.Diagnostics;
-#if OPEN_SOURCE
 using System.Windows.Media.Imaging;
-#endif
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
 {
@@ -37,9 +35,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
   {
     #region Members
 
-#if !OPEN_SOURCE
-    private DependencyObject _textBlockIdentifier;
-#endif
 
     #endregion
 
@@ -52,7 +47,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
 
     private void OnLayoutComboSelectionChanged( object sender, RoutedEventArgs e )
     {
-#if OPEN_SOURCE
       ComboBox comboBox = sender as ComboBox;
       bool isPlusPanel = (comboBox.SelectedIndex >= 2);
 
@@ -130,524 +124,64 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
         if( _openSourceScreenShotDesc != null )
           _openSourceScreenShotDesc.Text = desc;
       }
-#endif
     }
 
     private void OnSwitchPanelLayoutChanged( object sender, RoutedEventArgs e )
     {
-#if !OPEN_SOURCE
-      SwitchPanel switchPanel = sender as SwitchPanel;
-      if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.Canvas )
-      {
-        InitCanvasPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.DockPanel )
-      {
-        InitDockPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.Grid )
-      {
-        InitGridPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.StackedStackPanel )
-      {
-        InitStackedStackPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.RelativeCanvas )
-      {
-        InitRelativeCanvasPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.RadialCanvas )
-      {
-        InitRadialCanvasPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.CameraPanel )
-      {
-        InitCameraPanel( switchPanel );
-      }
-      else if( switchPanel.ActiveLayout is Xceed.Wpf.Toolkit.Panels.AnimatedTimelinePanel )
-      {
-        InitAnimatedTimelinePanel( switchPanel );
-      }
-#endif
     }
 
-#if !OPEN_SOURCE
 
-    private void OnCanvasMoveItemComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
-      SetItemPositionOnCanvas( _textBlockIdentifier, coordinate.X, coordinate.Y );
-    }
 
-    private void OnDockComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo != null) && (combo.SelectedItem is Dock) )
-        SetItemPositionOnDockPanel( _textBlockIdentifier, (Dock)combo.SelectedItem );
-    }
 
-    private void OnGridComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
-      SetItemPositionOnGrid( _textBlockIdentifier, (int)coordinate.X, (int)coordinate.Y );
-    }
 
-    private void OnStackedStackComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo != null ) && ( combo.SelectedItem is int ) )
-        SetItemPositionOnStackedStackPanel( _textBlockIdentifier, (int)combo.SelectedItem );
-    }
 
-    private void OnStackedStackPanelStackLengthChanged( object sender, EventArgs e )
-    {
-      DoubleUpDown doubleUpDown = sender as DoubleUpDown;
-      if( doubleUpDown.Value.HasValue )
-      {
-        _stackedStackPanel.DefaultStackLength = double.IsNaN( doubleUpDown.Value.Value )
-                                                ? StackLength.Auto
-                                                : new StackLength( doubleUpDown.Value.Value );
-      }
-    }
 
-    private void OnRelativeLeftTopComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
 
-      SetItemPositionOnRelativeCanvas( _textBlockIdentifier, coordinate.X, coordinate.Y, null, null, null );
-    }
 
-    private void OnRelativeWidthHeightComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
 
-      SetItemPositionOnRelativeCanvas( _textBlockIdentifier, null, null, coordinate.X, coordinate.Y, null );
-    }
 
-    private void OnRelativePinPointComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
-      Point pinPoint = new Point( coordinate.X, coordinate.Y );
-      SetItemPositionOnRelativeCanvas( _textBlockIdentifier, null, null, null, null, pinPoint );
-    }
 
-    private void OnRadialCanvasCenterComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
-      _radialCanvas.Center = new Point( coordinate.X, coordinate.Y );
-    }
 
-    private void OnRadialCanvasAngleComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo != null ) && ( combo.SelectedItem is int ) )
-      {
-        if( _textBlockIdentifier != null )
-          Xceed.Wpf.Toolkit.Panels.RadialCanvas.SetAngle( _textBlockIdentifier, ( int )combo.SelectedItem );
-      }
-    }
 
-    private void OnRadialCanvasRadiusComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo != null ) && ( combo.SelectedItem is int ) )
-      {
-        if( _textBlockIdentifier != null )
-          Xceed.Wpf.Toolkit.Panels.RadialCanvas.SetRadius( _textBlockIdentifier, ( int )combo.SelectedItem );
-      }
-    }
 
-    private void OnRadialCanvasPinPointComboBoxChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo == null ) || !( combo.SelectedItem is Coordinates ) )
-      {
-        throw new InvalidDataException( "ComboBox should contain a coordinate." );
-      }
-      Coordinates coordinate = combo.SelectedItem as Coordinates;
-      Point pinPoint = new Point( coordinate.X, coordinate.Y );
-      SetItemPositionOnRadialCanvas( _textBlockIdentifier, null, null, pinPoint );
-    }
 
-    private void OnAnimatedTimelineUnitTimeSpanChanged( object sender, EventArgs e )
-    {
-      IntegerUpDown integerUpDown = sender as IntegerUpDown;
-      if( integerUpDown.Value.HasValue )
-      {
-        _animatedTimeLinePanel.UnitTimeSpan = (integerUpDown.Value.Value == 0)
-                                              ? System.TimeSpan.Zero
-                                              : new System.TimeSpan( integerUpDown.Value.Value, 0, 0, 0 );
-      }
-    }
 
-    private void OnAnimatedTimelineDatesChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox combo = sender as ComboBox;
-      if( ( combo != null ) && ( combo.SelectedItem is string ) )
-      {
-        string selectionContent = ( string )combo.SelectedItem;
-        string[] dateContent = selectionContent.Split( new string[]{ "to" }, StringSplitOptions.RemoveEmptyEntries );
-        if( dateContent.Length != 2 )
-          throw new InvalidDataException( "ComboBox should contain 2 date strings." );
 
-        if( ( _textBlockIdentifier != null ) && ( _textBlockIdentifier is TextBlock ) )
-        {
-          TextBlock textBlock = _textBlockIdentifier as TextBlock;
-          ResetItemContent( textBlock );
-          AddToItemContent( textBlock,  dateContent[ 0 ], dateContent[ 1 ] );
-        }
-        SetItemPositionOnAnimatedTimelinePanel( _textBlockIdentifier, System.DateTime.Parse( dateContent[ 0 ] ), System.DateTime.Parse( dateContent[ 1 ] ) );
-      }
-    }
 
-    private void OnAnimatedTimelinePanelDeactivated( object sender, RoutedEventArgs e )
-    {
-      AnimationPanel animationPanel = sender as AnimationPanel;
-      if( animationPanel != null )
-      {
-        ResetItemContent( "_item1" );
-        ResetItemContent( "_item2" );
-        ResetItemContent( "_item3" );
-        ResetItemContent( "_item4" );
-        ResetItemContent( "_item5" );
-        ResetItemContent( "_item6" );
-        ResetItemContent( "_item7" );
-        ResetItemContent( "_item8" );
-      }
-    }
 
-#endif //!OPEN_SOURCE
 
     #endregion 
 
     #region Methods (Private)
 
-    #if !OPEN_SOURCE
 
-    private void InitCanvasPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item8" ) as DependencyObject;
-        SetItemPositionOnCanvas( switchPanel, "_item1", 0, 200 );
-        SetItemPositionOnCanvas( switchPanel, "_item2", 150, 0 );
-        SetItemPositionOnCanvas( switchPanel, "_item3", 180, 180 );
-        SetItemPositionOnCanvas( switchPanel, "_item4", 12, 50 );
-        SetItemPositionOnCanvas( switchPanel, "_item5", 400, 30 );
-        SetItemPositionOnCanvas( switchPanel, "_item6", 500, 200 );
-        SetItemPositionOnCanvas( switchPanel, "_item7", 260, 50 );
-        SetItemPositionOnCanvas( switchPanel, "_item8", 600, 0 );
-      }
-    }
 
-    private void InitDockPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item2" ) as DependencyObject;
-    }
 
-    private void InitGridPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item4" ) as DependencyObject;
-        SetItemPositionOnGrid( switchPanel, "_item1", 1, 2 );
-        SetItemPositionOnGrid( switchPanel, "_item2", 3, 0 );
-        SetItemPositionOnGrid( switchPanel, "_item3", 2, 1 );
-        SetItemPositionOnGrid( switchPanel, "_item4", 3, 2 );
-        SetItemPositionOnGrid( switchPanel, "_item5", 3, 1 );
-        SetItemPositionOnGrid( switchPanel, "_item6", 2, 0 );
-        SetItemPositionOnGrid( switchPanel, "_item7", 0, 0 );
-        SetItemPositionOnGrid( switchPanel, "_item8", 1, 1 );
-      }
-    }
 
-    private void InitStackedStackPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item5" ) as DependencyObject;
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item1", 1 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item2", 3 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item3", 2 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item4", 3 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item5", 2 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item6", 2 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item7", 0 );
-        SetItemPositionOnStackedStackPanel( switchPanel, "_item8", 1 );
-      }
-    }
 
-    private void InitRelativeCanvasPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item6" ) as DependencyObject;
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item1", 0.3, 0.1 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item2", 0.55, 0 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item3", 0.6, 0.75 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item4", 0.05, 0.2 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item5", 0.45, 0.9 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item6", 0.2, 0.7 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item7", 0.5, 0.4 );
-        SetItemPositionOnRelativeCanvas( switchPanel, "_item8", 0.85, 0.8 );
-      }
-    }
 
-    private void InitRadialCanvasPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item7" ) as DependencyObject;
-        SetItemPositionOnRadialCanvas( switchPanel, "_item1", 278, 0 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item2", 100, 145 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item3", 125, 270 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item4", 200, 335 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item5", 200, 30 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item6", 25, 0 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item7", 175, 200 );
-        SetItemPositionOnRadialCanvas( switchPanel, "_item8", 300, 175 );
-      }
-    }
 
-    private void InitCameraPanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item3" ) as DependencyObject;
-        SetItemPositionOnCameraPanel( switchPanel, "_item1", 50, 100, 100 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item2", 400, 175, 25 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item3", 250, 300, 200 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item4", 75, 0, 50 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item5", 500, 150, 2 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item6", 25, 300, 90 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item7", 0, 200, 300 );
-        SetItemPositionOnCameraPanel( switchPanel, "_item8", 450, 250, 100 );
-      }
-    }
 
-    private void InitAnimatedTimelinePanel( SwitchPanel switchPanel )
-    {
-      if( ( switchPanel != null ) && ( switchPanel.ActiveLayout != null ) )
-      {
-        _textBlockIdentifier = switchPanel.ActiveLayout.FindName( "_item2" ) as DependencyObject;
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item1", new System.DateTime( 2012, 1, 1 ), new System.DateTime( 2012, 1, 1 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item2", new System.DateTime( 2012, 1, 3 ), new System.DateTime( 2012, 1, 3 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item3", new System.DateTime( 2012, 1, 1 ), new System.DateTime( 2012, 1, 4 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item4", new System.DateTime( 2012, 1, 4 ), new System.DateTime( 2012, 1, 4 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item5", new System.DateTime( 2012, 1, 1 ), new System.DateTime( 2012, 1, 1 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item6", new System.DateTime( 2012, 1, 7 ), new System.DateTime( 2012, 1, 7 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item7", new System.DateTime( 2012, 1, 5 ), new System.DateTime( 2012, 1, 7 ) );
-        SetItemPositionOnAnimatedTimelinePanel( switchPanel, "_item8", new System.DateTime( 2012, 1, 6 ), new System.DateTime( 2012, 1, 6 ) );
-      }
-    }
 
-    private void SetItemPositionOnCanvas( SwitchPanel switchPanel, string itemName, double left, double top )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnCanvas( ( DependencyObject )item, left, top );
-      }
-    }
-    
-    private void SetItemPositionOnCanvas( DependencyObject item, double left, double top )
-    {
-      if( item != null )
-      {
-        Xceed.Wpf.Toolkit.Panels.Canvas.SetLeft( item, left );
-        Xceed.Wpf.Toolkit.Panels.Canvas.SetTop( item, top );
-      }
-    }
 
-    private void SetItemPositionOnDockPanel( DependencyObject item, Dock dock )
-    {
-      if( item != null )
-        Xceed.Wpf.Toolkit.Panels.DockPanel.SetDock( item, dock );
-    }
 
-    private void SetItemPositionOnGrid( SwitchPanel switchPanel, string itemName, int row, int column )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnGrid( ( DependencyObject )item, row, column );
-      }
-    }
 
-    private void SetItemPositionOnGrid( DependencyObject item, int row, int column )
-    {
-      if( item != null )
-      {
-        Xceed.Wpf.Toolkit.Panels.Grid.SetRow( item, row );
-        Xceed.Wpf.Toolkit.Panels.Grid.SetColumn( item, column );
-      }
-    }
 
-    private void SetItemPositionOnStackedStackPanel( SwitchPanel switchPanel, string itemName, int stacked )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnStackedStackPanel( ( DependencyObject )item, stacked );
-      }
-    }
 
-    private void SetItemPositionOnStackedStackPanel( DependencyObject item, int stacked )
-    {
-      if( item != null )
-        Xceed.Wpf.Toolkit.Panels.StackedStackPanel.SetStack( item, stacked );
-    }
 
-    private void SetItemPositionOnRelativeCanvas( SwitchPanel switchPanel, string itemName, double left, double top )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnRelativeCanvas( ( DependencyObject )item, left, top, null, null, null );
-      }
-    }
 
-    private void SetItemPositionOnRelativeCanvas( DependencyObject item, double? left, double? top, double? width, double? height, Point? pinPoint )
-    {
-      if( item != null )
-      {
-        if( left.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RelativeCanvas.SetLeft( item, left.Value );
-        if( top.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RelativeCanvas.SetTop( item, top.Value );
-        if( width.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RelativeCanvas.SetRelativeWidth( item, width.Value );
-        if( height.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RelativeCanvas.SetRelativeHeight( item, height.Value );
-        if( pinPoint.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RelativeCanvas.SetPinPoint( item, pinPoint.Value );
-      }
-    }
 
-    private void SetItemPositionOnRadialCanvas( SwitchPanel switchPanel, string itemName, int radius, int angle )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnRadialCanvas( ( DependencyObject )item, radius, angle, null );
-      }
-    }
 
-    private void SetItemPositionOnRadialCanvas( DependencyObject item, int? radius, int? angle, Point? pinPoint )
-    {
-      if( item != null )
-      {
-        if( radius.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RadialCanvas.SetRadius( item, radius.Value );
-        if( angle.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RadialCanvas.SetAngle( item, angle.Value );
-        if( pinPoint.HasValue )
-          Xceed.Wpf.Toolkit.Panels.RadialCanvas.SetPinPoint( item, pinPoint.Value );
-      }
-    }
 
-    private void SetItemPositionOnCameraPanel( SwitchPanel switchPanel, string itemName, double left, double top, int depth )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        SetItemPositionOnCameraPanel( ( DependencyObject )item, left, top,  depth );
-      }
-    }
 
-    private void SetItemPositionOnCameraPanel( DependencyObject item, double left, double top, int depth )
-    {
-      if( item != null )
-      {
-        Xceed.Wpf.Toolkit.Panels.CameraPanel.SetLeft( item, left );
-        Xceed.Wpf.Toolkit.Panels.CameraPanel.SetTop( item, top );
-        Xceed.Wpf.Toolkit.Panels.CameraPanel.SetDepth( item, depth );
-      }
-    }
 
-    private void SetItemPositionOnAnimatedTimelinePanel( SwitchPanel switchPanel, string itemName, System.DateTime date, System.DateTime dateEnd )
-    {
-      if( switchPanel != null )
-      {
-        object item = switchPanel.ActiveLayout.FindName( itemName ) as object;
-        AddToItemContent( item, date.ToShortDateString(), dateEnd.ToShortDateString() );
-        SetItemPositionOnAnimatedTimelinePanel( ( DependencyObject )item, date, dateEnd );
-      }
-    }
 
-    private void SetItemPositionOnAnimatedTimelinePanel( DependencyObject item, System.DateTime date, System.DateTime dateEnd )
-    {
-      if( item != null )
-      {
-        Xceed.Wpf.Toolkit.Panels.AnimatedTimelinePanel.SetDate( item, date );
-        Xceed.Wpf.Toolkit.Panels.AnimatedTimelinePanel.SetDateEnd( item, dateEnd );
-      }
-    }
 
-    private void AddToItemContent( object o, string date1, string date2 )
-    {
-      if( o is TextBlock )
-      {
-        string addedString = "\n" + date1 + "\nto " + date2;
-        ( ( TextBlock )o ).Text += addedString;
-      }
-    }
 
-    private void ResetItemContent( object o )
-    {
-      if( o is TextBlock )
-      {
-        TextBlock textBlock = ( TextBlock )o;
-        //# Only keep the first line
-        int endIndex = textBlock.Text.IndexOf( '\n' );
-        if( endIndex > 0 )
-          textBlock.Text = textBlock.Text.Substring( 0, endIndex );
-      }
-    }
 
-    private void ResetItemContent( string itemName )
-    {
-      if( ( _switchPanel != null ) && ( _switchPanel.ActiveLayout != null ) )
-      {
-        object textBlock = _switchPanel.ActiveLayout.FindName( itemName );
-        ResetItemContent( textBlock );
-      }
-    }
 
-#endif //!OPEN_SOURCE
-    
+
+
     #endregion
 
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt
index f0c6bc1c..621016f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -29,7 +29,7 @@
             The SwitchPanel allows you to animate the children between different layouts.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <Style x:Key="panelElement" TargetType="{x:Type TextBlock}">
          <Setter Property="Background"
@@ -40,13 +40,13 @@
          <Setter Property="Height" Value="100" />
          <Setter Property="TextAlignment" Value="Center" />
       </Style>
-       
+
       <ObjectDataProvider x:Key="orientationCombo" MethodName="GetValues" ObjectType="{x:Type s:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="Orientation" />
             </ObjectDataProvider.MethodParameters>
       </ObjectDataProvider>
-       
+
       <Style x:Key="controlInError" TargetType="Control">
         <Style.Triggers>
             <Trigger Property="Validation.HasError" Value="true">
@@ -55,8 +55,7 @@
             </Trigger>
         </Style.Triggers>
      </Style>
-    
-<!--##INCLUDE_OPEN_SOURCE
+
       <Style x:Key="plusSuffix" TargetType="TextBlock">
           <Setter Property="Margin" Value="5,0,0,0"/>
           <Setter Property="Text" Value="Plus Only"/>
@@ -70,7 +69,6 @@
             </DataTrigger>
           </Style.Triggers>
       </Style>
-##END-->
 
       <Style x:Key="plusItem" TargetType="ComboBoxItem" >
          <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -79,9 +77,7 @@
                <DataTemplate>
                   <DockPanel>
                      <TextBlock DockPanel.Dock="Left" Text="{Binding}" />
-<!--##INCLUDE_OPEN_SOURCE
                      <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-##END-->
                   </DockPanel>
                </DataTemplate>
             </Setter.Value>
@@ -104,82 +100,20 @@
       <s:String x:Key="animatedTimelinePanelDescription">Defines an area where items are positioned on a timeline.</s:String>
 
             <conv:ComboBoxToVisibilityConverter x:Key="comboBoxToVisibilityConverter" />
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      <ObjectDataProvider x:Key="dockCombo" MethodName="GetValues" ObjectType="{x:Type s:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Dock" />
-            </ObjectDataProvider.MethodParameters>
-       </ObjectDataProvider>
-       
-      <x:Array x:Key="canvasMovePositionCombo" x:Type="view:Coordinates">
-         <view:Coordinates X="600" Y="0" />
-         <view:Coordinates X="300" Y="200" />
-      </x:Array>
-       
-      <x:Array x:Key="gridCombo" x:Type="view:Coordinates">
-         <view:Coordinates X="3" Y="2" />
-         <view:Coordinates X="1" Y="0" />
-         <view:Coordinates X="0" Y="1" />
-      </x:Array>
-       
-      <x:Array x:Key="stakedStackPanelCombo" x:Type="s:Int32">
-          <s:Int32>2</s:Int32>
-          <s:Int32>0</s:Int32>
-      </x:Array>
-
-      <x:Array x:Key="relativeLeftTopCombo" x:Type="view:Coordinates">
-         <view:Coordinates X="0.2" Y="0.7" />
-         <view:Coordinates X="0.85" Y="0.25" />
-      </x:Array>
-       
-      <x:Array x:Key="relativeWidthHeightCombo" x:Type="view:Coordinates">
-          <view:Coordinates X="{x:Static s:Double.NaN}" Y="{x:Static s:Double.NaN}" />
-          <view:Coordinates X="0.1" Y="0.5" />
-          <view:Coordinates X="0.5" Y="0.1" />
-      </x:Array>
-       
-      <x:Array x:Key="relativePinPointCombo" x:Type="view:Coordinates">
-         <view:Coordinates X="0.5" Y="0.5" />
-         <view:Coordinates X="0" Y="1" />
-         <view:Coordinates X="1" Y="0" />
-      </x:Array>
-       
-      <x:Array x:Key="radialCanvasCenterCombo" x:Type="view:Coordinates">
-         <view:Coordinates X="0.5" Y="0.5" />
-         <view:Coordinates X="0.75" Y="0.25" />
-         <view:Coordinates X="0.2" Y="0.8" />
-      </x:Array>
-       
-      <x:Array x:Key="radialCanvasAngleCombo" x:Type="s:Int32">
-          <s:Int32>45</s:Int32>
-          <s:Int32>145</s:Int32>
-          <s:Int32>200</s:Int32>
-          <s:Int32>300</s:Int32>
-      </x:Array>
-       
-      <x:Array x:Key="radialCanvasRadiusCombo" x:Type="s:Int32">
-          <s:Int32>0</s:Int32>
-          <s:Int32>50</s:Int32>
-          <s:Int32>175</s:Int32>
-          <s:Int32>250</s:Int32>
-      </x:Array>
-       
-       <x:Array x:Key="animatedTimelinePanelDatesCombo" x:Type="s:String">
-          <s:String>1/3/2012 to 1/3/2012</s:String>
-          <s:String>1/3/2012 to 1/5/2012</s:String>
-          <s:String>1/5/2012 to 1/5/2012</s:String>
-      </x:Array>
-       
-      <ObjectDataProvider x:Key="overlapBehaviorCombo" MethodName="GetValues" ObjectType="{x:Type s:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="panels:OverlapBehaviorKind" />
-            </ObjectDataProvider.MethodParameters>
-       </ObjectDataProvider>
 
-      <xctk:InverseBoolConverter x:Key="inverseBoolConverter" />
-        <!--##END-->
+
+
+
+
+
+
+
+
+
+
+
    </local:DemoView.Resources>
-   
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -220,7 +154,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
          </Grid.RowDefinitions>
-          
+
          <TextBlock Grid.Row="0" Text="Usage:" Style="{StaticResource Header}" />
         <TextBlock Grid.Row="1" Text="Resize the window to see the layout animation." />
 
@@ -228,32 +162,6 @@
             <xctk:SwitchPanel.Layouts>
                <xctk:WrapPanel x:Name="_wrapPanel" ItemWidth="100" ItemHeight="100"/>
                <xctk:RandomPanel x:Name="_randomPanel" />
-               <!--##EXCLUDE_OPEN_SOURCE-->
-               <xctk:Canvas />
-               <xctk:Carousel x:Name="_carouselPanel" Tilt="70" MaximumRadius="290" MaximumAngularSeparation="45" />
-               <xctk:DockPanel />
-               <xctk:Grid x:Name="_grid" ShowGridLines="True">
-                    <xctk:Grid.ColumnDefinitions>
-                        <xctk:ColumnDefinition />
-                        <xctk:ColumnDefinition />
-                        <xctk:ColumnDefinition />
-                     </xctk:Grid.ColumnDefinitions>
-                      <xctk:Grid.RowDefinitions>
-                        <xctk:RowDefinition />
-                        <xctk:RowDefinition />
-                        <xctk:RowDefinition />
-                        <xctk:RowDefinition />
-                      </xctk:Grid.RowDefinitions>
-               </xctk:Grid>
-               <xctk:StackPanel x:Name="_stackPanel" Orientation="Horizontal"/>
-               <xctk:StackedStackPanel  x:Name="_stackedStackPanel"/>
-               <xctk:AutoStretchStackPanel x:Name="_autoStretchStackPanel" />
-               <xctk:RelativeCanvas />
-               <xctk:RadialCanvas x:Name="_radialCanvas"/>
-               <xctk:CameraPanel x:Name="_cameraPanel" CameraX="130" CameraY="140" CameraZ="310"/>
-               <xctk:PerspectivePanel x:Name="_perspectivePanel" AnchorX="250" AnchorY="50" ShiftX="150" ShiftY="70" AngleOfTwist="-10"  DecayConstant="0.2"/>
-               <xctk:AnimatedTimelinePanel x:Name="_animatedTimeLinePanel" OverlapBehavior="Stretch" BeginDate="1/01/12" EndDate="1/08/12" SwitchLayoutDeactivated="OnAnimatedTimelinePanelDeactivated"/>
-               <!--##END-->
             </xctk:SwitchPanel.Layouts>
             <TextBlock x:Name="_item1" Text="Item #1" Style="{StaticResource panelElement}"/>
             <TextBlock x:Name="_item2" Text="Item #2" Style="{StaticResource panelElement}"/>
@@ -265,7 +173,6 @@
             <TextBlock x:Name="_item8" Text="Item #8" Style="{StaticResource panelElement}"/>
          </xctk:SwitchPanel>
 
-         <!--##INCLUDE_OPEN_SOURCE
          <Image x:Name="_openSourceScreenShot" Grid.Row="2" Height="250" Visibility="Collapsed" />
          <TextBlock x:Name="_openSourceScreenShotDesc" Grid.Row="3" TextWrapping="Wrap" Visibility="Collapsed" />
          <StackPanel x:Name="_openSourceTextHyperlink" Grid.Row="4" Orientation="Horizontal" Visibility="Collapsed">
@@ -276,7 +183,6 @@
                  </Hyperlink>
              </TextBlock>
          </StackPanel>
-         ##END-->
 
          <GroupBox Header="WrapPanel Toolbox" 
                    Background="White"
@@ -290,7 +196,7 @@
                 <TextBlock TextWrapping="Wrap"
                             Text="Resize the Window to animate the WrapPanel." 
                             Margin="10,0" />
-                
+
                 <Grid Margin="5">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -302,7 +208,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                        
+
                     <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
                     <ComboBox Grid.Column="1"
                               ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
@@ -342,7 +248,7 @@
                 </Grid>
             </StackPanel>
         </GroupBox>
-          
+
          <GroupBox Header="RandomPanel Toolbox" 
                    Background="White"
                    Grid.Row="3" 
@@ -355,7 +261,7 @@
                 <TextBlock TextWrapping="Wrap"
                            Text="Modify the Minimum and Maximum values to affect the children size." 
                            Margin="10,0" />
-                
+
                 <Grid Margin="5">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -367,7 +273,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                        
+
                     <TextBlock Text="Minimum Width:" VerticalAlignment="Center"/>
                     <xctk:DoubleUpDown x:Name="_minimumWidth"
                                        Grid.Column="1"
@@ -421,756 +327,42 @@
                 </Grid>
             </StackPanel>
         </GroupBox>
-          
-          <!--##EXCLUDE_OPEN_SOURCE-->
-          <GroupBox Header="CanvasPanel Toolbox" 
-                    Background="White"
-                    Grid.Row="3" 
-                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=2}" 
-                    Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource canvasPanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Use ComboBox to change the coordinates of item #8." 
-                           Margin="10,0" />
-                
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    
-                    <TextBlock Text="Move Item #8 to (X,Y):" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource canvasMovePositionCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnCanvasMoveItemComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="Carousel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=3}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                            Text="{StaticResource carouselDescription}" 
-                            Margin="10,0" />
-                
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                        
-                    <!--First Column-->
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_carouselPanel}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Row="1" Text="Are Children Scaled:" VerticalAlignment="Center"/>
-                    <CheckBox Grid.Row="1" 
-                              Grid.Column="1" 
-                              IsChecked="{Binding AreChildrenScaled, ElementName=_carouselPanel}" 
-                              ClickMode="Press" 
-                              VerticalAlignment="Center"
-                              Margin="5"/>
-                    <TextBlock Grid.Row="2" Text="Distant Child Scale:" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="2"
-                            Value="{Binding DistantChildScale, ElementName=_carouselPanel}"
-                            Minimum="-2"
-                            Maximum="2"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Row="3" Text="Tilt:" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="3"
-                            Minimum="-180"
-                            Maximum="180"
-                            Value="{Binding Tilt, ElementName=_carouselPanel}"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <!--Second Column-->
-                    <TextBlock Grid.Column="2" Text="Maximum Angular Separation:" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Value="{Binding MaximumAngularSeparation, ElementName=_carouselPanel}"
-                            Minimum="0"
-                            Maximum="45"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Row="1" Grid.Column="2" Text="Maximum Radius:" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="1"
-                            Value="{Binding MaximumRadius, ElementName=_carouselPanel}"
-                            Minimum="-290"
-                            Maximum="290"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Row="2" Grid.Column="2" Text="Angular Extent:" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="2"
-                            Value="{Binding AngularExtent, ElementName=_carouselPanel}"
-                            Minimum="0"
-                            Maximum="360"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Row="3" Grid.Column="2" Text="Angular Offset:" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="3"
-                            Minimum="0"
-                            Maximum="360"
-                            Value="{Binding AngularOffset, ElementName=_carouselPanel}"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="DockPanel Toolbox" 
-                    Grid.Row="3" 
-                    Background="White"
-                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=4}" 
-                    Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource dockPanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Use ComboBox to dock item #2." 
-                           Margin="10,0" />
-                
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    
-                   <TextBlock Text="Dock Item #2 to:" VerticalAlignment="Center" Margin="5"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource dockCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnDockComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="Grid Toolbox" 
-                    Grid.Row="3" 
-                    Background="White"
-                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=5}" 
-                    Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource gridDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Use the ComboBox to change the row and column of item #4." 
-                           Margin="10,0" />
-                
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    
-                    <TextBlock Text="Show Grid Lines:" VerticalAlignment="Center"/>
-                    <CheckBox Grid.Column="1"
-                              IsChecked="{Binding ShowGridLines, ElementName=_grid}"
-                              Margin="5" />
-                    
-                    <TextBlock Grid.Row="1" Text="Move Item #4 to:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Row="1"
-                              Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource gridCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnGridComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="StackPanel Toolbox" 
-                    Grid.Row="3" 
-                    Background="White"
-                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=6}" 
-                    Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource stackPanelDescription}" 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_stackPanel}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="StackedStackPanel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=7}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource stackedStackPanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Use the ComboBox to move Item #5 from stack to stack." 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_stackedStackPanel}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Row="1" Text="Move Item #5 to Stack: " VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              Grid.Row="1"
-                              ItemsSource="{Binding Source={StaticResource stakedStackPanelCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnStackedStackComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="2" />
-                    <TextBlock Grid.Column="2" Text="Default Stack Length:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <xctk:DoubleUpDown Grid.Column="3"
-                                       Value="NaN"
-                                       ValueChanged="OnStackedStackPanelStackLengthChanged"
-                                       AllowInputSpecialValues="NaN"
-                                       Minimum="0"
-                                       Maximum="250"
-                                       Width="100"
-                                       VerticalAlignment="Center"
-                                       Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="AutoStretchStackPanel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=8}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource autoStretchStackPanelDescription}" 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_autoStretchStackPanel}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Text="Gap Ratio:" Grid.Row="1" VerticalAlignment="Center"/>
-                    <xctk:DoubleUpDown Grid.Row="1"
-                                       Grid.Column="1"
-                                       Value="{Binding GapRatio, ElementName=_autoStretchStackPanel}"
-                                       AllowInputSpecialValues="None"
-                                       Increment="0.5"
-                                       Minimum="0"
-                                       Maximum="5"
-                                       Style="{StaticResource controlInError}"
-                                       Width="100"
-                                       VerticalAlignment="Center"
-                                       Margin="5" />
-                    <TextBlock Text="Is Children Reversed:" Grid.Column="2" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <CheckBox Grid.Column="3"
-                              IsChecked="{Binding IsChildOrderReversed, ElementName=_autoStretchStackPanel}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="RelativeCanvas Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=9}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource relativeCanvasDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Click on ComboBoxes to modify left, top, width, height, and pinPoint of item #6 relative to the panel." 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    
-                    <TextBlock Text="Move Item #6 with Relative (Left,Top):" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource relativeLeftTopCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnRelativeLeftTopComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Text="Use Item #6 with Relative (Width,Height):" Grid.Row="1" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              Grid.Row="1"
-                              ItemsSource="{Binding Source={StaticResource relativeWidthHeightCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnRelativeWidthHeightComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Text="Change Item #6 pinPoint (X,Y):" Grid.Column="2" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <ComboBox Grid.Column="3"
-                              ItemsSource="{Binding Source={StaticResource relativePinPointCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnRelativePinPointComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="RadialCanvas Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=10}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource radialCanvasDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Use the ComboBoxes to modify the angle, radius, and pinPoint of Item #7." 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    
-                    <TextBlock Text="Is Auto Arrange:" VerticalAlignment="Center"/>
-                    <CheckBox x:Name="_autoArrangeCheckBox"
-                              Grid.Column="1"
-                              IsChecked="{Binding IsAutoArrange, ElementName=_radialCanvas}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Row="1" Text="Center (X,Y):" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              Grid.Row="1"
-                              ItemsSource="{Binding Source={StaticResource radialCanvasCenterCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnRadialCanvasCenterComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Column="2" Text="Angle for item #7:" VerticalAlignment="Center" Margin="20,0,0,0" IsEnabled="{Binding IsEnabled, ElementName=_radialAngleComboBox}" Style="{StaticResource DisableGrayText}"/>
-                    <ComboBox x:Name="_radialAngleComboBox"
-                              Grid.Column="3"
-                              ItemsSource="{Binding Source={StaticResource radialCanvasAngleCombo}}" 
-                              SelectedIndex="2"
-                              SelectionChanged="OnRadialCanvasAngleComboBoxChanged"
-                              IsEnabled="{Binding IsChecked, ElementName=_autoArrangeCheckBox, Converter={StaticResource inverseBoolConverter}}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Column="2" Grid.Row="1" Text="Radius for item #7:" VerticalAlignment="Center" Margin="20,0,0,0" IsEnabled="{Binding IsEnabled, ElementName=_radialRadiusComboBox}" Style="{StaticResource DisableGrayText}"/>
-                    <ComboBox x:Name="_radialRadiusComboBox"
-                              Grid.Column="3"
-                              Grid.Row="1"
-                              ItemsSource="{Binding Source={StaticResource radialCanvasRadiusCombo}}" 
-                              SelectedIndex="2"
-                              SelectionChanged="OnRadialCanvasRadiusComboBoxChanged"
-                              IsEnabled="{Binding IsChecked, ElementName=_autoArrangeCheckBox, Converter={StaticResource inverseBoolConverter}}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Column="2" Grid.Row="2" Text="PinPoint for item #7:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <ComboBox Grid.Column="3"
-                              Grid.Row="2"
-                              ItemsSource="{Binding Source={StaticResource relativePinPointCombo}}" 
-                              SelectedIndex="0"
-                              SelectionChanged="OnRadialCanvasPinPointComboBoxChanged"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="CameraPanel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=11}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource cameraPanelDescription}" 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="150"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="150"/>
-                    </Grid.ColumnDefinitions>
-                    
-                    <TextBlock Text="Camera X:" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Value="{Binding CameraX, ElementName=_cameraPanel}"
-                            Minimum="0"
-                            Maximum="400"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Camera Y:" Grid.Row="1" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="1"
-                            Value="{Binding CameraY, ElementName=_cameraPanel}"
-                            Minimum="0"
-                            Maximum="300"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Camera Z:" Grid.Row="2" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="2"
-                            Value="{Binding CameraZ, ElementName=_cameraPanel}"
-                            Minimum="0"
-                            Maximum="500"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Z Scale Factor:" Grid.Row="3" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="3"
-                            Value="{Binding ZScaleFactor, ElementName=_cameraPanel}"
-                            Minimum="1"
-                            Maximum="400"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Column="2" Text="Position X for item #3:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Value="{Binding (xctk:CameraPanel.Left), ElementName=_item3}"
-                            Minimum="0"
-                            Maximum="400"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Column="2" Grid.Row="1" Text="Position Y for item #3:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="1"
-                            Value="{Binding (xctk:CameraPanel.Top), ElementName=_item3}"
-                            Minimum="0"
-                            Maximum="300"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Grid.Column="2" Grid.Row="2" Text="Position Z for item #3:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="2"
-                            Value="{Binding (xctk:CameraPanel.Depth), ElementName=_item3}"
-                            Minimum="0"
-                            Maximum="300"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="PerspectivePanel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=12}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource perspectivePanelDescription}" 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                    </Grid.ColumnDefinitions>
-                    
-                    <!--First Colummn -->
-                    <TextBlock Text="Active Child Index:" VerticalAlignment="Center"/>
-                    <xctk:IntegerUpDown Grid.Column="1"
-                                        Value="{Binding ActiveChildIndex, ElementName=_perspectivePanel}"
-                                        Minimum="0"
-                                        Maximum="7"
-                                        Style="{StaticResource controlInError}"
-                                        VerticalAlignment="Center"
-                                        Margin="5" />
-                    <TextBlock Text="Anchor X:" Grid.Row="1" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="1"
-                            Value="{Binding AnchorX, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="500"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Anchor Y:" Grid.Row="2" VerticalAlignment="Center"/>
-                    <Slider Grid.Column="1"
-                            Grid.Row="2"
-                            Value="{Binding AnchorY, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="200"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <!--Second Column -->
-                    <TextBlock Text="Angle of Twist:" Grid.Column="2" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Value="{Binding AngleOfTwist, ElementName=_perspectivePanel}"
-                            Minimum="-50"
-                            Maximum="50"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Shift X:" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="1"
-                            Value="{Binding ShiftX, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="350"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Shift Y:" Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="3"
-                            Grid.Row="2"
-                            Value="{Binding ShiftY, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="200"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <!--Third Column-->
-                    <TextBlock Text="Decay Constant:" Grid.Column="4" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="5"
-                            Value="{Binding DecayConstant, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="1.5"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Scale Factor X:" Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="5"
-                            Grid.Row="1"
-                            Value="{Binding ScaleFactorX, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="1.25"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                    <TextBlock Text="Scale Factor Y:" Grid.Row="2" Grid.Column="4" VerticalAlignment="Center" Margin="15,0,0,0"/>
-                    <Slider Grid.Column="5"
-                            Grid.Row="2"
-                            Value="{Binding ScaleFactorY, ElementName=_perspectivePanel}"
-                            Minimum="0"
-                            Maximum="1.25"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          
-          <GroupBox Header="AnimatedTimeLinePanel Toolbox" 
-                   Grid.Row="3" 
-                   Background="White"
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=13}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource animatedTimelinePanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Change the position of Item #2 with the ComboBox." 
-                           Margin="10,0" />
 
-                <Grid Margin="5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    
-                    <!--First Colummn -->
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_animatedTimeLinePanel}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Text="Begin Date:" Grid.Row="1" VerticalAlignment="Center"/>
-                    <DatePicker Grid.Column="1"
-                                Grid.Row="1"
-                                SelectedDate="{Binding BeginDate, ElementName=_animatedTimeLinePanel}"
-                                DisplayDateStart="1/01/12" 
-                                DisplayDateEnd="1/07/12" 
-                                SelectedDateFormat="Short"
-                                VerticalAlignment="Center"
-                                Margin="5" />
-                    <TextBlock Text="End Date:" Grid.Row="2" VerticalAlignment="Center"/>
-                    <DatePicker Grid.Column="1"
-                                Grid.Row="2"
-                                SelectedDate="{Binding EndDate, ElementName=_animatedTimeLinePanel}"
-                                DisplayDateStart="1/01/12" 
-                                DisplayDateEnd="1/07/12" 
-                                SelectedDateFormat="Short"
-                                VerticalAlignment="Center"
-                                Margin="5" />
-                    <TextBlock Text="Overlap Behavior:" Grid.Row="3" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              Grid.Row="3"
-                              ItemsSource="{Binding Source={StaticResource overlapBehaviorCombo}}" 
-                              SelectedItem="{Binding OverlapBehavior, ElementName=_animatedTimeLinePanel}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <!--Second Colummn -->
-                    <TextBlock Text="Keep Original Order For Overlap:" Grid.Column="2" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <CheckBox Grid.Column="3"
-                              IsChecked="{Binding KeepOriginalOrderForOverlap, ElementName=_animatedTimeLinePanel}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Text="Unit Size:" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" Margin="25,0,0,0" IsEnabled="{Binding Value, ElementName=_unitTimeSpan}" Style="{StaticResource DisableGrayText}"/>
-                    <xctk:DoubleUpDown Grid.Column="3"
-                                       Grid.Row="1"
-                                       Value="{Binding UnitSize, ElementName=_animatedTimeLinePanel}"
-                                       AllowInputSpecialValues="NaN"
-                                       Minimum="0"
-                                       Maximum="200"
-                                       IsEnabled="{Binding Value, ElementName=_unitTimeSpan}"
-                                       VerticalAlignment="Center"
-                                       Margin="5" />
-                    <TextBlock Text="Unit Time Span (Days):" Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <xctk:IntegerUpDown x:Name="_unitTimeSpan"
-                                        Grid.Column="3"
-                                        Grid.Row="2"
-                                        Value="0"
-                                        ValueChanged="OnAnimatedTimelineUnitTimeSpanChanged"
-                                        Minimum="0"
-                                        Maximum="7"
-                                        VerticalAlignment="Center"
-                                        Margin="5" />
-                    <TextBlock Text="Change Item #2 Dates:" Grid.Column="2" Grid.Row="3" VerticalAlignment="Center" Margin="25,0,0,0"/>
-                    <ComboBox Grid.Column="3"
-                              Grid.Row="3"
-                              ItemsSource="{StaticResource animatedTimelinePanelDatesCombo}"
-                              SelectedIndex="0"
-                              SelectionChanged="OnAnimatedTimelineDatesChanged"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-          <!--##END-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      </Grid>
    </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt
index 9a3fb22c..67eb9b0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,12 +27,6 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.IO;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Themes.Metro;
-using System.Diagnostics;
-using Xceed.Wpf.Themes.Office2007;
-using Xceed.Wpf.Themes.Windows10;
-#endif
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
@@ -41,13 +35,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
   /// </summary>
   public partial class ThemingAvalonDockView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Brush _accentBrush = new SolidColorBrush( System.Windows.Media.Color.FromRgb( 255, 152, 29 ) );
 
-    #endregion
-#endif
 
     #region constructors
 
@@ -65,18 +54,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
     {
       AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
 
-#if OPEN_SOURCE
       if( comboBoxItem != null )
       {
         this.SetOpenSourceImage( comboBoxItem );
       }
-#else
-      this.SetInternalControlsTheme( comboBoxItem );
-      if( _accentColorPanel != null )
-      {
-        _accentColorPanel.Visibility = Visibility.Hidden;
-      }
-#endif
     }
 
     private void AvalonDockControlsThemes_Initialized( object sender, EventArgs e )
@@ -87,68 +68,24 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
     private void MetroComboBoxItem_Selected( object sender, RoutedEventArgs e )
     {
       AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
-#if OPEN_SOURCE
       if( comboBoxItem != null )
       {
         this.SetOpenSourceImage( comboBoxItem );
       }
-#else
-      this.SetInternalControlsTheme( comboBoxItem );
-      if( comboBoxItem != null )
-      {
-        comboBoxItem.Tag = this.GetAvalonDockMetroTheme( ( comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroDark )
-                                                      ? new Xceed.Wpf.AvalonDock.Themes.MetroAccent.AvalonDockMetroDarkThemeResourceDictionary() as MetroThemeResourceDictionaryBase
-                                                      : new Xceed.Wpf.AvalonDock.Themes.MetroAccent.AvalonDockMetroLightThemeResourceDictionary() as MetroThemeResourceDictionaryBase );
-    }
-#endif
     }
 
-#if !OPEN_SOURCE
 
-    private void RadioButton_Checked( object sender, RoutedEventArgs e )
-    {
-      RadioButton button = sender as RadioButton;
-      if( button == null )
-        return;
 
-      _accentBrush = button.Background;
-      if( _accentBrush == null )
-        return;
 
-      AvalonDockComboBoxItem comboBoxItem = _themeCombo.SelectedItem as AvalonDockComboBoxItem;
 
-      if( comboBoxItem != null )
-      {
-        this.SetInternalControlsTheme( comboBoxItem );
 
-        if( comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroDark )
-        {
-          metroDarkComboBoxItem.Tag = this.GetAvalonDockMetroTheme( new Xceed.Wpf.AvalonDock.Themes.MetroAccent.AvalonDockMetroDarkThemeResourceDictionary() );
-        }
-        else if( comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroLight )
-        {
-          metroLightComboBoxItem.Tag = this.GetAvalonDockMetroTheme( new Xceed.Wpf.AvalonDock.Themes.MetroAccent.AvalonDockMetroLightThemeResourceDictionary() );
-        }
-      }
-    }
 
-    private Xceed.Wpf.AvalonDock.Themes.MetroAccentTheme GetAvalonDockMetroTheme( MetroThemeResourceDictionaryBase metroThemeResourceDictionary )
-    {
-      if( _accentColorPanel != null )
-      {
-        _accentColorPanel.Visibility = Visibility.Visible;
-      }
-      metroThemeResourceDictionary.AccentBrush = _accentBrush;
-      return new Xceed.Wpf.AvalonDock.Themes.MetroAccentTheme( metroThemeResourceDictionary );
-    }
 
-#endif
 
     #endregion
 
     #region private Methods
 
-#if OPEN_SOURCE
 
      private void SetOpenSourceImage( AvalonDockComboBoxItem comboBoxItem )
     {
@@ -204,86 +141,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
       }
     }
 
-#else
 
-    private void SetInternalControlsTheme( AvalonDockComboBoxItem comboBoxItem )
-    {
-      if( ( comboBoxItem == null ) || ( SampleBorder == null ) )
-        return;
 
-      SampleBorder.Resources.MergedDictionaries.Clear();
 
-      if( comboBoxItem != null )
-      {
-        switch( comboBoxItem.ThemeEnum )
-        {
-          case AvalonDockThemesEnum.Generic:
-          case AvalonDockThemesEnum.Aero:
-          case AvalonDockThemesEnum.VS2010:
-          case AvalonDockThemesEnum.Metro:
-            break;
-          case AvalonDockThemesEnum.Office2007Black:
-            Office2007BlackResourceDictionary office2007Black = new Xceed.Wpf.Themes.Office2007.Office2007BlackResourceDictionary();
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              office2007Black.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( office2007Black );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007BlackResourceDictionary() );
-            break;
-          case AvalonDockThemesEnum.Office2007Blue:
-            Office2007BlueResourceDictionary office2007Blue = new Xceed.Wpf.Themes.Office2007.Office2007BlueResourceDictionary();
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              office2007Blue.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( office2007Blue );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007BlueResourceDictionary() );
-            break;
-          case AvalonDockThemesEnum.Office2007Silver:
-            Office2007SilverResourceDictionary office2007Silver = new Xceed.Wpf.Themes.Office2007.Office2007SilverResourceDictionary();
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              office2007Silver.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( office2007Silver );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007SilverResourceDictionary() );
-            break;
-          case AvalonDockThemesEnum.Windows10:
-            Windows10ResourceDictionary windows10 = new Xceed.Wpf.Themes.Windows10.Windows10ResourceDictionary();
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              windows10.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( windows10 );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Windows10.Windows10ResourceDictionary() );
-            break;
-          case AvalonDockThemesEnum.MetroDark:
-            MetroDarkThemeResourceDictionary darkTheme = new Xceed.Wpf.Themes.Metro.MetroDarkThemeResourceDictionary( _accentBrush );
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              darkTheme.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( darkTheme );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroDarkThemeResourceDictionary( _accentBrush ) );
-            break;
-          case AvalonDockThemesEnum.MetroLight:
-            MetroLightThemeResourceDictionary lightTheme = new Xceed.Wpf.Themes.Metro.MetroLightThemeResourceDictionary( _accentBrush );
-            if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-            {
-              lightTheme.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-            }
-            SampleBorder.Resources.MergedDictionaries.Add( lightTheme );
-            SampleBorder.Resources.MergedDictionaries.Add( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroLightThemeResourceDictionary( _accentBrush ) );
-            break;
-          default:
-            Debug.Assert( false, "Unknown theme" );
-            break;
-        }
-      }
-    }
 
-#endif
 
     #endregion
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt
index 14741de0..3a9b2773 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,14 +27,12 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>Changes the themes of the AvalonDock controls. Available themes are System, Aero, VS2010, Metro, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.AvalonDock.Themes.xxx.dll assemblies are necessary to use these themes.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>Some features of this sample are only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
@@ -43,132 +41,9 @@
          <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
          </ResourceDictionary.MergedDictionaries>
-         
-         <!--##EXCLUDE_OPEN_SOURCE-->
-      <LinearGradientBrush x:Key="customAccentBrush1"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF0086c6"
-                       Offset="0" />
-         <GradientStop Color="#FF66ccff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.97" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="1" />
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="customAccentBrush2"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FFff0099"
-                       Offset="0" />
-         <GradientStop Color="#FF993366"
-                       Offset="1" />
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="customAccentBrush3"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF9DE214"
-                       Offset="0" />
-         <GradientStop Color="#FF9DE214"
-                       Offset="0.2" />
-         <GradientStop Color="#FF95CA2A"
-                       Offset="0.2" />
-         <GradientStop Color="#FF339933"
-                       Offset="1" />
-      </LinearGradientBrush>
 
-      <Style x:Key="MetroSampleRadioButtonTemplate"
-             TargetType="RadioButton">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="RadioButton">
-                  <Grid>
-                     <VisualStateManager.VisualStateGroups>
-                        <VisualStateGroup x:Name="CommonStates">
-                           <VisualStateGroup.Transitions>
-                              <VisualTransition GeneratedDuration="0:0:0.2" />
-                              <VisualTransition From="Normal"
-                                                GeneratedDuration="0"
-                                                To="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.45"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualTransition>
-                           </VisualStateGroup.Transitions>
-                           <VisualState x:Name="Normal" />
-                           <VisualState x:Name="MouseOver">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="0.35"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="rectangle" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Pressed">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="0.35"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="rectangle" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Disabled">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To=".2"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="content" />
-                              </Storyboard>
-                           </VisualState>
-                        </VisualStateGroup>
-                        <VisualStateGroup x:Name="CheckStates">
-                           <VisualStateGroup.Transitions>
-                              <VisualTransition GeneratedDuration="0:0:0.2" />
-                           </VisualStateGroup.Transitions>
-                           <VisualState x:Name="Checked">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="1"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="CheckIcon" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Unchecked" />
-                        </VisualStateGroup>
-                     </VisualStateManager.VisualStateGroups>
-                     <Rectangle x:Name="content"
-                                Width="20"
-                                Height="20"
-                                Fill="{TemplateBinding Background}" />
-                     <Path x:Name="CheckIcon"
-                           Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                           Fill="White"
-                           FlowDirection="LeftToRight"
-                           Opacity="0"
-                           Stretch="Fill"
-                           UseLayoutRounding="False"
-                           VerticalAlignment="Bottom"
-                           HorizontalAlignment="Right"
-                           Width="12"
-                           Height="12"
-                           Margin="0,0,1,1" />
-                     <Rectangle x:Name="rectangle"
-                                Fill="White"
-                                Opacity="0" />
-                  </Grid>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-      <!--##END-->
 
-      <!--##INCLUDE_OPEN_SOURCE
+
       <Style x:Key="plusSuffix" TargetType="TextBlock">
           <Setter Property="Margin" Value="5,0,0,0"/>
           <Setter Property="Text" Value="Plus Only"/>
@@ -182,7 +57,6 @@
             </DataTrigger>
           </Style.Triggers>
       </Style>
-##END-->
 
       <Style x:Key="plusItem"
              TargetType="ComboBoxItem">
@@ -194,9 +68,7 @@
                   <DockPanel>
                      <TextBlock DockPanel.Dock="Left"
                                 Text="{Binding}" />
-                     <!--##INCLUDE_OPEN_SOURCE
                      <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-##END-->
                   </DockPanel>
                </DataTemplate>
             </Setter.Value>
@@ -215,9 +87,7 @@
                                 Text="{Binding}" />
                      <TextBlock TextAlignment="Right"
                                 Style="{StaticResource newSuffix}" />
-                        <!--##INCLUDE_OPEN_SOURCE
                      <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-##END-->
                   </DockPanel>
                </DataTemplate>
             </Setter.Value>
@@ -231,9 +101,7 @@
          <RowDefinition Height="Auto" />
          <RowDefinition Height="Auto" />
          <RowDefinition Height="*" />
-         <!--##INCLUDE_OPEN_SOURCE
          <RowDefinition Height="Auto" />
-         ##END-->
       </Grid.RowDefinitions>
 
       <GroupBox Header="Features"
@@ -282,41 +150,21 @@
                                                Content="Office2007 Black"
                                                Selected="DefaultComboBoxItem_Selected"
                                                ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Black}">
-                     <!--##EXCLUDE_OPEN_SOURCE-->
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:Office2007BlackTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                     <!--##END-->
                   </view:AvalonDockComboBoxItem>
                   <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
                                                Content="Office2007 Blue"
                                                Selected="DefaultComboBoxItem_Selected"
                                                ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Blue}">
-                     <!--##EXCLUDE_OPEN_SOURCE-->
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:Office2007BlueTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                     <!--##END-->
                   </view:AvalonDockComboBoxItem>
                   <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
                                                Content="Office2007 Silver"
                                                Selected="DefaultComboBoxItem_Selected"
                                                ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Silver}">
-                     <!--##EXCLUDE_OPEN_SOURCE-->
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:Office2007SilverTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                     <!--##END-->
                   </view:AvalonDockComboBoxItem>
                   <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
                                                Content="Windows 10"
                                                Selected="DefaultComboBoxItem_Selected"
                                                ThemeEnum="{x:Static view:AvalonDockThemesEnum.Windows10}">
-                     <!--##EXCLUDE_OPEN_SOURCE-->
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:Windows10Theme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                     <!--##END-->
                   </view:AvalonDockComboBoxItem>
                   <view:AvalonDockComboBoxItem x:Name="metroDarkComboBoxItem"
                                                Style="{StaticResource plusItem}"
@@ -334,213 +182,8 @@
                   </view:AvalonDockComboBoxItem>
                </ComboBox>
             </StackPanel>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <StackPanel x:Name="_accentColorPanel"
-                        Grid.Column="1"
-                        Margin="10,0,0,0"
-                        Orientation="Horizontal"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Visibility="Hidden">
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition />
-                     <RowDefinition />
-                  </Grid.RowDefinitions>
 
-                  <StackPanel>
-                     <TextBlock Text="Accent Color"
-                                FontFamily="Segoe UI"
-                                FontSize="13"
-                                Foreground="#414141" />
-                     <StackPanel Orientation="Horizontal">
-                        <RadioButton Background="#FFF4B300"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Gold"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF78BA00"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="LightGreen"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF2673EC"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Blue"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FFAE113D"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="MediumVioletRed"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF632F00"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Brown"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FFB01E00"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="DarkRed"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FFC1004F"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="PaleVioletRed"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF7200AC"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="DarkViolet"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF4617B4"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="DarkSlateBlue"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF006AC1"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="RoyalBlue"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF008287"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Teal"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF199900"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Green"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                        <RadioButton Background="#FF00C13F"
-                                     Margin="0,0,2,0"
-                                     Checked="RadioButton_Checked"
-                                     GroupName="themeRadioGroup"
-                                     Tag="Lime"
-                                     Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     </StackPanel>
-                  </StackPanel>
-                  <StackPanel Grid.Row="1"
-                              Orientation="Horizontal"
-                              Margin="0,2,0,0">
-                     <RadioButton Background="#FFFF981D"
-                                  Margin="0,0,2,0"
-                                  IsChecked="True"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="LightSalmon"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFFF2E12"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Red"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFFF1D77"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="DeepPink"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFAA40FF"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Purple"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FF1FAEFF"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="DeepSkyBlue"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FF56C5FF"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="DarkTurquoise"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FF00D8CC"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Turquoise"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FF91D100"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="YellowGreen"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFE1B700"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="DarkYellow"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFFF76BC"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Pink"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FF00A4A4"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="LightSeaGreen"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Background="#FFFF7D23"
-                                  Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Orange"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                  </StackPanel>
-               </Grid>
 
-               <StackPanel Margin="10,0,0,0">
-                  <TextBlock Text="Custom Color"
-                             FontFamily="Segoe UI"
-                             FontSize="13"
-                             Foreground="#414141" />
-                  <StackPanel Orientation="Horizontal">
-                     <RadioButton Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  Background="{StaticResource customAccentBrush1}"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Custom1"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  Background="{StaticResource customAccentBrush2}"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Custom2"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                     <RadioButton Margin="0,0,2,0"
-                                  Checked="RadioButton_Checked"
-                                  Background="{StaticResource customAccentBrush3}"
-                                  GroupName="themeRadioGroup"
-                                  Tag="Custom3"
-                                  Style="{StaticResource MetroSampleRadioButtonTemplate}" />
-                  </StackPanel>
-               </StackPanel>
-            </StackPanel>
-            <!--##END-->
          </Grid>
       </GroupBox>
 
@@ -663,7 +306,6 @@
          </xcad:DockingManager>
       </Border>
 
-      <!--##INCLUDE_OPEN_SOURCE
       <Image x:Name="_openSourceScreenShot" Grid.Row="2" Height="395" Visibility="Collapsed" />
       <StackPanel x:Name="_openSourceTextHyperlink" Grid.Row="3" Orientation="Horizontal" Visibility="Collapsed">
             <TextBlock Text="This theme is only available in the &quot;Plus&quot; version. "/>
@@ -673,6 +315,5 @@
                </Hyperlink>
             </TextBlock>
       </StackPanel>
-      ##END-->
    </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt
index 1dfeb9af..90768ddf 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,11 +20,6 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using Xceed.Wpf.Toolkit;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Themes;
-using Xceed.Wpf.Themes.Metro;
-using Xceed.Wpf.Themes;
-#endif
 using System.Windows.Controls.Primitives;
 using System;
 using System.Data;
@@ -40,194 +35,49 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
   /// </summary>
   public partial class ThemingCoreWPFView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    public static string DefaultSearchString = "type in your search";
-    private Storyboard _progressStoryboard = null;
-    private Brush _accentBrush = new SolidColorBrush( System.Windows.Media.Color.FromRgb( 255, 152, 29 ) );
-    private Brush whiteBrush = new SolidColorBrush(Colors.White);
-    private Brush blackBrush = new SolidColorBrush(Colors.Black);
 
-    #endregion
 
-    #region Properties
 
-    public ObservableCollection<Xceed.Wpf.Samples.SampleData.Product> Products
-    {
-      get
-      {
-        return Xceed.Wpf.Samples.SampleData.SampleDataProvider.GetProducts();
-      }
-    }
 
-    #endregion
-#endif
 
     #region Constructors
 
     public ThemingCoreWPFView()
     {
-#if !OPEN_SOURCE
-      this.Initialized += new EventHandler( WPFControlsThemes_Initialized );
-      DataContext = this;
-#endif
       InitializeComponent();
     }
 
     #endregion
 
-#if !OPEN_SOURCE
 
-    #region EventHandlers
 
-    private void RadioButton_Checked( object sender, RoutedEventArgs e )
-    {
-      RadioButton button = sender as RadioButton;
-      if( button == null )
-        return;
-
-      _accentBrush = button.Background;
-      if( _accentBrush == null )
-        return;
-
-      if( themeComboBox.SelectedItem == null )
-        return;
-
-      if( themeComboBox.SelectedItem.Equals( metroDarkComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.Themes.Metro.MetroDarkThemeResourceDictionary() );
-        
-      }
-      else if( themeComboBox.SelectedItem.Equals( metroLightComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.Themes.Metro.MetroLightThemeResourceDictionary() );
-      }
-    }
 
-    #endregion
 
-    #region Methods (Private)
 
-    private void WPFControlsThemes_Initialized( object sender, EventArgs e )
-    {
-      themeComboBox.SelectedIndex = 0;
-    }
 
-    private void SystemComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      ChangeTheme( null, null, null, null, null, SystemColors.WindowBrush );
-    }
 
-    private void Office2007BlueComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      ChangeTheme( new Xceed.Wpf.Themes.Office2007.Office2007BlueResourceDictionary(), null, null, null, null,
-                    Xceed.Wpf.Themes.Office2007.Office2007BlueResources.ApplicationBackgroundBrush );
-    }
 
-    private void Office2007SilverComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      ChangeTheme( new Xceed.Wpf.Themes.Office2007.Office2007SilverResourceDictionary(), null, null, null, null,
-                    Xceed.Wpf.Themes.Office2007.Office2007SilverResources.ApplicationBackgroundBrush );
-    }
 
-    private void Office2007BlackComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      ChangeTheme( new Xceed.Wpf.Themes.Office2007.Office2007BlackResourceDictionary(),
-                    Xceed.Wpf.Themes.Office2007.Office2007BlackResources.ApplicationLightBackgroundBrush,
-                    Xceed.Wpf.Themes.Office2007.Office2007BlackResources.BorderBrush,
-                    Xceed.Wpf.Themes.Office2007.Office2007BlackResources.ApplicationLightBackgroundBrush,
-                    Xceed.Wpf.Themes.Office2007.Office2007BlackResources.ApplicationLightBackgroundBrush,
-                    Xceed.Wpf.Themes.Office2007.Office2007BlackResources.ApplicationBackgroundBrush );
-    }
 
-    private void Windows10ComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      ChangeTheme( new Xceed.Wpf.Themes.Windows10.Windows10ResourceDictionary(), null, null, null, null,
-                    Xceed.Wpf.Themes.Windows10.Windows10Resources.ApplicationBackgroundBrush );
-    }
 
-    private void MetroDarkComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeMetroTheme( new Xceed.Wpf.Themes.Metro.MetroDarkThemeResourceDictionary() );
-    }
 
-    private void MetroLightComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeMetroTheme( new Xceed.Wpf.Themes.Metro.MetroLightThemeResourceDictionary() );
-    }
 
-    private void ChangeTheme( Xceed.Wpf.Themes.ThemeResourceDictionary theme, Brush groupBoxBackgroundBrush, Brush groupBoxBorderBrush,
-                              Brush treeViewBackgroundBrush, Brush treeViewBorderBrush, Brush sampleBackgroundBrush )
-    {
-      SampleBorder.Resources.MergedDictionaries.Clear();
-
-      if( theme != null )
-      {
-        //# The licenser will throw on the second call to this if we set a empty key
-        //# line if we set an empty key. 
-        //# See Licenser.LicenseKey {set;}, "Detect that license was set too soon".
-        if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-        {
-          theme.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-        }
-        SampleBorder.Resources.MergedDictionaries.Add( theme );
-      }
-
-      groupBoxBorder.Background = groupBoxBackgroundBrush == null ? Brushes.Transparent : groupBoxBackgroundBrush;
-      groupBoxBorder.BorderBrush = groupBoxBorderBrush == null ? Brushes.Transparent : groupBoxBorderBrush;
-      listItemTreeViewBorder.Background = treeViewBackgroundBrush == null ? Brushes.Transparent : treeViewBackgroundBrush;
-      listItemTreeViewBorder.BorderBrush = treeViewBorderBrush == null ? Brushes.Transparent : treeViewBorderBrush;
-      SampleBorder.Background = sampleBackgroundBrush;
-    }
 
-    private void ChangeMetroTheme( MetroThemeResourceDictionaryBase metroThemeResourceDictionary )
-    {
-      _accentColorPanel.Visibility = Visibility.Visible;
-
-      if( metroThemeResourceDictionary != null )
-      {
-        metroThemeResourceDictionary.AccentBrush = _accentBrush;
-        this.ChangeTheme( metroThemeResourceDictionary, null, null, null, null
-                      , ( metroThemeResourceDictionary.GetType() == typeof( MetroDarkThemeResourceDictionary ) ) ? blackBrush : whiteBrush );
-      }
-    }
 
-    private void animatedProgressToggleButton_Checked( object sender, RoutedEventArgs e )
-    {
-      _progressStoryboard = rootLayout.Resources[ "animatedProgressBarStoryboard" ] as Storyboard;
-      _progressStoryboard.Begin();
-    }
 
-    private void animatedProgressToggleButton_Unchecked( object sender, RoutedEventArgs e )
-    {
-      if( _progressStoryboard != null )
-        _progressStoryboard.Stop();
-    }
 
-    private void TextBox_PreviewGotKeyboardFocus( object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e )
-    {
-      System.Windows.Controls.TextBox textBox = sender as System.Windows.Controls.TextBox;
 
-      if( textBox != null && textBox.Text == ThemingCoreWPFView.DefaultSearchString )
-        textBox.Text = string.Empty;
-    }
 
-    private void TextBox_PreviewLostKeyboardFocus( object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e )
-    {
-      System.Windows.Controls.TextBox textBox = sender as System.Windows.Controls.TextBox;
 
-      if( textBox != null && string.IsNullOrEmpty( textBox.Text ) )
-        textBox.Text = ThemingCoreWPFView.DefaultSearchString;
-    }
 
-    #endregion
 
-#endif
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt
index d6f7769c..83482965 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,1065 +21,49 @@
                  xmlns:sys="clr-namespace:System;assembly=mscorlib"
                  xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views"
                  Title="Theming Core WPF Controls">
-    
+
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
          <Run>Changes the themes of the WPF controls. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Themes.Office2007.dll or Xceed.Wpf.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Toolkit Plus for WPF.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
- <!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-         
-         <LinearGradientBrush x:Key="customAccentBrush1"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF0086c6"
-                       Offset="0" />
-         <GradientStop Color="#FF66ccff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.97" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="1" />
-      </LinearGradientBrush>
-       <LinearGradientBrush x:Key="customAccentBrush2"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FFff0099"
-                     Offset="0" />
-      <GradientStop Color="#FF993366"
-                     Offset="1" />
-   </LinearGradientBrush>
-       <LinearGradientBrush x:Key="customAccentBrush3"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF9DE214"
-                       Offset="0" />
-         <GradientStop Color="#FF9DE214"
-                       Offset="0.2" />
-         <GradientStop Color="#FF95CA2A"
-                       Offset="0.2" />
-         <GradientStop Color="#FF339933"
-                       Offset="1" />
-      </LinearGradientBrush>
 
-        <Style x:Key="MetroSampleRadioButtonTemplate" TargetType="RadioButton">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="RadioButton">
-                     <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                                 <VisualTransition From="Normal"
-                                                   GeneratedDuration="0"
-                                                   To="Pressed">
-                                    <Storyboard>
-                                       <DoubleAnimation Duration="0"
-                                                        To="0.45"
-                                                        Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                        Storyboard.TargetName="rectangle" />
-                                    </Storyboard>
-                                 </VisualTransition>
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="MouseOver">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To=".2"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="content" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-                           <VisualStateGroup x:Name="CheckStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Checked">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="CheckIcon" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Unchecked" />
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Rectangle x:Name="content"
-                                   Width="20"
-                                   Height="20"
-                                   Fill="{TemplateBinding Background}" />
-                        <Path x:Name="CheckIcon"
-                              Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                              Fill="White"
-                              FlowDirection="LeftToRight"
-                              Opacity="0"
-                              Stretch="Fill"
-                              UseLayoutRounding="False"
-                              VerticalAlignment="Bottom"
-                              HorizontalAlignment="Right"
-                              Width="12"
-                              Height="12"
-                              Margin="0,0,1,1" />
-                        <Rectangle x:Name="rectangle"
-                                   Fill="White"
-                                   Opacity="0" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-       
-        <Style TargetType="Button"
-               x:Key="linkTextBlockStyle">
 
-            <Setter Property="Foreground"
-                    Value="#Dadada" />
 
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Grid Background="Transparent">
-                            <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" />
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                                <Setter Property="Foreground"
-                                        Value="#FFE64AA4" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
-           <!-- This is the Data Source used in the ListView and DataGrid. -->
-         <CollectionViewSource x:Key="cvsProducts" Source="{Binding Path=Products}" />
-      </ResourceDictionary>
-   </local:DemoView.Resources>
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
 
 
-        <GroupBox Header="Features"
-                  Grid.Row="0"
-                  Margin="5">
-            <Grid Margin="5"
-                  HorizontalAlignment="Left">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-               
-                <StackPanel Margin="0,5,5,5" Orientation="Horizontal">
-                  <TextBlock Text="Themes:" Margin="0,5,5,5" VerticalAlignment="Center"/>
-                   <ComboBox x:Name="themeComboBox" Width="150" Height="25">
-                      <ComboBoxItem Selected="SystemComboBoxItem_Selected"
-                                    Content="System" />
-                      <ComboBoxItem Selected="Office2007BlueComboBoxItem_Selected"
-                                    Content="Office 2007 Blue" />
-                      <ComboBoxItem Selected="Office2007BlackComboBoxItem_Selected"
-                                    Content="Office 2007 Black" />
-                      <ComboBoxItem Selected="Office2007SilverComboBoxItem_Selected"
-                                    Content="Office 2007 Silver" />
-                      <ComboBoxItem Selected="Windows10ComboBoxItem_Selected">
-                        <ComboBoxItem.Content>
-                           <DockPanel>
-                              <TextBlock DockPanel.Dock="Left"
-                                         Text="Windows 10" />
-                           </DockPanel>
-                        </ComboBoxItem.Content>
-                      </ComboBoxItem>
-                      <ComboBoxItem x:Name="metroDarkComboBoxItem"
-                                    Selected="MetroDarkComboBoxItem_Selected"
-                                    Content="Metro Dark" />
-                      <ComboBoxItem x:Name="metroLightComboBoxItem"
-                                    Selected="MetroLightComboBoxItem_Selected"
-                                    Content="Metro Light" />
-                   </ComboBox>
-               </StackPanel>
-               
-               <StackPanel x:Name="_accentColorPanel"
-                         Grid.Column="1" Margin="10,0,0,0"
-                         Orientation="Horizontal"
-                         VerticalAlignment="Top"
-                         HorizontalAlignment="Left"
-                         Visibility="Hidden">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-                     
-                     <StackPanel>
-                        <TextBlock Text="Accent Color" />
-                        <StackPanel Orientation="Horizontal">
-                           <RadioButton Background="#FFF4B300"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Gold"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF78BA00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightGreen" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF2673EC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Blue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFAE113D"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="MediumVioletRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF632F00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Brown" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFB01E00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFC1004F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="PaleVioletRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF7200AC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkViolet" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF4617B4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkSlateBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF006AC1"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="RoyalBlue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF008287"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Teal" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF199900"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Green" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                            <RadioButton Background="#FF00C13F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Lime"
-                                         Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        </StackPanel>
-                     </StackPanel>
-                     <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,2,0,0">
-                        <RadioButton Background="#FFFF981D"
-                                        Margin="0,0,2,0"
-                                        IsChecked="True"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSalmon"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF2E12"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Red"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF1D77"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepPink" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFAA40FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Purple"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF1FAEFF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepSkyBlue"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF56C5FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkTurquoise" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00D8CC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Turquoise"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF91D100"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="YellowGreen"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFE1B700"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkYellow" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF76BC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Pink"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00A4A4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSeaGreen" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF7D23"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Orange" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </Grid>
-                  
-                  <StackPanel Margin="10,0,0,0">
-                     <TextBlock Text="Custom Color" />
-                     <StackPanel Orientation="Horizontal">
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush1}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom1"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush2}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom2"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush3}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom3" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </StackPanel>
-               </StackPanel>
-            </Grid>
-      </GroupBox>
 
-        <StackPanel Grid.Row="1"
-                    Margin="10"
-                    HorizontalAlignment="Left">
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
 
-            <Grid x:Name="rootLayout">
-                <Grid.Resources>
-                    <Storyboard x:Key="animatedProgressBarStoryboard"
-                                RepeatBehavior="Forever">
-                        <DoubleAnimation Storyboard.TargetName="verticalProgressBar"
-                                         Storyboard.TargetProperty="Value"
-                                         To="100"
-                                         Duration="00:00:02" />
-                        <DoubleAnimation Storyboard.TargetName="horizontalProgressBar"
-                                         Storyboard.TargetProperty="Value"
-                                         To="100"
-                                         Duration="00:00:02" />
-                    </Storyboard>
-                </Grid.Resources>
 
-                <Border x:Name="SampleBorder"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="Black"
-                        BorderThickness="2"
-                        BorderBrush="Black">
 
-                    <Grid SnapsToDevicePixels="True"
-                          Height="675">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="0.213*" />
-                            <ColumnDefinition Width="4" />
-                            <ColumnDefinition Width="0.303*" />
-                            <ColumnDefinition Width="0.484*" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="262*" />
-                            <RowDefinition Height="338*" />
-                            <RowDefinition Height="Auto"
-                                           MinHeight="23" />
-                        </Grid.RowDefinitions>
-                        <Border x:Name="groupBoxBorder"
-                                Grid.Column="2"
-                                Grid.Row="2"
-                                BorderBrush="Transparent"
-                                BorderThickness="1"
-                                Margin="3,6,0,0">
-                            <GroupBox Header="Login"
-                                      Margin="6" Width="155">
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="77"/>
-                                        <RowDefinition Height="15" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <ComboBox VerticalAlignment="Top" Margin="6,3,0,0" Grid.RowSpan="2">
-                                        <ComboBoxItem IsSelected="True">
-                                            <Image Source="..\Images\NoPictureA.jpg"
-                                                   Width="80"
-                                                   Height="80"
-                                                   Margin="6,3,0,3" />
-                                        </ComboBoxItem>
-                                        <ComboBoxItem>
-                                            <Image Source="..\Images\NoPictureB.jpg"
-                                                   Width="80"
-                                                   Height="80"
-                                                   Margin="6,3,0,3" />
-                                        </ComboBoxItem>
-                                        <ComboBoxItem>
-                                            <Image Source="..\Images\NoPictureC.jpg"
-                                                   Height="80"
-                                                   Width="80"
-                                                   Margin="6,3" />
-                                        </ComboBoxItem>
-                                        <ComboBoxItem>
-                                            <Image Source="..\Images\NoPictureD.jpg"
-                                                   Width="80"
-                                                   Height="80"
-                                                   Margin="6,3" />
-                                        </ComboBoxItem>
-                                    </ComboBox>
-                                    
-                                    <!--<Calendar Grid.Row="1"
-                                              HorizontalAlignment="Right"/>-->
-                                    <DatePicker Grid.Row="2" />
-                                    
-                                    <!--<Expander Name="myExpander" 
-                                              Grid.Row="2"
-                                              Header="My Expander" 
-                                              ExpandDirection="Down" 
-                                              IsExpanded="True" 
-                                              Width="100">
-                                        <TextBlock TextWrapping="Wrap">
-                                            Lorem ipsum dolor sit amet, consectetur
-                                            adipisicing elit.
-                                        </TextBlock>
-                                    </Expander>-->
-                                    
-                                </Grid>
-                            </GroupBox>
-                        </Border>
-                        <Menu Grid.ColumnSpan="4">
-                            <MenuItem Margin="0"
-                                      Header="File">
-                                <MenuItem Header="New" />
-                                <MenuItem Header="Open" />
-                                <MenuItem Header="Close" />
-                                <Separator />
-                                <MenuItem Header="Save" />
-                                <MenuItem Header="Save As" />
-                                <Separator />
-                                <MenuItem Header="Folder">
-                                    <MenuItem Header="New Folder" />
-                                    <Separator />
-                                    <MenuItem Header="Copy Folder" />
-                                    <MenuItem Header="Move Folder" />
-                                    <MenuItem Header="Properties" />
-                                </MenuItem>
-                            </MenuItem>
-                            <MenuItem Header="Edit">
-                                <MenuItem Header="Undo">
-                                    <MenuItem Header="1" />
-                                </MenuItem>
-                                <MenuItem Header="Redo" />
-                                <Separator />
-                                <MenuItem Header="Copy" />
-                                <MenuItem Header="Cut" />
-                                <MenuItem Header="Paste" />
-                            </MenuItem>
-                            <MenuItem Header="View">
-                                <MenuItem Header="Show Tool Bar"
-                                          IsChecked="True" />
-                                <MenuItem Header="Show Status Bar"
-                                          IsChecked="True" />
-                                <Separator />
-                                <MenuItem Header="Zoom In" />
-                                <MenuItem Header="Zoom Out" />
-                            </MenuItem>
-                            <MenuItem Header="Help">
-                                <MenuItem Header="Application Help" />
-                                <MenuItem Header="Online Help Resources" />
-                                <MenuItem Header="Contact Us" />
-                                <Separator />
-                                <MenuItem Header="Check For Updates" />
-                                <Separator />
-                                <MenuItem Header="About Us" />
-                            </MenuItem>
-                        </Menu>
-                        <ToolBar Grid.Row="1"
-                                 Grid.ColumnSpan="4">
-                            <Label Content="Search"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Left" />
-                            <TextBox HorizontalAlignment="Stretch"
-                                     Margin="0"
-                                     VerticalAlignment="Center"
-                                     Text="{x:Static view:ThemingCoreWPFView.DefaultSearchString}"
-                                     TextWrapping="NoWrap"
-                                     PreviewGotKeyboardFocus="TextBox_PreviewGotKeyboardFocus"
-                                     PreviewLostKeyboardFocus="TextBox_PreviewLostKeyboardFocus"
-                                     Width="150" />
-                            <Separator Margin="2,0" />
-                        </ToolBar>
-                        <StatusBar Grid.Row="4"
-                                   Grid.ColumnSpan="4">
-                            <StatusBarItem Content="11/20/2012" />
-                            <Separator Margin="0" />
-                            <StatusBarItem Content="WPF Controls Themes" />
-                        </StatusBar>
-                        <Grid Grid.Row="2"
-                              Grid.RowSpan="2"
-                              Margin="6,6,0,6">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="4" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="listItemTreeViewBorder"
-                                    Grid.RowSpan="3"
-                                    BorderThickness="1"
-                                    BorderBrush="Transparent" />
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="0.9*" />
-                                </Grid.RowDefinitions>
-                                <Label Grid.Row="0"
-                                       FontWeight="Bold"
-                                       Content="My Music" />
-                                <ListBox Grid.Row="1">
-                                    <ListBoxItem Content="Product Name" />
-                                    <ListBoxItem Content="Category" />
-                                    <ListBoxItem Content="Price" />
-                                    <ListBoxItem Content="Quantity/unit" />
-                                    <ListBoxItem Content="Discontinued"
-                                                 IsEnabled="False" />
-                                    <ListBoxItem Content="Reorder Date" />
-                                </ListBox>
-                                
-                            </Grid>
-                            <Grid Grid.Row="3">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="0.9*" />
-                                </Grid.RowDefinitions>
-                                <Label Grid.Row="0"
-                                       FontWeight="Bold"
-                                       Content="Colors" />
-                                <TreeView Grid.Row="1"
-                                          Grid.RowSpan="2">
-                                    <TreeViewItem Header="Primary Color"
-                                                  IsExpanded="True"
-                                                  >
-                                        <TreeViewItem Header="Yellow">
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="Yellow" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Red"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="Red" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Blue"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#333399" />
-                                        </TreeViewItem>
-                                    </TreeViewItem>
-                                    <TreeViewItem Header="Secondary Color"
-                                                  IsExpanded="True"
-                                                  >
-                                        <TreeViewItem Header="Green"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#00A550" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Violet"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#8601AF" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Orange"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="Orange" />
-                                        </TreeViewItem>
-                                    </TreeViewItem>
-                                    <TreeViewItem Header="Tertiary color"
-                                                  IsExpanded="True"
-                                                  >
-                                        <TreeViewItem Header="Red Orange"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#EC5800" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Orange Yellow"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#FFD700" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Chartreuse"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#DFFF00" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Aquamarine"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="Turquoise" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Indigo"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#120a8f" />
-                                        </TreeViewItem>
-                                        <TreeViewItem Header="Violet Red"
-                                                      >
-                                            <Border Width="60"
-                                                    Height="10"
-                                                    Background="#702963" />
-                                        </TreeViewItem>
-                                    </TreeViewItem>
-                                </TreeView>
-                            </Grid>
-                        </Grid>
-                        <TabControl Grid.Row="2" x:Name="tabItemFilter"
-                                    Grid.Column="3"
-                                    Margin="6,6,6,330" Grid.RowSpan="2">
-                            <TabItem Header="Filter">
-                                <Grid Margin="3,0,0,0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid Margin="0,3,3,0">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="0.39*" />
-                                            <RowDefinition Height="0.40*" />
-                                            <RowDefinition Height="0.21*" />
-                                        </Grid.RowDefinitions>
-                                        <GroupBox Header="Most Played"
-                                                  Margin="0,0,3,3">
-                                            <StackPanel Orientation="Vertical"
-                                                        Margin="0">
-                                                <RadioButton Margin="2,1,0,0"
-                                                             Content="Today" />
-                                                <RadioButton Margin="2,1,0,0"
-                                                             Content="Last week" />
-                                                <RadioButton Margin="2,2,0,0"
-                                                             Content="Last month"
-                                                             IsEnabled="False" />
-                                            </StackPanel>
-                                        </GroupBox>
-                                        <GroupBox Header="Star Rating"
-                                                  Margin="0,86,3,6" Grid.RowSpan="2">
-                                            <StackPanel Orientation="Vertical">
-                                                <CheckBox Margin="2"
-                                                          Content="4 stars" />
-                                                <CheckBox Margin="2"
-                                                          Content="3 stars" />
-                                                <CheckBox Margin="2"
-                                                          IsEnabled="False"
-                                                          Content="&lt; 3 stars" />
-                                            </StackPanel>
-                                        </GroupBox>
-                                        <GroupBox Header="Rating"
-                                                  Margin="0,88,3,4"
-                                                  Grid.Row="1" Grid.RowSpan="2">
-                                            <StackPanel Orientation="Vertical">
-                                                <CheckBox Margin="2"
-                                                          IsThreeState="True"
-                                                          IsChecked="True"
-                                                          Content="Like it" />
-                                            </StackPanel>
-                                        </GroupBox>
-                                    </Grid>
-                                    <ProgressBar x:Name="verticalProgressBar"
-                                                 Grid.Column="2"
-                                                 Width="20"
-                                                 HorizontalAlignment="Center"
-                                                 Orientation="Vertical"
-                                                 Value="{Binding Value, ElementName=slider}"
-                                                 Margin="2,5,-2,7" />
-                                    <GroupBox Header="Progress Bars"
-                                              Grid.Column="1"
-                                              Margin="0,3,0,6" Width="153">
-                                        <StackPanel Orientation="Vertical">
-                                            <ToggleButton x:Name="animatedProgressToggleButton"
-                                                          Content="Animate ProgressBars"
-                                                          Checked="animatedProgressToggleButton_Checked"
-                                                          Unchecked="animatedProgressToggleButton_Unchecked"
-                                                          Margin="0,6,0,12" />
-                                            <Slider x:Name="slider"
-                                                    Margin="0,0,0,6"
-                                                    TickFrequency="10"
-                                                    Maximum="100"
-                                                    TickPlacement="Both" />
-                                            <ProgressBar x:Name="horizontalProgressBar"
-                                                         Height="20"
-                                                         Margin="0,6"
-                                                         Value="{Binding Value, ElementName=slider}" />
-                                            <Grid Height="94">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="27" />
-                                                    <RowDefinition Height="41*" />
-                                                </Grid.RowDefinitions>
-                                                <Grid VerticalAlignment="Top"
-                                                      Grid.Row="2" Margin="26,23,3,10"
-                                                      Height="33" Grid.ColumnSpan="2" Grid.RowSpan="2">
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="3*" />
-                                                        <RowDefinition Height="19" />
-                                                    </Grid.RowDefinitions>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="0.5*" />
-                                                        <ColumnDefinition Width="0.5*" />
-                                                    </Grid.ColumnDefinitions>
-                                                    <RepeatButton Content="Cancel" Grid.RowSpan="2" HorizontalAlignment="Right" Padding="2" Margin="0,6,10,6" Width="52" Grid.ColumnSpan="2" />
-                                                    <Button Content="OK" Grid.RowSpan="2" IsDefault="True" Margin="6,6,13,6" />
-                                                </Grid>
-                                                <Label Margin="0"
-                                                       VerticalAlignment="Center"
-                                                       Content="User Name"
-                                                       HorizontalAlignment="Right"
-                                                       Grid.Row="1" />
-                                                <Label VerticalAlignment="Top"
-                                                       Content="Password"
-                                                       HorizontalAlignment="Right" Grid.Row="2" Height="27" Grid.RowSpan="2" Width="69" />
-                                                <TextBox Text="Anonymous"
-                                                         Grid.Column="1"
-                                                         VerticalAlignment="Center"
-                                                         Grid.Row="1" 
-                                                         ToolTip="This is anonymous user"
-                                                         >
-                                                    <TextBox.ContextMenu>
-                                                        <ContextMenu>
-                                                            <MenuItem Header="Copy" />
-                                                            <MenuItem Header="Cut" />
-                                                            <MenuItem Header="Past" />
-                                                        </ContextMenu>
-                                                    </TextBox.ContextMenu>
-                                                </TextBox>
-                                                <PasswordBox VerticalAlignment="Center"
-                                                             Grid.Row="2"
-                                                             Grid.Column="1">
-                                                    <PasswordBox.ContextMenu>
-                                                        <ContextMenu>
-                                                            <MenuItem Header="Copy" />
-                                                            <MenuItem Header="Cut" />
-                                                            <MenuItem Header="Past" />
-                                                        </ContextMenu>
-                                                    </PasswordBox.ContextMenu>
-                                                </PasswordBox>
-                                            </Grid>
-                                        </StackPanel>
-                                    </GroupBox>
-                                </Grid>
-                            </TabItem>
-                            <TabItem Header="Search">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="0.506*" />
-                                        <ColumnDefinition Width="0.494*" />
-                                    </Grid.ColumnDefinitions>
-                                    <GroupBox Header="Search"
-                                              Margin="3">
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="24" />
-                                                <RowDefinition Height="24" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="*" />
-                                            </Grid.RowDefinitions>
-                                            <Label Content="Title"
-                                                   HorizontalAlignment="Right"
-                                                   VerticalAlignment="Center" />
-                                            <TextBox TextWrapping="NoWrap"
-                                                     Grid.Column="1"
-                                                     Margin="0,1,0,1" />
-                                            <Label Content="Category"
-                                                   HorizontalAlignment="Right"
-                                                   Grid.Row="1"
-                                                   VerticalAlignment="Center" />
-                                            <ComboBox Grid.Row="1"
-                                                      Grid.Column="1"
-                                                      Margin="0,1,0,1">
-                                                <ComboBoxItem Content="Cabaret"
-                                                              IsSelected="True" />
-                                                <ComboBoxItem Content="Classical" />
-                                                <ComboBoxItem Content="Folk" />
-                                                <ComboBoxItem Content="Jazz" />
-                                                <ComboBoxItem Content="Pop" />
-                                            </ComboBox>
-                                            <Grid VerticalAlignment="Top"
-                                                  Grid.Row="4"
-                                                  Grid.Column="1"
-                                                  Height="22"
-                                                  Margin="0,4,0,0">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="0.5*" />
-                                                    <ColumnDefinition Width="0.5*" />
-                                                </Grid.ColumnDefinitions>
-                                                <Button Content="OK"
-                                                        IsDefault="True"
-                                                        Margin="0,0,2,0" />
-                                                <Button Content="Cancel"
-                                                        Grid.Column="1"
-                                                        Margin="2,0,0,0" />
-                                            </Grid>
-                                        </Grid>
-                                    </GroupBox>
-                                    <GroupBox Header="Search by Artist"
-                                              Margin="3"
-                                              Grid.Column="1">
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="64" />
-                                                <ColumnDefinition Width="72" />
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="24" />
-                                                <RowDefinition Height="24" />
-                                                <RowDefinition Height="*" />
 
-                                            </Grid.RowDefinitions>
-                                            <Label Margin="0,0,2,0"
-                                                   VerticalAlignment="Center"
-                                                   Content="First Name"
-                                                   HorizontalAlignment="Right" />
-                                            <TextBox TextWrapping="NoWrap"
-                                                     Grid.Column="1"
-                                                     Margin="0,1,0,1" />
-                                            <Label Margin="0,0,2,0"
-                                                   VerticalAlignment="Center"
-                                                   Content="Last Name"
-                                                   HorizontalAlignment="Right"
-                                                   Grid.Row="1" />
-                                            <TextBox TextWrapping="NoWrap"
-                                                     Grid.Column="1"
-                                                     Grid.Row="1"
-                                                     Margin="0,1,0,1" />
-                                            <Grid VerticalAlignment="Top"
-                                                  Height="22"
-                                                  Grid.Column="1"
-                                                  Grid.Row="2"
-                                                  Margin="0,4,0,0">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto" />
-                                                    <ColumnDefinition Width="Auto" />
-                                                </Grid.ColumnDefinitions>
-                                                <Button Content="OK"
-                                                        IsDefault="True"
-                                                        Margin="0,0,2,0" />
-                                                <RepeatButton Content="Cancel"
-                                                        Grid.Column="1"
-                                                        Margin="2,0,0,0" />
-                                            </Grid>
-                                        </Grid>
-                                    </GroupBox>
-                                </Grid>
-                            </TabItem>
-                            <TabItem Header="Disabled TabItem"
-                                     IsEnabled="False">
-                                <Grid />
-                            </TabItem>
-                        </TabControl>
-                        <Border Grid.Row="3"
-                                Grid.Column="2"
-                                Grid.ColumnSpan="2"
-                                Margin="3,0,6,6">
-                            <TabControl TabStripPlacement="Bottom">
-                                <TabItem Header="ListView Control">
-                                    <ListView x:Name="msListView"
-                                              ItemsSource="{Binding Source={StaticResource cvsProducts}}">
-                                        <ListView.View>
-                                            <GridView>
-                                                <GridViewColumn Header="Product Name"
-                                                                DisplayMemberBinding="{Binding ProductName}" />
-                                                <GridViewColumn Header="Category Name"
-                                                                DisplayMemberBinding="{Binding Category.CategoryName}" />
-                                                <GridViewColumn Header="Quantity/unit"
-                                                                DisplayMemberBinding="{Binding QuantityPerUnit}" />
-                                                <GridViewColumn Header="Reorder Date">                                               
-                                                   <GridViewColumn.CellTemplate>
-                                                      <DataTemplate>
-                                                           <TextBlock Text="{Binding ReorderDate, StringFormat=\{0:d\}}" VerticalAlignment="Center" />
-                                                      </DataTemplate>
-                                                   </GridViewColumn.CellTemplate>
-                                               </GridViewColumn>                                               
-                                                <GridViewColumn Header="Discontinued"
-                                                                DisplayMemberBinding="{Binding Discontinued}" />
-                                                <GridViewColumn Header="Price">
-                                                   <GridViewColumn.CellTemplate>
-                                                      <DataTemplate>
-                                                          <TextBlock Text="{Binding UnitPrice, StringFormat=\{0:C\}}" VerticalAlignment="Center" />
-                                                      </DataTemplate>
-                                                   </GridViewColumn.CellTemplate>
-                                                </GridViewColumn>
-                                            </GridView>
-                                        </ListView.View>
-                                    </ListView>
-                                </TabItem>
-                                <TabItem Header="DataGrid Control">
-                                    <DataGrid x:Name="msDataGrid"
-                                              ItemsSource="{Binding Source={StaticResource cvsProducts}}"
-                                              AutoGenerateColumns="False">
-                                        <DataGrid.Columns>
-                                            <DataGridTextColumn Header="Product Name"
-                                                                Width="SizeToCells"
-                                                                Binding="{Binding ProductName}" />
-                                           
-                                            <DataGridTextColumn Header="Category"
-                                                                Width="SizeToCells"
-                                                                Binding="{Binding Category.CategoryName}" />
 
-                                            <DataGridTextColumn Header="Quantity/unit"
-                                                                Width="SizeToCells"
-                                                                Binding="{Binding QuantityPerUnit}" />
-               
-                                            <DataGridTemplateColumn Header="Reorder Date"
-                                                                    Width="SizeToHeader"
-                                                                    SortMemberPath="ReorderDate">                                               
-                                                <DataGridTemplateColumn.CellTemplate>
-                                                   <DataTemplate>
-                                                        <TextBlock Text="{Binding ReorderDate, StringFormat=\{0:d\}}" VerticalAlignment="Center" />
-                                                   </DataTemplate>
-                                                </DataGridTemplateColumn.CellTemplate>
-                                            </DataGridTemplateColumn>
 
-                                            <DataGridTextColumn Header="Discontinued"
-                                                                Width="SizeToHeader"
-                                                                Binding="{Binding Discontinued}" />
-                                           
-                                            <DataGridTemplateColumn Header="Price"
-                                                                    Width="SizeToCells"
-                                                                    SortMemberPath="UnitPrice">                                               
-                                                <DataGridTemplateColumn.CellTemplate>
-                                                   <DataTemplate>
-                                                       <TextBlock Text="{Binding UnitPrice, StringFormat=\{0:C\}}" VerticalAlignment="Center" />
-                                                   </DataTemplate>
-                                                </DataGridTemplateColumn.CellTemplate>
-                                            </DataGridTemplateColumn>
-                                          
-                                        </DataGrid.Columns>
-                                    </DataGrid>
-                                </TabItem>
 
-                            </TabControl>
 
-                        </Border>
-                    </Grid>
-                </Border>
-            </Grid>
-        </StackPanel>
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\CoreWPFControls.png" Width="700" Height="500"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt
index f805d677..90d31027 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,11 +20,6 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using Xceed.Wpf.Toolkit;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Themes;
-using Xceed.Wpf.DataGrid.Themes.Metro;
-using Xceed.Wpf.DataGrid.Themes;
-#endif
 using System.Windows.Controls.Primitives;
 using System;
 using Xceed.Wpf.Samples.SampleData;
@@ -41,103 +36,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
   /// </summary>
   public partial class ThemingDataGridView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Brush _accentBrush = new SolidColorBrush( System.Windows.Media.Color.FromRgb( 255, 152, 29 ) );
 
-    #endregion
-#endif
 
     public ThemingDataGridView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void RadioButton_Checked( object sender, RoutedEventArgs e )
-    {
-      RadioButton button = sender as RadioButton;
-
-      if( button == null )
-        return;
-
-      _accentBrush = button.Background;
-      if( _accentBrush == null )
-        return;
-
-      if( themeComboBox.SelectedItem.Equals( metroDarkComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.DataGrid.Themes.Metro.MetroDarkThemeResourceDictionary() );
-      }
-      else if( themeComboBox.SelectedItem.Equals( metroLightComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.DataGrid.Themes.Metro.MetroLightThemeResourceDictionary() );
-      }
-    }
 
-    private void ThemeComboBoxSelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = sender as ComboBox;
-      if( (comboBox != null) && (_dataGrid != null) )
-      {
-        switch( comboBox.SelectedIndex )
-        {
-          case 1:
-            this.ChangeTheme( new Xceed.Wpf.DataGrid.Themes.Office2007BlueTheme() );
-            break;
-          case 2:
-            this.ChangeTheme( new Xceed.Wpf.DataGrid.Themes.Office2007BlackTheme() );
-            break;
-          case 3:
-            this.ChangeTheme( new Xceed.Wpf.DataGrid.Themes.Office2007SilverTheme() );
-            break;
-          case 4:
-            this.ChangeTheme( new Xceed.Wpf.DataGrid.Themes.Windows10Theme() );
-            break;
-          case 5:
-            //# TODODOC
-            // Using a new instance of Brush to prevent the bug of AccentBrush in MetroTheme :
-            // if using the same instance of AccentBrush, ThemeKey won't make the difference 
-            // between MetroLight and MetroDark and new Theme won't be applied (see case 156588).
-            _accentBrush = _accentBrush.Clone();
-            this.ChangeMetroTheme( new Xceed.Wpf.DataGrid.Themes.Metro.MetroDarkThemeResourceDictionary() );
-            break;
-          case 6:
-            _accentBrush = _accentBrush.Clone();
-            this.ChangeMetroTheme( new Xceed.Wpf.DataGrid.Themes.Metro.MetroLightThemeResourceDictionary() );
-            break;
-          default:
-            this.ChangeTheme( null );
-            break;
-        }
-      }
-    }
 
-    private void ChangeTheme( Theme dataGridTheme )
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      _dataGrid.View.Theme = dataGridTheme;
-    }
 
-    private void ChangeMetroTheme( DataGridMetroThemeResourceDictionaryBase metroDataGridThemeResourceDictionary )
-    {
-      _accentColorPanel.Visibility = Visibility.Visible;
-
-      if( metroDataGridThemeResourceDictionary != null )
-      {
-        if( !string.IsNullOrEmpty( Xceed.Wpf.Toolkit.Licenser.LicenseKey ) )
-        {
-          metroDataGridThemeResourceDictionary.LicenseKey = Xceed.Wpf.Toolkit.Licenser.LicenseKey;
-        }
-
-        metroDataGridThemeResourceDictionary.AccentBrush = _accentBrush;
-        _dataGrid.View.Theme = new Xceed.Wpf.DataGrid.Themes.Metro.MetroTheme( metroDataGridThemeResourceDictionary );
-      }
-    }
-#endif
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt
index 5a5c5a44..b9bbed29 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,529 +27,52 @@
      <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
          <Run>Changes the themes of the datagrid control. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.DataGrid.Themes.Office2007.dll or Xceed.Wpf.DataGrid.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-         <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>
-
-         <xcdg:DataGridCollectionViewSource x:Key="cvsOrders"
-                                            Source="{Binding}">
-            <xcdg:DataGridCollectionViewSource.GroupDescriptions>
-               <PropertyGroupDescription PropertyName="ShipCountry" />
-               <PropertyGroupDescription PropertyName="ShipCity" />
-            </xcdg:DataGridCollectionViewSource.GroupDescriptions>
-         </xcdg:DataGridCollectionViewSource>
-
-         <LinearGradientBrush x:Key="customAccentBrush1"
-                              EndPoint="0.5,1"
-                              StartPoint="0.5,0">
-            <GradientStop Color="#FF0086c6"
-                          Offset="0" />
-            <GradientStop Color="#FF66ccff"
-                          Offset="0.94" />
-            <GradientStop Color="#FFddf4ff"
-                          Offset="0.94" />
-            <GradientStop Color="#FFddf4ff"
-                          Offset="0.97" />
-            <GradientStop Color="#FFddf4ff"
-                          Offset="1" />
-         </LinearGradientBrush>
-         <LinearGradientBrush x:Key="customAccentBrush2"
-                              EndPoint="0.5,1"
-                              StartPoint="0.5,0">
-            <GradientStop Color="#FFff0099"
-                          Offset="0" />
-            <GradientStop Color="#FF993366"
-                          Offset="1" />
-         </LinearGradientBrush>
-         <LinearGradientBrush x:Key="customAccentBrush3"
-                              EndPoint="0.5,1"
-                              StartPoint="0.5,0">
-            <GradientStop Color="#FF9DE214"
-                          Offset="0" />
-            <GradientStop Color="#FF9DE214"
-                          Offset="0.2" />
-            <GradientStop Color="#FF95CA2A"
-                          Offset="0.2" />
-            <GradientStop Color="#FF339933"
-                          Offset="1" />
-         </LinearGradientBrush>
-
-         <Style x:Key="MetroSampleRadioButtonTemplate"
-                TargetType="RadioButton">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="RadioButton">
-                     <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                                 <VisualTransition From="Normal"
-                                                   GeneratedDuration="0"
-                                                   To="Pressed">
-                                    <Storyboard>
-                                       <DoubleAnimation Duration="0"
-                                                        To="0.45"
-                                                        Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                        Storyboard.TargetName="rectangle" />
-                                    </Storyboard>
-                                 </VisualTransition>
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="MouseOver">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To=".2"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="content" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-                           <VisualStateGroup x:Name="CheckStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Checked">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="CheckIcon" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Unchecked" />
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Rectangle x:Name="content"
-                                   Width="20"
-                                   Height="20"
-                                   Fill="{TemplateBinding Background}" />
-                        <Path x:Name="CheckIcon"
-                              Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                              Fill="White"
-                              FlowDirection="LeftToRight"
-                              Opacity="0"
-                              Stretch="Fill"
-                              UseLayoutRounding="False"
-                              VerticalAlignment="Bottom"
-                              HorizontalAlignment="Right"
-                              Width="12"
-                              Height="12"
-                              Margin="0,0,1,1" />
-                        <Rectangle x:Name="rectangle"
-                                   Fill="White"
-                                   Opacity="0" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5" HorizontalAlignment="Left">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <StackPanel Margin="0,5,5,5" Orientation="Horizontal">
-               <TextBlock Text="Themes:" Margin="0,5,5,5" VerticalAlignment="Center"/>
-               <ComboBox x:Name="themeComboBox" Width="150" Height="25" SelectedIndex="0" SelectionChanged="ThemeComboBoxSelectionChanged">
-                  <ComboBoxItem Content="System" />
-                  <ComboBoxItem Content="Office 2007 Blue" />
-                  <ComboBoxItem Content="Office 2007 Black" />
-                  <ComboBoxItem Content="Office 2007 Silver" />
-                  <ComboBoxItem>
-                     <ComboBoxItem.Content>
-                        <DockPanel>
-                           <TextBlock DockPanel.Dock="Left"
-                                      Text="Windows 10" />
-                        </DockPanel>
-                     </ComboBoxItem.Content>
-                  </ComboBoxItem>
-                  <ComboBoxItem x:Name="metroDarkComboBoxItem" Content="Metro Dark" />
-                  <ComboBoxItem x:Name="metroLightComboBoxItem" Content="Metro Light" />
-               </ComboBox>
-            </StackPanel>
-            
-            <StackPanel x:Name="_accentColorPanel"
-                         Grid.Column="1" Margin="10,0,0,0"
-                         Orientation="Horizontal"
-                         VerticalAlignment="Top"
-                         HorizontalAlignment="Left"
-                         Visibility="Hidden">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-                     
-                     <StackPanel>
-                        <TextBlock Text="Accent Color"/>
-                        <StackPanel Orientation="Horizontal">
-                           <RadioButton Background="#FFF4B300"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Gold"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF78BA00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF2673EC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Blue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFAE113D"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="MediumVioletRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF632F00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Brown"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFB01E00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFC1004F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="PaleVioletRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF7200AC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkViolet"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF4617B4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkSlateBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF006AC1"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="RoyalBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF008287"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Teal" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF199900"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Green" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                            <RadioButton Background="#FF00C13F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Lime" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        </StackPanel>
-                     </StackPanel>
-                     <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,2,0,0">
-                        <RadioButton Background="#FFFF981D"
-                                        Margin="0,0,2,0"
-                                        IsChecked="True"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSalmon" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF2E12"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Red"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF1D77"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepPink" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFAA40FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Purple"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF1FAEFF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepSkyBlue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF56C5FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkTurquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00D8CC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Turquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF91D100"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="YellowGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFE1B700"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkYellow"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF76BC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Pink"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00A4A4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSeaGreen" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF7D23"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Orange"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </Grid>
-                  
-                  <StackPanel Margin="10,0,0,0">
-                     <TextBlock Text="Custom Color" />
-                     <StackPanel Orientation="Horizontal">
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush1}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom1"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush2}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom2"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush3}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom3"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </StackPanel>
-               </StackPanel>
-         </Grid>
-      </GroupBox>
-
-      <TextBlock Grid.Row="1" Margin="10" HorizontalAlignment="Left" Text="Usage:" Style="{StaticResource Header}"/>
-
-      <Border  Grid.Row="2" x:Name="myBorder">
-         <xcdg:DataGridControl x:Name="_dataGrid"
-                                 ReadOnly="False"
-                                 ItemsSource="{Binding Source={StaticResource cvsOrders}}">
-            <xcdg:DataGridControl.View>
-               <xcdg:TableflowView />
-            </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>
-      </Border>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\DataGridControls.png" Width="700" Height="500"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt
index 7bc669f5..bb250ed9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -16,12 +16,6 @@
 
 using System.Diagnostics;
 using System.Windows;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Themes;
-using Xceed.Wpf.Toolkit.Themes.Office2007;
-using Xceed.Wpf.Toolkit.Themes.Metro;
-using Xceed.Wpf.Themes.Metro;
-#endif
 using System;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -35,122 +29,31 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
   /// </summary>
   public partial class ThemingExtendedToolkitView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Brush _accentBrush = new SolidColorBrush( System.Windows.Media.Color.FromRgb( 255, 152, 29 ) );
-    private Brush whiteBrush = new SolidColorBrush( Colors.White );
-    private Brush blackBrush = new SolidColorBrush( Colors.Black );
 
-    #endregion
-#endif
 
     public ThemingExtendedToolkitView()
     {
-#if !OPEN_SOURCE
-      this.Initialized += new EventHandler( ToolkitControlsThemes_Initialized );
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void RadioButton_Checked( object sender, RoutedEventArgs e )
-    {
-      RadioButton button = sender as RadioButton;
-      if( button == null )
-        return;
-
-      _accentBrush = button.Background;
-      if( _accentBrush == null )
-        return;
-
-      if( themeComboBox.SelectedItem == null )
-        return;
-
-      if( themeComboBox.SelectedItem.Equals( metroDarkComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroDarkThemeResourceDictionary()
-                               , blackBrush );
-      }
-      else if( themeComboBox.SelectedItem.Equals( metroLightComboBoxItem ) )
-      {
-        this.ChangeMetroTheme( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroLightThemeResourceDictionary()
-                              , whiteBrush );
-      }
-    }
 
-    private void ToolkitControlsThemes_Initialized( object sender,EventArgs e )
-    {
-      themeComboBox.SelectedIndex = 0;
-    }
 
-    private void SystemComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeTheme( null );
-    }
 
-    private void Office2007BlueComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeTheme( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007BlueResourceDictionary() );
-    }
 
-    private void Office2007SilverComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeTheme( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007SilverResourceDictionary() );
-    }
 
-    private void Office2007BlackComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeTheme( new Xceed.Wpf.Toolkit.Themes.Office2007.Office2007BlackResourceDictionary() );
-    }
 
-    private void Windows10ComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeTheme( new Xceed.Wpf.Toolkit.Themes.Windows10.Windows10ResourceDictionary() );
-    }
 
-    private void MetroDarkComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeMetroTheme( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroDarkThemeResourceDictionary()
-                            , blackBrush );
-    }
 
-    private void MetroLightComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      this.ChangeMetroTheme( new Xceed.Wpf.Toolkit.Themes.Metro.ToolkitMetroLightThemeResourceDictionary()
-                             , whiteBrush );
-    }
 
-    private void ChangeTheme( ThemeResourceDictionary toolkitTheme)
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
 
-      SampleBorder.Resources.MergedDictionaries.Clear();
-      if( toolkitTheme != null )
-      {
-        SampleBorder.Resources.MergedDictionaries.Add( toolkitTheme );
-      }
 
-      SampleBorder.Background = SystemColors.WindowBrush;
-      TextElement.SetForeground( SampleBorder, blackBrush );
-    }
 
-    private void ChangeMetroTheme( MetroThemeResourceDictionaryBase metroToolkitThemeResourceDictionary
-                                   , Brush sampleBrush)
-    {
-      _accentColorPanel.Visibility = Visibility.Visible;
 
-      if( metroToolkitThemeResourceDictionary != null )
-      {
-        metroToolkitThemeResourceDictionary.AccentBrush = _accentBrush;
 
-        SampleBorder.Resources.MergedDictionaries.Clear();
-        SampleBorder.Resources.MergedDictionaries.Add( metroToolkitThemeResourceDictionary );
-      }
 
-      SampleBorder.Background = sampleBrush;
-      TextElement.SetForeground( SampleBorder, ( sampleBrush == blackBrush ) ? whiteBrush : blackBrush );
-    }
-#endif
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt
index ede0ba82..b93b285a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,507 +25,42 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
          <Run>Changes the themes of the Toolkit for WPF controls. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Toolkit.Themes.Office2007.dll, Xceed.Wpf.Toolkit.Themes.Windows10.dll or Xceed.Wpf.Toolkit.Themes.Metro.dll assemblies are necessary to use the themes.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
- <!--##EXCLUDE_OPEN_SOURCE-->   
-    <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-         
-         <LinearGradientBrush x:Key="customAccentBrush1"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF0086c6"
-                       Offset="0" />
-         <GradientStop Color="#FF66ccff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.97" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="1" />
-      </LinearGradientBrush>
-       <LinearGradientBrush x:Key="customAccentBrush2"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FFff0099"
-                     Offset="0" />
-      <GradientStop Color="#FF993366"
-                     Offset="1" />
-   </LinearGradientBrush>
-       <LinearGradientBrush x:Key="customAccentBrush3"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF9DE214"
-                       Offset="0" />
-         <GradientStop Color="#FF9DE214"
-                       Offset="0.2" />
-         <GradientStop Color="#FF95CA2A"
-                       Offset="0.2" />
-         <GradientStop Color="#FF339933"
-                       Offset="1" />
-      </LinearGradientBrush>
-       
-       <Style x:Key="MetroSampleRadioButtonTemplate" TargetType="RadioButton">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="RadioButton">
-                     <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                                 <VisualTransition From="Normal"
-                                                   GeneratedDuration="0"
-                                                   To="Pressed">
-                                    <Storyboard>
-                                       <DoubleAnimation Duration="0"
-                                                        To="0.45"
-                                                        Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                        Storyboard.TargetName="rectangle" />
-                                    </Storyboard>
-                                 </VisualTransition>
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="MouseOver">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To=".2"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="content" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-                           <VisualStateGroup x:Name="CheckStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Checked">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="CheckIcon" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Unchecked" />
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Rectangle x:Name="content"
-                                   Width="20"
-                                   Height="20"
-                                   Fill="{TemplateBinding Background}" />
-                        <Path x:Name="CheckIcon"
-                              Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                              Fill="White"
-                              FlowDirection="LeftToRight"
-                              Opacity="0"
-                              Stretch="Fill"
-                              UseLayoutRounding="False"
-                              VerticalAlignment="Bottom"
-                              HorizontalAlignment="Right"
-                              Width="12"
-                              Height="12"
-                              Margin="0,0,1,1" />
-                        <Rectangle x:Name="rectangle"
-                                   Fill="White"
-                                   Opacity="0" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-
-        <x:Array Type="sys:String" x:Key="checkList" >
-            <sys:String>Blue</sys:String>
-            <sys:String>Red</sys:String>
-            <sys:String>Yellow</sys:String>
-            <sys:String>Green</sys:String>
-            <sys:String>White</sys:String>
-        </x:Array>
-
-      <Style x:Key="TextBlockStyle" 
-             TargetType="TextBlock">
-         <Setter Property="VerticalAlignment" Value="Center" />
-         <Setter Property="Margin" Value="2" />
-         <!--Foreground Property is set in code-behind-->         
-      </Style>
-     </ResourceDictionary>
-   </local:DemoView.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="450" />
-        </Grid.RowDefinitions>
-
-        <GroupBox Header="Features" Grid.Row="0" Margin="5">
-            <Grid Margin="5" HorizontalAlignment="Left">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-               <StackPanel Margin="0,5,5,5" Orientation="Horizontal">
-                  <TextBlock Text="Themes:" Margin="0,5,5,5" VerticalAlignment="Center"/>
-                   <ComboBox x:Name="themeComboBox" Width="150" Height="25">
-                      <ComboBoxItem Selected="SystemComboBoxItem_Selected"
-                                    Content="System" />
-                      <ComboBoxItem Selected="Office2007BlueComboBoxItem_Selected"
-                                    Content="Office 2007 Blue" />
-                      <ComboBoxItem Selected="Office2007BlackComboBoxItem_Selected"
-                                    Content="Office 2007 Black" />
-                      <ComboBoxItem Selected="Office2007SilverComboBoxItem_Selected"
-                                    Content="Office 2007 Silver" />
-                      <ComboBoxItem Selected="Windows10ComboBoxItem_Selected">
-                        <ComboBoxItem.Content>
-                        <DockPanel>
-                           <TextBlock DockPanel.Dock="Left"
-                                      Text="Windows 10" />
-                        </DockPanel>
-                     </ComboBoxItem.Content>
-                      </ComboBoxItem>
-                      <ComboBoxItem x:Name="metroDarkComboBoxItem"
-                                    Selected="MetroDarkComboBoxItem_Selected"
-                                    Content="Metro Dark" />
-                      <ComboBoxItem x:Name="metroLightComboBoxItem"
-                                    Selected="MetroLightComboBoxItem_Selected"
-                                    Content="Metro Light" />
-                   </ComboBox>
-               </StackPanel>
-               
-               <StackPanel x:Name="_accentColorPanel"
-                         Grid.Column="1" Margin="10,0,0,0"
-                         Orientation="Horizontal"
-                         VerticalAlignment="Top"
-                         HorizontalAlignment="Left"
-                         Visibility="Hidden">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-                     
-                     <StackPanel>
-                        <TextBlock Text="Accent Color" />
-                        <StackPanel Orientation="Horizontal">
-                           <RadioButton Background="#FFF4B300"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Gold"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF78BA00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF2673EC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Blue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFAE113D"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="MediumVioletRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF632F00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Brown"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFB01E00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFC1004F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="PaleVioletRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF7200AC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkViolet" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF4617B4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkSlateBlue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF006AC1"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="RoyalBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF008287"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Teal"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF199900"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Green" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                            <RadioButton Background="#FF00C13F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Lime"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        </StackPanel>
-                     </StackPanel>
-                     <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,2,0,0">
-                        <RadioButton Background="#FFFF981D"
-                                        Margin="0,0,2,0"
-                                        IsChecked="True"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSalmon"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF2E12"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Red" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF1D77"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepPink"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFAA40FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Purple"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF1FAEFF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepSkyBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF56C5FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkTurquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00D8CC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Turquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF91D100"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="YellowGreen" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFE1B700"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkYellow"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF76BC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Pink" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00A4A4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSeaGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF7D23"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Orange" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </Grid>
-                  
-                  <StackPanel Margin="10,0,0,0">
-                     <TextBlock Text="Custom Color"/>
-                     <StackPanel Orientation="Horizontal">
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush1}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom1"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush2}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom2" 
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush3}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom3"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </StackPanel>
-               </StackPanel>
-            </Grid>
-        </GroupBox>
-       
-        <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10" HorizontalAlignment="Left"/>
-
-       <Border x:Name="SampleBorder"
-               Grid.Row="2"
-               HorizontalAlignment="Stretch"
-               VerticalAlignment="Stretch"
-               BorderThickness="2"
-               BorderBrush="Black">
-            <Grid >
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="300" />
-                  <ColumnDefinition Width="*"/>
-               </Grid.ColumnDefinitions>
-
-               <Grid Grid.Column="0">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="Auto"/>
-                     <ColumnDefinition Width="*"/>
-                  </Grid.ColumnDefinitions>
-
-                  <TextBlock Text="IntegerUpDown:" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:IntegerUpDown x:Name="_integerUpDown" Value="22" Grid.Column="1" Margin="5"/>
-
-                  <TextBlock Text="CalculatorUpDown:" Grid.Row="1" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:CalculatorUpDown Grid.Row="1" Grid.Column="1" Value="8" Margin="5"/>
-
-                  <TextBlock Text="DateTimePicker:" Grid.Row="2" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:DateTimePicker Grid.Row="2" Grid.Column="1" Format="ShortDate" Value="2012/11/16" Margin="5"/>
-
-                  <TextBlock Text="CheckListBox:" Grid.Row="3" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:CheckListBox Grid.Row="3" Grid.Column="1" ItemsSource="{StaticResource checkList}" SelectedItem="Red" Margin="5"/>
-
-                  <TextBlock Text="DropDownButton:" Grid.Row="4" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:DropDownButton Grid.Row="4" Grid.Column="1" Content="Show WatermarkTextBox" Margin="5">
-                     <xctk:DropDownButton.DropDownContent>
-                           <StackPanel>
-                              <xctk:WatermarkTextBox Watermark="Enter text here" Width="150"/>
-                              <xctk:WatermarkTextBox Watermark="Enter text here" Width="150"/>
-                              <xctk:WatermarkTextBox Watermark="Enter text here" Width="150"/>
-                           </StackPanel>
-                     </xctk:DropDownButton.DropDownContent>
-                  </xctk:DropDownButton>
-
-                  <TextBlock Text="ColorPicker:" Grid.Row="5" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:ColorPicker Grid.Row="5" Grid.Column="1" SelectedColor="Blue" DisplayColorAndName="True" Margin="5"/>
-
-                  <TextBlock Text="MultiLineTextEditor:" Grid.Row="6" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:MultiLineTextEditor Grid.Row="6" Grid.Column="1" Content="MultiLine" Text="This is a multi-line text editor." Margin="5" />
-
-                  <TextBlock Text="MaskedTextBox:" Grid.Row="7" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:MaskedTextBox Grid.Row="7" Grid.Column="1"  Mask="(000) 000-0000" Text="5256963" Margin="5" />
-
-                  <TextBlock Text="ToggleSwitch:" Grid.Row="8" Style="{StaticResource TextBlockStyle}"/>
-                  <xctk:ToggleSwitch Grid.Row="8" Grid.Column="1" Margin="5" Height="20"/>
-               </Grid>
-
-               <Grid Grid.Column="1">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="*" />
-                  </Grid.RowDefinitions>
-                    
-                  <TextBlock Text="PropertyGrid:" Style="{StaticResource TextBlockStyle}"/>
-                   <xctk:PropertyGrid  Grid.Row="1" Margin="5" SelectedObject="{Binding ElementName=_integerUpDown}" ShowAdvancedOptions="True" AutoGenerateProperties="False" >
-                     <xctk:PropertyGrid.PropertyDefinitions>
-                        <xctk:PropertyDefinition TargetProperties="Background" />
-                        <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                        <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                        <xctk:PropertyDefinition TargetProperties="FontFamily" />
-                        <xctk:PropertyDefinition TargetProperties="FontSize" />
-                        <xctk:PropertyDefinition TargetProperties="FontStretch" />
-                        <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                        <xctk:PropertyDefinition TargetProperties="FontWeight" />
-                        <xctk:PropertyDefinition TargetProperties="Foreground" />
-                        <xctk:PropertyDefinition TargetProperties="IsTabStop" />
-                        <xctk:PropertyDefinition TargetProperties="Content" />
-                        <xctk:PropertyDefinition TargetProperties="HorizontalContentAlignment" />
-                        <xctk:PropertyDefinition TargetProperties="VerticalContentAlignment" />
-                        <xctk:PropertyDefinition TargetProperties="Visibility" />
-                        <xctk:PropertyDefinition TargetProperties="Width" />
-                        <xctk:PropertyDefinition TargetProperties="Height" />
-                     </xctk:PropertyGrid.PropertyDefinitions>
-                  </xctk:PropertyGrid>
-               </Grid>
-            </Grid>
-         </Border>
-
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ExtendedWPFToolkitControls.png" Width="700" Height="500"/>
-##END-->
 
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt
index e512e831..d5abbe63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,14 +20,6 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using Xceed.Wpf.Toolkit;
-#if !OPEN_SOURCE
-using Xceed.Wpf.ListBox.Themes.Windows10;
-using Xceed.Wpf.ListBox.Themes.Office2007;
-using Xceed.Wpf.ListBox.Themes.LiveExplorer;
-using Xceed.Wpf.ListBox.Themes.Metro;
-using Xceed.Wpf.ListBox.Themes.WMP11;
-using Xceed.Wpf.ListBox;
-#endif
 using System.Windows.Controls.Primitives;
 using System;
 using Xceed.Wpf.Samples.SampleData;
@@ -38,177 +30,41 @@ using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
-#if !OPEN_SOURCE
-  public enum ThemesEnum
-  {
-    System,
-    Office2007Blue,
-    Office2007Black,
-    Office2007Silver,
-    Windows10,
-    LiveExplorer,
-    MetroDark,
-    MetroLight,
-    MediaPlayer
-  }
-#endif
 
   /// <summary>
   /// Interaction logic for ThemingListBoxView.xaml
   /// </summary>
   public partial class ThemingListBoxView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Brush _accentBrush = new SolidColorBrush( System.Windows.Media.Color.FromRgb( 255, 152, 29 ) );
-    private ThemesEnum _selectedTheme = ThemesEnum.System;
-    private DispatcherTimer _dispatcherTimer;
 
-    #endregion
-#endif
 
     #region Initialization
 
     public ThemingListBoxView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
       InitializeComponent();
 
-#if !OPEN_SOURCE
-      //Add the default GroupDescriptions to the ListBox's GroupDescriptions collection.
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCountryGroupDescription" ] as GroupDescription );
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCityGroupDescription" ] as GroupDescription );
-#endif
     }
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region EventHandlers
 
-    private void ThemeComboBoxSelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = sender as ComboBox;
-      if( ( comboBox != null ) && ( _listBox != null ) )
-      {
-        _selectedTheme = ( ThemesEnum )((ComboBoxItem)comboBox.SelectedItem).Tag;
-
-        // Use a DispatcherTimer to update the Theme on the ListBox
-        // to avoid changing Theme very often.
-        if( _dispatcherTimer == null )
-        {
-          _dispatcherTimer = new DispatcherTimer();
-          _dispatcherTimer.Tick += new EventHandler( this.DispatcherTimer_Tick );
-          _dispatcherTimer.Interval = System.TimeSpan.FromMilliseconds( 250d );
-        }
-
-        _dispatcherTimer.Start();
-      }
-    }
 
-    private void RadioButton_Checked( object sender, RoutedEventArgs e )
-    {
-      RadioButton button = sender as RadioButton;
-      if( button == null )
-        return;
-
-      _accentBrush = button.Background;
-      if( _accentBrush == null )
-        return;
-
-      // Use a DispatcherTimer to update the Theme on the ListBox
-      // to avoid changing Theme very often.
-      if( _dispatcherTimer == null )
-      {
-        _dispatcherTimer = new DispatcherTimer();
-        _dispatcherTimer.Tick += new EventHandler( this.DispatcherTimer_Tick );
-        _dispatcherTimer.Interval = System.TimeSpan.FromMilliseconds( 250d );
-      }
-
-      _dispatcherTimer.Start();
-    }
 
-    private void DispatcherTimer_Tick( object sender, EventArgs e )
-    {
-      DispatcherTimer timer = sender as DispatcherTimer;
 
-      // Make sure the timer is still active.
-      if( timer == null || !timer.IsEnabled )
-        return;
 
-      timer.Stop();
 
-      this.ChangeTheme();
-    }
 
-    #endregion
-#endif
 
-#if !OPEN_SOURCE
-    private void ChangeTheme()
-    {
-      _listBox.Resources.MergedDictionaries.Clear();
-
-      ThemeResourceDictionary themeResourceDictionary;
-
-      switch( _selectedTheme )
-      {
-        case ThemesEnum.Office2007Blue:
-          themeResourceDictionary = new Office2007BlueThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        case ThemesEnum.Office2007Black:
-          themeResourceDictionary = new Office2007BlackThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        case ThemesEnum.Office2007Silver:
-          themeResourceDictionary = new Office2007SilverThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        case ThemesEnum.Windows10:
-          themeResourceDictionary = new Windows10ThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        case ThemesEnum.LiveExplorer:
-          themeResourceDictionary = new LiveExplorerThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        case ThemesEnum.MetroDark:
-          _accentColorPanel.Visibility = Visibility.Visible;
-          MetroThemeResourceDictionaryBase metroDarkThemeResourceDictionary = new MetroDarkThemeResourceDictionary();
-          metroDarkThemeResourceDictionary.AccentBrush = _accentBrush;
-          themeResourceDictionary = metroDarkThemeResourceDictionary;
-          break;
-        case ThemesEnum.MetroLight:
-          _accentColorPanel.Visibility = Visibility.Visible;
-          MetroThemeResourceDictionaryBase metroLightThemeResourceDictionary = new MetroLightThemeResourceDictionary();
-          metroLightThemeResourceDictionary.AccentBrush = _accentBrush;
-          themeResourceDictionary = metroLightThemeResourceDictionary;
-          break;
-        case ThemesEnum.MediaPlayer:
-          themeResourceDictionary = new WMP11ThemeResourceDictionary();
-          this.InitTheme();
-          break;
-        default:
-          _accentColorPanel.Visibility = Visibility.Hidden;
-          themeResourceDictionary = null;
-          break;
-      }
-
-      if( themeResourceDictionary != null )
-      {
-        _listBox.Resources.MergedDictionaries.Add( themeResourceDictionary );
-      }
-    }
 
-    private void InitTheme()
-    {
-      _accentColorPanel.Visibility = Visibility.Hidden;
-      _listBox.ItemTemplate = Resources[ "orderListBoxItemTemplate" ] as DataTemplate;
-    }
-#endif
+
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt
index 4173ee68..2f64e7bb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -30,395 +30,29 @@
             <LineBreak />
             <LineBreak />
          <Run>Supports implicit styles, so the entire listbox can be styled in minutes with a couple of lines of code. Also supports explicit styles and Expression Blend. Available themes are System, Office2007, LiveExplorer, MediaPlayer, Windows10 and Metro with accent color. The Xceed.Wpf.ListBox.Themes.xxx.dll assembly is necessary to use the themes.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <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>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-       <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/ItemTemplates.xaml" />
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-           
-         <PropertyGroupDescription x:Key="shipCountryGroupDescription"
-                                   PropertyName="ShipCountry" />
 
-         <PropertyGroupDescription x:Key="shipCityGroupDescription"
-                                   PropertyName="ShipCity" />
 
-         <Style x:Key="MetroSampleRadioButtonTemplate" TargetType="RadioButton">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="RadioButton">
-                     <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                           <VisualStateGroup x:Name="CommonStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                                 <VisualTransition From="Normal"
-                                                   GeneratedDuration="0"
-                                                   To="Pressed">
-                                    <Storyboard>
-                                       <DoubleAnimation Duration="0"
-                                                        To="0.45"
-                                                        Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                        Storyboard.TargetName="rectangle" />
-                                    </Storyboard>
-                                 </VisualTransition>
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Normal" />
-                              <VisualState x:Name="MouseOver">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.35"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Disabled">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To=".2"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="content" />
-                                 </Storyboard>
-                              </VisualState>
-                           </VisualStateGroup>
-                           <VisualStateGroup x:Name="CheckStates">
-                              <VisualStateGroup.Transitions>
-                                 <VisualTransition GeneratedDuration="0:0:0.2" />
-                              </VisualStateGroup.Transitions>
-                              <VisualState x:Name="Checked">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="1"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="CheckIcon" />
-                                 </Storyboard>
-                              </VisualState>
-                              <VisualState x:Name="Unchecked" />
-                           </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Rectangle x:Name="content"
-                                   Width="20"
-                                   Height="20"
-                                   Fill="{TemplateBinding Background}" />
-                        <Path x:Name="CheckIcon"
-                              Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                              Fill="White"
-                              FlowDirection="LeftToRight"
-                              Opacity="0"
-                              Stretch="Fill"
-                              UseLayoutRounding="False"
-                              VerticalAlignment="Bottom"
-                              HorizontalAlignment="Right"
-                              Width="12"
-                              Height="12"
-                              Margin="0,0,1,1" />
-                        <Rectangle x:Name="rectangle"
-                                   Fill="White"
-                                   Opacity="0" />
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-           
-      </ResourceDictionary>
-   </local:DemoView.Resources>
 
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
 
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
 
-            <StackPanel Margin="0,5,5,5" Orientation="Horizontal">
-               <TextBlock Text="Themes:" Margin="0,5,5,5" VerticalAlignment="Center"/>
-               <ComboBox x:Name="themeComboBox" Width="150" Height="25"
-                         SelectedIndex="0"
-                         VerticalAlignment="Center"
-                         SelectionChanged="ThemeComboBoxSelectionChanged">
-                  <ComboBoxItem Content="System"
-                                Tag="{x:Static view:ThemesEnum.System}"/>
-                  <ComboBoxItem Content="Office 2007 Blue"
-                                Tag="{x:Static view:ThemesEnum.Office2007Blue}"/>
-                  <ComboBoxItem Content="Office 2007 Black"
-                                Tag="{x:Static view:ThemesEnum.Office2007Black}"/>
-                  <ComboBoxItem Content="Office 2007 Silver"
-                                Tag="{x:Static view:ThemesEnum.Office2007Silver}"/>
-                  <ComboBoxItem Tag="{x:Static view:ThemesEnum.Windows10}">
-                     <ComboBoxItem.Content>
-                        <DockPanel>
-                           <TextBlock DockPanel.Dock="Left"
-                                      Text="Windows 10" />
-                        </DockPanel>
-                     </ComboBoxItem.Content>
-                  </ComboBoxItem>
-                  <ComboBoxItem Content="Live Explorer"
-                                Tag="{x:Static view:ThemesEnum.LiveExplorer}"/>
-                  <ComboBoxItem Content="Metro Dark"
-                                Tag="{x:Static view:ThemesEnum.MetroDark}"/>
-                  <ComboBoxItem Content="Metro Light"
-                                Tag="{x:Static view:ThemesEnum.MetroLight}"/>
-                  <ComboBoxItem Content="Media Player"
-                                Tag="{x:Static view:ThemesEnum.MediaPlayer}"/>
-               </ComboBox>
-            </StackPanel>
-            
-            <StackPanel x:Name="_accentColorPanel"
-                         Grid.Column="1" Margin="10,0,0,0"
-                         Orientation="Horizontal"
-                         VerticalAlignment="Top"
-                         HorizontalAlignment="Left"
-                         Visibility="Hidden">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-                     
-                     <StackPanel>
-                        <TextBlock Text="Accent Color"
-                                   FontFamily="Segoe UI"
-                                   FontSize="13"
-                                   Foreground="#414141" />
-                        <StackPanel Orientation="Horizontal">
-                           <RadioButton Background="#FFF4B300"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Gold"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF78BA00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF2673EC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Blue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFAE113D"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="MediumVioletRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF632F00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Brown" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFB01E00"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkRed"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FFC1004F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="PaleVioletRed" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF7200AC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkViolet" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF4617B4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkSlateBlue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF006AC1"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="RoyalBlue" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF008287"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Teal" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                           <RadioButton Background="#FF199900"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Green" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                            <RadioButton Background="#FF00C13F"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Lime" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        </StackPanel>
-                     </StackPanel>
-                     <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,2,0,0">
-                        <RadioButton Background="#FFFF981D"
-                                        Margin="0,0,2,0"
-                                        IsChecked="True"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSalmon"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF2E12"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Red" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF1D77"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepPink"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFAA40FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Purple"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF1FAEFF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DeepSkyBlue"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF56C5FF"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkTurquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00D8CC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Turquoise"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF91D100"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="YellowGreen"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFE1B700"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="DarkYellow"
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF76BC"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Pink" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FF00A4A4"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="LightSeaGreen" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Background="#FFFF7D23"
-                                        Margin="0,0,2,0"
-                                        Checked="RadioButton_Checked"
-                                        GroupName="themeRadioGroup"
-                                        Tag="Orange" 
-                                        Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </Grid>
-                  
-                  <StackPanel Margin="10,0,0,0">
-                     <TextBlock Text="Custom Color"
-                                   FontFamily="Segoe UI"
-                                   FontSize="13"
-                                   Foreground="#414141" />
-                     <StackPanel Orientation="Horizontal">
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush1}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom1"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush2}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom2"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                        <RadioButton Margin="0,0,2,0"
-                                       Checked="RadioButton_Checked"
-                                       Background="{StaticResource customAccentBrush3}"
-                                       GroupName="themeRadioGroup"
-                                       Tag="Custom3"
-                                       Style="{StaticResource MetroSampleRadioButtonTemplate}"/>
-                     </StackPanel>
-                  </StackPanel>
-               </StackPanel>
-         </Grid>
-      </GroupBox>
 
-      <TextBlock Grid.Row="1" Margin="10" HorizontalAlignment="Left" Text="Usage:" Style="{StaticResource Header}"/>
 
-      <Border  Grid.Row="2" x:Name="myBorder">
-            <xclb:ListBox x:Name="_listBox"
-                        ItemsSource="{Binding}"
-                        ItemTemplate="{StaticResource orderListBoxItemTemplate}"
-                        ToolPaneVisibility="Visible">
 
-            <xclb:SearchTextBox.FilteredFieldNames>
-               <xclb:FieldNameList>
-                  <sys:String>ShipCountry</sys:String>
-               </xclb:FieldNameList>
-            </xclb:SearchTextBox.FilteredFieldNames>
 
-            <xclb:DataNavigationControl.DataNavigationConfiguration>
-               <xclb:AlphabeticalDataNavigationConfiguration />
-            </xclb:DataNavigationControl.DataNavigationConfiguration>
-         </xclb:ListBox>
-      </Border>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ListBoxControls.png" Width="700" Height="500"/>
-##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt
index 073f84e7..b7e79593 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimeSpanView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
index 0a5ce9a1..2e32ea8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimelinePanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt
index f9a5ea18..a78cce4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimelinePanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.txt
index a697f2d3..048b0e1a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,7 @@
            TimelinePanel is a WPF panel at arranges it's children along a timeline.  Items are placed along the timeline based on the Date attached property, which is set on each item.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <ObjectDataProvider x:Key="Orientations" MethodName="GetValues"
                           ObjectType="{x:Type sys:Enum}">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt
index f3e1b086..48f42067 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ToggleSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
index b8db00ec..11f85407 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -27,7 +27,6 @@
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The ToggleSwitch control is a fully customizable on/off switch that can be used to enhance the UI experience.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -35,504 +34,34 @@
          <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>
-       ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
-      <conv:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
-      <localConv:ZeroToBoolConverter x:Key="ZeroToBoolConverter" />
-
-      <LinearGradientBrush x:Key="customAccentBrush1"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF0086c6"
-                       Offset="0" />
-         <GradientStop Color="#FF66ccff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.94" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="0.97" />
-         <GradientStop Color="#FFddf4ff"
-                       Offset="1" />
-      </LinearGradientBrush>
-
-      <LinearGradientBrush x:Key="customAccentBrush2"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FFff0099"
-                       Offset="0" />
-         <GradientStop Color="#FF993366"
-                       Offset="1" />
-      </LinearGradientBrush>
-
-      <LinearGradientBrush x:Key="customAccentBrush3"
-                           EndPoint="0.5,1"
-                           StartPoint="0.5,0">
-         <GradientStop Color="#FF9DE214"
-                       Offset="0" />
-         <GradientStop Color="#FF9DE214"
-                       Offset="0.2" />
-         <GradientStop Color="#FF95CA2A"
-                       Offset="0.2" />
-         <GradientStop Color="#FF339933"
-                       Offset="1" />
-      </LinearGradientBrush>
-
-      <Style x:Key="MetroSampleRadioButtonTemplate"
-             TargetType="RadioButton">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="RadioButton">
-                  <Grid>
-                     <VisualStateManager.VisualStateGroups>
-                        <VisualStateGroup x:Name="CommonStates">
-                           <VisualStateGroup.Transitions>
-                              <VisualTransition GeneratedDuration="0:0:0.2" />
-                              <VisualTransition From="Normal"
-                                                GeneratedDuration="0"
-                                                To="Pressed">
-                                 <Storyboard>
-                                    <DoubleAnimation Duration="0"
-                                                     To="0.45"
-                                                     Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                     Storyboard.TargetName="rectangle" />
-                                 </Storyboard>
-                              </VisualTransition>
-                           </VisualStateGroup.Transitions>
-                           <VisualState x:Name="Normal" />
-                           <VisualState x:Name="MouseOver">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="0.35"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="rectangle" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Pressed">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="0.35"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="rectangle" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Disabled">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To=".2"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="content" />
-                              </Storyboard>
-                           </VisualState>
-                        </VisualStateGroup>
-                        <VisualStateGroup x:Name="CheckStates">
-                           <VisualStateGroup.Transitions>
-                              <VisualTransition GeneratedDuration="0:0:0.2" />
-                           </VisualStateGroup.Transitions>
-                           <VisualState x:Name="Checked">
-                              <Storyboard>
-                                 <DoubleAnimation Duration="0"
-                                                  To="1"
-                                                  Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                  Storyboard.TargetName="CheckIcon" />
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Unchecked" />
-                        </VisualStateGroup>
-                     </VisualStateManager.VisualStateGroups>
-                     <Rectangle x:Name="content"
-                                Width="20"
-                                Height="20"
-                                Fill="{TemplateBinding Background}" />
-                     <Path x:Name="CheckIcon"
-                           Data="M 619,736 C619,736 617,738 617,738 617,738 621,742 621,742 621,742 629,732 629,732 629,732 627,730 627,730 627,730 621,738 621,738 621,738 619,736 619,736 z"
-                           Fill="White"
-                           FlowDirection="LeftToRight"
-                           Opacity="0"
-                           Stretch="Fill"
-                           UseLayoutRounding="False"
-                           VerticalAlignment="Bottom"
-                           HorizontalAlignment="Right"
-                           Width="12"
-                           Height="12"
-                           Margin="0,0,1,1" />
-                     <Rectangle x:Name="rectangle"
-                                Fill="White"
-                                Opacity="0" />
-                  </Grid>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="ThumbStyle1"
-             TargetType="{x:Type Thumb}">
-         <Setter Property="VerticalAlignment"
-                 Value="Center" />
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type Thumb}">
-                  <Grid>
-                     <Border x:Name="border"
-                             Width="{TemplateBinding ActualWidth}"
-                             Height="{TemplateBinding ActualHeight}"
-                             HorizontalAlignment="Center"
-                             BorderBrush="Orange"
-                             BorderThickness="2"
-                             Background="Black" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Value="True">
-                        <Setter Property="Background"
-                                Value="Green"
-                                TargetName="border" />
-                     </DataTrigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="ThumbStyle2"
-             TargetType="{x:Type Thumb}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type Thumb}">
-                  <Grid>
-                     <Image Source="..\Resources\PencilTool16.png"
-                            Stretch="None" />
-                  </Grid>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Margin="5">
-
-         <GroupBox.Resources>
-            <Style TargetType="TextBlock"
-                   BasedOn="{StaticResource DisableGrayText}">
-               <Setter Property="Width"
-                       Value="125" />
-               <Setter Property="Margin"
-                       Value="0,5,0,5" />
-            </Style>
-            <Style x:Key="SubHeader"
-                   TargetType="TextBlock">
-               <Setter Property="Margin"
-                       Value="0,10,0,0" />
-               <Setter Property="Foreground"
-                       Value="Orange" />
-               <Setter Property="TextElement.FontWeight"
-                       Value="Bold" />
-            </Style>
-         </GroupBox.Resources>
-
-         <Grid>
-            <Grid Grid.Row="0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*" />
-                  <ColumnDefinition Width="1*" />
-                  <ColumnDefinition Width="1*" />
-               </Grid.ColumnDefinitions>
-
-               <!-- General Section -->
-               <StackPanel Grid.Column="0"
-                           Margin="5,0,0,0">
-                  <StackPanel>
-                     <TextBlock Text="Section: General"
-                                Style="{StaticResource SubHeader}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="IsChecked:" />
-                     <CheckBox Width="80"
-                               Margin="0,5,0,0"
-                               IsChecked="{Binding IsChecked, ElementName=_toggleSwitch}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="IsCheckedLeft:" />
-                     <CheckBox Width="80"
-                               Margin="0,5,0,0"
-                               IsChecked="{Binding IsCheckedLeft, ElementName=_toggleSwitch}" />
-                  </StackPanel>
-
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Width:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="50.0"
-                                        Maximum="300.0"
-                                        Increment="1.0"
-                                        Value="{Binding Width, ElementName=_toggleSwitch}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Height:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="20.0"
-                                        Maximum="100.0"
-                                        Increment="0.1"
-                                        FormatString="N1"
-                                        Value="{Binding Height, ElementName=_toggleSwitch}" />
-                  </StackPanel>
-
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Corner Radius:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="0.0"
-                                        Maximum="25.0"
-                                        Value="{Binding CornerRadius, ElementName=_toggleSwitch, Converter={StaticResource CornerRadiusToDoubleConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Outer Margin:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="0.0"
-                                        Maximum="5.0"
-                                        Value="{Binding OuterMargin, ElementName=_toggleSwitch, Converter={StaticResource ThicknessToDoubleConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Inner Margin:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="0.0"
-                                        Maximum="5.0"
-                                        Value="{Binding InnerMargin, ElementName=_toggleSwitch, Converter={StaticResource ThicknessToDoubleConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Border Thickness:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="0.0"
-                                        Maximum="3.0"
-                                        Value="{Binding BorderThickness, ElementName=_toggleSwitch, Converter={StaticResource ThicknessToDoubleConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Border Brush:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding BorderBrush, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-
-               </StackPanel>
-
-               <!-- Checked/Unchecked Sections -->
-               <StackPanel Grid.Column="1"
-                           Margin="5,0,0,0">
-
-                  <StackPanel>
-                     <TextBlock Text="Section: Checked"
-                                Style="{StaticResource SubHeader}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Content:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding CheckedContent, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="ToolTip:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding CheckedToolTip, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Foreground:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding CheckedForeground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Background:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding CheckedBackground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-
-                  <StackPanel>
-                     <TextBlock Text="Section: Unchecked"
-                                Style="{StaticResource SubHeader}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Content:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding UncheckedContent, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="ToolTip:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding UncheckedToolTip, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Foreground:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding UncheckedForeground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Background:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding UncheckedBackground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-               </StackPanel>
-
-               <!-- Thumb -->
-               <StackPanel Grid.Column="2"
-                           Margin="5,0,0,0">
-                  <StackPanel>
-                     <TextBlock Text="Section: Thumb"
-                                Style="{StaticResource SubHeader}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Width:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Minimum="20"
-                                        Maximum="40"
-                                        Margin="0,5,0,0"
-                                        Value="{Binding ThumbWidth, ElementName=_toggleSwitch}"
-                                        ToolTip="Gets/Sets the Width of the Thumb." />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Height:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Minimum="10"
-                                        Maximum="50"
-                                        Margin="0,5,0,0"
-                                        Value="{Binding ThumbHeight, ElementName=_toggleSwitch}"
-                                        ToolTip="Gets/Sets the Height of the Thumb." />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Elasticity:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Minimum="10"
-                                        Maximum="90"
-                                        Margin="0,5,0,0"
-                                        Value="{Binding ThumbElasticity, ElementName=_toggleSwitch}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Right Content:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding ThumbRightContent, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Left Content:" />
-                     <TextBox Width="80"
-                              Margin="0,5,0,0"
-                              Text="{Binding ThumbLeftContent, ElementName=_toggleSwitch, UpdateSourceTrigger=PropertyChanged}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Border Thickness:" />
-                     <xctk:DoubleUpDown Width="80"
-                                        Margin="0,5,0,0"
-                                        Minimum="0.0"
-                                        Maximum="3.0"
-                                        Value="{Binding ThumbBorderThickness, ElementName=_toggleSwitch, Converter={StaticResource ThicknessToDoubleConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Border Brush:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding ThumbBorderBrush, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Foreground:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding ThumbForeground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Background:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding ThumbBackground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Hover Background:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding ThumbHoverBackground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal"
-                              IsEnabled="{Binding SelectedIndex, ElementName=thumbStyleComboBox, Converter={StaticResource ZeroToBoolConverter}}">
-                     <TextBlock Text="Pressed Background:" />
-                     <xctk:ColorPicker Width="80"
-                                       Margin="0,5,0,0"
-                                       SelectedColor="{Binding ThumbPressedBackground, ElementName=_toggleSwitch, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-                  </StackPanel>
-                  <StackPanel Orientation="Horizontal">
-                     <TextBlock Text="Style:" />
-                     <ComboBox x:Name="thumbStyleComboBox"
-                               Width="80"
-                               SelectedValue="{Binding ThumbStyle, ElementName=_toggleSwitch}"
-                               SelectedValuePath="Tag"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Left"
-                               Margin="0,5,0,0">
-                        <ComboBoxItem Content="Default"
-                                      Tag="{x:Null}" />
-                        <ComboBoxItem Content="Style 1"
-                                      Tag="{StaticResource ThumbStyle1}" />
-                        <ComboBoxItem Content="Style 2"
-                                      Tag="{StaticResource ThumbStyle2}" />
-                     </ComboBox>
-                  </StackPanel>
-               </StackPanel>
-
-            </Grid>
-
-         </Grid>
-      </GroupBox>
-
-      <StackPanel x:Name="_samplePanel"
-                  Grid.Row="1"
-                  Margin="10">
-
-         <TextBlock Text="Usage:"
-                    Margin="10"
-                    Style="{StaticResource Header}" />
-
-         <xctk:ToggleSwitch x:Name="_toggleSwitch"
-                            Margin="10"
-                            CheckedContent="ON"
-                            UncheckedContent="OFF"
-                            Width="80"
-                            Height="25"
-                            ThumbHeight="25"
-                            ThumbWidth="24"
-                            HorizontalAlignment="Center" />
-
-
-      </StackPanel>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ToggleSwitch.png" Width="200" Height="160"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt
index 9a0f9cac..ec9c2548 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -30,13 +30,6 @@ using System.Windows.Shapes;
 using System.ComponentModel;
 using System.Data;
 using System.Collections.ObjectModel;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Themes;
-using Xceed.Wpf.Toolkit.Themes.Office2007;
-using Xceed.Wpf.Toolkit.Themes.Metro;
-using Xceed.Wpf.Themes.Metro;
-using Xceed.Wpf.Samples.SampleData;
-#endif
 
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views
@@ -46,107 +39,25 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views
   /// </summary>
   public partial class TokenizedTextBoxView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private static ObservableCollection<Record> m_Records;
 
-    #endregion
-#endif
 
     public TokenizedTextBoxView()
     {
 
-#if !OPEN_SOURCE
-      InitDataSource();
-      DataContext = this;
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    void InitDataSource()
-    {
-      NorthwindCollections northwind = new NorthwindCollections();
-      m_Records = new ObservableCollection<Record>();
-      foreach( var employee in northwind.Employees )
-      {
-        m_Records.Add( new Record( employee.FirstName, employee.LastName ) );
-      }
-    }
 
 
-    public static ObservableCollection<Record> EmployeeList
-    {
-      get
-      {
-        return m_Records;
-      }
-    }
 
-    private void OnDeleteToken( object sender, RoutedEventArgs e )
-    {
-      object item = ( ( FrameworkElement )e.OriginalSource ).DataContext;
-      this.customTokenizedTextBox.SelectedItems.Remove( item );
-    }
-#endif
   }
 
-#if !OPEN_SOURCE
-  public class Record : INotifyPropertyChanged
-  {
-    public Record()
-    {
-    }
 
-    public Record( string pFirstName, string pLastName )
-    {
-      FirstName = pFirstName;
-      LastName = pLastName;
-    }
 
-    private string m_firstName;
-    public string FirstName
-    {
-      get
-      {
-        return m_firstName;
-      }
-      set
-      {
-        m_firstName = value;
-        OnPropertyChanged( "FirstName" );
-      }
-    }
 
-    private string m_lastName;
-    public string LastName
-    {
-      get
-      {
-        return m_lastName;
-      }
-      set
-      {
-        m_lastName = value;
-        OnPropertyChanged( "LastName" );
-      }
-    }
 
 
-    #region INotifyPropertyChanged Members
 
-    public event PropertyChangedEventHandler PropertyChanged;
 
-    protected void OnPropertyChanged( string name )
-    {
-      PropertyChangedEventHandler handler = PropertyChanged;
-      if( handler != null )
-      {
-        handler( this, new PropertyChangedEventArgs( name ) );
-      }
-    }
-    #endregion
-  }
-#endif
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt
index 799ff705..0ed541cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -26,7 +26,6 @@
         <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>The TokenizedTextBox lets you display a series of values as tokens. If an ItemsSource is specified, an AutoComplete popup will appear with a filtered list of valid values during edit.</Run>
-            <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,294 +33,42 @@
             <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>
-          ##END-->
       </Paragraph>
     </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <GroupBox Header="Features"
-                  Margin="5">
-
-            <GroupBox.Resources>
-                <Style TargetType="TextBlock">
-                    <Setter Property="Width" Value="150" />
-                    <Setter Property="Margin" Value="0,5,0,5" />
-                </Style>
-                <Style x:Key="SubHeader" TargetType="TextBlock">
-                    <Setter Property="Margin" Value="0,10,0,0" />
-                    <Setter Property="Foreground" Value="Orange" />
-                    <Setter Property="TextElement.FontWeight" Value="Bold" />
-                </Style>
-            </GroupBox.Resources>
-
-         <Grid Margin="5,0,0,5">
-
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="4*" />
-               <ColumnDefinition Width="6*" />
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <StackPanel Grid.Column="0">
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="Is Valid:" />
-                  <TextBlock Width="80"
-                             Margin="0,5,0,0"
-                             ToolTip="False if there is some invalid values or text segments within the TokenizedTextBox that are&#x0a;not yet resolved to a valid item and added to the TokenizedTextBox.SelectedItems collection.&#x0a;&#x0a;In this sample this value is linked to the Default TokenizedTextBox only."
-                             Text="{Binding IsValid, ElementName=defaultTokenizedTextBox}">
-                  </TextBlock>
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="Allow Invalid Values:" />
-                  <CheckBox x:Name="chkAllowInvalidValues"
-                            Width="80"
-                            Margin="0,5,0,0"
-                            IsChecked="{Binding AllowInvalidValues, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="Allow Duplicate Values:" />
-                  <CheckBox x:Name="chkAllowDuplicateValues"
-                            Width="80"
-                            Margin="0,5,0,0"
-                            IsChecked="{Binding AllowDuplicateValues, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="Token Delimiter:" />
-                  <TextBox Width="15"
-                           Margin="0,5,0,0"
-                           MaxLength="1"
-                           Text="{Binding TokenDelimiter, ElementName=defaultTokenizedTextBox, UpdateSourceTrigger=PropertyChanged}" />
-               </StackPanel>
-
-            </StackPanel>
-
-            <StackPanel x:Name="panel1"
-                        Grid.Column="1">
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="TokenDisplayMemberPath:" />
-                  <TextBox x:Name="txtValueMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="{Binding TokenDisplayMemberPath, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="DisplayMemberPath:" />
-                  <TextBox x:Name="txtDisplayMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="{Binding DisplayMemberPath, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="SearchMemberPaths:" />
-                  <TextBox x:Name="txtSearchMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="{Binding SearchMemberPaths, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-            </StackPanel>
-
-            <StackPanel x:Name="panel2"
-                        Grid.Column="1"
-                        Visibility="Collapsed">
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="ValueMemberPath:" />
-                  <TextBox x:Name="txtHiddenValueMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="DisplayMemberPath:" />
-                  <TextBox x:Name="txtHiddenDisplayMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="" />
-               </StackPanel>
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="SearchMemberPaths:" />
-                  <TextBox x:Name="txtHiddenSearchMemberPath"
-                           Width="200"
-                           Margin="0,5,0,0"
-                           IsEnabled="False"
-                           Text="" />
-               </StackPanel>
-
-            </StackPanel>
-
-            <StackPanel Grid.Row="1"
-                        Grid.ColumnSpan="2">
-
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="Text:" />
-                  <TextBox x:Name="txtValue"
-                           Width="477"
-                           Margin="0,5,0,0"
-                           Text="{Binding Text, ElementName=defaultTokenizedTextBox}" />
-               </StackPanel>
-
-            </StackPanel>
-            <DockPanel Grid.Row="2"
-                       Grid.ColumnSpan="2"
-                       HorizontalAlignment="Stretch">
-               <TextBlock Text="SelectedItems:"
-                          DockPanel.Dock="Left" />
-               <Border BorderBrush="Gray"
-                       BorderThickness="1"
-                       Margin="5,5,0,0"
-                       Height="60"
-                       Width="477"
-                       SnapsToDevicePixels="True">
-                  <ScrollViewer>
-                     <ItemsControl ItemsSource="{Binding SelectedItems, ElementName=defaultTokenizedTextBox}"
-                                   HorizontalAlignment="Stretch">
-                        <ItemsControl.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <WrapPanel />
-                           </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                           <DataTemplate>
-                              <Border BorderThickness="1"
-                                      BorderBrush="Gray"
-                                      SnapsToDevicePixels="True"
-                                      Margin="3">
-                                 <StackPanel Orientation="Horizontal"
-                                             Margin="3">
-                                    <TextBlock Text="{Binding FirstName, FallbackValue=(String}"
-                                               Margin="0,0,5,0" />
-                                    <TextBlock Text="{Binding LastName, FallbackValue=Value)}" />
-                                 </StackPanel>
-                              </Border>
-                           </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                     </ItemsControl>
-                  </ScrollViewer>
-               </Border>
-            </DockPanel>
-         </Grid>
-        </GroupBox>
-
-        <StackPanel x:Name="_samplePanel" 
-                    Grid.Row="1" 
-                    Margin="10">
-
-            <TextBlock Text="Default:" 
-                       Margin="10"
-                       Style="{StaticResource Header}" />
-
-            <xctk:TokenizedTextBox x:Name="defaultTokenizedTextBox" 
-                                   Margin="10" 
-                                   Width="500"
-                                   HorizontalAlignment="Left"
-                                   AllowInvalidValues="False"
-                                   TokenDelimiter=";"
-                                   TokenDisplayMemberPath="FirstName"
-                                   DisplayMemberPath="LastName"
-                                   SearchMemberPaths="FirstName,LastName"
-                                   ItemsSource="{Binding Path=EmployeeList}" />
-
-            <TextBlock Text="Customized:" 
-                       Margin="10"
-                       Style="{StaticResource Header}" />
-
-         <xctk:TokenizedTextBox x:Name="customTokenizedTextBox"
-                                Margin="10"
-                                Width="500"
-                                HorizontalAlignment="Left"
-                                TokenDisplayMemberPath="{Binding TokenDisplayMemberPath, ElementName=defaultTokenizedTextBox}"
-                                AllowDuplicateValues="{Binding AllowDuplicateValues, ElementName=defaultTokenizedTextBox}"
-                                TokenDelimiter="{Binding TokenDelimiter, ElementName=defaultTokenizedTextBox}"
-                                SearchMemberPaths="{Binding SearchMemberPaths, ElementName=defaultTokenizedTextBox}"
-                                ItemsSource="{Binding Path=EmployeeList}">
-
-            
-            <xctk:TokenizedTextBox.ItemTemplate>
-               <DataTemplate>
-                  <StackPanel Orientation="Horizontal"
-                              ToolTip="This item's Italic font style was set using the ItemTemplate property">
-                     <TextBlock Text="{Binding FirstName}" FontStyle="Italic"/>
-                     <TextBlock Text="{Binding LastName}" FontStyle="Italic"
-                                Margin="5,0,0,0"/>
-                  </StackPanel>
-               </DataTemplate>
-            </xctk:TokenizedTextBox.ItemTemplate>
-            <xctk:TokenizedTextBox.TokenItemTemplate>
-               <DataTemplate>
-                  <StackPanel Orientation="Horizontal"
-                              ToolTip="This item's Bold font style was set using the TokenItemTemplate property">
-                     <TextBlock Text="{Binding FirstName}"
-                                FontWeight="Bold" />
-                     <TextBlock Text="{Binding LastName}"
-                                FontWeight="Bold"
-                                Margin="5,0,0,0" />
-                  </StackPanel>
-               </DataTemplate>
-            </xctk:TokenizedTextBox.TokenItemTemplate>
-            <xctk:TokenizedTextBox.TokenItemContainerStyle>
-               <Style TargetType="{x:Type xctk:TokenItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type xctk:TokenItem}">
-                           <DockPanel>
-                              <Button DockPanel.Dock="Right"
-                                      Margin="2,0,0,0"
-                                      Padding="0"
-                                      BorderThickness="1"
-                                      BorderBrush="Gray"
-                                      KeyboardNavigation.IsTabStop="False"
-                                      Click="OnDeleteToken"
-                                      ToolTip="This button was added using the TokenItemContainerStyle property">
-                                 <Grid>
-                                    <Path Stroke="Red"
-                                          StrokeThickness="2"
-                                          Data="M 1,1 L 10,10" />
-                                    <Path Stroke="Red"
-                                          StrokeThickness="2"
-                                          Data="M 1,10 L 10,1" />
-                                 </Grid>
-                              </Button>
-                              <ContentPresenter />
-                           </DockPanel>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </xctk:TokenizedTextBox.TokenItemContainerStyle>            
-            
-         </xctk:TokenizedTextBox>
-
-      </StackPanel>
-    </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\TokenizedTextBox.png" Width="600" Height="400"/>
-   ##END-->
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt
index d946d4c3..5301d255 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt
index 79ae69e1..bd53f0c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkPasswordBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
index c09b86ce..d37064fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkPasswordBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt
index 14a7891b..9d8592dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="WatermarkPasswordBox">
    <local:DemoView.Description>
-      <!--//#TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          The WatermarkPasswordBox is a PasswordBox where you can enter a secure password and display a watermark when the password is not defined.
@@ -65,7 +64,7 @@
                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            
+
             <!--1st Column-->
             <TextBlock Text="PasswordChar: "
                        VerticalAlignment="Center" />
@@ -76,7 +75,7 @@
                      Margin="5,5,25,5"
                      HorizontalAlignment="Left"
                      VerticalAlignment="Center" />
-            
+
             <TextBlock Grid.Row="1"
                        Text="Password: "
                        VerticalAlignment="Center" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt
index 1537fc4c..e50a9aa9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt
index f68a4584..98ad267c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WindowContainerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt
index 904cd585..62b692da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -40,7 +40,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     {
       InitializeComponent();
 
-      //# Use translucent colors in the Available Colors Tab from ColorPicker
       ObservableCollection<ColorItem> alphaAvailableColors = new ObservableCollection<ColorItem>();
       foreach( ColorItem item in _modalBackgroundColorPicker.AvailableColors )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt
index 0bc473db..46075034 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -38,7 +38,7 @@
    <local:DemoView.Resources>
         <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
         <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
-        
+
         <ObjectDataProvider x:Key="GenderEnum" MethodName="GetValues"
                           ObjectType="{x:Type sys:Enum}">
          <ObjectDataProvider.MethodParameters>
@@ -52,25 +52,25 @@
              <RowDefinition Height="Auto" />
              <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        
+
        <GroupBox Header="Features" Grid.Row="0" Margin="5">
          <Grid Margin="5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-     
+
             <TextBlock Text="ModalBackgroundBrush:" VerticalAlignment="Center" />
             <xctk:ColorPicker x:Name="_modalBackgroundColorPicker" Grid.Column="1" SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
          </Grid>
       </GroupBox>
-        
+
        <Grid Grid.Row="1" Margin="10">
            <Grid.RowDefinitions>
              <RowDefinition Height="Auto" />
              <RowDefinition Height="*" />
           </Grid.RowDefinitions>
-          
+
           <TextBlock Text="Usage:" Style="{StaticResource Header}" />
 
           <Grid Grid.Row="1">
@@ -84,7 +84,7 @@
                 <CheckBox x:Name="_modalChildWindowCheckBox" Content="Modal Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
                 <CheckBox x:Name="_messageBoxCheckBox" Content="MessageBox" Margin="5" Checked="OnMessageBoxCheckBoxChecked" Unchecked="OnMessageBoxCheckBoxUnchecked" />
             </StackPanel>
-              
+
             <Grid Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="80" />
@@ -105,7 +105,7 @@
                 <TextBox Grid.Row="1" Grid.Column="1" Width="150" Height="30" Text="Thompson" HorizontalAlignment="Left"/>
                 <TextBlock Grid.Row="2" Text="Address:" VerticalAlignment="Center" Margin="10"/>
                 <TextBox Grid.Row="2" Grid.Column="1" Width="150" Height="30" Text="65 Main street" HorizontalAlignment="Left"/>
-                
+
                 <!-- 2nd Column-->
                 <TextBlock Grid.Column="2" Text="Gender:" VerticalAlignment="Center" Margin="10"/>
                 <ComboBox Grid.Column="3" Width="100" Height="30" ItemsSource="{Binding Source={StaticResource GenderEnum}}" SelectedIndex="0" Margin="5" HorizontalAlignment="Left"/>
@@ -114,7 +114,7 @@
                 <TextBlock Grid.Row="2" Grid.Column="2" Text="Salary:" VerticalAlignment="Center" Margin="10"/>
                 <xctk:IntegerUpDown Grid.Row="2" Width="100" Grid.Column="3" Height="30" Value="30000" Increment="5000" Margin="5" HorizontalAlignment="Left"/>
             </Grid>
-             
+
             <Border Grid.Column="1"
                     BorderBrush="Black"
                     BorderThickness="2"
@@ -131,7 +131,7 @@
                                   WindowState="Open">
                         <TextBlock Text="This is a regular Child Window" Padding="10"/>
                 </xctk:ChildWindow>
-                    
+
                   <xctk:ChildWindow x:Name="_modalChildWindow" 
                                   Caption="Modal ChildWindow"
                                   IsModal="True"
@@ -142,13 +142,13 @@
                                   WindowState="Open">
                         <TextBlock Text="This is a modal Child Window" Padding="10"/>
                 </xctk:ChildWindow>
-                    
+
                   <xctk:MessageBox x:Name="_messageBox"
                                  Caption="MessageBox" 
                                  Text="This is a MessageBox, always modal"
                                  Closed="OnMessageBoxClose" />
                </xctk:WindowContainer>
-               
+
             </Border>
         </Grid>
       </Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
index 6e8ef7be..bbe5e301 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WizardView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt
index e988b452..bf6465d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -24,7 +24,7 @@
            The Wizard will explain how to do something in a series of steps.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <xctk:Wizard x:Key="_wizard" FinishButtonClosesWindow="True" Help="OnWizardHelp">
             <xctk:WizardPage Title="Welcome to my Wizard"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt
index 0b002cc6..34097cf5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ZoomboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt
index cc59323e..0f6d85b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,7 +25,7 @@
            The Zoombox control provides zoom and pan functionality for any UIElement (its content) that has a discrete size. It allows the content to be scaled up (zoomed in) or scaled down (zoomed out) using the mouse wheel, key bindings, or programmatically through methods and properties exposed by the control. Similarly, the content can be panned (translated) in any direction by dragging it with the mouse, using key bindings, or programmatically through methods and properties exposed by the control.&#x0a;&#x0a;The Zoombox control also provides a view finder that acts as a reduced-scale map of the contained element, showing exactly which portion of the content is visible within the Zoombox's viewport.
         </Paragraph>
     </local:DemoView.Description>
-    
+
 
    <Grid Grid.Row="1" 
          HorizontalAlignment="Stretch"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
index 480a1bb4..16b042ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Core/Converters/ZeroToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs
index efdd3ac3..f4926894 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Core/LiveExplorerTreeViewItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
index d7316417..3c75095f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Core/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
index bbd5b1fa..46b7f466 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
index 5745daa0..027037d5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
index f7627d93..5f6e7b87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
index 9f7f1fec..130fce22 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
index b3b9cf5c..01f1ad41 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -580,8 +580,7 @@
             <core:LiveExplorerTreeViewItem Header="DropDown and Split Buttons"
                                            SampleType="{x:Type samples:Button.Views.DropDownSplitButtonView}" />
             <core:LiveExplorerTreeViewItem Header="IconButton"
-                                           SampleType="{x:Type samples:Button.Views.IconButtonView}"
-                                           IsNewFeature="True"/>
+                                           SampleType="{x:Type samples:Button.Views.IconButtonView}"/>
           </core:LiveExplorerTreeViewItem>
          <core:LiveExplorerTreeViewItem Header="Charts"
                                         Style="{StaticResource TreeViewHeaderStyle}"
@@ -656,7 +655,6 @@
                <core:LiveExplorerTreeViewItem Header="Frame"
                                               SampleType="{x:Type samples:MaterialControls.Views.MaterialFrameView}" />
                <core:LiveExplorerTreeViewItem Header="Hamburger"
-                                              IsNewFeature="True"
                                               SampleType="{x:Type samples:MaterialControls.Views.MaterialHamburgerView}" />
                <core:LiveExplorerTreeViewItem Header="ListBox"
                                               SampleType="{x:Type samples:MaterialControls.Views.MaterialListBoxView}" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
index bf2d3582..d0f63a8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -46,9 +46,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
       InitializeComponent();
       this.Loaded += new RoutedEventHandler( this.MainWindow_Loaded );
 
-      var assembly = Assembly.GetExecutingAssembly();
-      var fvi = FileVersionInfo.GetVersionInfo( assembly.Location );
-      VersionTextBlock.Text = "Version: " + fvi.FileVersion;
+      VersionTextBlock.Text = "Version: " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
     }
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
index 32b504e8..1a5949b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Windows;
 [assembly: AssemblyDescription( "" )]
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 [assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -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.2.*" )]
-[assembly: AssemblyFileVersion( "3.2.0.0" )]
+[assembly: AssemblyVersion( "3.3.*" )]
+[assembly: AssemblyFileVersion( "3.3.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 3fdce637..aeb9a794 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.2
+    Version 3.3
     
     The primary goals of this format is to allow a simple XML format 
     that is mostly human readable. The generation and parsing of the 
@@ -14,7 +14,7 @@
     
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">3.2</resheader>
+    <resheader name="version">3.3</resheader>
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><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.2</value>
+    <value>3.3</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=3.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=3.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=3.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=3.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
index 28b5b1a0..8c67085f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
index 3459955e..96e97c4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/AvalonDock/Views/AvalonDockView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
index 40831d09..67420a70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -14,107 +14,141 @@
 
   ***********************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views.AvalonDockView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 Title="AvalonDock">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
-      </Paragraph>
-   </local:DemoView.Description>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                Title="AvalonDock">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
+    </Paragraph>
+  </local:DemoView.Description>
 
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
 
-     <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" />
+    <TextBlock Grid.Row="1"
+               Text="Usage:"
+               Style="{StaticResource Header}" />
 
-      <xcad:DockingManager Grid.Row="2" MaxHeight="395"
-                           AllowMixedOrientation="True"
-                           BorderBrush="Black"
-                           BorderThickness="1">
-         <xcad:DockingManager.DocumentHeaderTemplate>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="{Binding IconSource}" Margin="0,0,4,0"/>
-                  <TextBlock Text="{Binding Title}" />
-               </StackPanel>
-            </DataTemplate>
-         </xcad:DockingManager.DocumentHeaderTemplate>
-         <xcad:LayoutRoot x:Name="_layoutRoot">
-            <xcad:LayoutPanel Orientation="Horizontal">
-               <xcad:LayoutAnchorablePane DockWidth="200">
-                  <xcad:LayoutAnchorable ContentId="properties" Title="Properties" CanHide="False" CanClose="False"
-                                            AutoHideWidth="240"
-                                         IconSource="../Images/property-blue.png">
-                     <xctk:PropertyGrid NameColumnWidth="110" SelectedObject="{Binding ElementName=_layoutRoot, Path=LastFocusedDocument.Content}" AutoGenerateProperties="False">
-                        <xctk:PropertyGrid.PropertyDefinitions>
-                           <xctk:PropertyDefinition TargetProperties="Background" />
-                           <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                           <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                           <xctk:PropertyDefinition TargetProperties="FontSize" />
-                           <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                           <xctk:PropertyDefinition TargetProperties="Width" />
-                           <xctk:PropertyDefinition TargetProperties="Height" />
-                        </xctk:PropertyGrid.PropertyDefinitions>
-                     </xctk:PropertyGrid>
-                  </xcad:LayoutAnchorable>
-               </xcad:LayoutAnchorablePane>
-               <xcad:LayoutDocumentPaneGroup >
-                  <xcad:LayoutDocumentPane>
-                     <xcad:LayoutDocument ContentId="document1" Title="Document 1" IconSource="../Images/document.png" >
-                           <Button Content="Document 1 Content" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                     </xcad:LayoutDocument>
-                     <xcad:LayoutDocument ContentId="document2" Title="Document 2" IconSource="../Images/document.png">
-                        <TextBox Text="Document 2 Content" AcceptsReturn="True"/>
-                     </xcad:LayoutDocument>
-                  </xcad:LayoutDocumentPane>
-               </xcad:LayoutDocumentPaneGroup >
-               <xcad:LayoutAnchorablePaneGroup DockWidth="125">
-                  <xcad:LayoutAnchorablePane>
-                     <xcad:LayoutAnchorable ContentId="alarms" Title="Alarms" IconSource="../Images/alarm-clock-blue.png" >
-                        <ListBox>
-                           <s:String>Alarm 1</s:String>
-                           <s:String>Alarm 2</s:String>
-                           <s:String>Alarm 3</s:String>
-                        </ListBox>
-                     </xcad:LayoutAnchorable>
-                     <xcad:LayoutAnchorable ContentId="journal" Title="Journal" >
-                        <RichTextBox>
-                           <FlowDocument>
-                              <Paragraph FontSize="14" FontFamily="Segoe">
-                                 This is the content of the Journal Pane.
-                                 <LineBreak/>
-                                 A
-                                 <Bold>RichTextBox</Bold> has been added here
-                              </Paragraph>
-                           </FlowDocument>
-                        </RichTextBox>
-                     </xcad:LayoutAnchorable>
-                  </xcad:LayoutAnchorablePane>
-               </xcad:LayoutAnchorablePaneGroup>
-            </xcad:LayoutPanel>
+    <xcad:DockingManager Grid.Row="2"
+                         MaxHeight="395"
+                         AllowMixedOrientation="True"
+                         BorderBrush="Black"
+                         BorderThickness="1">
+      <xcad:DockingManager.DocumentHeaderTemplate>
+        <DataTemplate>
+          <StackPanel Orientation="Horizontal">
+            <Image Source="{Binding IconSource}"
+                   Margin="0,0,4,0" />
+            <TextBlock Text="{Binding Title}" />
+          </StackPanel>
+        </DataTemplate>
+      </xcad:DockingManager.DocumentHeaderTemplate>
+      <xcad:LayoutRoot x:Name="_layoutRoot">
+        <xcad:LayoutPanel Orientation="Horizontal">
+          <xcad:LayoutAnchorablePane DockWidth="200">
+            <xcad:LayoutAnchorable ContentId="properties"
+                                   Title="Properties"
+                                   CanHide="False"
+                                   CanClose="False"
+                                   AutoHideWidth="240"
+                                   IconSource="../Images/property-blue.png">
+              <xctk:PropertyGrid NameColumnWidth="110"
+                                 SelectedObject="{Binding ElementName=_layoutRoot, Path=LastFocusedDocument.Content}"
+                                 AutoGenerateProperties="False">
+                <xctk:PropertyGrid.PropertyDefinitions>
+                  <xctk:PropertyDefinition TargetProperties="Background" />
+                  <xctk:PropertyDefinition TargetProperties="BorderBrush" />
+                  <xctk:PropertyDefinition TargetProperties="BorderThickness" />
+                  <xctk:PropertyDefinition TargetProperties="FontSize" />
+                  <xctk:PropertyDefinition TargetProperties="FontStyle" />
+                  <xctk:PropertyDefinition TargetProperties="Width" />
+                  <xctk:PropertyDefinition TargetProperties="Height" />
+                </xctk:PropertyGrid.PropertyDefinitions>
+              </xctk:PropertyGrid>
+            </xcad:LayoutAnchorable>
+          </xcad:LayoutAnchorablePane>
+          <xcad:LayoutDocumentPaneGroup>
+            <xcad:LayoutDocumentPane>
+              <xcad:LayoutDocument ContentId="document1"
+                                   Title="Document 1"
+                                   IconSource="../Images/document.png">
+                <Button Content="Document 1 Content"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center" />
+              </xcad:LayoutDocument>
+              <xcad:LayoutDocument ContentId="document2"
+                                   Title="Document 2"
+                                   IconSource="../Images/document.png">
+                <TextBox Text="Document 2 Content"
+                         AcceptsReturn="True" />
+              </xcad:LayoutDocument>
+            </xcad:LayoutDocumentPane>
+          </xcad:LayoutDocumentPaneGroup >
+          <xcad:LayoutAnchorablePaneGroup DockWidth="125">
+            <xcad:LayoutAnchorablePane>
+              <xcad:LayoutAnchorable ContentId="alarms"
+                                     Title="Alarms"
+                                     IconSource="../Images/alarm-clock-blue.png"
+                                     CanClose="True">
+                <ListBox>
+                  <s:String>Alarm 1</s:String>
+                  <s:String>Alarm 2</s:String>
+                  <s:String>Alarm 3</s:String>
+                </ListBox>
+              </xcad:LayoutAnchorable>
+              <xcad:LayoutAnchorable ContentId="journal"
+                                     Title="Journal">
+                <RichTextBox>
+                  <FlowDocument>
+                    <Paragraph FontSize="14"
+                               FontFamily="Segoe">
+                      This is the content of the Journal Pane.
+                      <LineBreak />
+                      A
+                      <Bold>RichTextBox</Bold> has been added here
+                    </Paragraph>
+                  </FlowDocument>
+                </RichTextBox>
+              </xcad:LayoutAnchorable>
+            </xcad:LayoutAnchorablePane>
+          </xcad:LayoutAnchorablePaneGroup>
+        </xcad:LayoutPanel>
 
-            <xcad:LayoutRoot.LeftSide>
-               <xcad:LayoutAnchorSide>
-                  <xcad:LayoutAnchorGroup>
-                     <xcad:LayoutAnchorable Title="Agenda" ContentId="agenda" IconSource="../Images/address-book-open.png">
-                        <TextBlock Text="Agenda Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
-                     </xcad:LayoutAnchorable>
-                     <xcad:LayoutAnchorable Title="Contacts" ContentId="contacts" IconSource="../Images/address-book--pencil.png" >
-                        <TextBlock Text="Contacts Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
-                     </xcad:LayoutAnchorable>
-                  </xcad:LayoutAnchorGroup>
-               </xcad:LayoutAnchorSide>
-            </xcad:LayoutRoot.LeftSide>
-         </xcad:LayoutRoot>
-      </xcad:DockingManager>
-   </Grid>
+        <xcad:LayoutRoot.LeftSide>
+          <xcad:LayoutAnchorSide>
+            <xcad:LayoutAnchorGroup>
+              <xcad:LayoutAnchorable Title="Agenda"
+                                     ContentId="agenda"
+                                     IconSource="../Images/address-book-open.png">
+                <TextBlock Text="Agenda Content"
+                           Margin="10"
+                           FontSize="18"
+                           FontWeight="Black"
+                           TextWrapping="Wrap" />
+              </xcad:LayoutAnchorable>
+              <xcad:LayoutAnchorable Title="Contacts"
+                                     ContentId="contacts"
+                                     IconSource="../Images/address-book--pencil.png">
+                <TextBlock Text="Contacts Content"
+                           Margin="10"
+                           FontSize="18"
+                           FontWeight="Black"
+                           TextWrapping="Wrap" />
+              </xcad:LayoutAnchorable>
+            </xcad:LayoutAnchorGroup>
+          </xcad:LayoutAnchorSide>
+        </xcad:LayoutRoot.LeftSide>
+      </xcad:LayoutRoot>
+    </xcad:DockingManager>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
index a5c9dffe..73380b92 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Converters/IntegerToTimespanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
index 39cd0b08..041b3026 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Resources/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
index ddfb3225..c3f21912 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
index c82d19fb..f620b849 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
index d2b3b9c0..54099f48 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
index e39b0404..79180dbf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
index 6570ead1..02af7688 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
index 0f5762c2..aaa3bece 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/BusyIndicator/Views/BusyIndicatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
index 1cbe9296..d1ccd2aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Button/Views/ButtonSpinnerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
index b5b46928..7b8b20b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Button/Views/ButtonSpinnerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
index 6bb8736b..2cbdd52f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Button/Views/DropDownSplitButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
index 251e4035..a6bab569 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,124 +20,145 @@
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="DropDown and Split Buttons">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            <Run>The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
-        </Paragraph>
-    </local:DemoView.Description>
-   <local:DemoView.Resources>
-      <ObjectDataProvider x:Key="DropDownPlacementMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="PlacementMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <StackPanel Margin="10">
-
-         <GroupBox Header="Features"
-                   Margin="0,5,0,5">
-            <Grid Margin="5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-
-               <TextBlock Text="MaxDropDownHeight:"
-                          VerticalAlignment="Center"/>
-               <xctk:DoubleUpDown x:Name="maxDropDownHeight"
-                                  Grid.Column="1"
-                                  Width="60"
-                                  Value="500"
-                                  AllowInputSpecialValues="PositiveInfinity"
-                                  Minimum="0"
-                                  VerticalAlignment="Center"
-                                  Margin="5"/>
-
-               <TextBlock Text="DropDown Position: "
-                          Grid.Row="1"
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="dropDownPosition"
-                         Grid.Column="1"
-                         Grid.Row="1"
-                         ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
-                         SelectedIndex="2"
-                         HorizontalAlignment="Left"
-                         Width="110"
-                         VerticalAlignment="Center"
-                         Margin="5" />
-            </Grid>
-         </GroupBox>
-
-         <StackPanel>
-            <TextBlock Text="Usage:"
-                       Style="{StaticResource Header}" />
-
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="DropDownButton Usage:"
-                          Style="{StaticResource Header}" />
-               <xctk:DropDownButton x:Name="_dropDownButton"
-                                    Grid.Row="1"
-                                    Margin="10"
-                                    Width="150"
-                                    HorizontalAlignment="Left"
-                                    Content="Click Me"
-                                    MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                                    DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                                    Click="DropDownButton_Click">
-                  <xctk:DropDownButton.DropDownContent>
-                     <StackPanel>
-                        <xctk:ColorCanvas />
-                        <Button Click="Button_Click"
-                                Margin="10">OK</Button>
-                     </StackPanel>
-                  </xctk:DropDownButton.DropDownContent>
-               </xctk:DropDownButton>
-
-               <TextBlock Text="SplitButton Usage:"
-                          Grid.Column="1"
-                          Style="{StaticResource Header}" />
-               <xctk:SplitButton x:Name="_splitButton"
-                                 Grid.Row="1"
-                                 Grid.Column="1"
-                                 Margin="10"
-                                 Width="150"
-                                 HorizontalAlignment="Left"
-                                 Content="Click Me"
-                                 MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                                 DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                                 Click="SplitButton_Click">
-                  <xctk:SplitButton.DropDownContent>
-                     <StackPanel>
-                        <xctk:ColorCanvas />
-                        <Button Click="Button_Click"
-                                Margin="10">OK</Button>
-                     </StackPanel>
-                  </xctk:SplitButton.DropDownContent>
-               </xctk:SplitButton>
-            </Grid>
-         </StackPanel>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+  <local:DemoView.Resources>
+    <xctk:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+    <ObjectDataProvider x:Key="DropDownPlacementMode"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="PlacementMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+
+  <Grid>
+    <StackPanel Margin="10">
+
+      <GroupBox Header="Features"
+                Margin="0,5,0,5">
+        <Grid Margin="5">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+
+          <!-- 1st Column-->
+          <TextBlock Text="MaxDropDownHeight:"
+                     VerticalAlignment="Center" />
+          <xctk:DoubleUpDown x:Name="maxDropDownHeight"
+                             Grid.Column="1"
+                             Width="60"
+                             Value="500"
+                             AllowInputSpecialValues="PositiveInfinity"
+                             Minimum="0"
+                             HorizontalAlignment="Left"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+
+          <TextBlock Text="DropDown Position: "
+                     Grid.Row="1"
+                     VerticalAlignment="Center" />
+          <ComboBox x:Name="dropDownPosition"
+                    Grid.Column="1"
+                    Grid.Row="1"
+                    ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
+                    SelectedIndex="2"
+                    HorizontalAlignment="Left"
+                    Width="110"
+                    VerticalAlignment="Center"
+                    Margin="5" />
+
+          <!-- 2nd Column-->
+          <TextBlock Text="DropDownContentBackground:"
+                     VerticalAlignment="Center" 
+                     Grid.Column="2"/>
+          <xctk:ColorPicker x:Name="dropDownContentBackground"
+                            Grid.Column="3"
+                            Width="60"
+                            SelectedColor="LightGray"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Margin="5" />
+        </Grid>
+      </GroupBox>
+
+      <StackPanel>
+        <TextBlock Text="Usage:"
+                   Style="{StaticResource Header}" />
+
+        <Grid>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+
+          <TextBlock Text="DropDownButton Usage:"
+                     Style="{StaticResource Header}" />
+          <xctk:DropDownButton x:Name="_dropDownButton"
+                               Grid.Row="1"
+                               Margin="10"
+                               Width="150"
+                               HorizontalAlignment="Left"
+                               Content="Click Me"
+                               MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
+                               DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
+                               DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                               Click="DropDownButton_Click">
+            <xctk:DropDownButton.DropDownContent>
+              <StackPanel>
+                <xctk:ColorCanvas Margin="10"/>
+                <Button Click="Button_Click"
+                        Margin="10">OK</Button>
+              </StackPanel>
+            </xctk:DropDownButton.DropDownContent>
+          </xctk:DropDownButton>
+
+          <TextBlock Text="SplitButton Usage:"
+                     Grid.Column="1"
+                     Style="{StaticResource Header}" />
+          <xctk:SplitButton x:Name="_splitButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="10"
+                            Width="150"
+                            HorizontalAlignment="Left"
+                            Content="Click Me"
+                            MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
+                            DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
+                            DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                            Click="SplitButton_Click">
+            <xctk:SplitButton.DropDownContent>
+              <StackPanel>
+                <xctk:ColorCanvas Margin="10"/>
+                <Button Click="Button_Click"
+                        Margin="10">OK</Button>
+              </StackPanel>
+            </xctk:SplitButton.DropDownContent>
+          </xctk:SplitButton>
+        </Grid>
       </StackPanel>
-   </Grid>
+    </StackPanel>
+  </Grid>
 
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
index 514308b9..583db23c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Button/Views/IconButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml
index a5384cea..9c5633db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                  Title="IconButton">
      <local:DemoView.Description>
-        <!-- #// TODODOC -->
         <Paragraph FontSize="14" FontFamily="Segoe">
             The IconButton control is a Button that contains an icon and some data. The Foreground, Background and BorderBrush can be easily modified with properties while the Icon location is customizable.
         </Paragraph>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs
index 35a96f62..e1726617 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Calculator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
index 894a52c8..1363f5f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Calculator/Views/CalculatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
index 87163825..77ca355a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Converters/GraduationModeToComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
index 5a74b423..eaa243f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartAxisView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
index e40839df..4be65176 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartAxisView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
index cd1c4b4d..85c4ba11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartLegendView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
index 34832f5e..ed9dd017 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartLegendView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
index 7dd3de0f..4fa944ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartSeriesBasicTypesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
index d60023ab..e9fa3b03 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartSeriesBasicTypesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
index ab89f373..bfce285f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartSeriesDataPointsBindingView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
index fcd6c9f2..6b7dca83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
index d8372a4c..638b00b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingAxesGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
index f2d86a44..a48b9fe8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingAxesGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
index 4864490d..62b6964d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingColumnSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
index ca2fe617..d6dc938a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingColumnSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
index 971cddae..60a4bb3d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingLineSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
index debe4076..80a7b183 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingLineSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
index 42191573..0e783e8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingPieSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
index 4916d504..0380e45a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Chart/Views/ChartStylingPieSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
index 2e22ccc9..805b5484 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/CheckLists/Views/CheckListsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
index 038fd94c..9dd7a1c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/CheckLists/Views/CheckListsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
index e5a3beca..cefb3341 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Color/Views/ColorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
index 3a6b5f62..4dd5e575 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -20,318 +20,325 @@
                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 Title="Color">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.
-      </Paragraph>
-   </local:DemoView.Description>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.
+    </Paragraph>
+  </local:DemoView.Description>
 
-   <local:DemoView.Resources>
-      <Style x:Key="controlInError"
-             TargetType="xctk:IntegerUpDown">
-         <Style.Triggers>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-               <Setter Property="ToolTip"
-                       Value="{Binding RelativeSource={x:Static RelativeSource.Self},
+  <local:DemoView.Resources>
+    <Style x:Key="controlInError"
+           TargetType="xctk:IntegerUpDown">
+      <Style.Triggers>
+        <Trigger Property="Validation.HasError"
+                 Value="true">
+          <Setter Property="ToolTip"
+                  Value="{Binding RelativeSource={x:Static RelativeSource.Self},
                             Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-         </Style.Triggers>
-      </Style>
+        </Trigger>
+      </Style.Triggers>
+    </Style>
 
-      <ObjectDataProvider x:Key="ColorModeOptions" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:ColorMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
+    <ObjectDataProvider x:Key="ColorModeOptions"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:ColorMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
 
-      <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
+    <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
                         MethodName="GetValues"
                         ObjectType="{x:Type sys:Enum}">
-        <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:ColorSortingMode" />
-        </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="*" />
-         <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:ColorSortingMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+
+    <Grid Grid.Column="0"
+          Margin="5">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Grid.Column="0"
+                Grid.Row="0"
+                Header="ColorCanvas Features"
+                HorizontalAlignment="Stretch">
+        <Grid>
+          <Grid.Resources>
+            <Style x:Key="alignStyle"
+                   TargetType="{x:Type FrameworkElement}">
+              <Setter Property="Margin"
+                      Value="5" />
+            </Style>
 
-      <Grid Grid.Column="0"
-            Margin="5">
-         <Grid.RowDefinitions>
+            <Style TargetType="{x:Type TextBlock}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type TextBox}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type CheckBox}"
+                   BasedOn="{StaticResource alignStyle}" />
+            <Style TargetType="{x:Type xctk:IntegerUpDown}"
+                   BasedOn="{StaticResource alignStyle}">
+              <Setter Property="Width"
+                      Value="45" />
+              <Setter Property="Minimum"
+                      Value="0" />
+              <Setter Property="Maximum"
+                      Value="255" />
+            </Style>
+          </Grid.Resources>
+          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0"
-                   Grid.Row="0"
-                   Header="ColorCanvas Features"
-                   HorizontalAlignment="Stretch">
-            <Grid>
-               <Grid.Resources>
-                  <Style x:Key="alignStyle"
-                         TargetType="{x:Type FrameworkElement}">
-                     <Setter Property="Margin"
-                             Value="5" />
-                  </Style>
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
 
-                  <Style TargetType="{x:Type TextBlock}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type TextBox}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type CheckBox}"
-                         BasedOn="{StaticResource alignStyle}" />
-                  <Style TargetType="{x:Type xctk:IntegerUpDown}"
-                         BasedOn="{StaticResource alignStyle}">
-                     <Setter Property="Width"
-                             Value="45" />
-                     <Setter Property="Minimum"
-                             Value="0" />
-                     <Setter Property="Maximum"
-                             Value="255" />
-                  </Style>
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
+          <StackPanel Grid.Row="0"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      Orientation="Horizontal">
+            <TextBlock Text="R:" />
+            <xctk:IntegerUpDown x:Name="_R"
+                                Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="G:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_G"
+                                Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="B:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_B"
+                                Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+            <TextBlock Text="A:"
+                       Margin="5" />
+            <xctk:IntegerUpDown x:Name="_A"
+                                Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}"
+                                Minimum="0"
+                                Maximum="255"
+                                Style="{StaticResource controlInError}" />
+          </StackPanel>
 
-               <StackPanel Grid.Row="0"
-                           Grid.Column="0"
-                           Grid.ColumnSpan="2"
-                           HorizontalAlignment="Stretch"
-                           Orientation="Horizontal">
-                  <TextBlock Text="R:" />
-                  <xctk:IntegerUpDown x:Name="_R"
-                                      Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="G:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_G"
-                                      Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="B:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_B"
-                                      Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-                  <TextBlock Text="A:"
-                             Margin="5" />
-                  <xctk:IntegerUpDown x:Name="_A"
-                                      Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}"
-                                      Minimum="0"
-                                      Maximum="255"
-                                      Style="{StaticResource controlInError}" />
-               </StackPanel>
+          <TextBlock Grid.Column="0"
+                     Grid.Row="1"
+                     Text="UsingAlphaChannel: " />
+          <CheckBox Grid.Column="1"
+                    Grid.Row="1"
+                    x:Name="_usingAlphaChannel"
+                    IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="2"
+                     Text="HexadecimalString: " />
+          <TextBox Grid.Column="1"
+                   Grid.Row="2"
+                   IsEnabled="False"
+                   Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}" />
+        </Grid>
+      </GroupBox>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="UsingAlphaChannel: " />
-               <CheckBox Grid.Column="1"
-                         Grid.Row="1"
-                         x:Name="_usingAlphaChannel"
-                         IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="HexadecimalString: " />
-               <TextBox Grid.Column="1"
+      <TextBlock Text="ColorCanvas Usage: "
+                 Grid.Row="1"
+                 Margin="0,10,0,0"
+                 Style="{StaticResource Header}" />
+      <xctk:ColorCanvas x:Name="_colorCanvas"
                         Grid.Row="2"
-                        IsEnabled="False"
-                        Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}" />
-            </Grid>
-         </GroupBox>
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Stretch" />
 
-         <TextBlock Text="ColorCanvas Usage: "
-                    Grid.Row="1"
-                    Margin="0,10,0,0"
-                    Style="{StaticResource Header}" />
-         <xctk:ColorCanvas x:Name="_colorCanvas"
-                           Grid.Row="2"
-                           VerticalAlignment="Top"
-                           HorizontalAlignment="Stretch" />
+    </Grid>
 
-      </Grid>
+    <Grid Grid.Column="1"
+          Margin="5">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
 
-      <Grid Grid.Column="1"
-            Margin="5">
-         <Grid.RowDefinitions>
+      <GroupBox Grid.Column="0"
+                Grid.Row="0"
+                Header="ColorPicker Features"
+                HorizontalAlignment="Stretch"
+                Margin="10">
+        <Grid>
+          <Grid.Resources>
+            <Style TargetType="{x:Type TextBlock}">
+              <Setter Property="Margin"
+                      Value="3" />
+              <Setter Property="VerticalAlignment"
+                      Value="Center" />
+            </Style>
+            <Style TargetType="{x:Type TextBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+            <Style TargetType="{x:Type CheckBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+            <Style TargetType="{x:Type ComboBox}">
+              <Setter Property="Margin"
+                      Value="3" />
+            </Style>
+          </Grid.Resources>
+          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0"
-                   Grid.Row="0"
-                   Header="ColorPicker Features"
-                   HorizontalAlignment="Stretch"
-                   Margin="10">
-            <Grid>
-               <Grid.Resources>
-                  <Style TargetType="{x:Type TextBlock}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                     <Setter Property="VerticalAlignment"
-                             Value="Center" />
-                  </Style>
-                  <Style TargetType="{x:Type TextBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-                  <Style TargetType="{x:Type CheckBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-                   <Style TargetType="{x:Type ComboBox}">
-                     <Setter Property="Margin"
-                             Value="3" />
-                  </Style>
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
 
-               <TextBlock Grid.Column="0"
-                          Grid.Row="0"
-                          Text="ColorMode:" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="0"
-                         ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
-                         SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
-                         Height="22"/>
-               <TextBlock Grid.Column="0"
-                          Grid.Row="1"
-                          Text="AvailableColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="1"
-                        Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="2"
-                          Text="RecentColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="2"
-                        Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="3"
-                          Text="StandardColorsHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="3"
-                        Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="4"
-                          Text="AvailableColorsSortingMode:" />
-               <ComboBox Grid.Column="1"
-                         Grid.Row="4"
-                         ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
-                         SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
-                         Height="22" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="0"
+                     Text="ColorMode:" />
+          <ComboBox Grid.Column="1"
+                    Grid.Row="0"
+                    ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
+                    SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
+                    Height="22" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="1"
+                     Text="AvailableColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="1"
+                   Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="2"
+                     Text="RecentColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="2"
+                   Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="3"
+                     Text="StandardColorsHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="3"
+                   Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="4"
+                     Text="AvailableColorsSortingMode:" />
+          <ComboBox Grid.Column="1"
+                    Grid.Row="4"
+                    ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
+                    SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
+                    Height="22" />
 
-               <CheckBox Grid.Column="0"
-                         Grid.Row="5"
-                         Grid.ColumnSpan="2"
-                         Content="DisplayColorAndName"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="6"
-                         Grid.ColumnSpan="2"
-                         Content="ShowTabHeaders"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="7"
-                         Grid.ColumnSpan="2"
-                         Content="ShowAvailableColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="8"
-                         Grid.ColumnSpan="2"
-                         Content="ShowDropDownButton"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="9"
-                         Grid.ColumnSpan="2"
-                         Content="ShowRecentColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="10"
-                         Grid.ColumnSpan="2"
-                         Content="ShowStandardColors"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
-               <CheckBox Grid.Column="0"
-                         Grid.Row="11"
-                         Grid.ColumnSpan="2"
-                         Content="UsingAlphaChannel"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="12"
-                          Text="MaxDropDownWidth:" />
-               <xctk:IntegerUpDown Grid.Column="1"
-                                   Grid.Row="12"
-                                   Minimum="50"
-                                   Maximum="550"
-                                   Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="13"
-                          Text="AdvancedButtonHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="13"
-                        Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="14"
-                          Text="StandardButtonHeader:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="14"
-                        Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0"
-                          Grid.Row="15"
-                          Text="SelectedColorText:" />
-               <TextBox Grid.Column="1"
-                        Grid.Row="15"
-                        IsEnabled="False"
-                        Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
-            </Grid>
-         </GroupBox>
+          <CheckBox Grid.Column="0"
+                    Grid.Row="5"
+                    Grid.ColumnSpan="2"
+                    Content="DisplayColorAndName"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="6"
+                    Grid.ColumnSpan="2"
+                    Content="DisplayColorTooltip"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorTooltip, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="7"
+                    Grid.ColumnSpan="2"
+                    Content="ShowTabHeaders"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="8"
+                    Grid.ColumnSpan="2"
+                    Content="ShowAvailableColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="9"
+                    Grid.ColumnSpan="2"
+                    Content="ShowDropDownButton"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="10"
+                    Grid.ColumnSpan="2"
+                    Content="ShowRecentColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="11"
+                    Grid.ColumnSpan="2"
+                    Content="ShowStandardColors"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
+          <CheckBox Grid.Column="0"
+                    Grid.Row="12"
+                    Grid.ColumnSpan="2"
+                    Content="UsingAlphaChannel"
+                    IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="13"
+                     Text="MaxDropDownWidth:" />
+          <xctk:IntegerUpDown Grid.Column="1"
+                              Grid.Row="13"
+                              Minimum="50"
+                              Maximum="550"
+                              Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="14"
+                     Text="AdvancedButtonHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="14"
+                   Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="15"
+                     Text="StandardButtonHeader:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="15"
+                   Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
+          <TextBlock Grid.Column="0"
+                     Grid.Row="16"
+                     Text="SelectedColorText:" />
+          <TextBox Grid.Column="1"
+                   Grid.Row="16"
+                   IsEnabled="False"
+                   Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
+        </Grid>
+      </GroupBox>
 
-         <TextBlock Text="ColorPicker Usage: "
-                    Grid.Row="1"
-                    Style="{StaticResource Header}" />
-         <xctk:ColorPicker x:Name="_colorPicker"
-                           Grid.Row="2"
-                           VerticalAlignment="Top" />
-      </Grid>
-   </Grid>
+      <TextBlock Text="ColorPicker Usage: "
+                 Grid.Row="1"
+                 Style="{StaticResource Header}" />
+      <xctk:ColorPicker x:Name="_colorPicker"
+                        Grid.Row="2"
+                        VerticalAlignment="Top" />
+    </Grid>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
index 5516efb8..d5055d4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
index 084f2a64..ec30f4b6 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/UniqueIDCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
index cf3f8234..2f369577 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/Views/DataGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
index 22ecdffe..fa6d2f2e 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/Views/DataGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml.cs
index d15a488c..c380b492 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/Views/MultiColumnComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
index f224c295..eb469522 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DataGrid/Views/MultiColumnComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml.cs
index 1cbf8761..e32ef1f5 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DateTime/Converters/CustomFormatToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/CustomFormatToBoolConverter.cs
index a2730a96..e0a2a563 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/CustomFormatToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/CustomFormatToBoolConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DateTime/Converters/DateTimeToTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
index 9ce05f08..8a25b702 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DateTime/Views/DateTimeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
index 9e2b3535..886b1a48 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/DateTime/Views/DateTimeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
index 70d1f576..5c68a282 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/FilePicker/Views/FilePickerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml
index af502785..79701472 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/FilePicker/Views/FilePickerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs
index 53bd8cdb..6fe084df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Gauge/Views/RadialGaugeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml
index 33e6a26f..8517a855 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Gauge/Views/RadialGaugeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs
index ecb507b7..51045945 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ListBox/Converters/BoxArtImageSourceConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
index 2b3e89ce..e5535133 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ListBox/Views/ListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
index 09566105..4b87996c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ListBox/Views/ListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
index 43c427f1..35b9b36b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Magnifier/Converters/ColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
index 95642eee..f6b1764c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Magnifier/Converters/VisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
index c882654f..134759f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Magnifier/Views/MagnifierView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
index 56b6fa03..c25cbc93 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Magnifier/Views/MagnifierView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
index 22026220..4375dee6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Converters/EqualsMinusOneConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs
index c5b00a0f..ffaaa4a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Data/RequiredRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
index a47d8656..3ba45b31 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Resources/CommonResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
index 76c2d92a..8bc28475 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml
index ea6df55f..e2c40a4c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialButton">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A Button with a raised animation on mouse over and a customizable ink animation on MousePress. It uses the Material Brushes.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs
index c14c6ab4..588221a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialCheckBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml
index 24d054e0..6cac7952 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialCheckBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs
index ef00f889..38e34326 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml
index e8d34ce2..b0809e0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs
index 6e9d0ea9..af1f7e8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialControlsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml
index 8bc7107c..4bc64041 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialControlsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs
index 53fed7ff..81972001 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialDemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs
index 8cc88b7b..701fc775 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialDropDownView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml
index a1917554..791c5136 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialDropDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs
index 2a62c10c..b6b907e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialFrameView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml
index 6b87ebdc..eaa02dff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,7 +22,6 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="MaterialFrame">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A ContentControl with a fully customizable shadow that can be modified through Shadow properties or with a Z property that enables predefined shadows.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs
index 566212a8..052f0a7d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialHamburgerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml
index 47812583..b49fd2d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,7 +22,6 @@
                         xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters"
                         Title="MaterialHamburger">
   <local:DemoView.Description>
-    <!-- TODODOC-->
     <Paragraph FontSize="14"
                FontFamily="Segoe">
       <Run>A ToggleButton that pops a menu from left, right, top or bottom of a Window (or any FrameworkElement). The menu can be an animated HamburgerMenu or any customized content. It uses the Material Brushes.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs
index 479f55af..9b6fc8b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml
index d641473c..5b19c65b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialListBox &amp; MaterialListBoxItem">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>MaterialListBox is a ListBox that is using the Material Brushes and contains MaterialListBoxItems.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs
index 50e178ea..a16fd422 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialProgressBarCircularView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml
index 2b959a9f..4522cd82 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialProgressBarCircular">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A circular ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs
index 81e27e05..ea5af713 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialProgressBarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml
index 71f7fa02..eda31f43 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialProgressBar">   
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A linear ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs
index 07bbdb0c..a878cab4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialRadioButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml
index 0d5d3198..a857899b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialRadioButton">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A RadioButton with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs
index af4d695b..050091bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml
index 60f559ae..b4c4a15a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,11 +21,10 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         xmlns:winConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
                         Title="MaterialSlider">
-   <local:DemoView.Description>
-      <!-- TODODOC-->
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,8 +32,8 @@
          <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>
+    </Paragraph>
+  </local:DemoView.Description>
 
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs
index 5bff6963..6bb26b7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml
index a2d2b50e..de0f18c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialSwitch">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A ToggleSwitch from the Xceed WPF Toolkit with thumb animations when Checked state is changed and that is using the Material Brushes.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs
index 9f323d8a..850a3059 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialTabsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml
index 878864fb..af95f6d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,12 +21,11 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialTabControl &amp; MaterialTabItem">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is is using the Material Brushes and contains MaterialTabItems.</Run>
+         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is uses the Material Brushes and contains MaterialTabItems.</Run>
          <LineBreak />
-         <Run>MaterialTabItems are TabItems that are using the Material Brushes and who contains customizable ink animations on mouse press.</Run>
+         <Run>MaterialTabItems are TabItems that use the Material Brushes and contain customizable ink animations on mouse press.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs
index 9ddba865..eb49597e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialTextFieldView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml
index 119bc30d..529e5eef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,7 +22,6 @@
                         xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data"
                         Title="MaterialTextField">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          <Run>A TextBox containing a customizable animated watermark that remains active when text is entered. It uses the Material Brushes.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs
index 7a82b92d..54005b25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialToastView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml
index c57494a2..b1e287d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,10 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialToast">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It is using the Material Brushes.</Run>
+         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It uses the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs
index 5ddc4cb9..06aae47e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MaterialControls/Views/MaterialToolTipView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml
index 3b6ba35f..3cac9b4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,10 +21,9 @@
                         xmlns:sys="clr-namespace:System;assembly=mscorlib"
                         Title="MaterialToolTip">
    <local:DemoView.Description>
-      <!-- TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>A ToolTip with animations when opening. It is using the Material Brushes.</Run>
+         <Run>A ToolTip with animations when opening. It uses the Material Brushes.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs
index be593d5a..c7069f4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/MultiCalendar/Views/MultiCalendarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml
index de14f5f8..b93d15b2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -25,7 +25,6 @@
    <local:DemoView.Description>
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <!-- //# TODODOC-->
          <Run>The MultiCalendar combines X Microsoft Calendars that can be positioned in a grid with rows and columns. The selected dates, blackout dates and highlighted dates can be chosen from any calendar. The MultiCalendar will have a fast response no matter how many CalendarDayButtons are selected.</Run>
          <LineBreak />
          <LineBreak />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
index 9f46a868..29e3ca18 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Numeric/Views/NumericView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
index 96052e7f..3a973d11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Panels/Converters/ComboBoxToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
index 8545fe8b..b2c54711 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Panels/Views/SwitchPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
index 1aae6579..621016f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Panels/Views/SwitchPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
index 0aa5347d..61c45dfd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Converters/SliceLabelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
index e67bb193..4c6580cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieChartView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
index b1c26982..6bfe94ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieChartView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
index 3eba50ec..a07464e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieProgressView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
index 4508b383..aacf2ed9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieProgressView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
index 23092687..1554aa94 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
index e478b0d5..47684bc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Pie/Views/PieView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
index 9a1b8e2e..6a6d2329 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PileFlowPanel/Converters/FullNameStringConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
index 35244372..259a481a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PileFlowPanel/Views/PileFlowPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
index 4ea65770..1dd5d9d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PileFlowPanel/Views/PileFlowPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
index 688d0464..61624b9b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Converters/DimensionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
index 0a96e32e..f88104c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Resources/LastNameUserControlEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
index a574851e..626845cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
index 6169743d..758a73d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridAttributesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
index efe4b3ab..6ef4390a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
index 2001b01a..20a2b7d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
index b90730ca..83832349 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
index b5309292..22a7de24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
index f01f369c..9a3728a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
index 0e377dc8..b3668f36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
index a34189fe..50b13b1b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
index 016cd6f2..26d73f2c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
index 452b2fbd..9d5be674 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,9 +22,10 @@
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Custom Properties">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -32,18 +33,19 @@
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Toolkit Plus for WPF.
             </Hyperlink>
-      </Paragraph>
-    </local:DemoView.Description>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      <StackPanel Grid.Row="0" Margin="10">
-         <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
-                    TextWrapping="Wrap"/>
-      </StackPanel>
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <StackPanel Grid.Row="0"
+                Margin="10">
+      <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
+                 TextWrapping="Wrap" />
+    </StackPanel>
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -57,5 +59,5 @@
 
 
 
-   </Grid>      
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
index 8172125a..b55e83c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
index 94621894..9ec0fdf4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
index bdbecc44..75bd2ed0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
index 09790441..8a04084b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
index 61fe5aa5..909af452 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
index c590a92c..2d1e7504 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
index 70be6b93..0d9c5818 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
index c2c2b579..aaa65396 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
index faad6d7f..eee49ab8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml
index 1ce42493..677711f1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -22,7 +22,6 @@
                 VerticalScrollBarVisibility="Disabled"
                 Title="PropertyGrid">
    <local:DemoView.Description>
-      <!-- //# TODODOC -->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          The PropertyGrid allows you to expand non-primitive type properties from the SelectedObject to view or edit their sub-properties. It also allows you to expand collections or lists properties to view their items and drill down on these items properties, directly from the propertyGrid, instead of passing by the CollectionEditor.
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs
index 03ece539..dad71a07 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
index fa2e6572..01ccccb0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
index 69e5426b..71f78f25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
index 54633cae..3375009d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
index 72383712..4b858199 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
index ab2992d7..62cce170 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
index f62e2574..85dcbe38 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
index b3660262..2294aa51 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
index c65d08a6..8bd236a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
index 041f08fa..22b4ba0e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
index 7eb93046..696ff77e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
index 5afda6d8..ce5ade6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -35,9 +35,8 @@
                          AutoGenerateProperties="False">
 
          <xctk:PropertyGrid.PropertyDefinitions>
-            <!-- //# TODODOC 
-               The following properties will be displayed in the PropertyGrid 
-               Some data of properties will be overriden-->
+            <!-- The following properties will be displayed in the PropertyGrid 
+                 Some properties' data will be overriden-->
             <xctk:PropertyDefinition TargetProperties="FirstName,PetNames" DisplayOrder="0"/>
             <xctk:PropertyDefinition TargetProperties="FavoriteColor"
                                      DisplayName="Shirt Color"
@@ -52,8 +51,7 @@
             <!-- And all properties of type Boolean will be displayed in the PropertyGrid-->
             <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" DisplayOrder="1"/>
 
-            <!-- //# TODODOC
-               This Property won't be displayed -->
+            <!-- This Property won't be displayed -->
              <xctk:PropertyDefinition TargetProperties="WritingHand" IsBrowsable="False"/>
          </xctk:PropertyGrid.PropertyDefinitions>
       </xctk:PropertyGrid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
index 379a8f49..32f17891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/PropertyGrid/Views/PropertyGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
index 0e641146..cddd8e63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -47,13 +47,14 @@
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
           <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <!-- 1st column-->
@@ -71,7 +72,7 @@
                                Grid.Column="1"
                                Width="175"
                                Watermark="Search"
-                               Text="{Binding Filter, ElementName=_propertyGrid}"
+                               Text="{Binding Filter, ElementName=_propertyGrid, UpdateSourceTrigger=PropertyChanged}"
                                VerticalAlignment="Center"
                                Margin="5"
                                ToolTip="Filters the properties within the PropertyGrid." />
@@ -85,21 +86,11 @@
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="Set the IsReadOnly property to true or false." />
-        <TextBlock Text="IsVirtualizing:"
+        <TextBlock Text="ShowPreview:"
                    VerticalAlignment="Center"
                    Grid.Row="3"
                    Grid.Column="0" />
         <CheckBox Grid.Row="3"
-                  Grid.Column="1"
-                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
-        <TextBlock Text="ShowPreview:"
-                   VerticalAlignment="Center"
-                   Grid.Row="4"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="4"
                   Grid.Column="1"
                   IsChecked="{Binding ShowPreview, ElementName=_propertyGrid}"
                   VerticalAlignment="Center"
@@ -149,19 +140,39 @@
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
+
+        <!--Third Column-->
+        <TextBlock Text="Show Horizontal ScrollBar:"
+                   VerticalAlignment="Center"
+                   Grid.Column="4"
+                   Margin="10,0,0,0" />
+        <CheckBox Grid.Column="5"
+                  IsChecked="{Binding ShowHorizontalScrollBar, ElementName=_propertyGrid}"
+                  VerticalAlignment="Center"
+                  Margin="5"
+                  ToolTip="Gets/Sets if the horizontal scrollBar will be showned." />
         <TextBlock Text="HideInheritedProperties:"
                    VerticalAlignment="Center"
-                   Grid.Row="4"
-                   Grid.Column="2"
+                   Grid.Row="1"
+                   Grid.Column="4"
                    Margin="10,0,0,0" />
-        <CheckBox Grid.Row="4"
-                  Grid.Column="3"
+        <CheckBox Grid.Row="1"
+                  Grid.Column="5"
                   IsChecked="{Binding HideInheritedProperties, ElementName=_propertyGrid}"
                   VerticalAlignment="Center"
                   Margin="5"
                   ToolTip="When True, inherited properties are hidden." />
-
-
+        <TextBlock Text="IsVirtualizing:"
+                   VerticalAlignment="Center"
+                   Grid.Row="2"
+                   Grid.Column="4"
+                   Margin="10,0,0,0" />
+        <CheckBox Grid.Row="2"
+                  Grid.Column="5"
+                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
+                  VerticalAlignment="Center"
+                  Margin="5"
+                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
       </Grid>
     </GroupBox>
 
@@ -198,6 +209,7 @@
                            IsMiscCategoryLabelHidden="False"
                            ShowPreview="True"
                            HideInheritedProperties="False"
+                           ShowHorizontalScrollBar="False"
                            SelectedObject="{Binding ElementName=_button}">
         </xctk:PropertyGrid>
       </Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
index 41492be8..063c4a3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/RangeSlider/Converters/AbsoluteAdditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs
index 06678662..122b9f35 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/RangeSlider/Converters/RangeSliderEnabledConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs
index 29a10c82..298f812a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/RangeSlider/Views/RangeSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml
index ddaf1451..3439c940 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -525,14 +525,13 @@
             <TextBlock Text="Step:"
                        Grid.Row="4"
                        VerticalAlignment="Center" />
-            <!-- #// TODODOC -->
             <xctk:DoubleUpDown Value="{Binding Step, ElementName=_rangeSlider}"
                                Grid.Row="4"
                                Grid.Column="1"
                                FormatString="0.00"
                                VerticalAlignment="Center"
                                Margin="5"
-                               ToolTip="Identify the RangeSlider's size of individual move, while clicking on the LowerRange or HigherRange."/>
+                               ToolTip="Identify the RangeSlider's size of individual move, when clicking on the LowerRange or HigherRange."/>
 
             <TextBlock Text="Orientation:"
                        Grid.Row="5"
@@ -607,14 +606,13 @@
                        Grid.Column="2"
                        VerticalAlignment="Center"
                        Margin="10,5,5,5" />
-            <!-- //# TODODOC -->
             <ComboBox Grid.Row="5"
                       Grid.Column="3"
                       ItemsSource="{Binding Source={StaticResource AutoToolTipPlacement}}"
                       SelectedItem="{Binding AutoToolTipPlacement, ElementName=_rangeSlider}"
                       VerticalAlignment="Center"
                       Margin="5"
-                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
+                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider's Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
             </ComboBox>
 
             <TextBlock Text="Auto ToolTip Precision:"
@@ -622,7 +620,6 @@
                        Grid.Column="2"
                        VerticalAlignment="Center"
                        Margin="10,5,5,5" />
-            <!-- //# TODODOC -->
             <xctk:IntegerUpDown Value="{Binding AutoToolTipPrecision, ElementName=_rangeSlider}"
                                 Grid.Row="6"
                                 Grid.Column="3"
@@ -630,7 +627,7 @@
                                 Maximum="10"
                                 VerticalAlignment="Center"
                                 Margin="5"
-                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider Thumb in a tooltip." />
+                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider's Thumb in a tooltip." />
 
             <!-- Column 3 -->
             <TextBlock Text="Lower Range Style:"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs
index 98969b08..aeb93258 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Rating/Views/RatingView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml
index 9c37a261..8159f4b5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Rating/Views/RatingView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs
index 7d36095e..ac3af92c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/SlideShow/Views/SlideShowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml
index ddc3fe14..bfce3417 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/SlideShow/Views/SlideShowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs
index 1fe08639..80c1eacf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/AutoSelectTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
index 3f84a275..7c5f24d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/AutoSelectTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
index ce10aeba..81c9135d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/MaskedTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
index 43b235de..b6b70eee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/MaskedTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
index e4c3d607..88b5a14e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/MultiLineTextEditorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
index 5e56e2ca..ac9d417e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/MultiLineTextEditorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
index 2ee57a64..c2fba5d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/RichTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
index 91225537..516f1751 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/RichTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
index 9b0e1e96..0f97e22a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/TokenizedTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml
index fa70303c..0ed541cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/TokenizedTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs
index 350bfaa0..ec9c2548 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/WatermarkPasswordBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml
index a83ffef7..9d8592dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -21,7 +21,6 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="WatermarkPasswordBox">
    <local:DemoView.Description>
-      <!--//#TODODOC-->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          The WatermarkPasswordBox is a PasswordBox where you can enter a secure password and display a watermark when the password is not defined.
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs
index c09b86ce..d37064fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/WatermarkTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
index f68a4584..98ad267c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Text/Views/WatermarkTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
index 1537fc4c..e50a9aa9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
index c3c18663..8eb9009f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ItemTemplates/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml
index 18db079e..0f2b683e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingAvalonDockView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml
index cefc874a..3a9b2773 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingAvalonDockView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs
index 74cf3459..67eb9b0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
index 60c7f3e6..83482965 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 090b5db2..90768ddf 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingDataGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
index d35fa0ec..b9bbed29 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingDataGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs
index b0ee0a49..90d31027 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingExtendedToolkitView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
index 7dc29259..b93b285a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingExtendedToolkitView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
index fb43cb02..bb250ed9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
index 5e1ba250..2f64e7bb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ThemingListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
index da396978..d5abbe63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimeSpan/Views/TimeSpanView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml
index 0a5ce9a1..2e32ea8d 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
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimeSpan/Views/TimeSpanView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs
index 073f84e7..b7e79593 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimelinePanel/Views/TimelinePanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
index f2ef0d32..048b0e1a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/TimelinePanel/Views/TimelinePanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
index f9a5ea18..a78cce4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ToggleSwitch/Views/ToggleSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml
index 83929a86..11f85407 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/ToggleSwitch/Views/ToggleSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs
index f3e1b086..48f42067 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkComboBox/Views/WatermarkComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml
index 79ae69e1..bd53f0c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
index d946d4c3..5301d255 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Converters/IntToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
index b85c5094..00541040 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Converters/WindowStateToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
index 6c441801..87eadce4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Resources/FancyStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
index ca9c8fba..6af589e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Resources/WindowModelEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
index be31fd64..953fa3bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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 
@@ -96,11 +96,11 @@
       <DockPanel Margin="0,5,0,5">
          <TextBlock Text="CloseButtonVisibility:" 
                     VerticalAlignment="Center" 
-                    ToolTip="Not applicable for MessageBoxes."/> <!-- #TODODOC -->
+                    ToolTip="Not applicable to MessageBoxes."/>
          <CheckBox IsChecked="{Binding CloseButtonVisibility, Converter={StaticResource VisibilityToBoolConverter}}" 
                    Margin="5,0,0,0"
                    VerticalAlignment="Center"
-                   ToolTip="Not applicable for MessageBoxes."/> <!-- #TODODOC -->
+                   ToolTip="Not applicable to MessageBoxes."/>
       </DockPanel>
    </StackPanel>
 </UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
index 1b291a25..251857b7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/ChildWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
index f76b6e8b..c639a093 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/ChildWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
index 542141db..8ab0b09c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/StyleableWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml
index 1468cc84..abbf2cd5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/StyleableWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
index b9b403a7..e6a0d8ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/WindowContainerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
index 468f3475..46075034 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Window/Views/WindowContainerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
index 50917e9b..62b692da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Wizard/Views/WizardView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
index 86cf30fd..bf6465d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Wizard/Views/WizardView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
index 6e8ef7be..bbe5e301 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/PointConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
index c16b87d5..2b160390 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/RectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
index 2f8b6981..fb84c2e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/SimpleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
index 867f78e3..dd99d24c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/ViewFinderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
index 7e389918..c2f1ee15 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/ViewNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
index 014516dd..dd32c773 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Converters/ViewStackCountConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
index a6f8db49..bb0d21a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Views/ZoomboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
index ec93d88c..0f6d85b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/Zoombox/Views/ZoomboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
index 0b002cc6..34097cf5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2016 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/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application
new file mode 100644
index 00000000..7aac8fd6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application
@@ -0,0 +1,22 @@
+<?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="17176">
+      <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>5q77W+OT5+XU7wRXDJsDbPgYV4s=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
new file mode 100644
index 00000000..23366171
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
+            <setting name="lastSample" serializeAs="String">
+                <value/>
+            </setting>
+        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
+    </userSettings>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
new file mode 100644
index 00000000..bd21fa30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16602" 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="471552">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>6C3reu7B8IvkrD7aiRdYMYoLccs=</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.3.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>08Bls94r5dcQ5EZoj0HpS2OucGI=</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.3.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>dpZljRMo0oZRk2809tBmxNbZmU8=</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.3.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>yT0HGLkdH7S66On0Mk6DZCOP6qc=</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.3.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>RrBtqUx8ma71+N3wQ1SqzBfHCyY=</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.3.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>puAP8BCiw6OCnpiiMIMwotwoI+I=</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.3.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>comNp/VS5UC9JZm3Ystg06YN0bA=</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.3.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>6psJdJxJzuAjiR9PiZajyuLBDpE=</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.3.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>ANM0w7XJlJjfn1myZA1tiJsyhS8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>sUZbzuzmbRN5VJe+vgs2kiONYig=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>j6h4zg8hxYuhFSvbhk99UORNdlk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="105472">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.3.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>ojNf3oP7r4lRBZeVio9IuE7lLsA=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="97280">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>MVF+nMehMl0irg8/4NVBt1s9DqM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="104448">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>dyKIF42BiplCQLHv7/Vk3zumVn8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="3015680">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>ZfgtTBbFNMzXvA6K0i8tdnUuQ8o=</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="1326592">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>T4XnzCMDfMcrHP8aYqMRIHnBUJM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16386048">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16602" 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>Wv1uaJikbrwmOpm/VA4gbbShqMc=</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.3.6626.16602" 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>0FEv5tdFV/Lf48pZoCw7ymCStCY=</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/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
new file mode 100644
index 00000000..7aac8fd6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
@@ -0,0 +1,22 @@
+<?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="17176">
+      <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>5q77W+OT5+XU7wRXDJsDbPgYV4s=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>
\ No newline at end of file
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
new file mode 100644
index 00000000..23366171
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
+            <setting name="lastSample" serializeAs="String">
+                <value/>
+            </setting>
+        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
+    </userSettings>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
new file mode 100644
index 00000000..bd21fa30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16602" 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="471552">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>6C3reu7B8IvkrD7aiRdYMYoLccs=</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.3.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>08Bls94r5dcQ5EZoj0HpS2OucGI=</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.3.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>dpZljRMo0oZRk2809tBmxNbZmU8=</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.3.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>yT0HGLkdH7S66On0Mk6DZCOP6qc=</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.3.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>RrBtqUx8ma71+N3wQ1SqzBfHCyY=</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.3.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>puAP8BCiw6OCnpiiMIMwotwoI+I=</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.3.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>comNp/VS5UC9JZm3Ystg06YN0bA=</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.3.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>6psJdJxJzuAjiR9PiZajyuLBDpE=</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.3.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>ANM0w7XJlJjfn1myZA1tiJsyhS8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>sUZbzuzmbRN5VJe+vgs2kiONYig=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>j6h4zg8hxYuhFSvbhk99UORNdlk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="105472">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.3.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>ojNf3oP7r4lRBZeVio9IuE7lLsA=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="97280">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>MVF+nMehMl0irg8/4NVBt1s9DqM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="104448">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>dyKIF42BiplCQLHv7/Vk3zumVn8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="3015680">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>ZfgtTBbFNMzXvA6K0i8tdnUuQ8o=</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="1326592">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>T4XnzCMDfMcrHP8aYqMRIHnBUJM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16386048">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16602" 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>Wv1uaJikbrwmOpm/VA4gbbShqMc=</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.3.6626.16602" 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>0FEv5tdFV/Lf48pZoCw7ymCStCY=</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.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
new file mode 100644
index 00000000..bff21f20
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
@@ -0,0 +1,22 @@
+<?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>8yicxdfKttCQS9zrCVXwK/kd/wI=</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
new file mode 100644
index 00000000..23366171
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 00000000..96eee3e6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16958" 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="423936">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>yh8J7Gpu+862mxX4JsV9yVLZog8=</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.3.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>QQb6ljnnDKdHSin2C6nEL+pbtKQ=</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.3.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>b1qPOSPea4dj9i2vTmtnngHNhRI=</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.3.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>EgsWiOSGNstpQlkXTsUWqok9Qfc=</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.3.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>F+LofA8yW8kijhZPwtIdVVwQIRM=</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.3.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>PD3Ys6aK1e/ARCseDV093uUNLEA=</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.3.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>ONA9jHNXHD8Gl2TgeFqbJhamU+Q=</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.3.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>2+iwtdlc3AmPIjnmdrT87su78JM=</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.3.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>QeUrdtEGjfmP1wBnjlfOdanI0Fc=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>o8WLfLrbBvaRwDWw9Q14MyKjntk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>BIjiyx+cAGwElzPCgqmU38zqrv4=</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.3.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>QCTgml0eJRfPyeH59qjQ4rkOs6Q=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79360">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>XkHNCFh7LOdp0Gq08js4E0gonhk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="83968">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>TQmPfpvJzFXO94Zwto7jTk4M1ms=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435072">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>JWfLX/HG2uVaNuZadAr9Q7VvylM=</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="1093120">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>nHZSxXLH96hfpnAmriFf1lvgluM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16274944">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16958" 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>LH16Q6rYGQdOcA6D+fZjb13Wj5g=</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.3.6626.16958" 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>0rRo3xJEs6RebQPhU/JDTZZEmKY=</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
new file mode 100644
index 00000000..bff21f20
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
@@ -0,0 +1,22 @@
+<?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>8yicxdfKttCQS9zrCVXwK/kd/wI=</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
new file mode 100644
index 00000000..23366171
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 00000000..96eee3e6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16958" 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="423936">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>yh8J7Gpu+862mxX4JsV9yVLZog8=</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.3.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>QQb6ljnnDKdHSin2C6nEL+pbtKQ=</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.3.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>b1qPOSPea4dj9i2vTmtnngHNhRI=</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.3.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>EgsWiOSGNstpQlkXTsUWqok9Qfc=</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.3.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>F+LofA8yW8kijhZPwtIdVVwQIRM=</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.3.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>PD3Ys6aK1e/ARCseDV093uUNLEA=</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.3.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>ONA9jHNXHD8Gl2TgeFqbJhamU+Q=</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.3.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>2+iwtdlc3AmPIjnmdrT87su78JM=</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.3.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>QeUrdtEGjfmP1wBnjlfOdanI0Fc=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>o8WLfLrbBvaRwDWw9Q14MyKjntk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>BIjiyx+cAGwElzPCgqmU38zqrv4=</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.3.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>QCTgml0eJRfPyeH59qjQ4rkOs6Q=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79360">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>XkHNCFh7LOdp0Gq08js4E0gonhk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="83968">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>TQmPfpvJzFXO94Zwto7jTk4M1ms=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435072">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>JWfLX/HG2uVaNuZadAr9Q7VvylM=</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="1093120">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>nHZSxXLH96hfpnAmriFf1lvgluM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16274944">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16958" 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>LH16Q6rYGQdOcA6D+fZjb13Wj5g=</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.3.6626.16958" 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>0rRo3xJEs6RebQPhU/JDTZZEmKY=</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/App.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.baml
new file mode 100644
index 00000000..da603b4d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.g.cs
new file mode 100644
index 00000000..1429bc0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.g.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "89A9835FC33A95880DDA09E8EA1A625B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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/Debug/App.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.g.i.cs
new file mode 100644
index 00000000..1429bc0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/App.g.i.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "89A9835FC33A95880DDA09E8EA1A625B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/GeneratedInternalTypeHelper.g.i.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/HomeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.baml
new file mode 100644
index 00000000..b921b0dd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.g.cs
new file mode 100644
index 00000000..8939350f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.g.cs
@@ -0,0 +1,96 @@
+#pragma checksum "..\..\..\HomeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E30E57950DD27F30E2C80D223616FA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/HomeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.g.i.cs
new file mode 100644
index 00000000..8939350f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/HomeView.g.i.cs
@@ -0,0 +1,96 @@
+#pragma checksum "..\..\..\HomeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E30E57950DD27F30E2C80D223616FA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/MainWindow.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.baml
new file mode 100644
index 00000000..209ca9e0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.g.cs
new file mode 100644
index 00000000..8220b37e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.g.cs
@@ -0,0 +1,167 @@
+#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D34BA94FD2F49B4CEF1845BF8634871B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/MainWindow.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.g.i.cs
new file mode 100644
index 00000000..8220b37e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/MainWindow.g.i.cs
@@ -0,0 +1,167 @@
+#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D34BA94FD2F49B4CEF1845BF8634871B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Resources/LiveExplorerScrollViewer.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Resources/LiveExplorerScrollViewer.baml
new file mode 100644
index 00000000..1a22942b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Resources/LiveExplorerScrollViewer.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Resources/TextBlockStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Resources/TextBlockStyles.baml
new file mode 100644
index 00000000..b054796c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Resources/TextBlockStyles.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.baml
new file mode 100644
index 00000000..88680207
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.cs
new file mode 100644
index 00000000..06e4484d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.cs
@@ -0,0 +1,116 @@
+#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "92ED5E92454A663B8F83998357DCEAC7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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 56 "..\..\..\..\..\..\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._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.i.cs
new file mode 100644
index 00000000..06e4484d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/AvalonDock/Views/AvalonDockView.g.i.cs
@@ -0,0 +1,116 @@
+#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "92ED5E92454A663B8F83998357DCEAC7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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 56 "..\..\..\..\..\..\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._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Resources/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Resources/Common.baml
new file mode 100644
index 00000000..20185374
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Resources/Common.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml
new file mode 100644
index 00000000..c49c674b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
new file mode 100644
index 00000000..887333e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "33AC2C02B4C60CE323F93D716AEBD973"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs
new file mode 100644
index 00000000..887333e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "33AC2C02B4C60CE323F93D716AEBD973"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml
new file mode 100644
index 00000000..d3bb99ac
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
new file mode 100644
index 00000000..283dae16
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7B7BE4A7D4E244DA6A124E2E621B682C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs
new file mode 100644
index 00000000..283dae16
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7B7BE4A7D4E244DA6A124E2E621B682C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.baml
new file mode 100644
index 00000000..2af314b6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
new file mode 100644
index 00000000..5a740e23
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
@@ -0,0 +1,123 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B9A09EE5E5D5F3A7414E18432ED72B5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs
new file mode 100644
index 00000000..5a740e23
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs
@@ -0,0 +1,123 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B9A09EE5E5D5F3A7414E18432ED72B5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/ButtonSpinnerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.baml
new file mode 100644
index 00000000..7d747569
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.g.cs
new file mode 100644
index 00000000..cffdc224
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.g.cs
@@ -0,0 +1,130 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DE4E4E948127554304CA97BFE16CC088"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/ButtonSpinnerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.g.i.cs
new file mode 100644
index 00000000..cffdc224
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/ButtonSpinnerView.g.i.cs
@@ -0,0 +1,130 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DE4E4E948127554304CA97BFE16CC088"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/DropDownSplitButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.baml
new file mode 100644
index 00000000..36da4fad
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.g.cs
new file mode 100644
index 00000000..bb49d052
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.g.cs
@@ -0,0 +1,183 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "425B6668D50D5B9529F349045F52F019"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/DropDownSplitButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.g.i.cs
new file mode 100644
index 00000000..bb49d052
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/DropDownSplitButtonView.g.i.cs
@@ -0,0 +1,183 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "425B6668D50D5B9529F349045F52F019"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/IconButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.baml
new file mode 100644
index 00000000..a4e1cca2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.g.cs
new file mode 100644
index 00000000..7d8232c1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F07810DDCB1858BE029A8D83B9F8CCD8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Button/Views/IconButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.g.i.cs
new file mode 100644
index 00000000..7d8232c1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Button/Views/IconButtonView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F07810DDCB1858BE029A8D83B9F8CCD8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Calculator/Views/CalculatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.baml
new file mode 100644
index 00000000..e2d59a2f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.g.cs
new file mode 100644
index 00000000..bfda3234
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59D23210567C9C4100B2DD74FCFB89DD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Calculator/Views/CalculatorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.g.i.cs
new file mode 100644
index 00000000..bfda3234
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Calculator/Views/CalculatorView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59D23210567C9C4100B2DD74FCFB89DD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartAxisView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.baml
new file mode 100644
index 00000000..f6102cf3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.g.cs
new file mode 100644
index 00000000..94843082
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.g.cs
@@ -0,0 +1,119 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AC64E02BC06156BE697351274DDAFA7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 31 "..\..\..\..\..\..\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/Debug/Samples/Chart/Views/ChartAxisView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.g.i.cs
new file mode 100644
index 00000000..94843082
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartAxisView.g.i.cs
@@ -0,0 +1,119 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AC64E02BC06156BE697351274DDAFA7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 31 "..\..\..\..\..\..\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/Debug/Samples/Chart/Views/ChartLegendView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.baml
new file mode 100644
index 00000000..f33c9bb4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.g.cs
new file mode 100644
index 00000000..26ba29bf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8AB5EE252CEAB6C69E67AF1EC34C02EC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartLegendView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.g.i.cs
new file mode 100644
index 00000000..26ba29bf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartLegendView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8AB5EE252CEAB6C69E67AF1EC34C02EC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.baml
new file mode 100644
index 00000000..2fb7d386
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
new file mode 100644
index 00000000..071f3f8b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6968E7FBB43FE839B373B7C525DE3F8D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs
new file mode 100644
index 00000000..071f3f8b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6968E7FBB43FE839B373B7C525DE3F8D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml
new file mode 100644
index 00000000..345b2bce
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
new file mode 100644
index 00000000..7dbef669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AA63D4E41307F408A34F458A68C67EB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs
new file mode 100644
index 00000000..7dbef669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AA63D4E41307F408A34F458A68C67EB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingAxesGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.baml
new file mode 100644
index 00000000..8a7dd5ce
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
new file mode 100644
index 00000000..44149512
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "708F7B1CC8A54AD456D3FEEE8365D6B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs
new file mode 100644
index 00000000..44149512
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "708F7B1CC8A54AD456D3FEEE8365D6B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.baml
new file mode 100644
index 00000000..a174ffbd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
new file mode 100644
index 00000000..08201bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0D1ACACF4A29F23149F2D3CEBB6BB6B7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs
new file mode 100644
index 00000000..08201bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0D1ACACF4A29F23149F2D3CEBB6BB6B7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.baml
new file mode 100644
index 00000000..9b654760
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
new file mode 100644
index 00000000..d75b7df9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7284D1DE8B138517DEE89A3936A5AC4A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs
new file mode 100644
index 00000000..d75b7df9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7284D1DE8B138517DEE89A3936A5AC4A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.baml
new file mode 100644
index 00000000..3e88b7e9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
new file mode 100644
index 00000000..132c425b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5EB29C421D0DFBE5B2AC703283CC1CE6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs
new file mode 100644
index 00000000..132c425b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5EB29C421D0DFBE5B2AC703283CC1CE6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/CheckLists/Views/CheckListsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.baml
new file mode 100644
index 00000000..d39c03f2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.cs
new file mode 100644
index 00000000..f21739fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9B36256FD336C907F7858967F6B81AB8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 63 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _delimiter;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _valueMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 84 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedValue;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 94 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 105 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _displayMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 116 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isEditable;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 127 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isDropDownOpen;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 141 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 169 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 182 "..\..\..\..\..\..\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._isEditable = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 8:
+            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 9:
+            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
+            return;
+            case 10:
+            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
+            return;
+            case 11:
+            this._checkComboBox = ((Xceed.Wpf.Toolkit.CheckComboBox)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.i.cs
new file mode 100644
index 00000000..f21739fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/CheckLists/Views/CheckListsView.g.i.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9B36256FD336C907F7858967F6B81AB8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 63 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _delimiter;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _valueMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 84 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedValue;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 94 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 105 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _displayMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 116 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isEditable;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 127 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isDropDownOpen;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 141 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 169 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 182 "..\..\..\..\..\..\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._isEditable = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 8:
+            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 9:
+            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
+            return;
+            case 10:
+            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
+            return;
+            case 11:
+            this._checkComboBox = ((Xceed.Wpf.Toolkit.CheckComboBox)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.baml
new file mode 100644
index 00000000..a496c1ed
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.g.cs
new file mode 100644
index 00000000..06ca4c7c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.g.cs
@@ -0,0 +1,176 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "203E5EC198C70B1BF7A2360D5458313E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Color/Views/ColorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.g.i.cs
new file mode 100644
index 00000000..06ca4c7c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Color/Views/ColorView.g.i.cs
@@ -0,0 +1,176 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "203E5EC198C70B1BF7A2360D5458313E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/DataGrid/Views/DataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.baml
new file mode 100644
index 00000000..f34712af
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.g.cs
new file mode 100644
index 00000000..1444c492
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.g.cs
@@ -0,0 +1,138 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "173785EFF1E408ED2B311134B0F7B81D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/DataGrid/Views/DataGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.g.i.cs
new file mode 100644
index 00000000..1444c492
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/DataGridView.g.i.cs
@@ -0,0 +1,138 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "173785EFF1E408ED2B311134B0F7B81D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.baml
new file mode 100644
index 00000000..a3f48233
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
new file mode 100644
index 00000000..ffee9a0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E1954D2ADDB10401486F05340DF399"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs
new file mode 100644
index 00000000..ffee9a0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E1954D2ADDB10401486F05340DF399"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/DateTime/Views/DateTimeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.baml
new file mode 100644
index 00000000..cdf91129
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.g.cs
new file mode 100644
index 00000000..d02c106c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.g.cs
@@ -0,0 +1,354 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5D6AD3840CB50CF72E259B189BAAAB1"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/DateTime/Views/DateTimeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.g.i.cs
new file mode 100644
index 00000000..d02c106c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/DateTime/Views/DateTimeView.g.i.cs
@@ -0,0 +1,354 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5D6AD3840CB50CF72E259B189BAAAB1"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/FilePicker/Views/FilePickerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.baml
new file mode 100644
index 00000000..a699674a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.g.cs
new file mode 100644
index 00000000..47a2a6dd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "EC27D819C19ABFAAE354D9B99A5F6D44"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/FilePicker/Views/FilePickerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.g.i.cs
new file mode 100644
index 00000000..47a2a6dd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/FilePicker/Views/FilePickerView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "EC27D819C19ABFAAE354D9B99A5F6D44"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Gauge/Views/RadialGaugeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.baml
new file mode 100644
index 00000000..6e2fb437
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.g.cs
new file mode 100644
index 00000000..4d1fdc4c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C86D2034A8C09675D9F6A393FFC09C56"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Gauge/Views/RadialGaugeView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.g.i.cs
new file mode 100644
index 00000000..4d1fdc4c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Gauge/Views/RadialGaugeView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C86D2034A8C09675D9F6A393FFC09C56"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/ListBox/Views/ListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.baml
new file mode 100644
index 00000000..0df13b41
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.g.cs
new file mode 100644
index 00000000..4fb30f11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.g.cs
@@ -0,0 +1,94 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8A5AD07F043DFAC24069F57C9B04A213"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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/Debug/Samples/ListBox/Views/ListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.g.i.cs
new file mode 100644
index 00000000..4fb30f11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ListBox/Views/ListBoxView.g.i.cs
@@ -0,0 +1,94 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8A5AD07F043DFAC24069F57C9B04A213"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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/Debug/Samples/Magnifier/Views/MagnifierView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.baml
new file mode 100644
index 00000000..4a474be6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.g.cs
new file mode 100644
index 00000000..e4001eb3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.g.cs
@@ -0,0 +1,222 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2902797CE61E92E0503FC24834CAE53"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Magnifier/Views/MagnifierView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.g.i.cs
new file mode 100644
index 00000000..e4001eb3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Magnifier/Views/MagnifierView.g.i.cs
@@ -0,0 +1,222 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2902797CE61E92E0503FC24834CAE53"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Resources/CommonResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Resources/CommonResources.baml
new file mode 100644
index 00000000..b6603117
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Resources/CommonResources.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.baml
new file mode 100644
index 00000000..a8b63264
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.cs
new file mode 100644
index 00000000..7db04b1e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "30147024D89FE9330AA194CCE15A0DEB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs
new file mode 100644
index 00000000..7db04b1e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "30147024D89FE9330AA194CCE15A0DEB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.baml
new file mode 100644
index 00000000..51798a43
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
new file mode 100644
index 00000000..31260d6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FB6958FE64E2A7BED895C79BA2D73007"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs
new file mode 100644
index 00000000..31260d6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FB6958FE64E2A7BED895C79BA2D73007"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.baml
new file mode 100644
index 00000000..054bcdbf
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
new file mode 100644
index 00000000..14695097
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "63F03E5DA41728F8C2B434C48DA45D64"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs
new file mode 100644
index 00000000..14695097
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "63F03E5DA41728F8C2B434C48DA45D64"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialControlsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.baml
new file mode 100644
index 00000000..6443dc49
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.cs
new file mode 100644
index 00000000..78b74844
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "52C8CB154A66637E501B043F72DB98B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs
new file mode 100644
index 00000000..78b74844
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "52C8CB154A66637E501B043F72DB98B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialDropDownView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.baml
new file mode 100644
index 00000000..f989fbb2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
new file mode 100644
index 00000000..11b75a60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F1F23BF670E99EEB1EB0C162B7B12016"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs
new file mode 100644
index 00000000..11b75a60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F1F23BF670E99EEB1EB0C162B7B12016"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialFrameView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.baml
new file mode 100644
index 00000000..133936fd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.cs
new file mode 100644
index 00000000..d18c95fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "250C540AA4176DCB72148EC239965ABB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs
new file mode 100644
index 00000000..d18c95fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "250C540AA4176DCB72148EC239965ABB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.baml
new file mode 100644
index 00000000..b932506c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
new file mode 100644
index 00000000..9f717985
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31B7951EFD8A91E1CA15D798AF34FA59"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs
new file mode 100644
index 00000000..9f717985
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31B7951EFD8A91E1CA15D798AF34FA59"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.baml
new file mode 100644
index 00000000..c65915b5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
new file mode 100644
index 00000000..8fd8d712
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A4442212B8ABCFBAB341E78943AC7A93"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs
new file mode 100644
index 00000000..8fd8d712
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A4442212B8ABCFBAB341E78943AC7A93"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml
new file mode 100644
index 00000000..7ca20183
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
new file mode 100644
index 00000000..e73d0bcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C901A296D3ADD57F53F29F99B6BD37DC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs
new file mode 100644
index 00000000..e73d0bcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C901A296D3ADD57F53F29F99B6BD37DC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.baml
new file mode 100644
index 00000000..32a97769
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
new file mode 100644
index 00000000..e47940f1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "32F98F370F309FE5A9E9CD1580DEDB82"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs
new file mode 100644
index 00000000..e47940f1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "32F98F370F309FE5A9E9CD1580DEDB82"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.baml
new file mode 100644
index 00000000..8f3f2e1f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
new file mode 100644
index 00000000..48a9903d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "370E6E1B1DA2CEF6427EDA5FF84A36AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs
new file mode 100644
index 00000000..48a9903d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "370E6E1B1DA2CEF6427EDA5FF84A36AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.baml
new file mode 100644
index 00000000..3aaf1a01
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.cs
new file mode 100644
index 00000000..18254a04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4E401EC42D33D5FAD3D3EE15DA835180"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs
new file mode 100644
index 00000000..18254a04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4E401EC42D33D5FAD3D3EE15DA835180"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.baml
new file mode 100644
index 00000000..f3ea4dc0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
new file mode 100644
index 00000000..5fcb0114
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "376E38B054C35CEDD0CFC69D9380A6B8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs
new file mode 100644
index 00000000..5fcb0114
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "376E38B054C35CEDD0CFC69D9380A6B8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialTabsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.baml
new file mode 100644
index 00000000..53100846
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.cs
new file mode 100644
index 00000000..eab58413
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BFEE99CA9C0B719E7F2D584F6077619A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs
new file mode 100644
index 00000000..eab58413
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BFEE99CA9C0B719E7F2D584F6077619A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.baml
new file mode 100644
index 00000000..a60364b2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
new file mode 100644
index 00000000..83e1ee5a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5C667B6EAE3C375B2B10DA3A1784A415"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs
new file mode 100644
index 00000000..83e1ee5a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5C667B6EAE3C375B2B10DA3A1784A415"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialToastView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.baml
new file mode 100644
index 00000000..3f11c6f0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.g.cs
new file mode 100644
index 00000000..8a4cf215
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "18353EB6BC6D23FDABEC6BB33C0B4DDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialToastView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.g.i.cs
new file mode 100644
index 00000000..8a4cf215
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToastView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "18353EB6BC6D23FDABEC6BB33C0B4DDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialToolTipView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.baml
new file mode 100644
index 00000000..60cbae44
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
new file mode 100644
index 00000000..8bc4c91e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B508C5FE71256B816849073D3E19BD51"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs
new file mode 100644
index 00000000..8bc4c91e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B508C5FE71256B816849073D3E19BD51"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MultiCalendar/Views/MultiCalendarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.baml
new file mode 100644
index 00000000..c74c00cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
new file mode 100644
index 00000000..c1c7cc89
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "84C186DE6E22185211992DF830B23DD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs
new file mode 100644
index 00000000..c1c7cc89
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "84C186DE6E22185211992DF830B23DD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Numeric/Views/NumericView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.baml
new file mode 100644
index 00000000..63e93e6b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.g.cs
new file mode 100644
index 00000000..d32682f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.g.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "70D7AAE41CCF80412FFD2BAB5ED0F3B9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 192 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 221 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 229 "..\..\..\..\..\..\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/Debug/Samples/Numeric/Views/NumericView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.g.i.cs
new file mode 100644
index 00000000..d32682f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Numeric/Views/NumericView.g.i.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "70D7AAE41CCF80412FFD2BAB5ED0F3B9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 192 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 221 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 229 "..\..\..\..\..\..\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/Debug/Samples/Panels/Views/SwitchPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.baml
new file mode 100644
index 00000000..41a86972
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.g.cs
new file mode 100644
index 00000000..30cad869
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.g.cs
@@ -0,0 +1,331 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A611E6E3BFE3EAD071101EA9BB2FBEFD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Panels/Views/SwitchPanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.g.i.cs
new file mode 100644
index 00000000..30cad869
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Panels/Views/SwitchPanelView.g.i.cs
@@ -0,0 +1,331 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A611E6E3BFE3EAD071101EA9BB2FBEFD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieChartView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.baml
new file mode 100644
index 00000000..2a49fc84
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.g.cs
new file mode 100644
index 00000000..267286a5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.g.cs
@@ -0,0 +1,188 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "361F3E28556DF72CD7A7B9A2D86C92D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieChartView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.g.i.cs
new file mode 100644
index 00000000..267286a5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieChartView.g.i.cs
@@ -0,0 +1,188 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "361F3E28556DF72CD7A7B9A2D86C92D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieProgressView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.baml
new file mode 100644
index 00000000..db25de76
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.g.cs
new file mode 100644
index 00000000..084eb3c5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.g.cs
@@ -0,0 +1,132 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8E26D5425039B979CA20540231B3F309"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieProgressView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.g.i.cs
new file mode 100644
index 00000000..084eb3c5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieProgressView.g.i.cs
@@ -0,0 +1,132 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8E26D5425039B979CA20540231B3F309"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.baml
new file mode 100644
index 00000000..e09f7b42
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.g.cs
new file mode 100644
index 00000000..43719c22
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.g.cs
@@ -0,0 +1,173 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "911B4B8F01EA2F557D6B9B86BA342B6D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Pie/Views/PieView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.g.i.cs
new file mode 100644
index 00000000..43719c22
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Pie/Views/PieView.g.i.cs
@@ -0,0 +1,173 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "911B4B8F01EA2F557D6B9B86BA342B6D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.baml
new file mode 100644
index 00000000..e7eac43e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
new file mode 100644
index 00000000..a0c4908b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0A98D8893F4BC6D233094D8D32CFEB50"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs
new file mode 100644
index 00000000..a0c4908b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0A98D8893F4BC6D233094D8D32CFEB50"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml
new file mode 100644
index 00000000..c17e5637
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
new file mode 100644
index 00000000..9fbadace
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB56F1072E14BEADBBDBCB9E0BAF9ED5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs
new file mode 100644
index 00000000..9fbadace
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB56F1072E14BEADBBDBCB9E0BAF9ED5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml
new file mode 100644
index 00000000..3c3468bc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
new file mode 100644
index 00000000..20d66b9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "22D86F7B9D50BE6B275441B56940BE23"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs
new file mode 100644
index 00000000..20d66b9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "22D86F7B9D50BE6B275441B56940BE23"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml
new file mode 100644
index 00000000..c35576a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
new file mode 100644
index 00000000..56030b2e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "51AD87D6657891B952C323D97C67EBC8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs
new file mode 100644
index 00000000..56030b2e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "51AD87D6657891B952C323D97C67EBC8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml
new file mode 100644
index 00000000..e5f2153f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
new file mode 100644
index 00000000..397c4a2d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3DEDF51EF5E0EA9F18126A129D54BF16"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs
new file mode 100644
index 00000000..397c4a2d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3DEDF51EF5E0EA9F18126A129D54BF16"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml
new file mode 100644
index 00000000..8dde0889
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
new file mode 100644
index 00000000..46964f60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
@@ -0,0 +1,112 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "42739FE3E4FFF86EEE5E97CA6D83E98D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs
new file mode 100644
index 00000000..46964f60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs
@@ -0,0 +1,112 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "42739FE3E4FFF86EEE5E97CA6D83E98D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml
new file mode 100644
index 00000000..37db02ef
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
new file mode 100644
index 00000000..22483e7a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9197F3A8D7DF994EE35D66565B77A610"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs
new file mode 100644
index 00000000..22483e7a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9197F3A8D7DF994EE35D66565B77A610"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml
new file mode 100644
index 00000000..82b717f1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
new file mode 100644
index 00000000..d7c99bee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1431905E13FF68F2EBD26F2D920EA583"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs
new file mode 100644
index 00000000..d7c99bee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1431905E13FF68F2EBD26F2D920EA583"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml
new file mode 100644
index 00000000..3b4d6832
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
new file mode 100644
index 00000000..021504e4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAFB7B996636B0543A3297F20FF5BCF9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs
new file mode 100644
index 00000000..021504e4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAFB7B996636B0543A3297F20FF5BCF9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml
new file mode 100644
index 00000000..85758155
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
new file mode 100644
index 00000000..92c93d06
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2DAA4448DDC19C49A26E9894CD99C41"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs
new file mode 100644
index 00000000..92c93d06
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2DAA4448DDC19C49A26E9894CD99C41"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml
new file mode 100644
index 00000000..12456d27
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
new file mode 100644
index 00000000..ed026fab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "985AADB99922494429AFC8635566D396"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to 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/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs
new file mode 100644
index 00000000..ed026fab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "985AADB99922494429AFC8635566D396"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to 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/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml
new file mode 100644
index 00000000..57ad8329
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
new file mode 100644
index 00000000..79320e64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3D07C405C42CF3443748EC52DCEFF40D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs
new file mode 100644
index 00000000..79320e64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3D07C405C42CF3443748EC52DCEFF40D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml
new file mode 100644
index 00000000..d4b51e94
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
new file mode 100644
index 00000000..a73c889c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31E8DB7CA71F5A5754D99F8CBF49CD1F"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs
new file mode 100644
index 00000000..a73c889c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31E8DB7CA71F5A5754D99F8CBF49CD1F"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml
new file mode 100644
index 00000000..c3d08993
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
new file mode 100644
index 00000000..a17375c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "64BAB8495AE85DF99ACC1F888F7FD3B2"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs
new file mode 100644
index 00000000..a17375c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "64BAB8495AE85DF99ACC1F888F7FD3B2"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml
new file mode 100644
index 00000000..dc420258
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
new file mode 100644
index 00000000..5ff8b529
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8D21A2AF267EA97AA070D501E9E5CED7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs
new file mode 100644
index 00000000..5ff8b529
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8D21A2AF267EA97AA070D501E9E5CED7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml
new file mode 100644
index 00000000..d52049dc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
new file mode 100644
index 00000000..2595b5cf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
@@ -0,0 +1,118 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAEA080449FC2243D1506B197C1950BF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs
new file mode 100644
index 00000000..2595b5cf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs
@@ -0,0 +1,118 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAEA080449FC2243D1506B197C1950BF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml
new file mode 100644
index 00000000..47d8e866
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
new file mode 100644
index 00000000..41c2e15d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
@@ -0,0 +1,135 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9D8095E7595DF821B7A0E2D5EF4F5745"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs
new file mode 100644
index 00000000..41c2e15d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs
@@ -0,0 +1,135 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9D8095E7595DF821B7A0E2D5EF4F5745"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml
new file mode 100644
index 00000000..9b9735aa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
new file mode 100644
index 00000000..31badc30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F70325BE273D610780AD77FB8EFFA6DB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs
new file mode 100644
index 00000000..31badc30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F70325BE273D610780AD77FB8EFFA6DB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.baml
new file mode 100644
index 00000000..e93a173a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.cs
new file mode 100644
index 00000000..dc76cd79
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE276E3795373DD7311736A620CB49CF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs
new file mode 100644
index 00000000..dc76cd79
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE276E3795373DD7311736A620CB49CF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/RangeSlider/Views/RangeSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.baml
new file mode 100644
index 00000000..70ab1e4c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.g.cs
new file mode 100644
index 00000000..d9335783
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.g.cs
@@ -0,0 +1,185 @@
+#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "12C74F8DB5DE0876F86EF6C8485D47A3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/RangeSlider/Views/RangeSliderView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.g.i.cs
new file mode 100644
index 00000000..d9335783
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/RangeSlider/Views/RangeSliderView.g.i.cs
@@ -0,0 +1,185 @@
+#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "12C74F8DB5DE0876F86EF6C8485D47A3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Rating/Views/RatingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.baml
new file mode 100644
index 00000000..0e9cc4d2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.g.cs
new file mode 100644
index 00000000..3143eef6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.g.cs
@@ -0,0 +1,107 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6CAE4EA7E0C15E7352DC1CB3CE0B0AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Rating/Views/RatingView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.g.i.cs
new file mode 100644
index 00000000..3143eef6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Rating/Views/RatingView.g.i.cs
@@ -0,0 +1,107 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6CAE4EA7E0C15E7352DC1CB3CE0B0AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/SlideShow/Views/SlideShowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.baml
new file mode 100644
index 00000000..f33594e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.g.cs
new file mode 100644
index 00000000..06737b48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8337D43507A10D4248E9AE61001E3013"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/SlideShow/Views/SlideShowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.g.i.cs
new file mode 100644
index 00000000..06737b48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/SlideShow/Views/SlideShowView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8337D43507A10D4248E9AE61001E3013"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/AutoSelectTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.baml
new file mode 100644
index 00000000..02cfd2a2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.g.cs
new file mode 100644
index 00000000..b575ef98
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B6FA88224F364D0492A2273431F24CDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/AutoSelectTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.g.i.cs
new file mode 100644
index 00000000..b575ef98
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/AutoSelectTextboxView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B6FA88224F364D0492A2273431F24CDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/MaskedTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.baml
new file mode 100644
index 00000000..223bcba4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.g.cs
new file mode 100644
index 00000000..246c632a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.g.cs
@@ -0,0 +1,166 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67C4F3D3D60AF07B73A13BF7B6455335"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/MaskedTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.g.i.cs
new file mode 100644
index 00000000..246c632a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MaskedTextboxView.g.i.cs
@@ -0,0 +1,166 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67C4F3D3D60AF07B73A13BF7B6455335"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/MultiLineTextEditorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.baml
new file mode 100644
index 00000000..a36e5ef7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.g.cs
new file mode 100644
index 00000000..dfeb53c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BF00D06467B143777849DC9DAC3B65CA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/MultiLineTextEditorView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.g.i.cs
new file mode 100644
index 00000000..dfeb53c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/MultiLineTextEditorView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BF00D06467B143777849DC9DAC3B65CA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/RichTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.baml
new file mode 100644
index 00000000..596c7e8d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.g.cs
new file mode 100644
index 00000000..1744f345
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.g.cs
@@ -0,0 +1,140 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E9A3DEB5A046406D4A848FF131AE7A9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/RichTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.g.i.cs
new file mode 100644
index 00000000..1744f345
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/RichTextboxView.g.i.cs
@@ -0,0 +1,140 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E9A3DEB5A046406D4A848FF131AE7A9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/TokenizedTextBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.baml
new file mode 100644
index 00000000..7e08c080
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.g.cs
new file mode 100644
index 00000000..f4474034
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "470D3512C62877DB01C9C7A84979A80D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/TokenizedTextBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.g.i.cs
new file mode 100644
index 00000000..f4474034
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/TokenizedTextBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "470D3512C62877DB01C9C7A84979A80D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/WatermarkPasswordBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.baml
new file mode 100644
index 00000000..e72e23d4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
new file mode 100644
index 00000000..9da514fd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
@@ -0,0 +1,128 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "45B74A333CEBE72F524B406B4565E144"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs
new file mode 100644
index 00000000..9da514fd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs
@@ -0,0 +1,128 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "45B74A333CEBE72F524B406B4565E144"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/WatermarkTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.baml
new file mode 100644
index 00000000..2044f425
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.g.cs
new file mode 100644
index 00000000..4553e85b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "245BF5828A570A364C1A1036E51EC500"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Text/Views/WatermarkTextboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.g.i.cs
new file mode 100644
index 00000000..4553e85b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Text/Views/WatermarkTextboxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "245BF5828A570A364C1A1036E51EC500"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Theming/ItemTemplates/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/ItemTemplates/Common.baml
new file mode 100644
index 00000000..b4e35686
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/ItemTemplates/Common.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.baml
new file mode 100644
index 00000000..f6866597
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.cs
new file mode 100644
index 00000000..c21d6498
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "513D67C8231F6E598090AB5C7446CE1C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs
new file mode 100644
index 00000000..c21d6498
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "513D67C8231F6E598090AB5C7446CE1C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/Theming/Views/ThemingCoreWPFView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.baml
new file mode 100644
index 00000000..eeac6c8e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.cs
new file mode 100644
index 00000000..b18bc626
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "300D5A8AF0F376ED349BD07043967F39"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs
new file mode 100644
index 00000000..b18bc626
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "300D5A8AF0F376ED349BD07043967F39"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Theming/Views/ThemingDataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.baml
new file mode 100644
index 00000000..128bb5e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.cs
new file mode 100644
index 00000000..f6c64257
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.cs
@@ -0,0 +1,125 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ACB7599829398CEB9D11E8CC562543F0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/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
new file mode 100644
index 00000000..f6c64257
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingDataGridView.g.i.cs
@@ -0,0 +1,125 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ACB7599829398CEB9D11E8CC562543F0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.baml
new file mode 100644
index 00000000..cab9450a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
new file mode 100644
index 00000000..95266306
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DF05CBA94144F649EDEDFF4275BC0155"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/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
new file mode 100644
index 00000000..95266306
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DF05CBA94144F649EDEDFF4275BC0155"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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/Debug/Samples/Theming/Views/ThemingListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.baml
new file mode 100644
index 00000000..f80c4bde
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.g.cs
new file mode 100644
index 00000000..38f2568c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.g.cs
@@ -0,0 +1,120 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C23371A9138D697E237E944E896F3FED"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Theming/Views/ThemingListBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.g.i.cs
new file mode 100644
index 00000000..38f2568c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Theming/Views/ThemingListBoxView.g.i.cs
@@ -0,0 +1,120 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C23371A9138D697E237E944E896F3FED"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/TimeSpan/Views/TimeSpanView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.baml
new file mode 100644
index 00000000..272f018d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.g.cs
new file mode 100644
index 00000000..2ae54782
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.g.cs
@@ -0,0 +1,210 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6879E372A48E6208935A658FB1A6D351"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/TimeSpan/Views/TimeSpanView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.g.i.cs
new file mode 100644
index 00000000..2ae54782
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimeSpan/Views/TimeSpanView.g.i.cs
@@ -0,0 +1,210 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6879E372A48E6208935A658FB1A6D351"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/TimelinePanel/Views/TimelinePanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.baml
new file mode 100644
index 00000000..80c31419
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
new file mode 100644
index 00000000..c7f320e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "13F4926D25071F584A76516A7C5A90B6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs
new file mode 100644
index 00000000..c7f320e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "13F4926D25071F584A76516A7C5A90B6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.baml
new file mode 100644
index 00000000..65988e39
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
new file mode 100644
index 00000000..c084a3d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "386E5AB0927E794852888999884EF97A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs
new file mode 100644
index 00000000..c084a3d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "386E5AB0927E794852888999884EF97A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml
new file mode 100644
index 00000000..16f26f09
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
new file mode 100644
index 00000000..52c69e3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "842ECEEE469D3D00D30EDEBB79723492"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs
new file mode 100644
index 00000000..52c69e3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "842ECEEE469D3D00D30EDEBB79723492"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Resources/FancyStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/FancyStyles.baml
new file mode 100644
index 00000000..a65e7bdb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/FancyStyles.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.baml
new file mode 100644
index 00000000..d54d1c22
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.g.cs
new file mode 100644
index 00000000..2f90c9fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.g.cs
@@ -0,0 +1,114 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "728E8958400F00D4C5A9F29507E8F5D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Resources/WindowModelEditor.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.g.i.cs
new file mode 100644
index 00000000..2f90c9fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Resources/WindowModelEditor.g.i.cs
@@ -0,0 +1,114 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "728E8958400F00D4C5A9F29507E8F5D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/ChildWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.baml
new file mode 100644
index 00000000..6b80b446
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.g.cs
new file mode 100644
index 00000000..01ec0802
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.g.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59100B775368B91505BFB35B8825FCA8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/ChildWindowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.g.i.cs
new file mode 100644
index 00000000..01ec0802
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/ChildWindowView.g.i.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59100B775368B91505BFB35B8825FCA8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/StyleableWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.baml
new file mode 100644
index 00000000..6e70f2d0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.g.cs
new file mode 100644
index 00000000..9f548c6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.g.cs
@@ -0,0 +1,163 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "71C0ED35FA7570F353CD72D2152FBB42"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/StyleableWindowView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.g.i.cs
new file mode 100644
index 00000000..9f548c6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/StyleableWindowView.g.i.cs
@@ -0,0 +1,163 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "71C0ED35FA7570F353CD72D2152FBB42"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/WindowContainerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.baml
new file mode 100644
index 00000000..59c0ec40
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.g.cs
new file mode 100644
index 00000000..737d0364
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.g.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1A30195B6A078815A1B066B96BB8917E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Window/Views/WindowContainerView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.g.i.cs
new file mode 100644
index 00000000..737d0364
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Window/Views/WindowContainerView.g.i.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1A30195B6A078815A1B066B96BB8917E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Wizard/Views/WizardView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.baml
new file mode 100644
index 00000000..b70a3a25
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.g.cs
new file mode 100644
index 00000000..8b52b217
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.g.cs
@@ -0,0 +1,115 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FF6F2B73AE6F16076285DC96DC6ACB87"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Wizard/Views/WizardView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.g.i.cs
new file mode 100644
index 00000000..8b52b217
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Wizard/Views/WizardView.g.i.cs
@@ -0,0 +1,115 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FF6F2B73AE6F16076285DC96DC6ACB87"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Zoombox/Views/ZoomboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.baml
new file mode 100644
index 00000000..2467639c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.g.cs
new file mode 100644
index 00000000..3fb13410
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.g.cs
@@ -0,0 +1,153 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "416AB542D970A69AD44360CA527C1C04"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Samples/Zoombox/Views/ZoomboxView.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.g.i.cs
new file mode 100644
index 00000000..3fb13410
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Samples/Zoombox/Views/ZoomboxView.g.i.cs
@@ -0,0 +1,153 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "416AB542D970A69AD44360CA527C1C04"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
new file mode 100644
index 00000000..6c05a977
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
new file mode 100644
index 00000000..c27ca56f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
new file mode 100644
index 00000000..c5068ba1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application
new file mode 100644
index 00000000..7aac8fd6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.application
@@ -0,0 +1,22 @@
+<?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="17176">
+      <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>5q77W+OT5+XU7wRXDJsDbPgYV4s=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..b86c61d9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
@@ -0,0 +1,239 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Samples.SampleData.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.DataGrid.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\LiveExplorerScrollViewer.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Resources\TextBlockStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Resources\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Resources\CommonResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\ItemTemplates\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\FancyStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Resources\WindowModelEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\App.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\HomeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\MainWindow.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\AvalonDock\Views\AvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\BusyIndicator\Views\BusyIndicatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\IconButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\ButtonSpinnerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Button\Views\DropDownSplitButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Calculator\Views\CalculatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartAxisView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartLegendView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingAxesGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingLineSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Chart\Views\ChartStylingPieSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\CheckLists\Views\CheckListsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Color\Views\ColorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\DataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\DateTime\Views\DateTimeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\FilePicker\Views\FilePickerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Gauge\Views\RadialGaugeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ListBox\Views\ListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Magnifier\Views\MagnifierView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialHamburgerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToolTipView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialDropDownView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialFrameView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTabsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialProgressBarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialToastView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialTextFieldView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MaterialControls\Views\MaterialControlsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\MultiCalendar\Views\MultiCalendarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Numeric\Views\NumericView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Panels\Views\SwitchPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieChartView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieProgressView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Pie\Views\PieView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\PropertyGrid\Views\PropertyGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\RangeSlider\Views\RangeSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Rating\Views\RatingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\SlideShow\Views\SlideShowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\AutoSelectTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MaskedTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\MultiLineTextEditorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\RichTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkPasswordBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\WatermarkTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingAvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingCoreWPFView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingDataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingExtendedToolkitView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Theming\Views\ThemingListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimelinePanel\Views\TimelinePanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\TimeSpan\Views\TimeSpanView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Text\Views\TokenizedTextBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\ChildWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\StyleableWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Window\Views\WindowContainerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Wizard\Views\WizardView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Samples\Zoombox\Views\ZoomboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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.3.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.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
new file mode 100644
index 00000000..bd21fa30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16602" 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="471552">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>6C3reu7B8IvkrD7aiRdYMYoLccs=</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.3.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>08Bls94r5dcQ5EZoj0HpS2OucGI=</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.3.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>dpZljRMo0oZRk2809tBmxNbZmU8=</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.3.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>yT0HGLkdH7S66On0Mk6DZCOP6qc=</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.3.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>RrBtqUx8ma71+N3wQ1SqzBfHCyY=</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.3.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>puAP8BCiw6OCnpiiMIMwotwoI+I=</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.3.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>comNp/VS5UC9JZm3Ystg06YN0bA=</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.3.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>6psJdJxJzuAjiR9PiZajyuLBDpE=</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.3.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>ANM0w7XJlJjfn1myZA1tiJsyhS8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>sUZbzuzmbRN5VJe+vgs2kiONYig=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>j6h4zg8hxYuhFSvbhk99UORNdlk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="105472">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.3.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>ojNf3oP7r4lRBZeVio9IuE7lLsA=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="97280">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>MVF+nMehMl0irg8/4NVBt1s9DqM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="104448">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>dyKIF42BiplCQLHv7/Vk3zumVn8=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="3015680">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>ZfgtTBbFNMzXvA6K0i8tdnUuQ8o=</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="1326592">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>T4XnzCMDfMcrHP8aYqMRIHnBUJM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16386048">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16602" 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>Wv1uaJikbrwmOpm/VA4gbbShqMc=</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.3.6626.16602" 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>0FEv5tdFV/Lf48pZoCw7ymCStCY=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <file name="App.ico" size="31356">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
+    </hash>
+  </file>
+  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
+    </hash>
+  </file>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+    </application>
+  </compatibility>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.g.resources
new file mode 100644
index 00000000..d4f7bcb1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.i.lref
new file mode 100644
index 00000000..f7c6f868
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.i.lref
@@ -0,0 +1,95 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\HomeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\MainWindow.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\AvalonDock\Views\AvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\IconButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\ButtonSpinnerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\DropDownSplitButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Calculator\Views\CalculatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartAxisView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartLegendView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingAxesGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingLineSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingPieSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\CheckLists\Views\CheckListsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Color\Views\ColorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\DataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DateTime\Views\DateTimeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\FilePicker\Views\FilePickerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Gauge\Views\RadialGaugeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ListBox\Views\ListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Magnifier\Views\MagnifierView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialHamburgerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToolTipView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialDropDownView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialFrameView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTabsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToastView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTextFieldView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialControlsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MultiCalendar\Views\MultiCalendarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Numeric\Views\NumericView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Panels\Views\SwitchPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieChartView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieProgressView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\RangeSlider\Views\RangeSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Rating\Views\RatingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\SlideShow\Views\SlideShowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\AutoSelectTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MaskedTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MultiLineTextEditorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\RichTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkPasswordBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingAvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingCoreWPFView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingDataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingExtendedToolkitView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimelinePanel\Views\TimelinePanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimeSpan\Views\TimeSpanView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\TokenizedTextBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\ChildWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\StyleableWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\WindowContainerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Wizard\Views\WizardView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Zoombox\Views\ZoomboxView.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
new file mode 100644
index 00000000..2adbc15c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
@@ -0,0 +1,95 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\HomeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\MainWindow.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\AvalonDock\Views\AvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\IconButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\ButtonSpinnerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\DropDownSplitButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Calculator\Views\CalculatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartAxisView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartLegendView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingAxesGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingLineSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingPieSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\CheckLists\Views\CheckListsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Color\Views\ColorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\DataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DateTime\Views\DateTimeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\FilePicker\Views\FilePickerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Gauge\Views\RadialGaugeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ListBox\Views\ListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Magnifier\Views\MagnifierView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialHamburgerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToolTipView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialDropDownView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialFrameView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTabsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToastView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTextFieldView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialControlsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MultiCalendar\Views\MultiCalendarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Numeric\Views\NumericView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Panels\Views\SwitchPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieChartView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieProgressView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\RangeSlider\Views\RangeSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Rating\Views\RatingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\SlideShow\Views\SlideShowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\AutoSelectTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MaskedTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MultiLineTextEditorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\RichTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkPasswordBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingAvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingCoreWPFView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingDataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingExtendedToolkitView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimelinePanel\Views\TimelinePanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimeSpan\Views\TimeSpanView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\TokenizedTextBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\ChildWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\StyleableWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\WindowContainerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Wizard\Views\WizardView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Zoombox\Views\ZoomboxView.xaml;;
+
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
new file mode 100644
index 00000000..a1d82d8e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml 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
new file mode 100644
index 00000000..1429bc0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "89A9835FC33A95880DDA09E8EA1A625B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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
new file mode 100644
index 00000000..1429bc0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.i.cs
@@ -0,0 +1,82 @@
+#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "89A9835FC33A95880DDA09E8EA1A625B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..f8ca15e9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml 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
new file mode 100644
index 00000000..8939350f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs
@@ -0,0 +1,96 @@
+#pragma checksum "..\..\..\HomeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E30E57950DD27F30E2C80D223616FA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8939350f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.i.cs
@@ -0,0 +1,96 @@
+#pragma checksum "..\..\..\HomeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E30E57950DD27F30E2C80D223616FA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8cf6bb9d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml 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
new file mode 100644
index 00000000..8220b37e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs
@@ -0,0 +1,167 @@
+#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D34BA94FD2F49B4CEF1845BF8634871B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8220b37e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.i.cs
@@ -0,0 +1,167 @@
+#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D34BA94FD2F49B4CEF1845BF8634871B"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..3ff8c459
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml 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
new file mode 100644
index 00000000..5fb9d95a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml 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
new file mode 100644
index 00000000..58a611ee
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml 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
new file mode 100644
index 00000000..06e4484d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs
@@ -0,0 +1,116 @@
+#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "92ED5E92454A663B8F83998357DCEAC7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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 56 "..\..\..\..\..\..\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._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
+            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
new file mode 100644
index 00000000..06e4484d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.i.cs
@@ -0,0 +1,116 @@
+#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "92ED5E92454A663B8F83998357DCEAC7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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 56 "..\..\..\..\..\..\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._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
+            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
new file mode 100644
index 00000000..48c17e14
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml 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
new file mode 100644
index 00000000..e935d715
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml 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
new file mode 100644
index 00000000..887333e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "33AC2C02B4C60CE323F93D716AEBD973"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..887333e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "33AC2C02B4C60CE323F93D716AEBD973"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a7a34740
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml 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
new file mode 100644
index 00000000..283dae16
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7B7BE4A7D4E244DA6A124E2E621B682C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..283dae16
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7B7BE4A7D4E244DA6A124E2E621B682C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..0767e9c3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml 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
new file mode 100644
index 00000000..5a740e23
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
@@ -0,0 +1,123 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B9A09EE5E5D5F3A7414E18432ED72B5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5a740e23
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.i.cs
@@ -0,0 +1,123 @@
+#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B9A09EE5E5D5F3A7414E18432ED72B5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5bef517f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml 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
new file mode 100644
index 00000000..cffdc224
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs
@@ -0,0 +1,130 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DE4E4E948127554304CA97BFE16CC088"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..cffdc224
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.i.cs
@@ -0,0 +1,130 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DE4E4E948127554304CA97BFE16CC088"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..4251cad6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml 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
new file mode 100644
index 00000000..bb49d052
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs
@@ -0,0 +1,183 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "425B6668D50D5B9529F349045F52F019"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..bb49d052
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.i.cs
@@ -0,0 +1,183 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "425B6668D50D5B9529F349045F52F019"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..72a3bedf
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml 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
new file mode 100644
index 00000000..7d8232c1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F07810DDCB1858BE029A8D83B9F8CCD8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7d8232c1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F07810DDCB1858BE029A8D83B9F8CCD8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e0eb6dba
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml 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
new file mode 100644
index 00000000..bfda3234
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59D23210567C9C4100B2DD74FCFB89DD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..bfda3234
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59D23210567C9C4100B2DD74FCFB89DD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7c61d84e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml 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
new file mode 100644
index 00000000..94843082
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs
@@ -0,0 +1,119 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AC64E02BC06156BE697351274DDAFA7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 31 "..\..\..\..\..\..\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
new file mode 100644
index 00000000..94843082
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.i.cs
@@ -0,0 +1,119 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AC64E02BC06156BE697351274DDAFA7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 31 "..\..\..\..\..\..\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
new file mode 100644
index 00000000..1944b8d4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml 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
new file mode 100644
index 00000000..26ba29bf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8AB5EE252CEAB6C69E67AF1EC34C02EC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..26ba29bf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8AB5EE252CEAB6C69E67AF1EC34C02EC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..ea976947
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml 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
new file mode 100644
index 00000000..071f3f8b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6968E7FBB43FE839B373B7C525DE3F8D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..071f3f8b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6968E7FBB43FE839B373B7C525DE3F8D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a8e199ad
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml 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
new file mode 100644
index 00000000..7dbef669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AA63D4E41307F408A34F458A68C67EB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7dbef669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0AA63D4E41307F408A34F458A68C67EB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e2a55d2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml 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
new file mode 100644
index 00000000..44149512
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "708F7B1CC8A54AD456D3FEEE8365D6B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..44149512
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "708F7B1CC8A54AD456D3FEEE8365D6B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5f1666ea
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml 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
new file mode 100644
index 00000000..08201bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0D1ACACF4A29F23149F2D3CEBB6BB6B7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..08201bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0D1ACACF4A29F23149F2D3CEBB6BB6B7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..31a5420e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml 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
new file mode 100644
index 00000000..d75b7df9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7284D1DE8B138517DEE89A3936A5AC4A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d75b7df9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7284D1DE8B138517DEE89A3936A5AC4A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..cb4329f5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml 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
new file mode 100644
index 00000000..132c425b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5EB29C421D0DFBE5B2AC703283CC1CE6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..132c425b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5EB29C421D0DFBE5B2AC703283CC1CE6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..22f80ee6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml 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
new file mode 100644
index 00000000..f21739fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9B36256FD336C907F7858967F6B81AB8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 63 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _delimiter;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _valueMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 84 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedValue;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 94 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 105 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _displayMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 116 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isEditable;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 127 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isDropDownOpen;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 141 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 169 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 182 "..\..\..\..\..\..\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._isEditable = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 8:
+            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 9:
+            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
+            return;
+            case 10:
+            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
+            return;
+            case 11:
+            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
new file mode 100644
index 00000000..f21739fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.i.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9B36256FD336C907F7858967F6B81AB8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 63 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _delimiter;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _valueMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 84 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedValue;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 94 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox _selectedMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 105 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox _displayMemberPath;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 116 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isEditable;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 127 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _isDropDownOpen;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 141 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 169 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 182 "..\..\..\..\..\..\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._isEditable = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 8:
+            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 9:
+            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
+            return;
+            case 10:
+            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
+            return;
+            case 11:
+            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
new file mode 100644
index 00000000..d73a02d9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml 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
new file mode 100644
index 00000000..06ca4c7c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs
@@ -0,0 +1,176 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "203E5EC198C70B1BF7A2360D5458313E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..06ca4c7c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.i.cs
@@ -0,0 +1,176 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "203E5EC198C70B1BF7A2360D5458313E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..02d25889
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml 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
new file mode 100644
index 00000000..1444c492
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs
@@ -0,0 +1,138 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "173785EFF1E408ED2B311134B0F7B81D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..1444c492
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.i.cs
@@ -0,0 +1,138 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "173785EFF1E408ED2B311134B0F7B81D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..d3898e2a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml 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
new file mode 100644
index 00000000..ffee9a0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E1954D2ADDB10401486F05340DF399"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..ffee9a0b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14E1954D2ADDB10401486F05340DF399"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..59d60780
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml 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
new file mode 100644
index 00000000..d02c106c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs
@@ -0,0 +1,354 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5D6AD3840CB50CF72E259B189BAAAB1"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d02c106c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.i.cs
@@ -0,0 +1,354 @@
+#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5D6AD3840CB50CF72E259B189BAAAB1"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..0c895f80
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml 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
new file mode 100644
index 00000000..47a2a6dd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "EC27D819C19ABFAAE354D9B99A5F6D44"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..47a2a6dd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "EC27D819C19ABFAAE354D9B99A5F6D44"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7ff924d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml 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
new file mode 100644
index 00000000..4d1fdc4c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C86D2034A8C09675D9F6A393FFC09C56"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..4d1fdc4c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C86D2034A8C09675D9F6A393FFC09C56"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..fb2a277e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml 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
new file mode 100644
index 00000000..4fb30f11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs
@@ -0,0 +1,94 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8A5AD07F043DFAC24069F57C9B04A213"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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
new file mode 100644
index 00000000..4fb30f11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.i.cs
@@ -0,0 +1,94 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8A5AD07F043DFAC24069F57C9B04A213"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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
new file mode 100644
index 00000000..8fa08783
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml 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
new file mode 100644
index 00000000..e4001eb3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs
@@ -0,0 +1,222 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2902797CE61E92E0503FC24834CAE53"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e4001eb3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.i.cs
@@ -0,0 +1,222 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2902797CE61E92E0503FC24834CAE53"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1f0cf69c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml 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
new file mode 100644
index 00000000..5f02d823
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml 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
new file mode 100644
index 00000000..7db04b1e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "30147024D89FE9330AA194CCE15A0DEB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7db04b1e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "30147024D89FE9330AA194CCE15A0DEB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1a8f5798
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml 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
new file mode 100644
index 00000000..31260d6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FB6958FE64E2A7BED895C79BA2D73007"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..31260d6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FB6958FE64E2A7BED895C79BA2D73007"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5d8e487a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml 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
new file mode 100644
index 00000000..14695097
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "63F03E5DA41728F8C2B434C48DA45D64"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..14695097
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "63F03E5DA41728F8C2B434C48DA45D64"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..32ef5de4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml 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
new file mode 100644
index 00000000..78b74844
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "52C8CB154A66637E501B043F72DB98B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..78b74844
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "52C8CB154A66637E501B043F72DB98B0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..76ae1001
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml 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
new file mode 100644
index 00000000..11b75a60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F1F23BF670E99EEB1EB0C162B7B12016"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..11b75a60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F1F23BF670E99EEB1EB0C162B7B12016"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..16c1ee7f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml 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
new file mode 100644
index 00000000..d18c95fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "250C540AA4176DCB72148EC239965ABB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d18c95fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "250C540AA4176DCB72148EC239965ABB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a572bd4d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml 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
new file mode 100644
index 00000000..9f717985
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31B7951EFD8A91E1CA15D798AF34FA59"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..9f717985
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31B7951EFD8A91E1CA15D798AF34FA59"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e3c7971a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml 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
new file mode 100644
index 00000000..8fd8d712
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A4442212B8ABCFBAB341E78943AC7A93"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8fd8d712
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A4442212B8ABCFBAB341E78943AC7A93"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..ecb6ef7e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml 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
new file mode 100644
index 00000000..e73d0bcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C901A296D3ADD57F53F29F99B6BD37DC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e73d0bcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C901A296D3ADD57F53F29F99B6BD37DC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a603f346
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml 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
new file mode 100644
index 00000000..e47940f1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "32F98F370F309FE5A9E9CD1580DEDB82"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..e47940f1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "32F98F370F309FE5A9E9CD1580DEDB82"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1827ad93
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml 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
new file mode 100644
index 00000000..48a9903d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "370E6E1B1DA2CEF6427EDA5FF84A36AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..48a9903d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "370E6E1B1DA2CEF6427EDA5FF84A36AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d5866c2c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml 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
new file mode 100644
index 00000000..18254a04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4E401EC42D33D5FAD3D3EE15DA835180"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..18254a04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4E401EC42D33D5FAD3D3EE15DA835180"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d828b780
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml 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
new file mode 100644
index 00000000..5fcb0114
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "376E38B054C35CEDD0CFC69D9380A6B8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5fcb0114
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "376E38B054C35CEDD0CFC69D9380A6B8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..bf99e321
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml 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
new file mode 100644
index 00000000..eab58413
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BFEE99CA9C0B719E7F2D584F6077619A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..eab58413
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BFEE99CA9C0B719E7F2D584F6077619A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..f81510aa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml 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
new file mode 100644
index 00000000..83e1ee5a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5C667B6EAE3C375B2B10DA3A1784A415"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..83e1ee5a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5C667B6EAE3C375B2B10DA3A1784A415"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..0fce55f1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml 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
new file mode 100644
index 00000000..8a4cf215
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "18353EB6BC6D23FDABEC6BB33C0B4DDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8a4cf215
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "18353EB6BC6D23FDABEC6BB33C0B4DDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..09182bef
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml 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
new file mode 100644
index 00000000..8bc4c91e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B508C5FE71256B816849073D3E19BD51"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8bc4c91e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B508C5FE71256B816849073D3E19BD51"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..80975855
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml 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
new file mode 100644
index 00000000..c1c7cc89
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "84C186DE6E22185211992DF830B23DD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..c1c7cc89
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "84C186DE6E22185211992DF830B23DD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..6c6ee10f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml 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
new file mode 100644
index 00000000..d32682f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "70D7AAE41CCF80412FFD2BAB5ED0F3B9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 192 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 221 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 229 "..\..\..\..\..\..\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
new file mode 100644
index 00000000..d32682f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.i.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "70D7AAE41CCF80412FFD2BAB5ED0F3B9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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 192 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 221 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 229 "..\..\..\..\..\..\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
new file mode 100644
index 00000000..851eca93
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml 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
new file mode 100644
index 00000000..30cad869
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs
@@ -0,0 +1,331 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A611E6E3BFE3EAD071101EA9BB2FBEFD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..30cad869
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.i.cs
@@ -0,0 +1,331 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A611E6E3BFE3EAD071101EA9BB2FBEFD"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8fee4ad2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml 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
new file mode 100644
index 00000000..267286a5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs
@@ -0,0 +1,188 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "361F3E28556DF72CD7A7B9A2D86C92D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..267286a5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.i.cs
@@ -0,0 +1,188 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "361F3E28556DF72CD7A7B9A2D86C92D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1d993297
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml 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
new file mode 100644
index 00000000..084eb3c5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs
@@ -0,0 +1,132 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8E26D5425039B979CA20540231B3F309"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..084eb3c5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.i.cs
@@ -0,0 +1,132 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8E26D5425039B979CA20540231B3F309"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..9720a550
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml 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
new file mode 100644
index 00000000..43719c22
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs
@@ -0,0 +1,173 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "911B4B8F01EA2F557D6B9B86BA342B6D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..43719c22
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.i.cs
@@ -0,0 +1,173 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "911B4B8F01EA2F557D6B9B86BA342B6D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..63648623
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml 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
new file mode 100644
index 00000000..a0c4908b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0A98D8893F4BC6D233094D8D32CFEB50"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a0c4908b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0A98D8893F4BC6D233094D8D32CFEB50"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..b1dde000
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml 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
new file mode 100644
index 00000000..9fbadace
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB56F1072E14BEADBBDBCB9E0BAF9ED5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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
new file mode 100644
index 00000000..9fbadace
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.i.cs
@@ -0,0 +1,97 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB56F1072E14BEADBBDBCB9E0BAF9ED5"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.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
new file mode 100644
index 00000000..4ccd4f64
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml 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
new file mode 100644
index 00000000..20d66b9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "22D86F7B9D50BE6B275441B56940BE23"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..20d66b9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.i.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "22D86F7B9D50BE6B275441B56940BE23"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..1b6280ba
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml 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
new file mode 100644
index 00000000..56030b2e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "51AD87D6657891B952C323D97C67EBC8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..56030b2e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.i.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "51AD87D6657891B952C323D97C67EBC8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..ef8819d0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml 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
new file mode 100644
index 00000000..397c4a2d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3DEDF51EF5E0EA9F18126A129D54BF16"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..397c4a2d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3DEDF51EF5E0EA9F18126A129D54BF16"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..90bd7a3f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml 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
new file mode 100644
index 00000000..46964f60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
@@ -0,0 +1,112 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "42739FE3E4FFF86EEE5E97CA6D83E98D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..46964f60
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.i.cs
@@ -0,0 +1,112 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "42739FE3E4FFF86EEE5E97CA6D83E98D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.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
new file mode 100644
index 00000000..f8fd7bae
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml 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
new file mode 100644
index 00000000..22483e7a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9197F3A8D7DF994EE35D66565B77A610"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..22483e7a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9197F3A8D7DF994EE35D66565B77A610"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..6eec3947
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml 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
new file mode 100644
index 00000000..d7c99bee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1431905E13FF68F2EBD26F2D920EA583"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d7c99bee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1431905E13FF68F2EBD26F2D920EA583"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..928d6415
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml 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
new file mode 100644
index 00000000..021504e4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAFB7B996636B0543A3297F20FF5BCF9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..021504e4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAFB7B996636B0543A3297F20FF5BCF9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..96779e0d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml 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
new file mode 100644
index 00000000..92c93d06
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2DAA4448DDC19C49A26E9894CD99C41"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..92c93d06
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D2DAA4448DDC19C49A26E9894CD99C41"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..2b377fbf
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml 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
new file mode 100644
index 00000000..ed026fab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "985AADB99922494429AFC8635566D396"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to 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
new file mode 100644
index 00000000..ed026fab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.i.cs
@@ -0,0 +1,110 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "985AADB99922494429AFC8635566D396"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to 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
new file mode 100644
index 00000000..b3c3ba22
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml 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
new file mode 100644
index 00000000..79320e64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3D07C405C42CF3443748EC52DCEFF40D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..79320e64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3D07C405C42CF3443748EC52DCEFF40D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a2ac74d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml 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
new file mode 100644
index 00000000..a73c889c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31E8DB7CA71F5A5754D99F8CBF49CD1F"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a73c889c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "31E8DB7CA71F5A5754D99F8CBF49CD1F"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7576f2eb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml 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
new file mode 100644
index 00000000..a17375c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "64BAB8495AE85DF99ACC1F888F7FD3B2"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..a17375c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "64BAB8495AE85DF99ACC1F888F7FD3B2"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..778bfd8c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml 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
new file mode 100644
index 00000000..5ff8b529
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8D21A2AF267EA97AA070D501E9E5CED7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5ff8b529
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8D21A2AF267EA97AA070D501E9E5CED7"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..7c8315a8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml 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
new file mode 100644
index 00000000..2595b5cf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
@@ -0,0 +1,118 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAEA080449FC2243D1506B197C1950BF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..2595b5cf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.i.cs
@@ -0,0 +1,118 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AAEA080449FC2243D1506B197C1950BF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..69470b08
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml 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
new file mode 100644
index 00000000..41c2e15d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
@@ -0,0 +1,135 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9D8095E7595DF821B7A0E2D5EF4F5745"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..41c2e15d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.i.cs
@@ -0,0 +1,135 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "9D8095E7595DF821B7A0E2D5EF4F5745"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..bfc629a7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml 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
new file mode 100644
index 00000000..31badc30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F70325BE273D610780AD77FB8EFFA6DB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..31badc30
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F70325BE273D610780AD77FB8EFFA6DB"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..61d326db
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml 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
new file mode 100644
index 00000000..dc76cd79
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE276E3795373DD7311736A620CB49CF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..dc76cd79
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE276E3795373DD7311736A620CB49CF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..03194486
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml 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
new file mode 100644
index 00000000..d9335783
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs
@@ -0,0 +1,185 @@
+#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "12C74F8DB5DE0876F86EF6C8485D47A3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d9335783
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.i.cs
@@ -0,0 +1,185 @@
+#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "12C74F8DB5DE0876F86EF6C8485D47A3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..6f09f576
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml 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
new file mode 100644
index 00000000..3143eef6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs
@@ -0,0 +1,107 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6CAE4EA7E0C15E7352DC1CB3CE0B0AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..3143eef6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.i.cs
@@ -0,0 +1,107 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6CAE4EA7E0C15E7352DC1CB3CE0B0AF"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..f1fe3739
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml 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
new file mode 100644
index 00000000..06737b48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8337D43507A10D4248E9AE61001E3013"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..06737b48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8337D43507A10D4248E9AE61001E3013"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..be88b5d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml 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
new file mode 100644
index 00000000..b575ef98
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B6FA88224F364D0492A2273431F24CDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..b575ef98
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.i.cs
@@ -0,0 +1,122 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B6FA88224F364D0492A2273431F24CDE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1e33c8cb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml 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
new file mode 100644
index 00000000..246c632a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs
@@ -0,0 +1,166 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67C4F3D3D60AF07B73A13BF7B6455335"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..246c632a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.i.cs
@@ -0,0 +1,166 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67C4F3D3D60AF07B73A13BF7B6455335"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..4e694cf9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml 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
new file mode 100644
index 00000000..dfeb53c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BF00D06467B143777849DC9DAC3B65CA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..dfeb53c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BF00D06467B143777849DC9DAC3B65CA"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5706c230
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml 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
new file mode 100644
index 00000000..1744f345
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs
@@ -0,0 +1,140 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E9A3DEB5A046406D4A848FF131AE7A9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..1744f345
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.i.cs
@@ -0,0 +1,140 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E9A3DEB5A046406D4A848FF131AE7A9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..93b000db
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml 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
new file mode 100644
index 00000000..f4474034
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "470D3512C62877DB01C9C7A84979A80D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..f4474034
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.i.cs
@@ -0,0 +1,108 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "470D3512C62877DB01C9C7A84979A80D"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..3fa41c99
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml 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
new file mode 100644
index 00000000..9da514fd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
@@ -0,0 +1,128 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "45B74A333CEBE72F524B406B4565E144"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..9da514fd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.i.cs
@@ -0,0 +1,128 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "45B74A333CEBE72F524B406B4565E144"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..5a8e9dd9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml 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
new file mode 100644
index 00000000..4553e85b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "245BF5828A570A364C1A1036E51EC500"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..4553e85b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "245BF5828A570A364C1A1036E51EC500"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..312235f0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml 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
new file mode 100644
index 00000000..44a6e74f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml 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
new file mode 100644
index 00000000..c21d6498
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "513D67C8231F6E598090AB5C7446CE1C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..c21d6498
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.i.cs
@@ -0,0 +1,221 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "513D67C8231F6E598090AB5C7446CE1C"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..dd8f4c9a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml 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
new file mode 100644
index 00000000..b18bc626
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "300D5A8AF0F376ED349BD07043967F39"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..b18bc626
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "300D5A8AF0F376ED349BD07043967F39"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..9dd236e7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml 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
new file mode 100644
index 00000000..f6c64257
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs
@@ -0,0 +1,125 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ACB7599829398CEB9D11E8CC562543F0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..f6c64257
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.i.cs
@@ -0,0 +1,125 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ACB7599829398CEB9D11E8CC562543F0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..fff3f31b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml 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
new file mode 100644
index 00000000..95266306
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DF05CBA94144F649EDEDFF4275BC0155"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..95266306
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.i.cs
@@ -0,0 +1,124 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DF05CBA94144F649EDEDFF4275BC0155"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using 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
new file mode 100644
index 00000000..b3f55aa5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml 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
new file mode 100644
index 00000000..38f2568c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs
@@ -0,0 +1,120 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C23371A9138D697E237E944E896F3FED"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..38f2568c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.i.cs
@@ -0,0 +1,120 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C23371A9138D697E237E944E896F3FED"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..d39f2fd0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml 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
new file mode 100644
index 00000000..2ae54782
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs
@@ -0,0 +1,210 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6879E372A48E6208935A658FB1A6D351"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..2ae54782
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.i.cs
@@ -0,0 +1,210 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6879E372A48E6208935A658FB1A6D351"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..3a9dc52d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml 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
new file mode 100644
index 00000000..c7f320e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "13F4926D25071F584A76516A7C5A90B6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..c7f320e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.i.cs
@@ -0,0 +1,144 @@
+#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "13F4926D25071F584A76516A7C5A90B6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..151c40f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml 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
new file mode 100644
index 00000000..c084a3d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "386E5AB0927E794852888999884EF97A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..c084a3d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.i.cs
@@ -0,0 +1,109 @@
+#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "386E5AB0927E794852888999884EF97A"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..dd9ad5a6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml 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
new file mode 100644
index 00000000..52c69e3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "842ECEEE469D3D00D30EDEBB79723492"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..52c69e3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.i.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "842ECEEE469D3D00D30EDEBB79723492"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8400bb82
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml 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
new file mode 100644
index 00000000..7dfe07d6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml 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
new file mode 100644
index 00000000..2f90c9fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs
@@ -0,0 +1,114 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "728E8958400F00D4C5A9F29507E8F5D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..2f90c9fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.i.cs
@@ -0,0 +1,114 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "728E8958400F00D4C5A9F29507E8F5D0"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..81b88447
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml 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
new file mode 100644
index 00000000..01ec0802
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59100B775368B91505BFB35B8825FCA8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..01ec0802
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.i.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59100B775368B91505BFB35B8825FCA8"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..460518fc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml 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
new file mode 100644
index 00000000..9f548c6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs
@@ -0,0 +1,163 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "71C0ED35FA7570F353CD72D2152FBB42"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..9f548c6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.i.cs
@@ -0,0 +1,163 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "71C0ED35FA7570F353CD72D2152FBB42"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..322230a5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml 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
new file mode 100644
index 00000000..737d0364
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1A30195B6A078815A1B066B96BB8917E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..737d0364
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.i.cs
@@ -0,0 +1,208 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1A30195B6A078815A1B066B96BB8917E"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..cc3193cc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml 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
new file mode 100644
index 00000000..8b52b217
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs
@@ -0,0 +1,115 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FF6F2B73AE6F16076285DC96DC6ACB87"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..8b52b217
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.i.cs
@@ -0,0 +1,115 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FF6F2B73AE6F16076285DC96DC6ACB87"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..ca32ffd9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml 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
new file mode 100644
index 00000000..3fb13410
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs
@@ -0,0 +1,153 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "416AB542D970A69AD44360CA527C1C04"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..3fb13410
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.i.cs
@@ -0,0 +1,153 @@
+#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "416AB542D970A69AD44360CA527C1C04"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using 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
new file mode 100644
index 00000000..6c05a977
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources 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
new file mode 100644
index 00000000..c27ca56f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources 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
new file mode 100644
index 00000000..c5068ba1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources 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
new file mode 100644
index 00000000..bff21f20
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
@@ -0,0 +1,22 @@
+<?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>8yicxdfKttCQS9zrCVXwK/kd/wI=</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
new file mode 100644
index 00000000..01ee1c2b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
@@ -0,0 +1,239 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Samples.SampleData.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\LiveExplorerScrollViewer.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\TextBlockStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Resources\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Resources\CommonResources.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\ItemTemplates\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\FancyStyles.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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.3.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.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..96eee3e6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
@@ -0,0 +1,298 @@
+<?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.3.6626.16958" 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="423936">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.3.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>yh8J7Gpu+862mxX4JsV9yVLZog8=</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.3.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>QQb6ljnnDKdHSin2C6nEL+pbtKQ=</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.3.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>b1qPOSPea4dj9i2vTmtnngHNhRI=</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.3.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>EgsWiOSGNstpQlkXTsUWqok9Qfc=</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.3.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>F+LofA8yW8kijhZPwtIdVVwQIRM=</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.3.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>PD3Ys6aK1e/ARCseDV093uUNLEA=</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.3.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>ONA9jHNXHD8Gl2TgeFqbJhamU+Q=</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.3.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>2+iwtdlc3AmPIjnmdrT87su78JM=</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.3.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>QeUrdtEGjfmP1wBnjlfOdanI0Fc=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>o8WLfLrbBvaRwDWw9Q14MyKjntk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="5632">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.3.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>BIjiyx+cAGwElzPCgqmU38zqrv4=</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.3.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>QCTgml0eJRfPyeH59qjQ4rkOs6Q=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79360">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.3.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>XkHNCFh7LOdp0Gq08js4E0gonhk=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="83968">
+      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.3.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>TQmPfpvJzFXO94Zwto7jTk4M1ms=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435072">
+      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.3.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>JWfLX/HG2uVaNuZadAr9Q7VvylM=</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="1093120">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.3.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>nHZSxXLH96hfpnAmriFf1lvgluM=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16274944">
+      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.3.6626.16958" 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>LH16Q6rYGQdOcA6D+fZjb13Wj5g=</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.3.6626.16958" 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>0rRo3xJEs6RebQPhU/JDTZZEmKY=</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
new file mode 100644
index 00000000..c95025db
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources 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
new file mode 100644
index 00000000..46efc385
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
@@ -0,0 +1,95 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\HomeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\MainWindow.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\AvalonDock\Views\AvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\IconButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\ButtonSpinnerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\DropDownSplitButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Calculator\Views\CalculatorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartAxisView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartLegendView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingAxesGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingLineSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingPieSeriesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\CheckLists\Views\CheckListsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Color\Views\ColorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\DataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DateTime\Views\DateTimeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\FilePicker\Views\FilePickerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Gauge\Views\RadialGaugeView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ListBox\Views\ListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Magnifier\Views\MagnifierView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialHamburgerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToolTipView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialDropDownView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialFrameView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTabsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToastView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTextFieldView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialButtonView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialControlsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MultiCalendar\Views\MultiCalendarView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Numeric\Views\NumericView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Panels\Views\SwitchPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieChartView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieProgressView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\RangeSlider\Views\RangeSliderView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Rating\Views\RatingView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\SlideShow\Views\SlideShowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\AutoSelectTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MaskedTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MultiLineTextEditorView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\RichTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkPasswordBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkTextboxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingAvalonDockView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingCoreWPFView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingDataGridView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingExtendedToolkitView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingListBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimelinePanel\Views\TimelinePanelView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimeSpan\Views\TimeSpanView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\TokenizedTextBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\ChildWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\StyleableWindowView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\WindowContainerView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Wizard\Views\WizardView.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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 5187d3fa..73fd3191 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.2";
+  public const string BaseVersion = "3.3";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index 64d76344..5074c981 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -17,17 +17,12 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows;
-using System.Windows.Automation;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
   public class AutoSelectTextBox : TextBox
   {
-    static AutoSelectTextBox()
-    {
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( AutoSelectTextBox ), new UIPropertyMetadata( "AutoSelectTextBox" ) );
-    }
 
     #region AutoSelectBehavior PROPERTY
 
@@ -165,6 +160,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
     private bool CanMoveFocus( FocusNavigationDirection direction, bool reachedMax )
     {
       QueryMoveFocusEventArgs e = new QueryMoveFocusEventArgs( direction, reachedMax );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index ac9088c8..a61532db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -67,6 +67,7 @@ namespace Xceed.Wpf.Toolkit
       ChangeVisualState( false );
     }
 
+
     #endregion //Base Class Overrides
 
     #region Properties
@@ -257,7 +258,7 @@ namespace Xceed.Wpf.Toolkit
         new PropertyMetadata( null ) );
 
     /// <summary>
-    /// Gets or sets a Control that should get focus when the busy indicator disapears.
+    /// Gets or sets a Control that should get the focus when the busy indicator disapears.
     /// </summary>
     public Control FocusAfterBusy
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
index d9b6413c..3515614b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -21,148 +21,195 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
+  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
 
-   <!-- =============================================================================== -->
-    <!-- BusyIndicator                                                                   -->
-    <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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>
+  <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>
+  <Style TargetType="{x:Type local:BusyIndicator}">
+    <Setter Property="Background"
+            Value="{StaticResource PanelBackgroundBrush}" />
+    <Setter Property="BusyContent"
+            Value="Please wait..." />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="OverlayStyle">
+      <Setter.Value>
+        <Style TargetType="Rectangle">
+          <Setter Property="Fill"
+                  Value="White" />
+          <Setter Property="Opacity"
+                  Value="0.5" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ProgressBarStyle">
+      <Setter.Value>
+        <Style TargetType="ProgressBar">
+          <Setter Property="IsIndeterminate"
+                  Value="True" />
+          <Setter Property="Height"
+                  Value="15" />
+          <Setter Property="Margin"
+                  Value="8,0,8,8" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="DisplayAfter"
+            Value="00:00:00.1" />
+    <Setter Property="HorizontalAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalAlignment"
+            Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="Template"
+            Value="{StaticResource BusyIndicatorTemplate}" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 355c5ca4..98acb60e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -20,157 +20,208 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-   <!-- =============================================================================== -->
-   <!-- BusyIndicator                                                                   -->
-   <!-- =============================================================================== -->
-   <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
+  <!-- =============================================================================== -->
+  <!-- BusyIndicator                                                                   -->
+  <!-- =============================================================================== -->
+  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
 
-   <Style TargetType="{x:Type local:BusyIndicator}">
-      <Setter Property="BusyContent" Value="Please wait..." />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="OverlayStyle">
-         <Setter.Value>
-            <Style TargetType="Rectangle">
-               <Setter Property="Fill" Value="White" />
-               <Setter Property="Opacity" Value="0.5" />
-            </Style>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="ProgressBarStyle">
-         <Setter.Value>
-            <Style TargetType="ProgressBar">
-               <Setter Property="IsIndeterminate" Value="True" />
-               <Setter Property="Height" Value="15" />
-               <Setter Property="Margin" Value="8,0,8,8" />
-            </Style>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="DisplayAfter" Value="00:00:00.1" />
-      <Setter Property="HorizontalAlignment" Value="Stretch" />
-      <Setter Property="VerticalAlignment" Value="Stretch" />
-      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-      <Setter Property="VerticalContentAlignment" Value="Stretch" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="VisibilityStates">
-                        <VisualState x:Name="Hidden">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Visible">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                     <VisualStateGroup x:Name="BusyStatusStates">
-                        <VisualState x:Name="Idle">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <sys:Boolean>True</sys:Boolean>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Busy">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <sys:Boolean>False</sys:Boolean>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
-                  <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
-                  <ContentPresenter x:Name="busycontent">
-                     <ContentPresenter.Content>
-                        <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                           <Border Background="White" BorderThickness="1" CornerRadius="2">
-                              <Border.BorderBrush>
-                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                                    <GradientStop Color="#FF718597" Offset="0.375" />
-                                    <GradientStop Color="#FF617584" Offset="1" />
-                                 </LinearGradientBrush>
-                              </Border.BorderBrush>
-                              <Border CornerRadius="1.5" Margin="1">
-                                 <Border.Background>
-                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                       <GradientStop Color="#FFF6F8F9" Offset="0.02" />
-                                       <GradientStop Color="#FFB8B8B8" Offset="0.996" />
-                                    </LinearGradientBrush>
-                                 </Border.Background>
-                                 <Grid x:Name="_grid" 
-                                       MinWidth="150">
-                                    <Grid.RowDefinitions>
-                                       <RowDefinition />
-                                       <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <ContentPresenter x:Name="busyContent"
-                                                      Content="{TemplateBinding BusyContent}"
-                                                      ContentTemplate="{TemplateBinding BusyContentTemplate}"
-                                                      HorizontalAlignment="Center"
-                                                      Margin="8" />
-                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" >
-                                       <ProgressBar.Width>
-                                          <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
-                                             <Binding Path="ActualWidth"
-                                                      ElementName="busyContent" />
-                                             <Binding Path="MinWidth"
-                                                      ElementName="_grid" />
-                                          </MultiBinding>
-                                       </ProgressBar.Width>
-                                    </ProgressBar>
-                                 </Grid>
-                              </Border>
-                           </Border>
-                        </Grid>
-                     </ContentPresenter.Content>
-                  </ContentPresenter>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <Style TargetType="{x:Type local:BusyIndicator}">
+    <Setter Property="BusyContent"
+            Value="Please wait..." />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="OverlayStyle">
+      <Setter.Value>
+        <Style TargetType="Rectangle">
+          <Setter Property="Fill"
+                  Value="White" />
+          <Setter Property="Opacity"
+                  Value="0.5" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ProgressBarStyle">
+      <Setter.Value>
+        <Style TargetType="ProgressBar">
+          <Setter Property="IsIndeterminate"
+                  Value="True" />
+          <Setter Property="Height"
+                  Value="15" />
+          <Setter Property="Margin"
+                  Value="8,0,8,8" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="DisplayAfter"
+            Value="00:00:00.1" />
+    <Setter Property="HorizontalAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalAlignment"
+            Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
+          <Grid>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="VisibilityStates">
+                <VisualState x:Name="Hidden">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="busycontent"
+                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Collapsed</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="overlay"
+                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Collapsed</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Visible">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="busycontent"
+                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="overlay"
+                                                   Storyboard.TargetProperty="(UIElement.Visibility)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="BusyStatusStates">
+                <VisualState x:Name="Idle">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="content"
+                                                   Storyboard.TargetProperty="(Control.IsEnabled)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <sys:Boolean>True</sys:Boolean>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Busy">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                   Duration="00:00:00.001"
+                                                   Storyboard.TargetName="content"
+                                                   Storyboard.TargetProperty="(Control.IsEnabled)">
+                      <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                        <DiscreteObjectKeyFrame.Value>
+                          <sys:Boolean>False</sys:Boolean>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <ContentControl x:Name="content"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            IsTabStop="False"
+                            Focusable="False" />
+            <Rectangle x:Name="overlay"
+                       Style="{TemplateBinding OverlayStyle}" />
+            <ContentPresenter x:Name="busycontent">
+              <ContentPresenter.Content>
+                <Grid HorizontalAlignment="Center"
+                      VerticalAlignment="Center">
+                  <Border Background="White"
+                          BorderThickness="1"
+                          CornerRadius="2">
+                    <Border.BorderBrush>
+                      <LinearGradientBrush StartPoint="0.5,0"
+                                           EndPoint="0.5,1">
+                        <GradientStop Color="#FFA3AEB9"
+                                      Offset="0" />
+                        <GradientStop Color="#FF8399A9"
+                                      Offset="0.375" />
+                        <GradientStop Color="#FF718597"
+                                      Offset="0.375" />
+                        <GradientStop Color="#FF617584"
+                                      Offset="1" />
+                      </LinearGradientBrush>
+                    </Border.BorderBrush>
+                    <Border CornerRadius="1.5"
+                            Margin="1">
+                      <Border.Background>
+                        <LinearGradientBrush StartPoint="0.5,0"
+                                             EndPoint="0.5,1">
+                          <GradientStop Color="#FFF6F8F9"
+                                        Offset="0.02" />
+                          <GradientStop Color="#FFB8B8B8"
+                                        Offset="0.996" />
+                        </LinearGradientBrush>
+                      </Border.Background>
+                      <Grid x:Name="_grid"
+                            MinWidth="150">
+                        <Grid.RowDefinitions>
+                          <RowDefinition />
+                          <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <ContentPresenter x:Name="busyContent"
+                                          Content="{TemplateBinding BusyContent}"
+                                          ContentTemplate="{TemplateBinding BusyContentTemplate}"
+                                          HorizontalAlignment="Center"
+                                          Margin="8" />
+                        <ProgressBar Grid.Row="1"
+                                     Style="{TemplateBinding ProgressBarStyle}">
+                          <ProgressBar.Width>
+                            <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
+                              <Binding Path="ActualWidth"
+                                       ElementName="busyContent" />
+                              <Binding Path="MinWidth"
+                                       ElementName="_grid" />
+                            </MultiBinding>
+                          </ProgressBar.Width>
+                        </ProgressBar>
+                      </Grid>
+                    </Border>
+                  </Border>
+                </Grid>
+              </ContentPresenter.Content>
+            </ContentPresenter>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
index a6800826..8eb02cd3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -304,6 +304,7 @@ namespace Xceed.Wpf.Toolkit
       SetButtonUsage();
     }
 
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
index 2497238d..ed8ad412 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -19,91 +19,132 @@
                     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 x:Name="PART_DecreaseButton"
-                                   Grid.Row="1"
-                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                            </Grid>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+
+  <!-- =============================================================================== -->
+  <!-- ButtonSpinner                                                                   -->
+  <!-- =============================================================================== -->
+
+  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+  <Style TargetType="{x:Type local:ButtonSpinner}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="IsTabStop"
+            Value="True" />
+    <Setter Property="Padding"
+            Value="1" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+          <Border x:Name="Border"
+                  SnapsToDevicePixels="True"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="firstContentColumn"
+                                  Width="*" />
+                <ColumnDefinition x:Name="secondContentColumn"
+                                  Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter x:Name="contentPresenter"
+                                Focusable="False"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+              <Grid x:Name="gridContent"
+                    Grid.Column="1"
+                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <RepeatButton x:Name="PART_IncreaseButton"
+                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                              IsTabStop="{TemplateBinding IsTabStop}"
+                              ContentTemplate="{StaticResource IncreaseGlyphNormalKey}">
+                </RepeatButton>
+
+                <RepeatButton x:Name="PART_DecreaseButton"
+                              Grid.Row="1"
+                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                              IsTabStop="{TemplateBinding IsTabStop}"
+                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}">
+                </RepeatButton>
+
+              </Grid>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+            </Trigger>
+            <Trigger SourceName="PART_IncreaseButton"
+                     Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="PART_IncreaseButton"
+                      Property="ContentTemplate"
+                      Value="{StaticResource IncreaseGlyphDisabledKey}" />
+            </Trigger>
+            <Trigger SourceName="PART_DecreaseButton"
+                     Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="PART_DecreaseButton"
+                      Property="ContentTemplate"
+                      Value="{StaticResource DecreaseGlyphDisabledKey}" />
+            </Trigger>
+            <Trigger Property="ButtonSpinnerLocation"
+                     Value="Left">
+              <Setter TargetName="firstContentColumn"
+                      Property="Width"
+                      Value="Auto" />
+              <Setter TargetName="secondContentColumn"
+                      Property="Width"
+                      Value="*" />
+              <Setter TargetName="contentPresenter"
+                      Property="Grid.Column"
+                      Value="1" />
+              <Setter TargetName="gridContent"
+                      Property="Grid.Column"
+                      Value="0" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
index 72c4f0c5..914e129c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -19,83 +19,119 @@
                     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 x:Name="PART_DecreaseButton"
-                                   Grid.Row="1"
-                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                     </Grid>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <!-- =============================================================================== -->
+  <!-- ButtonSpinner                                                                   -->
+  <!-- =============================================================================== -->
+
+  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+  <Style TargetType="{x:Type local:ButtonSpinner}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="IsTabStop"
+            Value="True" />
+    <Setter Property="Padding"
+            Value="1" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+          <Border x:Name="Border"
+                  SnapsToDevicePixels="True"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="firstContentColumn"
+                                  Width="*" />
+                <ColumnDefinition x:Name="secondContentColumn"
+                                  Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter x:Name="contentPresenter"
+                                Focusable="False"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+              <Grid x:Name="gridContent"
+                    Grid.Column="1"
+                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <RepeatButton x:Name="PART_IncreaseButton"
+                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                              IsTabStop="{TemplateBinding IsTabStop}"
+                              ContentTemplate="{StaticResource IncreaseGlyphNormalKey}">
+                </RepeatButton>
+
+                <RepeatButton x:Name="PART_DecreaseButton"
+                              Grid.Row="1"
+                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                              IsTabStop="{TemplateBinding IsTabStop}"
+                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" >
+                </RepeatButton>
+
+              </Grid>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Background"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+            </Trigger>
+            <Trigger SourceName="PART_IncreaseButton"
+                     Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="PART_IncreaseButton"
+                      Property="ContentTemplate"
+                      Value="{StaticResource IncreaseGlyphDisabledKey}" />
+            </Trigger>
+            <Trigger SourceName="PART_DecreaseButton"
+                     Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="PART_DecreaseButton"
+                      Property="ContentTemplate"
+                      Value="{StaticResource DecreaseGlyphDisabledKey}" />
+            </Trigger>
+            <Trigger Property="ButtonSpinnerLocation"
+                     Value="Left">
+              <Setter TargetName="firstContentColumn"
+                      Property="Width"
+                      Value="Auto" />
+              <Setter TargetName="secondContentColumn"
+                      Property="Width"
+                      Value="*" />
+              <Setter TargetName="contentPresenter"
+                      Property="Grid.Column"
+                      Value="1" />
+              <Setter TargetName="gridContent"
+                      Property="Grid.Column"
+                      Value="0" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
index 4e21124f..ec48e247 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -270,6 +270,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
index 9edea9e0..6058039e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -20,247 +20,387 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-    </Style>
-
-    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Background" Value="Pink" />
-    </Style>
-
-    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Background" Value="#FFE8E8E8" />
-    </Style>
-
-
-    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MC"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MR" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Back" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
-
-            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Cancel" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorClearButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Clear"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
-
-            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MS"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MAdd"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
-
-            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MSub"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Negate"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Sqrt"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Seven"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Eight"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Nine"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Divide"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Percent"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Four"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Five"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Six"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Multiply"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Fraction"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="One"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Two"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Three"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Subtract"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
-					  local:Calculator.CalculatorButtonType="Equal"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Zero"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Decimal"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Add"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:Calculator}">
-        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Calculator}">
-                    <Border Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       CornerRadius="0">
-                        <Grid Margin="10">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1">
-                                <StackPanel>
-                                    <Path Stretch="Fill"
-                                 Height="9"
-                                 Width="9"
-                                 Fill="DarkGray"
-                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Top"                                              
-                                 Margin="4,4,0,0"
-                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
-                                    <TextBlock FontSize="18"
-                                      HorizontalAlignment="Right"
-                                      Margin="0,0,4,0"
-                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1"
-                                            Template="{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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+  <Style x:Key="CalculatorOperatorButtonStyle"
+         TargetType="{x:Type Button}">
+    <Setter Property="Focusable"
+            Value="False" />
+  </Style>
+
+  <Style x:Key="CalculatorClearButtonStyle"
+         TargetType="{x:Type Button}">
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="Background"
+            Value="Pink" />
+  </Style>
+
+  <Style x:Key="CalculatorDigitButtonStyle"
+         TargetType="{x:Type Button}">
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="Background"
+            Value="#FFE8E8E8" />
+  </Style>
+
+
+  <ControlTemplate x:Key="CalculatorButtonPanel"
+                   TargetType="{x:Type ContentControl}">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <Button Grid.Column="0"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MC"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MR"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Back"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}"
+              Grid.RowSpan="1">
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Cancel"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorClearButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Clear"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorClearButtonStyle}"
+              Grid.ColumnSpan="1"
+              Grid.RowSpan="1">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MS"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MAdd"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}"
+              Margin="0">
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MSub"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Negate"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Sqrt"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Seven"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Eight"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Nine"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Divide"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Percent"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Four"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Five"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Six"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Multiply"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Fraction"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="One"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Two"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Three"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Subtract"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="8"
+              Grid.RowSpan="3"
+              MinWidth="28"
+              MinHeight="55"
+              local:Calculator.CalculatorButtonType="Equal"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="10"
+              Grid.ColumnSpan="3"
+              MinWidth="59"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Zero"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="10"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Decimal"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}">
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="10"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Add"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}">
+      </Button>
+    </Grid>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:Calculator}">
+    <Setter Property="Background"
+            Value="{StaticResource PanelBackgroundBrush}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:Calculator}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="0">
+            <Grid Margin="10">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border x:Name="PART_Display"
+                      Margin="0,0,0,10"
+                      Background="White"
+                      BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}"
+                      BorderThickness="1">
+                <StackPanel>
+                  <Path Stretch="Fill"
+                        Height="9"
+                        Width="9"
+                        Fill="DarkGray"
+                        Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Margin="4,4,0,0"
+                        Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                  <TextBlock FontSize="18"
+                             HorizontalAlignment="Right"
+                             Margin="0,0,4,0"
+                             Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}">
+                  </TextBlock>
+                </StackPanel>
+              </Border>
+              <ContentControl x:Name="PART_CalculatorButtonPanel"
+                              Grid.Row="1"
+                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource CalculatorButtonPanel}}"
+                              DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_Display"
+                      Property="Background"
+                      Value="Azure" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
index 278d13ac..ad78aba3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -19,783 +19,812 @@
                     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}"
+  <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="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}"
+                          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="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 Grid.Column="2"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MR"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Back"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}"
-                 Grid.RowSpan="1" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Cancel"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorClearButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Clear"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorClearButtonStyle}"
-                 Grid.ColumnSpan="1"
-                 Grid.RowSpan="1" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MS"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MAdd"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}"
-                 Margin="0" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MSub"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Negate"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Sqrt"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Seven"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Eight"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Nine"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Divide"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Percent"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Four"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Five"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Six"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Multiply"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Fraction"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="One"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Two"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Three"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Subtract"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="8"
-                 Grid.RowSpan="3"
-                 MinWidth="28"
-                 MinHeight="55"
-                 local:Calculator.CalculatorButtonType="Equal"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="10"
-                 Grid.ColumnSpan="3"
-                 MinWidth="59"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Zero"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="10"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Decimal"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="10"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Add"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-      </Grid>
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:Calculator}">
-      <Setter Property="Background">
-         <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}}" />
-                        </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>
+                          CornerRadius="1"
+                          Margin="1"
+                          Opacity="0">
+                    <Border.Background>
+                      <LinearGradientBrush EndPoint="0.5,1"
+                                           StartPoint="0.5,0">
+                        <GradientStop Color="#FF9CA2AB"
+                                      Offset="0" />
+                        <GradientStop Color="#FF9CA2AB"
+                                      Offset="1" />
+                      </LinearGradientBrush>
+                    </Border.Background>
+                    <Border BorderThickness="0"
+                            CornerRadius="1"
+                            Margin="2">
+                      <Border.Background>
+                        <LinearGradientBrush EndPoint="0.5,1"
+                                             StartPoint="0.5,0">
+                          <GradientStop Color="#FFEDF1F7"
+                                        Offset="0" />
+                          <GradientStop Color="#FFD5DBE3"
+                                        Offset="1" />
+                        </LinearGradientBrush>
+                      </Border.Background>
+                    </Border>
+                  </Border>
+                </Grid>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_MouseOver"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2"
+                      Background="#FF9CA2AB">
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1">
+                  <Border.Background>
+                    <LinearGradientBrush EndPoint="0.5,1"
+                                         StartPoint="0.5,0">
+                      <GradientStop Color="#FFFDFEFF"
+                                    Offset="0" />
+                      <GradientStop Color="#FFD9DFE8"
+                                    Offset="1" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_Pressed"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2"
+                      Background="#FF90959D">
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1"
+                        Background="#FFB5BBC5" />
+              </Border>
+            </Grid>
+            <ContentPresenter x:Name="contentPresenter"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="CalculatorClearButtonStyle"
+         TargetType="{x:Type Button}">
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="Foreground"
+            Value="#FFBF5254" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type Button}">
+          <Grid x:Name="Control">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="MouseOver">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="0" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_MouseOver"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="1" />
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Pressed">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="0" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Pressed"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="1" />
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Disabled">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To=".5" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="contentPresenter"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To=".5" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border Background="White"
+                    BorderBrush="{x:Null}"
+                    BorderThickness="0"
+                    CornerRadius="2"
+                    Margin="0,0,0,-1"
+                    Opacity="0.5" />
+            <Grid x:Name="PART_Default">
+              <Border BorderThickness="0"
+                      CornerRadius="2">
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0.5,1"
+                                       StartPoint="0.5,0">
+                    <GradientStop Color="#FFC19497"
+                                  Offset="0" />
+                    <GradientStop Color="#FFA67D80"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1">
+                  <Border.Background>
+                    <LinearGradientBrush EndPoint="0.5,1"
+                                         StartPoint="0.5,0">
+                      <GradientStop Color="#FFFDB8B8"
+                                    Offset="0" />
+                      <GradientStop Color="#FFF39998"
+                                    Offset="1" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_MouseOver"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2">
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0.5,1"
+                                       StartPoint="0.5,0">
+                    <GradientStop Color="#FFC19497"
+                                  Offset="0" />
+                    <GradientStop Color="#FFA67D80"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1">
+                  <Border.Background>
+                    <LinearGradientBrush EndPoint="0.5,1"
+                                         StartPoint="0.5,0">
+                      <GradientStop Color="#FFFEC9C9"
+                                    Offset="0" />
+                      <GradientStop Color="#FFEAA4A3"
+                                    Offset="1" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_Pressed"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2"
+                      Background="#FF9B6F72">
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1"
+                        Background="#FFE69197" />
+              </Border>
+            </Grid>
+            <ContentPresenter x:Name="contentPresenter"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="CalculatorDigitButtonStyle"
+         TargetType="{x:Type Button}">
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="Foreground"
+            Value="#FF2A313A" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type Button}">
+          <Grid x:Name="Control">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="MouseOver">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="0" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_MouseOver"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="1" />
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Pressed">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="0" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Pressed"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To="1" />
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Disabled">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="PART_Default"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To=".5" />
+                    <DoubleAnimation Duration="0"
+                                     Storyboard.TargetName="contentPresenter"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To=".5" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border BorderBrush="{x:Null}"
+                    BorderThickness="0"
+                    Background="White"
+                    CornerRadius="3"
+                    Margin="0,0,0,-1"
+                    Opacity="0.5" />
+            <Grid x:Name="PART_Default">
+              <Border BorderThickness="0"
+                      CornerRadius="2">
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0.5,1"
+                                       StartPoint="0.5,0">
+                    <GradientStop Color="#FFA9AAAB"
+                                  Offset="0" />
+                    <GradientStop Color="#FF98999A"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1">
+                  <Border.Background>
+                    <LinearGradientBrush EndPoint="0.5,1"
+                                         StartPoint="0.5,0">
+                      <GradientStop Color="#FFF6F7F7"
+                                    Offset="0" />
+                      <GradientStop Color="#FFDEE0E2"
+                                    Offset="1" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_MouseOver"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2">
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0.5,1"
+                                       StartPoint="0.5,0">
+                    <GradientStop Color="#FFA9AAAB"
+                                  Offset="0" />
+                    <GradientStop Color="#FF98999A"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1">
+                  <Border.Background>
+                    <LinearGradientBrush EndPoint="0.5,1"
+                                         StartPoint="0.5,0">
+                      <GradientStop Color="#FFFCFCFC"
+                                    Offset="0" />
+                      <GradientStop Color="#FFEEEFF2"
+                                    Offset="1" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+              </Border>
+            </Grid>
+            <Grid x:Name="PART_Pressed"
+                  Opacity="0">
+              <Border BorderThickness="0"
+                      CornerRadius="2"
+                      Background="#FF87888A">
+                <Border BorderThickness="0"
+                        CornerRadius="1"
+                        Margin="1"
+                        Background="#FFB5BBC5" />
+              </Border>
+            </Grid>
+            <ContentPresenter x:Name="contentPresenter"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+
+  <ControlTemplate x:Key="CalculatorButtonPanel"
+                   TargetType="{x:Type ContentControl}">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="3" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+        <RowDefinition Height="3" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <Button Grid.Column="0"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MC"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MR"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Back"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}"
+              Grid.RowSpan="1" >
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Cancel"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorClearButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Clear"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorClearButtonStyle}"
+              Grid.ColumnSpan="1"
+              Grid.RowSpan="1" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MS"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MAdd"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}"
+              Margin="0" >
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="0"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="MSub"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Negate"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="2"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Sqrt"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Seven"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Eight"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Nine"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Divide"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="4"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Percent"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Four"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Five"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Six"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Multiply"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="6"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Fraction"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="One"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="2"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Two"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Three"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="8"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Subtract"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="8"
+              Grid.Row="8"
+              Grid.RowSpan="3"
+              MinWidth="28"
+              MinHeight="55"
+              local:Calculator.CalculatorButtonType="Equal"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="0"
+              Grid.Row="10"
+              Grid.ColumnSpan="3"
+              MinWidth="59"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Zero"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="4"
+              Grid.Row="10"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Decimal"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorDigitButtonStyle}" >
+      </Button>
+
+      <Button Grid.Column="6"
+              Grid.Row="10"
+              MinWidth="28"
+              MinHeight="26"
+              local:Calculator.CalculatorButtonType="Add"
+              Command="local:CalculatorCommands.CalculatorButtonClick"
+              Style="{StaticResource CalculatorOperatorButtonStyle}" >
+      </Button>
+    </Grid>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:Calculator}">
+    <Setter Property="Background">
+      <Setter.Value>
+        <LinearGradientBrush EndPoint="0.5,1"
+                             StartPoint="0.5,0">
+          <GradientStop Color="#FFFAFBFB"
+                        Offset="0" />
+          <GradientStop Color="#FFF4F4F4"
+                        Offset="1" />
+        </LinearGradientBrush>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="BorderBrush"
+            Value="#FF949494" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:Calculator}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="3">
+            <Grid Margin="10">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border x:Name="PART_Display"
+                      Margin="0,0,0,10"
+                      Background="White"
+                      BorderBrush="#FF949494"
+                      BorderThickness="1">
+                <StackPanel>
+                  <Path Stretch="Fill"
+                        Height="9"
+                        Width="9"
+                        Fill="DarkGray"
+                        Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Margin="4,4,0,0"
+                        Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                  <TextBlock FontSize="18"
+                             HorizontalAlignment="Right"
+                             Margin="0,0,4,0"
+                             Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" >
+                  </TextBlock>
+                </StackPanel>
+              </Border>
+              <ContentControl x:Name="PART_CalculatorButtonPanel"
+                              Grid.Row="1"
+                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource CalculatorButtonPanel}}"
+                              DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_Display"
+                      Property="Background"
+                      Value="#E7F5FF" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
index 8c374919..0160991c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -22,167 +22,201 @@
                     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}}" />
-                        </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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
+    <ContentControl Content="{Binding}"
+                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                    Focusable="False"
+                    Margin="0,0,3,0" />
+  </DataTemplate>
+
+  <Style x:Key="CalculatorToggleButtonStyle"
+         TargetType="ToggleButton">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Grid SnapsToDevicePixels="True">
+            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                 CornerRadius="0"
+                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                 RenderPressed="{TemplateBinding IsPressed}">
+
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                <Grid x:Name="arrowGlyph"
+                      IsHitTestVisible="False"
+                      Grid.Column="1"
+                      Margin="5">
+                  <Path x:Name="Arrow"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Grid>
+            </chrome:ButtonChrome>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =============================================================================== -->
+  <!-- CalculatorUpDown                                                                -->
+  <!-- =============================================================================== -->
+
+  <Style TargetType="{x:Type local:CalculatorUpDown}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1,1,0,1" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Right" />
+    <Setter Property="TextAlignment"
+            Value="Right" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+          <Grid>
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <local:ButtonSpinner x:Name="PART_Spinner"
+                                   IsTabStop="False"
+                                   Background="{TemplateBinding Background}"
+                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                   BorderBrush="{TemplateBinding BorderBrush}"
+                                   ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                                   AllowSpin="{TemplateBinding AllowSpin}"
+                                   ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                   VerticalContentAlignment="Stretch"
+                                   HorizontalAlignment="Stretch">
+                <local:WatermarkTextBox x:Name="PART_TextBox"
+                                        BorderThickness="0"
+                                        Background="{TemplateBinding Background}"
+                                        ContextMenu="{TemplateBinding ContextMenu}"
+                                        FontFamily="{TemplateBinding FontFamily}"
+                                        FontSize="{TemplateBinding FontSize}"
+                                        FontStretch="{TemplateBinding FontStretch}"
+                                        FontStyle="{TemplateBinding FontStyle}"
+                                        FontWeight="{TemplateBinding FontWeight}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                        IsTabStop="True"
+                                        MinWidth="20"
+                                        AcceptsReturn="False"
+                                        Padding="{TemplateBinding Padding}"
+                                        AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}"
+                                        AutoMoveFocus="{TemplateBinding AutoMoveFocus}"
+                                        TextAlignment="{TemplateBinding TextAlignment}"
+                                        TextWrapping="NoWrap"
+                                        TabIndex="{TemplateBinding TabIndex}"
+                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Watermark="{TemplateBinding Watermark}"
+                                        WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+              </local:ButtonSpinner>
+              <ToggleButton x:Name="_calculatorToggleButton"
+                            Grid.Column="1"
+                            Focusable="False"
+                            IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource CalculatorToggleButtonStyle}"
+                            IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+              </ToggleButton>
+            </Grid>
+            <Popup x:Name="PART_CalculatorPopup"
+                   IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                   StaysOpen="False"
+                   ToolTip="{x:Static sys:String.Empty}">
+              <Popup.Resources>
+                <Style TargetType="ToolTip">
+                  <Style.Triggers>
+                    <Trigger Property="Content"
+                             Value="{x:Static sys:String.Empty}">
+                      <Setter Property="Visibility"
+                              Value="Collapsed" />
+                    </Trigger>
+                  </Style.Triggers>
+                </Style>
+              </Popup.Resources>
+              <Border BorderThickness="1"
+                      Background="{StaticResource PanelBackgroundBrush}"
+                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
+                      Padding="3">
+                <StackPanel>
+                  <local:Calculator x:Name="PART_Calculator"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
+                </StackPanel>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=PART_TextBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
index 2bed476b..3f3b0b28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -22,173 +22,208 @@
                     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" />
+  <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>
-                </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}}" />
-                  <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>
+                  </Style.Triggers>
+                </Style>
+              </Popup.Resources>
+              <Border BorderThickness="1"
+                      Background="{StaticResource PopupBackgroundBrush}"
+                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
+                      Padding="3">
+                <StackPanel>
+                  <local:Calculator x:Name="PART_Calculator"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
+                </StackPanel>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
index 442471ad..67944a0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -18,10 +18,8 @@ using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Windows.Controls;
-using System.Collections;
 using System.Collections.Generic;
 using System.Windows.Controls.Primitives;
 
@@ -214,6 +212,7 @@ namespace Xceed.Wpf.Toolkit
         _popup.Opened += Popup_Opened;
     }
 
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
index 4638e003..486199ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -21,189 +21,191 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+  <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>
+  <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" />
-                     <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>
+              <TextBox x:Name="TextBox"
+                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                       Foreground="{TemplateBinding Foreground}"
+                       BorderThickness="0"
+                       Background="Transparent"
+                       IsReadOnly="True"
+                       Focusable="False"
+                       Cursor="Arrow"
+                       Margin="{TemplateBinding Padding}"
+                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                       HorizontalScrollBarVisibility="Hidden"
+                       VerticalScrollBarVisibility="Hidden" >
+              </TextBox>
+              <Grid Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                <Path x:Name="Arrow"
+                      Data="{StaticResource DownArrowGeometry}"
+                      Fill="Black"
+                      HorizontalAlignment="Center"
+                      Margin="3,0,3,0"
+                      VerticalAlignment="Center" />
+              </Grid>
+            </Grid>
+          </chrome:ButtonChrome>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked"
+                     Value="true">
+              <Setter Property="RenderPressed"
+                      TargetName="Chrome"
+                      Value="true" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+            </Trigger>
+            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="False"
+                      TargetName="TextBox" />
+              <Setter Property="Focusable"
+                      Value="True"
+                      TargetName="TextBox" />
+              <Setter Property="Cursor"
+                      Value="{x:Null}"
+                      TargetName="TextBox" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-   <Style TargetType="{x:Type local:CheckComboBox}">
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-      <Setter Property="BorderThickness"
-              Value="1" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-              Value="Auto" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-              Value="Auto" />
-      <Setter Property="Padding"
-              Value="2" />
-      <Setter Property="ScrollViewer.CanContentScroll"
-              Value="true" />
-      <Setter Property="ScrollViewer.PanningMode"
-              Value="Both" />
-      <Setter Property="Stylus.IsFlicksEnabled"
-              Value="False" />
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-      <Setter Property="HorizontalContentAlignment"
-              Value="Stretch" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-               <Grid x:Name="MainGrid"
-                     SnapsToDevicePixels="true">
-                  <Popup x:Name="PART_Popup"
-                         AllowsTransparency="true"
-                         IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                         StaysOpen="False"
-                         Margin="1"
-                         PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-                         Placement="Bottom">
-                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                        <Border x:Name="DropDownBorder"
-                                MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                                BorderThickness="1"
-                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                           <ScrollViewer x:Name="DropDownScrollViewer">
-                              <Grid RenderOptions.ClearTypeHint="Enabled">
-                                 <Canvas HorizontalAlignment="Left"
-                                         Height="0"
-                                         VerticalAlignment="Top"
-                                         Width="0">
-                                    <Rectangle x:Name="OpaqueRect"
-                                               Fill="{Binding Background, ElementName=DropDownBorder}"
-                                               Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                               Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                                 </Canvas>
-                                 <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                                 KeyboardNavigation.DirectionalNavigation="Contained"
-                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                              </Grid>
-                           </ScrollViewer>
-                        </Border>
-                     </Grid>
-                  </Popup>
+  <Style TargetType="{x:Type local:CheckComboBox}">
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
+            Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
+            Value="Auto" />
+    <Setter Property="Padding"
+            Value="2" />
+    <Setter Property="ScrollViewer.CanContentScroll"
+            Value="true" />
+    <Setter Property="ScrollViewer.PanningMode"
+            Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled"
+            Value="False" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+          <Grid x:Name="MainGrid"
+                SnapsToDevicePixels="true">
+            <Popup x:Name="PART_Popup"
+                   AllowsTransparency="true"
+                   IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                   StaysOpen="False"
+                   Margin="1"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
+                   Placement="Bottom">
+              <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                <Border x:Name="DropDownBorder"
+                        MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
+                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                        BorderThickness="1"
+                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                  <ScrollViewer x:Name="DropDownScrollViewer">
+                    <Grid RenderOptions.ClearTypeHint="Enabled">
+                      <Canvas HorizontalAlignment="Left"
+                              Height="0"
+                              VerticalAlignment="Top"
+                              Width="0">
+                        <Rectangle x:Name="OpaqueRect"
+                                   Fill="{Binding Background, ElementName=DropDownBorder}"
+                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
+                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                      </Canvas>
+                      <ItemsPresenter x:Name="PART_ItemsPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Contained"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </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}}" />
-               </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>
+            <Border  Background="{TemplateBinding Background}"
+                     BorderBrush="{TemplateBinding BorderBrush}"
+                     BorderThickness="{TemplateBinding BorderThickness}" />
+            <ToggleButton x:Name="PART_DropDownButton"
+                          Content="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          Focusable="False"
+                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                          Style="{StaticResource ComboBoxToggleButton}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+            </ToggleButton>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
index d957d50d..52cb288c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -20,180 +20,182 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <SolidColorBrush x:Key="ButtonNormalBorder"
-                    Color="#FF707070" />
+  <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>
+  <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>
+  <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" />
-                     <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>
+              <TextBox x:Name="TextBox"
+                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                       Foreground="{TemplateBinding Foreground}"
+                       IsReadOnly="True"
+                       Focusable="False"
+                       Cursor="Arrow"
+                       BorderThickness="0"
+                       Background="Transparent"
+                       Margin="{TemplateBinding Padding}"
+                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                       HorizontalScrollBarVisibility="Hidden"
+                       VerticalScrollBarVisibility="Hidden" >
+              </TextBox>
+              <Grid Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                <Path x:Name="Arrow"
+                      Data="{StaticResource DownArrowGeometry}"
+                      Fill="Black"
+                      HorizontalAlignment="Center"
+                      Margin="3,0,3,0"
+                      VerticalAlignment="Center" />
+              </Grid>
+            </Grid>
+          </chrome:ButtonChrome>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked"
+                     Value="true">
+              <Setter Property="RenderPressed"
+                      TargetName="Chrome"
+                      Value="true" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+            </Trigger>
+            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="False"
+                      TargetName="TextBox" />
+              <Setter Property="Focusable"
+                      Value="True"
+                      TargetName="TextBox" />
+              <Setter Property="Cursor"
+                      Value="{x:Null}"
+                      TargetName="TextBox" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-   <Style TargetType="{x:Type local:CheckComboBox}">
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush"
-              Value="{StaticResource ButtonNormalBorder}" />
-      <Setter Property="BorderThickness"
-              Value="1" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-              Value="Auto" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-              Value="Auto" />
-      <Setter Property="Padding"
-              Value="2" />
-      <Setter Property="ScrollViewer.CanContentScroll"
-              Value="true" />
-      <Setter Property="ScrollViewer.PanningMode"
-              Value="Both" />
-      <Setter Property="Stylus.IsFlicksEnabled"
-              Value="False" />
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-      <Setter Property="HorizontalContentAlignment"
-              Value="Stretch" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-               <Grid x:Name="MainGrid"
-                     SnapsToDevicePixels="true">
-                  <Popup x:Name="PART_Popup"
-                         AllowsTransparency="true"
-                         IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                         StaysOpen="False"
-                         Margin="1"
-                         PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-                         Placement="Bottom">
-                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                        <Border x:Name="DropDownBorder"
-                                MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                                BorderThickness="1"
-                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                           <ScrollViewer x:Name="DropDownScrollViewer">
-                              <Grid RenderOptions.ClearTypeHint="Enabled">
-                                 <Canvas HorizontalAlignment="Left"
-                                         Height="0"
-                                         VerticalAlignment="Top"
-                                         Width="0">
-                                    <Rectangle x:Name="OpaqueRect"
-                                               Fill="{Binding Background, ElementName=DropDownBorder}"
-                                               Height="{Binding ActualHeight, ElementName=DropDownBorder}"
-                                               Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                                 </Canvas>
-                                 <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                                 KeyboardNavigation.DirectionalNavigation="Contained"
-                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                              </Grid>
-                           </ScrollViewer>
-                        </Border>
-                     </Grid>
-                  </Popup>
+  <Style TargetType="{x:Type local:CheckComboBox}">
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{StaticResource ButtonNormalBorder}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
+            Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
+            Value="Auto" />
+    <Setter Property="Padding"
+            Value="2" />
+    <Setter Property="ScrollViewer.CanContentScroll"
+            Value="true" />
+    <Setter Property="ScrollViewer.PanningMode"
+            Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled"
+            Value="False" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+          <Grid x:Name="MainGrid"
+                SnapsToDevicePixels="true">
+            <Popup x:Name="PART_Popup"
+                   AllowsTransparency="true"
+                   IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                   StaysOpen="False"
+                   Margin="1"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
+                   Placement="Bottom">
+              <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                <Border x:Name="DropDownBorder"
+                        MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"
+                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                        BorderThickness="1"
+                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                  <ScrollViewer x:Name="DropDownScrollViewer">
+                    <Grid RenderOptions.ClearTypeHint="Enabled">
+                      <Canvas HorizontalAlignment="Left"
+                              Height="0"
+                              VerticalAlignment="Top"
+                              Width="0">
+                        <Rectangle x:Name="OpaqueRect"
+                                   Fill="{Binding Background, ElementName=DropDownBorder}"
+                                   Height="{Binding ActualHeight, ElementName=DropDownBorder}"
+                                   Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                      </Canvas>
+                      <ItemsPresenter x:Name="PART_ItemsPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Contained"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                  </ScrollViewer>
+                </Border>
+              </Grid>
+            </Popup>
 
-                  <Border Background="{TemplateBinding Background}"
+            <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}"
-                          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}}" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                          Background="{TemplateBinding Background}"
+                          Focusable="False"
+                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                          Style="{StaticResource ComboBoxToggleButton}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
+            </ToggleButton>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
index 3796b06d..6d214bd8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -34,5 +34,10 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #endregion //Constructors
+
+    #region Base Class Override
+
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
index 082b2d6c..1c516f03 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -19,31 +19,43 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-    <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">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+  <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">
+              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index e73a1c93..1454e183 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -18,24 +18,30 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-   <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">
-                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <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">
+              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
index c669c376..ad27f8ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -24,7 +24,6 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 using Xceed.Wpf.Toolkit.Primitives;
-using System.Diagnostics;
 using Xceed.Wpf.Toolkit.Core;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
@@ -531,6 +530,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
index 7d7732bc..9a8e72db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
@@ -234,6 +234,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion
 
     #region Constructors
@@ -529,6 +532,9 @@ namespace Xceed.Wpf.Toolkit
 
         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 ];
         }
@@ -573,7 +579,11 @@ namespace Xceed.Wpf.Toolkit
         var constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
         if( constructor != null )
         {
-          collection = (IEnumerable)constructor.Invoke( null );
+          collection = ( IEnumerable )constructor.Invoke( null );
+        }
+        else if( ItemsSourceType.IsArray )
+        {
+          collection = Array.CreateInstance( ItemsSourceType.GetElementType(), Items.Count );
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
index e410e072..d7699fea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
@@ -19,6 +19,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -64,7 +65,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
+        return ( IEnumerable )GetValue( ItemsSourceProperty );
       }
       set
       {
@@ -108,6 +109,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion  //NewItemTypes
 
+    #endregion
+
+    #region Base Class Overrides
+
+
     #endregion
 
     #region Methods
@@ -115,7 +121,8 @@ namespace Xceed.Wpf.Toolkit
     private void CollectionControlButton_Click( object sender, RoutedEventArgs e )
     {
       var collectionControlDialog = new CollectionControlDialog();
-      collectionControlDialog.ItemsSource = this.ItemsSource;
+      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;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
index 8acc4792..486b29db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -24,6 +24,8 @@ 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;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -105,7 +107,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion //Properties
+    #endregion //Properties
 
 #region Constructors
 
@@ -134,7 +136,7 @@ namespace Xceed.Wpf.Toolkit
     {
       base.OnSourceInitialized( e );
 
-      //Backup data in case "Cancel" is clicked.
+      //Backup data if case "Cancel" is clicked.
       if( this.ItemsSource != null )
       {
         foreach( var item in this.ItemsSource )
@@ -184,8 +186,18 @@ namespace Xceed.Wpf.Toolkit
       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.
-      if( (this.ItemsSource is IDictionary)
+      else if( (this.ItemsSource is IDictionary)
         && sourceType.IsGenericType
         && typeof( KeyValuePair<,> ).IsAssignableFrom( sourceType.GetGenericTypeDefinition() ) )
       {
@@ -194,11 +206,23 @@ namespace Xceed.Wpf.Toolkit
       else
       {
         // Initialized a new object with default values
-        result = FormatterServices.GetUninitializedObject( sourceType );
+        try
+        {
+          result = FormatterServices.GetUninitializedObject( sourceType );
+        }
+        catch( Exception )
+        {
+        }
+
         var constructor = sourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor == null )
-          return null;
-        constructor.Invoke( result, null );
+        if( constructor != null )
+        {
+          constructor.Invoke( result, null );          
+        }
+        else
+        {
+          result = source;
+        }
       }
       Debug.Assert( result != null );
       if( result != null )
@@ -253,8 +277,16 @@ namespace Xceed.Wpf.Toolkit
             }
             else
             {
-              // copy regular object
-              propertyInfo.SetValue( result, propertyInfoValue, 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[] { propertyInfoValue } );
+              }
+              else
+              {
+                // copy regular object
+                propertyInfo.SetValue( result, propertyInfoValue, null );
+              }
             }
           }
         }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
index e255f357..d9dd11d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
@@ -195,6 +195,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Constructors
 
+    #region Overrides
+
+
+#endregion
+
     #region Methods
 
     private void PersistChanges()
@@ -208,9 +213,17 @@ namespace Xceed.Wpf.Toolkit
       //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 )
       {
-        list.Add( item );
+        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
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
index cca43984..1ddc2617 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
@@ -23,238 +23,296 @@
                     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>
+  <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" />
+  <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 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>
-                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                                  Grid.Row="1"
-                                  Margin="0,0,0,3"
-                                  HorizontalAlignment="Stretch"
-                                  DisplayMemberPath="Name">
-                                    <ComboBox.ItemsSource>
-                                        <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
-                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
-                                        </MultiBinding>
-                                    </ComboBox.ItemsSource>
-                                </ComboBox>
-                                <Button Margin="3,0,0,3"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Padding="5,0"
-                                Content="Add" 
-                                Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
-                                 <ListBox x:Name="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" />
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                            <Grid Column="1" Margin="20,0,0,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Column="1" Text="Properties:" />
-                                <pg:PropertyGrid 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}}" />
-                            </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>
+  <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>
+    </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>
+                <TextBlock Margin="0,0,0,5"
+                           Text="Select type:">
+                </TextBlock>
+                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                          Grid.Row="1"
+                          Margin="0,0,0,3"
+                          HorizontalAlignment="Stretch"
+                          DisplayMemberPath="Name">
+                  <ComboBox.ItemsSource>
+                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="ItemsSourceType" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="NewItemTypes" />
+                    </MultiBinding>
+                  </ComboBox.ItemsSource>
+                </ComboBox>
+                <Button Margin="3,0,0,3"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Padding="5,0"
+                        Content="Add"
+                        Command="New"
+                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}">
+                </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>
+                </StackPanel>
+              </Grid>
+              <Grid Column="1"
+                    Margin="20,0,0,0">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Column="1"
+                           Text="Properties:">
+                </TextBlock>
+                <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}}" />
+              </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}"/>
+  <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.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>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-   <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}" BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
+  <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>
+  <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>
+              <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>
+              <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>
+          </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}" />
+  <Style TargetType="{x:Type local:CollectionControlButton}"
+         BasedOn="{StaticResource CollectionControlButton}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
index b7af90c3..0e7d39a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
@@ -22,286 +22,290 @@
                     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>
+  <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" />
+  <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 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>
-                        <TextBlock Margin="0,0,0,5"
-                                   Text="Select type:" />
-                        <ComboBox x:Name="PART_NewItemTypesComboBox"
-                                  Grid.Row="1"
-                                  Margin="0,0,0,3"
-                                  HorizontalAlignment="Stretch"
-                                  DisplayMemberPath="Name">
-                           <ComboBox.ItemsSource>
-                              <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                                 <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                          Path="ItemsSourceType" />
-                                 <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                          Path="NewItemTypes" />
-                              </MultiBinding>
-                           </ComboBox.ItemsSource>
-                        </ComboBox>
-                        <Button Margin="3,0,0,3"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Padding="5,0"
-                                Content="Add"
-                                Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
-                        <ListBox x:Name="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" />
-                           </Button>
-                        </StackPanel>
-                     </Grid>
-                     <Grid Column="1"
-                           Margin="20,0,0,0">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <TextBlock Grid.Column="1"
-                                   Text="Properties:" />
-                        <pg:PropertyGrid 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}}" />
-                     </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 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>
+                <TextBlock Margin="0,0,0,5"
+                           Text="Select type:" >
+                </TextBlock>
+                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                          Grid.Row="1"
+                          Margin="0,0,0,3"
+                          HorizontalAlignment="Stretch"
+                          DisplayMemberPath="Name">
+                  <ComboBox.ItemsSource>
+                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="ItemsSourceType" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="NewItemTypes" />
+                    </MultiBinding>
+                  </ComboBox.ItemsSource>
+                </ComboBox>
+                <Button Margin="3,0,0,3"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Padding="5,0"
+                        Content="Add"
+                        Command="New"
+                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" >
+                </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>
+                </StackPanel>
+              </Grid>
+              <Grid Column="1"
+                    Margin="20,0,0,0">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Column="1"
+                           Text="Properties:" >
+                </TextBlock>
+                <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}}" />
+              </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 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 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>
+  <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>
+              <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>
+              <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>
+          </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}" />
+  <Style TargetType="{x:Type local:CollectionControlButton}"
+         BasedOn="{StaticResource CollectionControlButton}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
index 15419297..ac217077 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -16,7 +16,6 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -268,7 +267,13 @@ namespace Xceed.Wpf.Toolkit
       {
         if( !string.IsNullOrEmpty( retValue ) )
         {
-          ColorConverter.ConvertFromString( value );
+          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
@@ -387,6 +392,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
@@ -536,11 +544,11 @@ namespace Xceed.Wpf.Toolkit
 
       _currentColorPosition = null;
 
-      HsvColor hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
+      var hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
 
       if( _updateSpectrumSliderValue )
       {
-        _spectrumSlider.Value = hsv.H;
+        _spectrumSlider.Value = 360 - hsv.H;
       }
 
       Point p = new Point( hsv.S, 1 - hsv.V );
@@ -589,6 +597,12 @@ namespace Xceed.Wpf.Toolkit
         {
           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;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index fb0eb3d9..8d61bcbb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -92,9 +92,9 @@ namespace Xceed.Wpf.Toolkit
       _pickerBrush.EndPoint = new Point( 0.5, 1 );
       _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
 
-      List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
+      var colorsList = ColorUtilities.GenerateHsvSpectrum();
 
-      double stopIncrement = ( double )1 / colorsList.Count;
+      double stopIncrement = ( double )1 / (colorsList.Count - 1);
 
       int i;
       for( i = 0; i < colorsList.Count; i++ )
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 16d60984..4047e312 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -20,328 +20,456 @@
                     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}">
+  <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>
-         <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>
-
-    <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}" />
-                        </Grid>
-                    </Border>
-
-                    <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
-                        <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
-                    </Border>
-                </Grid>
-
-                <Border 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="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Grid.Row="0"
-                                   Grid.Column="0"
-                                   Text="R"
-                                   VerticalAlignment="Center"/>
-                        <Slider x:Name="PART_RSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="0"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="0"
-                                    Grid.Column="2"
-                                    Text="{Binding Value, ElementName=PART_RSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="1"
-                                      Grid.Column="0"
-                                      Text="G"
-                                      VerticalAlignment="Center" />
-                        <Slider x:Name="PART_GSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="1"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="1"
-                                    Grid.Column="2"
-                                    Text="{Binding Value, ElementName=PART_GSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="2"
-                                      Grid.Column="0"
-                                      Text="B"
-                                      VerticalAlignment="Center" />
-                        <Slider x:Name="PART_BSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="2"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="2"
-                                    Grid.Column="3"
-                                    Text="{Binding Value, ElementName=PART_BSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="3"
-                                      Grid.Column="0"
-                                      Text="A"
-                                      VerticalAlignment="Center"
-                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                        <Slider x:Name="PART_OpacitySlider"
-                                   Grid.Row="3"
-                                   Grid.Column="1"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center"
-                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                        <TextBox Grid.Row="3"
-                                    Grid.Column="3"
-                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                    </Grid>
-                </Border>
+          <Grid.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>
-      <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>
+      </Grid>
+    </Border>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled"
+               Value="False">
+        <Setter Property="Foreground"
+                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+      </Trigger>
+      <Trigger Property="SelectedColor"
+               Value="{x:Null}">
+        <Setter Property="Visibility"
+                Value="Collapsed"
+                TargetName="PART_ColorShadeSelector" />
+        <Setter Property="Background"
+                Value="Transparent"
+                TargetName="SelectedColorBorder" />
+        <Setter Property="IsEnabled"
+                Value="False"
+                TargetName="RGBBorder" />
+        <Setter Property="TextElement.Foreground"
+                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                TargetName="RGBBorder" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:ColorCanvas}">
+    <Setter Property="Background"
+            Value="{StaticResource PanelBackgroundBrush}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Template"
+            Value="{StaticResource ColorCanvasTemplate}" />
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index 4f671242..2c9d81f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -19,581 +19,598 @@
                     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"
+  <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"
-                             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}" />
-                        </Track.DecreaseRepeatButton>
-                        <Track.IncreaseRepeatButton>
-                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}"
-                                         Style="{StaticResource SliderRepeatButtonStyle}" />
-                        </Track.IncreaseRepeatButton>
-                        <Track.Thumb>
-                           <Thumb x:Name="Thumb"
-                                  Style="{StaticResource CustomThumbForSlider}" />
-                        </Track.Thumb>
-                     </Track>
+                             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>
-            </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}" />
-                           </Grid>
-                        </Border>
-
-                        <Border Grid.Column="1"
-                                Grid.RowSpan="2"
-                                Margin="4,-8,0,0"
-                                ClipToBounds="False">
-                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                                      VerticalAlignment="Stretch" />
-                        </Border>
-                     </Grid>
-
-                     <Border 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="Auto" />
-                           </Grid.ColumnDefinitions>
-
-                           <TextBlock Grid.Row="0"
-                                      Grid.Column="0"
-                                      Text="R"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_RSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="0"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="0"
+                </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"
-                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    Value="{Binding Value, ElementName=PART_RSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="1"
-                                      Grid.Column="0"
-                                      Text="G"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_GSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="1"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="1"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    Value="{Binding Value, ElementName=PART_GSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="2"
-                                      Grid.Column="0"
-                                      Text="B"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_BSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="2"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="2"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    Value="{Binding Value, ElementName=PART_BSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="3"
-                                      Grid.Column="0"
-                                      Text="A"
-                                      VerticalAlignment="Center"
-                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                           <Slider x:Name="PART_OpacitySlider"
-                                   Grid.Row="3"
-                                   Grid.Column="1"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center"
-                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                           <TextBox Grid.Row="3"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    Value="{Binding Value, ElementName=PART_OpacitySlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}"
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                        </Grid>
-                     </Border>
-                  </Grid>
-               </Border>
-               <ControlTemplate.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>
+                                    Background="Transparent"
+                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
+                  </local:ByteUpDown>
+                </Grid>
+              </Border>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="SelectedColor"
+                     Value="{x:Null}">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="PART_ColorShadeSelector" />
+              <Setter Property="Background"
+                      Value="Transparent"
+                      TargetName="SelectedColorBorder" />
+              <Setter Property="IsEnabled"
+                      Value="False"
+                      TargetName="RGBBorder" />
+              <Setter Property="TextElement.Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                      TargetName="RGBBorder" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+    <Setter Property="BorderBrush"
+            Value="DarkGray" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Orientation"
+            Value="Vertical" />
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+    <Setter Property="Minimum"
+            Value="0" />
+    <Setter Property="Maximum"
+            Value="360" />
+    <Setter Property="TickFrequency"
+            Value="0.001" />
+    <Setter Property="IsSnapToTickEnabled"
+            Value="True" />
+    <Setter Property="IsDirectionReversed"
+            Value="False" />
+    <Setter Property="IsMoveToPointEnabled"
+            Value="True" />
+    <Setter Property="Value"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
+          <Grid>
+            <Border BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Margin="0,8,0,0">
+              <Border x:Name="PART_TrackBackground"
+                      Width="15">
+                <Rectangle x:Name="PART_SpectrumDisplay"
+                           Stretch="Fill"
+                           VerticalAlignment="Stretch" />
+              </Border>
+            </Border>
+
+            <Track Name="PART_Track">
+              <Track.DecreaseRepeatButton>
+                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
+                              Command="Slider.DecreaseLarge" />
+              </Track.DecreaseRepeatButton>
+              <Track.IncreaseRepeatButton>
+                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
+                              Command="Slider.IncreaseLarge" />
+              </Track.IncreaseRepeatButton>
+              <Track.Thumb>
+                <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+              </Track.Thumb>
+            </Track>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index 91b87ed6..1cbe6c66 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -22,8 +22,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Windows.Controls.Primitives;
-using System.Linq;
-using System.Collections.Generic;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit
@@ -187,6 +185,23 @@ namespace Xceed.Wpf.Toolkit
 
     #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 ) );
@@ -581,7 +596,7 @@ namespace Xceed.Wpf.Toolkit
     {
       base.OnMouseUp( e );
 
-      // Close ColorPicker on MouseUp to prevent action of mouseUp on controls behind the ColorPicker.
+      // Close ColorPicker on MouseUp to prevent action of MouseUp on controls behind the ColorPicker.
       if( _selectionChanged )
       {
         CloseColorPicker( true );
@@ -589,7 +604,8 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Event Handlers
 
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 65c81a93..ca5926c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -22,474 +22,481 @@
                     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}}" />
+  <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>
-                  <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 DisplayColorAndName, 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"/>
+                </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>
-                     </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" />
-                           </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" />
-                                       <ListBox x:Name="PART_AvailableColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-
-                                 <!-- Standard Colors-->
-                                 <Grid Grid.Row="2"
-                                       Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <Grid>
-                                       <Grid.RowDefinitions>
-                                          <RowDefinition Height="Auto" />
-                                          <RowDefinition Height="Auto" />
-                                       </Grid.RowDefinitions>
-                                       <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                                  Background="AliceBlue"
-                                                  Padding="2"
-                                                  Margin="0,1,0,1" />
-                                       <ListBox x:Name="PART_StandardColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-
-                                 <!-- Recent Colors-->
-                                 <Grid Grid.Row="3"
-                                       Margin="0,1,0,1"
-                                       Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <Grid>
-                                       <Grid.RowDefinitions>
-                                          <RowDefinition Height="Auto" />
-                                          <RowDefinition Height="22" />
-                                       </Grid.RowDefinitions>
-                                       <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                                  Background="AliceBlue"
-                                                  Padding="2"
-                                                  Margin="0,1,0,1" />
-                                       <ListBox x:Name="PART_RecentColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-                              </Grid>
-                           </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}" />
+                      </Grid>
+
+                      <!-- Standard Colors-->
+                      <Grid Grid.Row="2"
+                            Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                          </Grid.RowDefinitions>
+                          <TextBlock Text="{TemplateBinding StandardColorsHeader}"
+                                     Background="AliceBlue"
+                                     Padding="2"
+                                     Margin="0,1,0,1">
+                          </TextBlock>
+                          <ListBox x:Name="PART_StandardColors"
+                                   Grid.Row="1"
+                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource ColorListStyle}">
+                          </ListBox>
+                        </Grid>
+                      </Grid>
+
+                      <!-- Recent Colors-->
+                      <Grid Grid.Row="3"
+                            Margin="0,1,0,1"
+                            Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="22" />
+                          </Grid.RowDefinitions>
+                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
+                                     Background="AliceBlue"
+                                     Padding="2"
+                                     Margin="0,1,0,1">
+                          </TextBlock>
+                          <ListBox x:Name="PART_RecentColors"
+                                   Grid.Row="1"
+                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource ColorListStyle}">
+                          </ListBox>
+                        </Grid>
+                      </Grid>
+                    </Grid>
+                  </local:ColorPickerTabItem>
+                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
+                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Template="{StaticResource TabItemTemplate}">
+                    <!-- ColorCanvas -->
+                    <Grid x:Name="_colorCanvasHost">
+                      <local:ColorCanvas Background="Transparent"
+                                         BorderThickness="0"
+                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
+                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+                    </Grid>
+                  </local:ColorPickerTabItem>
+                </TabControl>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="DisplayColorAndName"
+                     Value="True">
+              <Setter TargetName="ColorOnly"
+                      Property="Visibility"
+                      Value="Collapsed" />
+              <Setter TargetName="ColorAndName"
+                      Property="Visibility"
+                      Value="Visible" />
+            </Trigger>
+
+            <Trigger Property="ShowTabHeaders"
+                     Value="False">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="StandardTabItem" />
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="AdvancedTabItem" />
+            </Trigger>
+
+            <Trigger Property="ShowDropDownButton"
+                     Value="False">
+              <Setter Property="BorderThickness"
+                      Value="1" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+
+  <Style TargetType="{x:Type local:ColorPicker}"
+         BasedOn="{StaticResource ColorPicker}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index 8a245d96..aa31e288 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -21,393 +21,501 @@
                     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" />
+  <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>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                  </Trigger>
-                  <DataTrigger Binding="{Binding DisplayColorAndName, 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" />
+                </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>
-                </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" />
-                           </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" />
-                                    <ListBox x:Name="PART_AvailableColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-
-                              <!-- Standard Colors-->
-                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                 <Grid>
-                                    <Grid.RowDefinitions>
-                                       <RowDefinition Height="Auto" />
-                                       <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
-                                    <ListBox x:Name="PART_StandardColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-
-                              <!-- Recent Colors-->
-                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                 <Grid>
-                                    <Grid.RowDefinitions>
-                                       <RowDefinition Height="Auto" />
-                                       <RowDefinition Height="22" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
-                                    <ListBox x:Name="PART_RecentColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-                           </Grid>
-                           </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>
+                  </Style.Triggers>
+                </Style>
+              </Popup.Resources>
+              <Border BorderThickness="1"
+                      Background="{StaticResource PopupBackgroundBrush}"
+                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
+                      Padding="3">
+                <TabControl x:Name="ColorPickerTabControl"
+                            Background="Transparent"
+                            SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
+                  <local:ColorPickerTabItem x:Name="StandardTabItem"
+                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Template="{StaticResource TabItemTemplate}">
+                    <Grid x:Name="_colorPaletteHost"
+                          Margin="4">
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                      </Grid.RowDefinitions>
+
+                      <!-- Available Colors -->
+                      <Grid Grid.Row="1"
+                            Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                          </Grid.RowDefinitions>
+                          <TextBlock Text="{TemplateBinding AvailableColorsHeader}"
+                                     Background="AliceBlue"
+                                     Padding="2"
+                                     Margin="0,0,0,1" >
+                          </TextBlock>
+                          <ListBox x:Name="PART_AvailableColors"
+                                   Grid.Row="1"
+                                   ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource ColorListStyle}" >
+                          </ListBox>
+                        </Grid>
+                      </Grid>
+
+                      <!-- Standard Colors-->
+                      <Grid Grid.Row="2"
+                            Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                          </Grid.RowDefinitions>
+                          <TextBlock Text="{TemplateBinding StandardColorsHeader}"
+                                     Background="AliceBlue"
+                                     Padding="2"
+                                     Margin="0,1,0,1" >
+                          </TextBlock>
+                          <ListBox x:Name="PART_StandardColors"
+                                   Grid.Row="1"
+                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource ColorListStyle}" >
+                          </ListBox>
+                        </Grid>
+                      </Grid>
+
+                      <!-- Recent Colors-->
+                      <Grid Grid.Row="3"
+                            Margin="0,1,0,1"
+                            Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid>
+                          <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="22" />
+                          </Grid.RowDefinitions>
+                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
+                                     Background="AliceBlue"
+                                     Padding="2"
+                                     Margin="0,1,0,1" >
+                          </TextBlock>
+                          <ListBox x:Name="PART_RecentColors"
+                                   Grid.Row="1"
+                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource ColorListStyle}" >
+                          </ListBox>
+                        </Grid>
+                      </Grid>
+                    </Grid>
+                  </local:ColorPickerTabItem>
+                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
+                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Template="{StaticResource TabItemTemplate}">
+                    <!-- ColorCanvas -->
+                    <Grid x:Name="_colorCanvasHost">
+                      <local:ColorCanvas Background="Transparent"
+                                         BorderThickness="0"
+                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
+                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+                    </Grid>
+                  </local:ColorPickerTabItem>
+                </TabControl>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="DisplayColorAndName"
+                     Value="True">
+              <Setter TargetName="ColorOnly"
+                      Property="Visibility"
+                      Value="Collapsed" />
+              <Setter TargetName="ColorAndName"
+                      Property="Visibility"
+                      Value="Visible" />
+            </Trigger>
+
+            <Trigger Property="ShowTabHeaders"
+                     Value="False">
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="StandardTabItem" />
+              <Setter Property="Visibility"
+                      Value="Collapsed"
+                      TargetName="AdvancedTabItem" />
+            </Trigger>
+
+            <Trigger Property="ShowDropDownButton"
+                     Value="False">
+              <Setter Property="BorderThickness"
+                      Value="1" />
+            </Trigger>
+
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
index 4b484a13..b40f1574 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -37,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
       set
       {
         if( value < 0d || value > 1d )
-          throw new ArgumentException( "BlendedColorRatio must greater than or equal to 0 and lower than or equal to 1 " );
+          throw new ArgumentException( "BlendedColorRatio must be greater than or equal to 0 and lower than or equal to 1 " );
 
         _blendedColorRatio = value;
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index 7f9abf2e..c00f05bb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -54,10 +54,10 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     /// Converts an RGB color to an HSV color.
     /// </summary>
     /// <param name="r"></param>
-    /// <param name="b"></param>
     /// <param name="g"></param>
+    /// <param name="b"></param>
     /// <returns></returns>
-    public static HsvColor ConvertRgbToHsv( int r, int b, int g )
+    public static HsvColor ConvertRgbToHsv( int r, int g, int b )
     {
       double delta, min;
       double h = 0, s, v;
@@ -190,11 +190,12 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     /// <returns></returns>
     public static List<Color> GenerateHsvSpectrum()
     {
-      List<Color> colorsList = new List<Color>( 8 );
+      var colorsList = new List<Color>();
+      int hStep = 60;
 
-      for( int i = 0; i < 29; i++ )
+      for( int h = 0; h < 360; h+= hStep )
       {
-        colorsList.Add( ColorUtilities.ConvertHsvToRgb( i * 12, 1, 1 ) );
+        colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) );
       }
 
       colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
index bc54a7c6..de0e4f27 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -19,7 +19,9 @@ 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
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index 21f21686..169a40a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -275,6 +275,7 @@ namespace Xceed.Wpf.Toolkit
       {
         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 );
@@ -347,9 +348,9 @@ namespace Xceed.Wpf.Toolkit
     protected override void HandleKeyDown( object sender, KeyEventArgs e )
     {
       // The base call will handle the Ctrl+Down, Enter and Esc keys
-      // in order to open o r close the popup.
-      //Do not close the Calendar if the call is handled
-      //by the TimePicker inside the DateTimePicker template
+      // 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
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
index 14a5a5af..55615261 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -15,234 +15,263 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-      <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="ToggleButton">
-               <Grid SnapsToDevicePixels="True">
-                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                       CornerRadius="0"
-                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-									            RenderMouseOver="{TemplateBinding IsMouseOver}"
-									            RenderPressed="{TemplateBinding IsPressed}">
-
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                           <Path x:Name="Arrow"
-                                 Width="9"
-                                 Height="5"
-                                 Data="{StaticResource DownArrowGeometry}"
-                                 Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                 Margin="0,1,0,0"/>
-                        </Grid>
-                     </Grid>
-                  </chrome:ButtonChrome>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-
-   <!-- =============================================================================== -->
-   <!-- DateTimePicker                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type local:DateTimePicker}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-      <Setter Property="BorderThickness" Value="1,1,0,1" />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="HorizontalContentAlignment" Value="Right" />
-      <Setter Property="TextAlignment" Value="Right" />
-      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="CalendarWidth" Value="178"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-               <Border>
-                  <Grid>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <local:ButtonSpinner x:Name="PART_Spinner"
-                                             IsTabStop="False"
-                                             Background="{TemplateBinding Background}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                             HorizontalContentAlignment="Stretch"
-                                             VerticalContentAlignment="Stretch"
-                                             AllowSpin="{TemplateBinding AllowSpin}"
-                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                           <local:WatermarkTextBox x:Name="PART_TextBox"
-                                                   BorderThickness="0" 
-                                                   Background="Transparent"
-                                                   FontFamily="{TemplateBinding FontFamily}" 
-                                                   FontSize="{TemplateBinding FontSize}" 
-                                                   FontStretch="{TemplateBinding FontStretch}"
-                                                   FontStyle="{TemplateBinding FontStyle}" 
-                                                   FontWeight="{TemplateBinding FontWeight}" 
-                                                   Foreground="{TemplateBinding Foreground}" 
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   IsTabStop="True"
-                                                   MinWidth="20"
-                                                   AcceptsReturn="False"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   TextAlignment="{TemplateBinding TextAlignment}"
-                                                   TextWrapping="NoWrap" 
-                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   TabIndex="{TemplateBinding TabIndex}"
-                                                   Watermark="{TemplateBinding Watermark}"
-                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                        </local:ButtonSpinner>
-                        <ToggleButton x:Name="_calendarToggleButton"
-                                      Grid.Column="1"
-                                      Background="White"
-                                      Focusable="False"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                     </Grid>
-                     <Popup x:Name="PART_Popup" 
-                            IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" 
-                            StaysOpen="False"
-                            ToolTip="{x:Static sys:String.Empty}">
-                        <Popup.Resources>
-                           <Style TargetType="ToolTip">
-                              <Style.Triggers>
-                                 <Trigger Property="Content"
-                                          Value="{x:Static sys:String.Empty}">
-                                    <Setter Property="Visibility"
-                                            Value="Collapsed" />
-                                 </Trigger>
-                              </Style.Triggers>
-                           </Style>
-                        </Popup.Resources>
-                        <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                           <StackPanel>
-                              <Calendar x:Name="PART_Calendar"
-                                        BorderThickness="0"
-                                        DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                                 <Calendar.Template>
-                                    <ControlTemplate TargetType="{x:Type Calendar}">
-                                       <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                                          <StackPanel x:Name="PART_Root"
-                                                      HorizontalAlignment="Center">
-                                             <CalendarItem x:Name="PART_CalendarItem"
-                                                           BorderBrush="{TemplateBinding BorderBrush}"
-                                                           BorderThickness="{TemplateBinding BorderThickness}"
-                                                           Background="{TemplateBinding Background}"
-                                                           Style="{TemplateBinding CalendarItemStyle}" />
-                                          </StackPanel>
-                                       </Viewbox>
-                                    </ControlTemplate>
-                                 </Calendar.Template>
-                              </Calendar>
-                              <local:TimePicker x:Name="PART_TimeUpDown"
-                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
-                                                Format="{TemplateBinding TimeFormat}"
-                                                FormatString="{TemplateBinding TimeFormatString}"
-                                                Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                                ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                                IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                                Step="{TemplateBinding Step}"
-                                                ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                                Watermark="{TemplateBinding TimeWatermark}"
-                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                                Visibility="{TemplateBinding TimePickerVisibility}"/>
-                           </StackPanel>
-                        </Border>
-                     </Popup>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="True">
-                     <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-                  </Trigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                  Value="True">
-                     <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                     <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-                  <Trigger Property="IsFocused" Value="True">
-                     <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
-                  </Trigger>
-                  <!--Binding one-way when UpdateValueOnEnterKey is True-->
-                  <Trigger Property="UpdateValueOnEnterKey"
-                           Value="True">
-                     <Setter Property="Value"
-                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                             TargetName="PART_TimeUpDown"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
+    <ContentControl Content="{Binding}"
+                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                    Focusable="False"
+                    Margin="0,0,3,0" />
+  </DataTemplate>
+
+  <Style x:Key="DateTimePickerToggleButtonStyle"
+         TargetType="ToggleButton">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Grid SnapsToDevicePixels="True">
+            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                 CornerRadius="0"
+                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                 RenderPressed="{TemplateBinding IsPressed}">
+
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                <Grid x:Name="arrowGlyph"
+                      IsHitTestVisible="False"
+                      Grid.Column="1"
+                      Margin="5">
+                  <Path x:Name="Arrow"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Grid>
+            </chrome:ButtonChrome>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+
+  <!-- =============================================================================== -->
+  <!-- DateTimePicker                                                                  -->
+  <!-- =============================================================================== -->
+
+  <Style TargetType="{x:Type local:DateTimePicker}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1,1,0,1" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Right" />
+    <Setter Property="TextAlignment"
+            Value="Right" />
+    <Setter Property="TimeWatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="CalendarWidth"
+            Value="178" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+          <Border>
+            <Grid>
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <local:ButtonSpinner x:Name="PART_Spinner"
+                                     IsTabStop="False"
+                                     Background="{TemplateBinding Background}"
+                                     BorderThickness="{TemplateBinding BorderThickness}"
+                                     BorderBrush="{TemplateBinding BorderBrush}"
+                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                                     HorizontalContentAlignment="Stretch"
+                                     VerticalContentAlignment="Stretch"
+                                     AllowSpin="{TemplateBinding AllowSpin}"
+                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="Transparent"
+                                          FontFamily="{TemplateBinding FontFamily}"
+                                          FontSize="{TemplateBinding FontSize}"
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}"
+                                          FontWeight="{TemplateBinding FontWeight}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
+                                          IsTabStop="True"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                </local:ButtonSpinner>
+                <ToggleButton x:Name="_calendarToggleButton"
+                              Grid.Column="1"
+                              Background="White"
+                              Focusable="False"
+                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
+                </ToggleButton>
+              </Grid>
+              <Popup x:Name="PART_Popup"
+                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
+                     StaysOpen="False"
+                     ToolTip="{x:Static sys:String.Empty}">
+                <Popup.Resources>
+                  <Style TargetType="ToolTip">
+                    <Style.Triggers>
+                      <Trigger Property="Content"
+                               Value="{x:Static sys:String.Empty}">
+                        <Setter Property="Visibility"
+                                Value="Collapsed" />
+                      </Trigger>
+                    </Style.Triggers>
+                  </Style>
+                </Popup.Resources>
+                <Border BorderThickness="1"
+                        Background="{StaticResource PanelBackgroundBrush}"
+                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
+                        Padding="3">
+                  <StackPanel>
+                    <Calendar x:Name="PART_Calendar"
+                              BorderThickness="0"
+                              DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
+                      <Calendar.Template>
+                        <ControlTemplate TargetType="{x:Type Calendar}">
+                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
+                            <StackPanel x:Name="PART_Root"
+                                        HorizontalAlignment="Center">
+                              <CalendarItem x:Name="PART_CalendarItem"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            Background="{TemplateBinding Background}"
+                                            Style="{TemplateBinding CalendarItemStyle}" />
+                            </StackPanel>
+                          </Viewbox>
+                        </ControlTemplate>
+                      </Calendar.Template>
+                    </Calendar>
+                    <local:TimePicker x:Name="PART_TimeUpDown"
+                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
+                                      Format="{TemplateBinding TimeFormat}"
+                                      FormatString="{TemplateBinding TimeFormatString}"
+                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
+                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
+                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
+                                      Step="{TemplateBinding Step}"
+                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
+                                      Watermark="{TemplateBinding TimeWatermark}"
+                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
+                                      Visibility="{TemplateBinding TimePickerVisibility}" />
+                  </StackPanel>
+                </Border>
+              </Popup>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=PART_TextBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
index e2ee0aa5..79d3a60e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -15,241 +15,271 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="1" Color="#FFE8EBED" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="ToggleButton">
-               <Grid SnapsToDevicePixels="True">
-                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                       CornerRadius="0,2.75,2.75,0"
-                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-											      RenderMouseOver="{TemplateBinding IsMouseOver}"
-											      RenderPressed="{TemplateBinding IsPressed}">
-
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                           <Path x:Name="Arrow"
-                                 Width="9"
-                                 Height="5"
-                                 Data="{StaticResource DownArrowGeometry}"
-                                 Fill="#FF000000"
-                                 Margin="0,1,0,0"/>
-                        </Grid>
-                     </Grid>
-                  </chrome:ButtonChrome>
-               </Grid>
-                <ControlTemplate.Triggers>
-                    <Trigger Property="IsEnabled" Value="False">
-                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
-                    </Trigger>
-                </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!-- =============================================================================== -->
-   <!-- DateTimePicker                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type local:DateTimePicker}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-      <Setter Property="BorderThickness" Value="1,1,0,1" />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-      <Setter Property="HorizontalContentAlignment" Value="Right" />
-      <Setter Property="TextAlignment" Value="Right" />
-      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="CalendarWidth" Value="178"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-               <Border>
-                  <Grid>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <local:ButtonSpinner x:Name="PART_Spinner"
-                                             IsTabStop="False"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                             HorizontalContentAlignment="Stretch"
-                                             VerticalContentAlignment="Stretch"
-                                             AllowSpin="{TemplateBinding AllowSpin}"
-                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                           <local:WatermarkTextBox x:Name="PART_TextBox"
-                                                   BorderThickness="0" 
-                                                   Background="Transparent"
-                                                   FontFamily="{TemplateBinding FontFamily}" 
-                                                   FontSize="{TemplateBinding FontSize}" 
-                                                   FontStretch="{TemplateBinding FontStretch}"
-                                                   FontStyle="{TemplateBinding FontStyle}" 
-                                                   FontWeight="{TemplateBinding FontWeight}" 
-                                                   Foreground="{TemplateBinding Foreground}" 
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   IsTabStop="True"
-                                                   MinWidth="20"
-                                                   AcceptsReturn="False"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   TextAlignment="{TemplateBinding TextAlignment}"
-                                                   TextWrapping="NoWrap" 
-                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   TabIndex="{TemplateBinding TabIndex}"
-                                                   Watermark="{TemplateBinding Watermark}"
-                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
-                        </local:ButtonSpinner>
-                        <ToggleButton x:Name="_calendarToggleButton"
-                                      Grid.Column="1"
-                                      Background="White"
-                                      Focusable="False"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                     </Grid>
-                     <Popup x:Name="PART_Popup" 
-                            IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" 
-                            StaysOpen="False"
-                            ToolTip="{x:Static sys:String.Empty}">
-                        <Popup.Resources>
-                           <Style TargetType="ToolTip">
-                              <Style.Triggers>
-                                 <Trigger Property="Content"
-                                          Value="{x:Static sys:String.Empty}">
-                                    <Setter Property="Visibility"
-                                            Value="Collapsed" />
-                                 </Trigger>
-                              </Style.Triggers>
-                           </Style>
-                        </Popup.Resources>
-                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                           <StackPanel>
-                              <Calendar x:Name="PART_Calendar"
-                                        BorderThickness="0"
-                                        DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}" >
-                                 <Calendar.Template>
-                                    <ControlTemplate TargetType="{x:Type Calendar}">
-                                       <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                                          <StackPanel x:Name="PART_Root"
-                                                      HorizontalAlignment="Center">
-                                             <CalendarItem x:Name="PART_CalendarItem"
-                                                           BorderBrush="{TemplateBinding BorderBrush}"
-                                                           BorderThickness="{TemplateBinding BorderThickness}"
-                                                           Background="{TemplateBinding Background}"
-                                                           Style="{TemplateBinding CalendarItemStyle}" />
-                                          </StackPanel>
-                                       </Viewbox>
-                                    </ControlTemplate>
-                                 </Calendar.Template>
-                              </Calendar>
-                              <local:TimePicker x:Name="PART_TimeUpDown"
-                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
-                                                Format="{TemplateBinding TimeFormat}"
-                                                FormatString="{TemplateBinding TimeFormatString}"
-                                                Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                                ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                                IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                                Step="{TemplateBinding Step}"
-                                                ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                                Watermark="{TemplateBinding TimeWatermark}"
-                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                                Visibility="{TemplateBinding TimePickerVisibility}"/>
-                           </StackPanel>
-                        </Border>
-                     </Popup>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                               Value="True">
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-                  <!--Binding one-way when UpdateValueOnEnterKey is True-->
-                  <Trigger Property="UpdateValueOnEnterKey"
-                           Value="True">
-                     <Setter Property="Value"
-                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                             TargetName="PART_TimeUpDown" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
+    <ContentControl Content="{Binding}"
+                    Foreground="Gray"
+                    Focusable="False"
+                    Margin="0,0,3,0" />
+  </DataTemplate>
+
+  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
+                       EndPoint="0.5,1"
+                       StartPoint="0.5,0">
+    <GradientStop Color="#FFA3AEB9"
+                  Offset="0" />
+    <GradientStop Color="#FF8399A9"
+                  Offset="0.375" />
+    <GradientStop Color="#FF718597"
+                  Offset="0.375" />
+    <GradientStop Color="#FF617584"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PopupBackgroundBrush"
+                       StartPoint="0,0"
+                       EndPoint="0,1">
+    <LinearGradientBrush.GradientStops>
+      <GradientStopCollection>
+        <GradientStop Offset="0"
+                      Color="#FFffffff" />
+        <GradientStop Offset="1"
+                      Color="#FFE8EBED" />
+      </GradientStopCollection>
+    </LinearGradientBrush.GradientStops>
+  </LinearGradientBrush>
+
+  <Style x:Key="DateTimePickerToggleButtonStyle"
+         TargetType="ToggleButton">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Grid SnapsToDevicePixels="True">
+            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                 CornerRadius="0,2.75,2.75,0"
+                                 RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                 RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                 RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                 RenderPressed="{TemplateBinding IsPressed}">
+
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                <Grid x:Name="arrowGlyph"
+                      IsHitTestVisible="False"
+                      Grid.Column="1"
+                      Margin="5">
+                  <Path x:Name="Arrow"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="#FF000000"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Grid>
+            </chrome:ButtonChrome>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =============================================================================== -->
+  <!-- DateTimePicker                                                                  -->
+  <!-- =============================================================================== -->
+
+  <Style TargetType="{x:Type local:DateTimePicker}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1,1,0,1" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Right" />
+    <Setter Property="TextAlignment"
+            Value="Right" />
+    <Setter Property="TimeWatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="CalendarWidth"
+            Value="178" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+          <Border>
+            <Grid>
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <local:ButtonSpinner x:Name="PART_Spinner"
+                                     IsTabStop="False"
+                                     Background="{TemplateBinding Background}"
+                                     BorderBrush="{TemplateBinding BorderBrush}"
+                                     BorderThickness="{TemplateBinding BorderThickness}"
+                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                                     HorizontalContentAlignment="Stretch"
+                                     VerticalContentAlignment="Stretch"
+                                     AllowSpin="{TemplateBinding AllowSpin}"
+                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="Transparent"
+                                          FontFamily="{TemplateBinding FontFamily}"
+                                          FontSize="{TemplateBinding FontSize}"
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}"
+                                          FontWeight="{TemplateBinding FontWeight}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
+                                          IsTabStop="True"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                </local:ButtonSpinner>
+                <ToggleButton x:Name="_calendarToggleButton"
+                              Grid.Column="1"
+                              Background="White"
+                              Focusable="False"
+                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
+                </ToggleButton>
+              </Grid>
+              <Popup x:Name="PART_Popup"
+                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
+                     StaysOpen="False"
+                     ToolTip="{x:Static sys:String.Empty}">
+                <Popup.Resources>
+                  <Style TargetType="ToolTip">
+                    <Style.Triggers>
+                      <Trigger Property="Content"
+                               Value="{x:Static sys:String.Empty}">
+                        <Setter Property="Visibility"
+                                Value="Collapsed" />
+                      </Trigger>
+                    </Style.Triggers>
+                  </Style>
+                </Popup.Resources>
+                <Border BorderThickness="1"
+                        Background="{StaticResource PopupBackgroundBrush}"
+                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
+                        Padding="3">
+                  <StackPanel>
+                    <Calendar x:Name="PART_Calendar"
+                              BorderThickness="0"
+                              DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
+                      <Calendar.Template>
+                        <ControlTemplate TargetType="{x:Type Calendar}">
+                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
+                            <StackPanel x:Name="PART_Root"
+                                        HorizontalAlignment="Center">
+                              <CalendarItem x:Name="PART_CalendarItem"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            Background="{TemplateBinding Background}"
+                                            Style="{TemplateBinding CalendarItemStyle}" />
+                            </StackPanel>
+                          </Viewbox>
+                        </ControlTemplate>
+                      </Calendar.Template>
+                    </Calendar>
+                    <local:TimePicker x:Name="PART_TimeUpDown"
+                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
+                                      Format="{TemplateBinding TimeFormat}"
+                                      FormatString="{TemplateBinding TimeFormatString}"
+                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
+                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
+                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
+                                      Step="{TemplateBinding Step}"
+                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
+                                      Watermark="{TemplateBinding TimeWatermark}"
+                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
+                                      Visibility="{TemplateBinding TimePickerVisibility}" />
+                  </StackPanel>
+                </Border>
+              </Popup>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index aba78992..75627f79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -15,16 +15,11 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 using System.Windows.Controls;
-using System.Linq;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -668,7 +663,8 @@ namespace Xceed.Wpf.Toolkit
       throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Methods
 
@@ -708,50 +704,13 @@ namespace Xceed.Wpf.Toolkit
 
     private void Increment( int step )
     {
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
+      if( this.Value.HasValue )
       {
-        _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.Value = this.UpdateDateTime( this.Value, step );
       }
       else
       {
-        if( this.Value.HasValue )
-        {
-          this.Value = this.UpdateDateTime( this.Value, step );
-        }
-        else
-        {
-          this.Value = this.DefaultValue ?? this.ContextNow;
-        }
+        this.Value = this.DefaultValue ?? this.ContextNow;
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index b889622b..11b77e7a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -55,8 +55,6 @@ namespace Xceed.Wpf.Toolkit
     {
       Keyboard.AddKeyDownHandler( this, OnKeyDown );
       Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-      //case 166525 : Do no inherit an implicit style of Button
-      this.InheritanceBehavior = InheritanceBehavior.SkipToThemeNow;
     }
 
     #endregion //Constructors
@@ -111,6 +109,23 @@ namespace Xceed.Wpf.Toolkit
 
     #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 )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
index a92b0229..f7faa69a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -22,131 +22,133 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
 
-   <!-- =============================================================================== -->
-   <!-- DropDownButton                                                                  -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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="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>
+  <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="{StaticResource PanelBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+              <Setter TargetName="ToggleButtonChrome"
+                      Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index c4cc825d..a54bfbf6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -22,151 +22,153 @@
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-   </ResourceDictionary.MergedDictionaries>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <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="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>
+  <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="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>
+  <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="{StaticResource PopupBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index 3553c7ad..7e1f8d78 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -81,6 +81,16 @@ namespace Xceed.Wpf.Toolkit
 
     #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 ) ) );
@@ -275,7 +285,16 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion // Base Class Overrides
 
-    #region Methods
+    #region Public Methods
+
+    public void Freeze( bool freeze )
+    {
+      this.IsFrozen = freeze;
+    }
+
+    #endregion
+
+    #region Private Methods
 
     private void UpdateViewBox()
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index 305b67a1..b0ef685c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -57,6 +57,9 @@ namespace Xceed.Wpf.Toolkit
       if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) )
         return;
 
+      if( _magnifier.IsFrozen )
+        return;
+
       _currentMousePosition = pt;
       _currentZoomFactor = _magnifier.ZoomFactor;
       UpdateViewBox();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index 6c66bac1..88856103 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -59,6 +59,10 @@ namespace Xceed.Wpf.Toolkit
 
     private void Element_MouseLeave( object sender, MouseEventArgs e )
     {
+      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
+      if( ( magnifier != null ) && magnifier.IsFrozen )
+        return;
+
       HideAdorner();
     }
 
@@ -94,16 +98,16 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion //Event Handlers
+    #endregion //Event Handlers
 
-#region Methods
+    #region Methods
 
     private void AttachToMagnifier( UIElement element, Magnifier magnifier )
     {
       _element = element;
-      _element.MouseEnter += Element_MouseEnter;
-      _element.MouseLeave += Element_MouseLeave;
-      _element.MouseWheel += Element_MouseWheel;
+      _element.MouseEnter += this.Element_MouseEnter;
+      _element.MouseLeave += this.Element_MouseLeave;
+      _element.MouseWheel += this.Element_MouseWheel;
 
       magnifier.Target = _element;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index 0aff1207..f9c7932a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -168,8 +168,6 @@ namespace Xceed.Wpf.Toolkit
         new FrameworkPropertyMetadata(
         null,
         new CoerceValueCallback( MaskedTextBox.TextCoerceValueCallback ) ) );
-
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( MaskedTextBox ), new UIPropertyMetadata( "MaskedTextBox" ) );
     }
 
     public MaskedTextBox()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
index f7a9dc5d..80fdf126 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
@@ -27,6 +27,7 @@ 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
 {
@@ -69,6 +70,7 @@ namespace Xceed.Wpf.Toolkit
     /// Tracks the owner of the MessageBox
     /// </summary>
     private Window _owner;
+    private IntPtr _ownerHandle;
 
     private WindowControl _windowControl;
 
@@ -382,12 +384,16 @@ namespace Xceed.Wpf.Toolkit
     }
 
 
+
+
     #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.
@@ -448,7 +454,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( null, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -459,7 +465,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -479,7 +485,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, icon, MessageBoxResult.None, 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 )
@@ -489,7 +495,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -509,7 +515,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, icon, defaultResult, 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 )
@@ -520,9 +526,60 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, icon, defaultResult, 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
@@ -611,17 +668,21 @@ namespace Xceed.Wpf.Toolkit
     /// <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>
-    protected void InitializeMessageBox( Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
+    /// <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 );
     }
 
@@ -740,7 +801,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
     {
-      this.InitializeMessageBox( null, messageText, caption, button, icon, defaultResult );
+      this.InitializeMessageBox( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult );
       this.ShowMessageBox();
     }
 
@@ -760,15 +821,20 @@ namespace Xceed.Wpf.Toolkit
     /// <param name="icon">The icon.</param>
     /// <param name="defaultResult">The default result.</param>
     /// <returns></returns>
-    private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    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." );
       }
 
-      MessageBox msgBox = new MessageBox();
-      msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
+      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 )
@@ -790,18 +856,21 @@ namespace Xceed.Wpf.Toolkit
     {
       Window result = null;
 
-      if( Application.Current.Dispatcher.CheckAccess() )
-      {
-        result = ComputeOwnerWindowCore();
-      }
-      else
+      if( Application.Current != null )
       {
-        Application.Current.Dispatcher.BeginInvoke( new Action( () =>
+        if( Application.Current.Dispatcher.CheckAccess() )
+        {
+          result = ComputeOwnerWindowCore();
+        }
+        else
+        {
+          Application.Current.Dispatcher.BeginInvoke( new Action( () =>
           {
             result = ComputeOwnerWindowCore();
           }
-        ) );
-      }
+          ) );
+        }
+      }     
 
       return result;
     }
@@ -876,12 +945,20 @@ namespace Xceed.Wpf.Toolkit
       newWindow.AllowsTransparency = true;
       newWindow.Background = Brushes.Transparent;
       newWindow.Content = this;
-      newWindow.Owner = _owner ?? ComputeOwnerWindow();
 
-      if( newWindow.Owner != null )
+      if( _ownerHandle != IntPtr.Zero )
+      {
+        var windowHelper = new WindowInteropHelper( newWindow ) { Owner = _ownerHandle };
         newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
+      }
       else
-        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+      {
+        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;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
index 03f6cccb..5f514cef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
@@ -19,175 +19,220 @@
                     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}" />
-
-                            <!-- 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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Primitives/Themes/Aero2/WindowControl.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <!-- =============================================================================== -->
+  <!-- MessageBox                                                                      -->
+  <!-- =============================================================================== -->
+
+  <ControlTemplate x:Key="MessageBoxTemplate"
+                   TargetType="{x:Type local:MessageBox}">
+    <Grid>
+      <VisualStateManager.VisualStateGroups>
+        <VisualStateGroup x:Name="group1">
+          <VisualState x:Name="OK">
+            <Storyboard>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+          <VisualState x:Name="OKCancel">
+            <Storyboard>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+          <VisualState x:Name="YesNo">
+            <Storyboard>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+          <VisualState x:Name="YesNoCancel">
+            <Storyboard>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
+                                             Storyboard.TargetProperty="Visibility">
+                <DiscreteObjectKeyFrame KeyTime="0">
+                  <DiscreteObjectKeyFrame.Value>
+                    <Visibility>Visible</Visibility>
+                  </DiscreteObjectKeyFrame.Value>
+                </DiscreteObjectKeyFrame>
+              </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateManager.VisualStateGroups>
+
+      <prim:WindowControl x:Name="PART_WindowControl"
+                          Caption="{TemplateBinding Caption}"
+                          CaptionFontSize="{TemplateBinding CaptionFontSize}"
+                          CaptionForeground="{TemplateBinding CaptionForeground}"
+                          CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                          CaptionIcon="{TemplateBinding CaptionIcon}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          IsActive="{TemplateBinding IsActive}"
+                          WindowBackground="{TemplateBinding WindowBackground}"
+                          WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}"
+                          WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                          WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                          CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                          WindowOpacity="{TemplateBinding WindowOpacity}">
+        <prim:WindowControl.Content>
+          <Grid MinWidth="350">
+            <Grid.RowDefinitions>
+              <RowDefinition />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Grid Margin="24,16,24,22">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+
+              <!-- Message Image -->
+              <Image x:Name="MessageBoxImage"
+                     VerticalAlignment="Top"
+                     SnapsToDevicePixels="True"
+                     Stretch="None"
+                     Source="{TemplateBinding ImageSource}">
+              </Image>
+
+              <!-- Message Text -->
+              <ScrollViewer Grid.Column="1"
+                            VerticalScrollBarVisibility="Auto">
+                <TextBlock x:Name="MessageText"
+                           TextWrapping="Wrap"
+                           VerticalAlignment="Center"
+                           MaxWidth="450"
+                           Text="{TemplateBinding Text}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontStyle="{TemplateBinding FontStyle}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Foreground="{TemplateBinding Foreground}"
+                           Margin="10,0,0,0" />
+              </ScrollViewer>
+            </Grid>
+
+            <!-- Buttons -->
+            <Border Grid.Row="1"
+                    Background="{TemplateBinding ButtonRegionBackground}">
+              <Grid HorizontalAlignment="Right"
+                    Margin="12">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Button Grid.Column="0"
+                        x:Name="PART_YesButton"
+                        MinWidth="65"
+                        Margin="6,0,0,0"
+                        Visibility="Collapsed"
+                        Content="{TemplateBinding YesButtonContent}"
+                        Style="{TemplateBinding YesButtonStyle}" />
+                <Button Grid.Column="1"
+                        x:Name="PART_NoButton"
+                        MinWidth="65"
+                        Margin="6,0,0,0"
+                        Visibility="Collapsed"
+                        Content="{TemplateBinding NoButtonContent}"
+                        Style="{TemplateBinding NoButtonStyle}" />
+                <Button Grid.Column="2"
+                        x:Name="PART_OkButton"
+                        MinWidth="65"
+                        Margin="6,0,0,0"
+                        Visibility="Collapsed"
+                        Content="{TemplateBinding OkButtonContent}"
+                        Style="{TemplateBinding OkButtonStyle}" />
+                <Button Grid.Column="3"
+                        x:Name="PART_CancelButton"
+                        MinWidth="65"
+                        Margin="6,0,0,0"
+                        Visibility="Collapsed"
+                        Content="{TemplateBinding CancelButtonContent}"
+                        Style="{TemplateBinding CancelButtonStyle}"
+                        IsCancel="True" />
+              </Grid>
+            </Border>
+          </Grid>
+        </prim:WindowControl.Content>
+      </prim:WindowControl>
+    </Grid>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:MessageBox}"
+         BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+    <Setter Property="ButtonRegionBackground"
+            Value="#FFF0F0F0" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="MinWidth"
+            Value="350" />
+    <Setter Property="MinHeight"
+            Value="50" />
+    <Setter Property="MaxHeight"
+            Value="250" />
+    <Setter Property="Template"
+            Value="{StaticResource MessageBoxTemplate}" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
index e8e41c2f..5c3d3796 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
@@ -19,177 +19,220 @@
                     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}" />
-
-                                <!-- 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.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
+    <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <!-- =============================================================================== -->
+  <!-- MessageBox                                                                      -->
+  <!-- =============================================================================== -->
+
+  <Style TargetType="{x:Type local:MessageBox}"
+         BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+    <Setter Property="ButtonRegionBackground"
+            Value="#FFF0F0F0" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="MinWidth"
+            Value="350" />
+    <Setter Property="MinHeight"
+            Value="50" />
+    <Setter Property="MaxHeight"
+            Value="250" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:MessageBox}">
+          <Grid>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="group1">
+                <VisualState x:Name="OK">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="OKCancel">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="YesNo">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="YesNoCancel">
+                  <Storyboard>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton"
+                                                   Storyboard.TargetProperty="Visibility">
+                      <DiscreteObjectKeyFrame KeyTime="0">
+                        <DiscreteObjectKeyFrame.Value>
+                          <Visibility>Visible</Visibility>
+                        </DiscreteObjectKeyFrame.Value>
+                      </DiscreteObjectKeyFrame>
+                    </ObjectAnimationUsingKeyFrames>
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+
+            <prim:WindowControl x:Name="PART_WindowControl"
+                                Caption="{TemplateBinding Caption}"
+                                CaptionFontSize="{TemplateBinding CaptionFontSize}"
+                                CaptionForeground="{TemplateBinding CaptionForeground}"
+                                CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                                CaptionIcon="{TemplateBinding CaptionIcon}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsActive="{TemplateBinding IsActive}"
+                                WindowBackground="{TemplateBinding WindowBackground}"
+                                WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}"
+                                WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                                WindowOpacity="{TemplateBinding WindowOpacity}">
+              <prim:WindowControl.Content>
+                <Grid MinWidth="350">
+                  <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+
+                  <Grid Margin="24,16,24,22">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <!-- Message Image -->
+                    <Image x:Name="MessageBoxImage"
+                           VerticalAlignment="Top"
+                           SnapsToDevicePixels="True"
+                           Stretch="None"
+                           Source="{TemplateBinding ImageSource}" >
+                    </Image>
+
+                    <!-- Message Text -->
+                    <ScrollViewer Grid.Column="1"
+                                  VerticalScrollBarVisibility="Auto">
+                      <TextBlock x:Name="MessageText"
+                                 TextWrapping="Wrap"
+                                 VerticalAlignment="Center"
+                                 MaxWidth="450"
+                                 Text="{TemplateBinding Text}"
+                                 FontFamily="{TemplateBinding FontFamily}"
+                                 FontSize="{TemplateBinding FontSize}"
+                                 FontStyle="{TemplateBinding FontStyle}"
+                                 FontWeight="{TemplateBinding FontWeight}"
+                                 Foreground="{TemplateBinding Foreground}"
+                                 Margin="10,0,0,0" />
+                    </ScrollViewer>
+                  </Grid>
+
+                  <!-- Buttons -->
+                  <Border Grid.Row="1"
+                          Background="{TemplateBinding ButtonRegionBackground}">
+                    <Grid HorizontalAlignment="Right"
+                          Margin="12">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                      </Grid.ColumnDefinitions>
+
+                      <Button Grid.Column="0"
+                              x:Name="PART_YesButton"
+                              MinWidth="65"
+                              Margin="6,0,0,0"
+                              Visibility="Collapsed"
+                              Content="{TemplateBinding YesButtonContent}"
+                              Style="{TemplateBinding YesButtonStyle}" />
+                      <Button Grid.Column="1"
+                              x:Name="PART_NoButton"
+                              MinWidth="65"
+                              Margin="6,0,0,0"
+                              Visibility="Collapsed"
+                              Content="{TemplateBinding NoButtonContent}"
+                              Style="{TemplateBinding NoButtonStyle}" />
+                      <Button Grid.Column="2"
+                              x:Name="PART_OkButton"
+                              MinWidth="65"
+                              Margin="6,0,0,0"
+                              Visibility="Collapsed"
+                              Content="{TemplateBinding OkButtonContent}"
+                              Style="{TemplateBinding OkButtonStyle}" />
+                      <Button Grid.Column="3"
+                              x:Name="PART_CancelButton"
+                              MinWidth="65"
+                              Margin="6,0,0,0"
+                              Visibility="Collapsed"
+                              Content="{TemplateBinding CancelButtonContent}"
+                              Style="{TemplateBinding CancelButtonStyle}"
+                              IsCancel="True" />
+                    </Grid>
+                  </Border>
+                </Grid>
+              </prim:WindowControl.Content>
+            </prim:WindowControl>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 4ceab8b8..39780891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -230,6 +230,9 @@ namespace Xceed.Wpf.Toolkit
       _toggleButton = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
     }
 
+
+
+
     #endregion //Bass Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
index 98c9c85e..2fbc03ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -22,194 +22,196 @@
                     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"/>
+  <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>
-                     </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}" />
-                  <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" />
-                           <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>
+                      </ControlTemplate>
+                    </Thumb.Template>
+                  </Thumb>
+                </Grid>
+              </Border>
+            </Popup>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 713b206a..378ade61 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -21,169 +21,216 @@
                     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" />
+  <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>
-                </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}" />
-                  <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" />
-                           <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>
+                  </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>
-                     </Border>
-                  </Popup>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                      </ControlTemplate>
+                    </Thumb.Template>
+                  </Thumb>
+                </Grid>
+              </Border>
+            </Popup>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 6687c89b..5af9e296 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -19,6 +19,7 @@ using System.Globalization;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
 
+
 namespace Xceed.Wpf.Toolkit
 {
   public abstract class NumericUpDown<T> : UpDownBase<T>
@@ -146,6 +147,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Properties
 
+    #region Overrides
+
+
+    #endregion
+
     #region Methods
 
     protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
index 8255aa58..ffc3cfd2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -21,181 +21,193 @@
                     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}}" />
-               </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}" />
+  <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}}">
+            </local:WatermarkTextBox>
+          </local:ButtonSpinner>
+
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=PART_TextBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =============================================================================== -->
+  <!-- DecimalUpDown                                                                   -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:DecimalUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- DoubleUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:DoubleUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- IntegerUpDown                                                                   -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:IntegerUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ShortUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ShortUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- LongUpDown                                                                      -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:LongUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ByteUpDown                                                                      -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ByteUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- SingleUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:SingleUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- ===============================================================================   -->
+  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
+  <!-- for external themes to redefine the default style. The reason is that the         -->
+  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
+  <!-- available in code-behind (not xaml).                                              -->
+  <!-- (ex. Office2007 theme)                                                            -->
+  <!-- ===============================================================================   -->
+
+  <!-- =============================================================================== -->
+  <!-- SByteUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:SByteUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- UIntegerUpDown                                                                  -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:UIntegerUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ULongUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ULongUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- UShortUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:UShortUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
index 62372059..a9f0662c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -21,151 +21,181 @@
                     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}}" />
-               </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}" />
+  <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}}" >
+            </local:WatermarkTextBox>
+          </local:ButtonSpinner>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=PART_TextBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =============================================================================== -->
+  <!-- DecimalUpDown                                                                   -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:DecimalUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- DoubleUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:DoubleUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- IntegerUpDown                                                                   -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:IntegerUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ShortUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ShortUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- LongUpDown                                                                      -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:LongUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ByteUpDown                                                                      -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ByteUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- SingleUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:SingleUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- ===============================================================================   -->
+  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
+  <!-- for external themes to redefine the default style. The reason is that the         -->
+  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
+  <!-- available in code-behind (not xaml).                                              -->
+  <!-- (ex. Office2007 theme)                                                            -->
+  <!-- ===============================================================================   -->
+
+  <!-- =============================================================================== -->
+  <!-- SByteUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:SByteUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- UIntegerUpDown                                                                  -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:UIntegerUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- ULongUpDown                                                                     -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:ULongUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
+
+  <!-- =============================================================================== -->
+  <!-- UShortUpDown                                                                    -->
+  <!-- =============================================================================== -->
+  <Style TargetType="{x:Type local:UShortUpDown}"
+         BasedOn="{StaticResource NumericUpDown}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index 38dd9add..dcc130ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -21,7 +21,6 @@ using System.Collections.Specialized;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Media.Animation;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -1364,6 +1363,7 @@ namespace Xceed.Wpf.Toolkit.Panels
       }
     }
 
+
     protected new void RemoveVisualChild( Visual child )
     {
       if( _switchParent == null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
index c7e74b92..eaf040a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
@@ -21,292 +21,375 @@
                     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}">
+  <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>
-            <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"/>
-                    </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>
+          <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>
+
 
-            <!-- 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>
-
-            <!-- #TODODOC-->
-            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
-            <Trigger Property="Text" Value="" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <!-- 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 
+      </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>
+    <Setter Property="BorderBrush"
+            Value="#5D6C7A" />
+    <Setter Property="BorderThickness"
+            Value="1,1,1,1" />
+    <Setter Property="Background"
+            Value="{StaticResource Window_Background}" />
+    <Setter Property="CaptionFontSize"
+            Value="{StaticResource Window_CaptionFontSize}" />
+    <Setter Property="CaptionForeground"
+            Value="{StaticResource Window_CaptionForeground}" />
+    <Setter Property="CaptionShadowBrush"
+            Value="{StaticResource Window_CaptionShadowBrush}" />
+    <Setter Property="WindowBorderBrush"
+            Value="{StaticResource Window_WindowBorderBrush}" />
+    <Setter Property="WindowBackground"
+            Value="{StaticResource Window_WindowBackground}" />
+    <Setter Property="WindowBorderThickness"
+            Value="{StaticResource Window_WindowBorderThickness}" />
+    <Setter Property="WindowInactiveBackground"
+            Value="{StaticResource Window_WindowInactiveBackground}" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="KeyboardNavigation.TabNavigation"
+            Value="None" />
+    <Setter Property="Template"
+            Value="{StaticResource WindowControlTemplate}" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
index a0007416..cb7bd023 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
@@ -21,255 +21,366 @@
                     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}" />
-                        </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"/>
-                        </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>
+  <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>
 
-            <!-- 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>
-
-            <!-- #TODODOC-->
-            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
-            <Trigger Property="Text" Value="" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <!-- 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 
+          </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>
+    <Setter Property="BorderBrush"
+            Value="{StaticResource Window_BorderBrush}" />
+    <Setter Property="BorderThickness"
+            Value="{StaticResource Window_BorderThickness}" />
+    <Setter Property="Background"
+            Value="{StaticResource Window_Background}" />
+    <Setter Property="CaptionFontSize"
+            Value="{StaticResource Window_CaptionFontSize}" />
+    <Setter Property="CaptionForeground"
+            Value="{StaticResource Window_CaptionForeground}" />
+    <Setter Property="WindowBorderBrush"
+            Value="{StaticResource Window_WindowBorderBrush}" />
+    <Setter Property="WindowBackground"
+            Value="{StaticResource Window_WindowBackground}" />
+    <Setter Property="WindowBorderThickness"
+            Value="{StaticResource Window_WindowBorderThickness}" />
+    <Setter Property="WindowInactiveBackground"
+            Value="{StaticResource Window_WindowInactiveBackground}" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="KeyboardNavigation.TabNavigation"
+            Value="None" />
+    <Setter Property="Template"
+            Value="{StaticResource WindowControlTemplate}" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
index 07babce9..46cb091b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
@@ -51,8 +51,6 @@ namespace Xceed.Wpf.Toolkit.Primitives
       ValueRangeTextBox.AcceptsTabProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
         new FrameworkPropertyMetadata(
         false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsTabCoerceValueCallback ) ) );
-
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( ValueRangeTextBox ), new UIPropertyMetadata( "ValueRangeTextBox" ) );
     }
 
     public ValueRangeTextBox()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index 481ed834..e2c7d4b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@ using System.Windows.Markup;
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 [assembly: AssemblyCulture( "" )]
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index 5b5de379..466b306f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -49,12 +49,13 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Constructor
 
-
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, bool isPropertyGridCategorized )
-      : base( isPropertyGridCategorized )
+    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, IPropertyContainer propertyContainer )
+       : base( propertyContainer.IsCategorized
+             )
     {
       this.Init( propertyDescriptor, selectedObject );
     }
+
     #endregion
 
     #region Custom Properties
@@ -120,8 +121,16 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     protected override bool ComputeCanResetValue()
     {
-      return PropertyDescriptor.CanResetValue( SelectedObject )
-        && !PropertyDescriptor.IsReadOnly;
+      if( !PropertyDescriptor.IsReadOnly )
+      {
+        var defaultValue = this.ComputeDefaultValueAttribute();
+        if( defaultValue != null )
+          return true;
+
+        return PropertyDescriptor.CanResetValue( SelectedObject );
+      }
+
+      return false;
     }
 
     protected override object ComputeAdvancedOptionsTooltip()
@@ -188,10 +197,22 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       var editorAttribute = GetAttribute<EditorAttribute>();
       if( editorAttribute != null )
       {
+        Type type = null;
 #if VS2008
-        var type = Type.GetType( editorAttribute.EditorTypeName );
+        type = Type.GetType( editorAttribute.EditorTypeName );
 #else
-        var type = Type.GetType( editorAttribute.EditorTypeName, ( name ) => { return AppDomain.CurrentDomain.GetAssemblies().Where( l => l.FullName == name.FullName ).FirstOrDefault(); }, null, true );
+        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.
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
index f3870f77..4bde0880 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -60,7 +60,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Initialization
 
-    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized )
+
+    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized
+                                             )
     {
       this.IsPropertyGridCategorized = isPropertyGridCategorized;
     }
@@ -212,15 +214,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal void UpdateAdvanceOptions()
     {
-      // Only set the Tooltip. the Icon will be added in XAML based on the Tooltip.
+      // 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.ExpandableAttribute
-        && this.ComputeIsExpandable();
+      this.IsExpandable = this.ComputeIsExpandable() 
+                          && ( this.ExpandableAttribute
+                             );
     }
 
     internal void UpdateValueFromSource()
@@ -576,6 +578,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
+
     internal bool IsPropertyGridCategorized
     {
       get;
@@ -583,6 +586,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     }
 
 
+
     #region Value Property (DP)
 
     public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null, OnValueChanged ) );
@@ -624,7 +628,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       _displayName = ComputeDisplayName();
       _defaultValue = ComputeDefaultValueAttribute();
       _displayOrder = ComputeDisplayOrder( this.IsPropertyGridCategorized );
-
       _expandableAttribute = ComputeExpandableAttribute();
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
index c0a86948..2b1a4545 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
@@ -30,6 +30,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       ValueProperty = CollectionControlButton.ItemsSourceProperty;
     }
 
+    protected override CollectionControlButton CreateEditor()
+    {
+      return new PropertyGridEditorCollectionControl();
+    }
+
 
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
index 29bacc5a..374858f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
@@ -18,6 +18,8 @@ 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
 {
@@ -35,6 +37,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       set;
     }
 
+    protected override MaskedTextBox CreateEditor()
+    {
+      return new PropertyGridEditorMaskedTextBox();
+    }
+
     protected override void SetControlProperties( PropertyItem propertyItem )
     {
       Editor.BorderThickness = new System.Windows.Thickness( 0 );
@@ -47,4 +54,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       this.ValueProperty = MaskedTextBox.ValueProperty;
     }
   }
+
+  public class PropertyGridEditorMaskedTextBox : MaskedTextBox
+  {
+    static PropertyGridEditorMaskedTextBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorMaskedTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorMaskedTextBox ) ) );
+    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
index 6a98f3b8..bd1097df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -31,6 +31,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty;
     }
 
+    protected override PrimitiveTypeCollectionControl CreateEditor()
+    {
+      return new PropertyGridEditorPrimitiveTypeCollectionControl();
+    }
+
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
       var type = propertyItem.PropertyType;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index 5aaca022..78fad1d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -34,6 +34,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     protected override void SetControlProperties( PropertyItem propertyItem )
     {
       Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
+      Editor.TextTrimming = TextTrimming.CharacterEllipsis;
     }
   }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
index 80d2cf90..8ba7a517 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
@@ -52,5 +52,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     FilterInfo FilterInfo { get; }
 
     bool? IsPropertyVisible( PropertyDescriptor pd );
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
index d135fd96..4c516e31 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -120,10 +120,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
     {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property,
-                                                                                  SelectedObject, 
-                                                                                  this.PropertyContainer.IsCategorized
-                                                                                 );
+      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
       definition.InitProperties();
 
       this.InitializeDescriptorDefinition( definition, propertyDef );
@@ -131,6 +128,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       Debug.Assert( SelectedObject != null );
       propertyItem.Instance = SelectedObject;
       propertyItem.CategoryOrder = this.GetCategoryOrder( definition.CategoryValue );
+
       propertyItem.WillRefreshPropertyGrid = this.GetWillRefreshPropertyGrid( property );
       return propertyItem;
     }
@@ -165,5 +163,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
index 352ab366..52a29bf2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -188,10 +188,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private void UpdateFilter()
     {
-      FilterInfo filterInfo = PropertyContainer.FilterInfo;
+      FilterInfo filterInfo = this.PropertyContainer.FilterInfo;
 
-      PropertyItems.FilterPredicate = filterInfo.Predicate
-        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString );
+      this.PropertyItems.FilterPredicate = filterInfo.Predicate
+        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString, this.PropertyItems, this.PropertyContainer );
     }
 
     private void UpdateCategorization( bool updateSubPropertiesCategorization )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index b7346fde..f5835f0b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -279,7 +279,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     #region IsVirtualizing
 
     public static readonly DependencyProperty IsVirtualizingProperty = DependencyProperty.Register( "IsVirtualizing", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( false ) );
+      , new UIPropertyMetadata( false, OnIsVirtualizingChanged ) );
     public bool IsVirtualizing
     {
       get
@@ -292,6 +292,18 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
+    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
 
 
@@ -693,6 +705,23 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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 ) );
@@ -867,7 +896,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Event Handlers
 
@@ -916,8 +946,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       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 )
@@ -1215,6 +1249,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #endregion
 
+
+
+
+
+
     #region PreparePropertyItemEvent Attached Routed Event
 
     /// <summary>
@@ -1396,6 +1435,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return null;
     }
 
+
+
+
     #endregion
 
 
@@ -1452,15 +1494,13 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
   }
   #endregion
 
-  #region isPropertyBrowsableEvent Handler/Args
-
-  public delegate void IsPropertyBrowsableHandler( object sender, IsPropertyBrowsableArgs e );
+  #region IsPropertyArgs class
 
-  public class IsPropertyBrowsableArgs : RoutedEventArgs
+  public class PropertyArgs : RoutedEventArgs
   {
     #region Constructors
 
-    public IsPropertyBrowsableArgs( PropertyDescriptor pd )
+    public PropertyArgs( PropertyDescriptor pd )
     {
       this.PropertyDescriptor = pd;
     }
@@ -1469,22 +1509,44 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Properties
 
-    #region IsBrowsable Property
+    #region PropertyDescriptor Property
 
-    public bool? IsBrowsable
+    public PropertyDescriptor PropertyDescriptor
     {
       get;
-      set;
+      private set;
     }
 
     #endregion
 
-    #region PropertyDescriptor Property
+    #endregion
+  }
 
-    public PropertyDescriptor PropertyDescriptor
+  #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;
-      private set;
+      set;
     }
 
     #endregion
@@ -1494,4 +1556,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
   #endregion
 
+
+
+
+
+
+
+
+
+
+
+
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
index 6554807c..828c86db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
@@ -205,20 +205,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       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();
-        }
-      }
-    }
-
     private void SetValueFontWeight()
     {
       if( this.ValueContainer == null )
@@ -234,6 +220,20 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
                                         : FontWeights.Normal;
     }
 
+    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
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
index 8476dae5..5d80bac9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
@@ -16,9 +16,7 @@
 
 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;
@@ -26,7 +24,6 @@ using System.Windows.Media;
 using System.Windows.Data;
 using System.Collections;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Reflection;
 using System.Linq.Expressions;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
@@ -130,6 +127,24 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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 ) );
@@ -429,6 +444,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       e.Handled = true;
     }
 
+
     private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
     { 
       IsSelected = true;
@@ -578,7 +594,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return null;
     }
 
-    #endregion
+
+
+#endregion
 
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
index 55066424..5f54fd2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -25,6 +25,7 @@ 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
@@ -80,7 +81,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public void Filter( string text )
     {
-      Predicate<object> filter = PropertyItemCollection.CreateFilter( text );
+      Predicate<object> filter = PropertyItemCollection.CreateFilter( text, this.Items, null );
       GetDefaultView().Filter = filter;
     }
 
@@ -151,7 +152,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       GetDefaultView().Refresh();
     }
 
-    internal static Predicate<object> CreateFilter( string text )
+    internal static Predicate<object> CreateFilter( string text, IList<PropertyItem> PropertyItems, IPropertyContainer propertyContainer )
     {
       Predicate<object> filter = null;
 
@@ -171,8 +172,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
                 return false;
             }
 #endif
-
-            return property.DisplayName.ToLower().Contains( text.ToLower() );
+            property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
+            return (property.HighlightedText != null);
           }
 
           return false;
@@ -181,5 +182,30 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
       return filter;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
index 4926b2a7..2839de49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
@@ -104,5 +104,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       this.RaiseClearPropertyItemEvent( ( PropertyItemBase )element, item );
       base.ClearContainerForItemOverride( element, item );
     }
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
index 9677c4f3..d0fbbd9b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
@@ -20,6 +20,8 @@ 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
 {
@@ -65,6 +67,89 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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)
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
index 90c389ae..7baed15b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
@@ -21,6 +21,7 @@
                     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"
@@ -54,8 +55,13 @@
             Member="sys:String.Empty" />
 
   <!-- PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
+  <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>
@@ -73,7 +79,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -91,7 +97,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -109,7 +115,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -127,7 +133,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -145,7 +151,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -163,7 +169,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -273,6 +279,11 @@
             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}">
@@ -311,13 +322,13 @@
   <!-- 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).                                               -->
+  <!-- available in code-behind (not xaml).                                              -->
   <!-- (ex. Office2007 theme)                                                            -->
   <!-- ===============================================================================   -->
 
   <!-- Internal PropertyGrid numeric Editors -->
   <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -335,7 +346,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -353,7 +364,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -371,7 +382,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -854,15 +865,18 @@
                                   Template="{StaticResource ExpanderToggleButton}"
                                   OverridesDefaultStyle="True"
                                   IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                  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}}" />
+                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                      </pg:TrimmedTextBlock>
                   </Grid>
 
                   <Grid Grid.Column="1"
@@ -872,10 +886,12 @@
                         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}}" />
+                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
+                    </Image>
                   </Grid>
                 </Grid>
               </Border>
@@ -1085,12 +1101,14 @@
                   <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
                     <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
                                          TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" />
+                                         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" />
+                                         TextTrimming="CharacterEllipsis">
+                    </pg:TrimmedTextBlock>
                   </Grid>
                 </StackPanel>
               </StackPanel>
@@ -1114,7 +1132,8 @@
                                  ToolTip="Categorized">
                       <Image Source="./../Images/Categorize16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                     <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                  VerticalAlignment="Center"
@@ -1122,7 +1141,8 @@
                                  ToolTip="Alphabetical">
                       <Image Source="./../Images/SortAscending16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                   </StackPanel>
                 </Grid>
@@ -1166,7 +1186,8 @@
                             HorizontalAlignment="Left">
                       <Image Source="./../Images/ClearFilter16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </Button>
                   </Grid>
                 </Border>
@@ -1201,13 +1222,22 @@
                               BorderBrush="{TemplateBinding BorderBrush}"
                               Background="{TemplateBinding Background}"
                               SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
+                        <ScrollViewer x:Name="ScrollBar"
+                                      Padding="{TemplateBinding Padding}"
                                       Focusable="False"
                                       VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="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>
 
@@ -1230,16 +1260,19 @@
               <GridSplitter Height="3"
                             Grid.Row="3"
                             HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            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}}" />
+                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}">
+                </TextBlock>
                 <TextBlock Padding="5 2 2 0"
                            TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}">
+                </TextBlock>
               </StackPanel>
             </Grid>
           </Border>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
index 36d5610c..caad45e6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
@@ -20,6 +20,7 @@
                     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"
@@ -52,8 +53,13 @@
             Member="sys:String.Empty" />
 
   <!-- PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
+  <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>
@@ -71,7 +77,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -89,7 +95,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -107,7 +113,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -125,7 +131,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -143,7 +149,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -161,7 +167,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -279,6 +285,11 @@
             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}}">
@@ -317,13 +328,13 @@
   <!-- 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).                                               -->
+  <!-- available in code-behind (not xaml).                                              -->
   <!-- (ex. Office2007 theme)                                                            -->
   <!-- ===============================================================================   -->
 
   <!-- Internal PropertyGrid numeric Editors -->
   <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -341,7 +352,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -359,7 +370,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -377,7 +388,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -970,15 +981,18 @@
                                   Template="{StaticResource ExpanderToggleButton}"
                                   OverridesDefaultStyle="True"
                                   IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                  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}}" />
+                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                    </pg:TrimmedTextBlock>
                   </Grid>
 
                   <Grid Grid.Column="1"
@@ -988,10 +1002,12 @@
                         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}}" />
+                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
+                    </Image>
                   </Grid>
                 </Grid>
               </Border>
@@ -1204,12 +1220,14 @@
                   <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
                     <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
                                          TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" />
+                                         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" />
+                                         TextTrimming="CharacterEllipsis" >
+                    </pg:TrimmedTextBlock>
                   </Grid>
                 </StackPanel>
               </StackPanel>
@@ -1233,7 +1251,8 @@
                                  ToolTip="Categorized">
                       <Image Source="./../Images/Categorize16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                     <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                  VerticalAlignment="Center"
@@ -1241,7 +1260,8 @@
                                  ToolTip="Alphabetical">
                       <Image Source="./../Images/SortAscending16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                   </StackPanel>
                 </Grid>
@@ -1285,7 +1305,8 @@
                             HorizontalAlignment="Left">
                       <Image Source="./../Images/ClearFilter16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </Button>
                   </Grid>
                 </Border>
@@ -1320,13 +1341,22 @@
                               BorderBrush="{TemplateBinding BorderBrush}"
                               Background="{TemplateBinding Background}"
                               SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
+                        <ScrollViewer x:Name="ScrollBar"
+                                      Padding="{TemplateBinding Padding}"
                                       Focusable="False"
                                       VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="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>
 
@@ -1349,16 +1379,19 @@
               <GridSplitter Height="3"
                             Grid.Row="3"
                             HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-              <StackPanel Grid.Row="4"
+                            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}}" />
+                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" >
+                </TextBlock>
                 <TextBlock Padding="5 2 2 0"
                            TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" >
+                </TextBlock>
               </StackPanel>
             </Grid>
           </Border>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
index 3e58a8dc..40528354 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
@@ -15,14 +15,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using System.ComponentModel;
-using System.Windows.Input;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit
@@ -123,8 +118,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between higher/maximum values. (Brush)
+    /// 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 ) );
@@ -145,8 +139,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Higher/Maximum values. (Style)
+    /// 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 )
@@ -168,9 +161,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the  HigherRange within the entire min/max range.
+    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the HigherRange within the entire min/max range.
     /// </summary>
     /// 
 
@@ -196,8 +187,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherThumbBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the HigherValue thumb back of the icons [active state]. (Brush)
+    /// 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 ) );
@@ -218,8 +208,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherValue
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// HigherValue property represents the higher value within the selected range.
     /// </summary>
     public static readonly DependencyProperty HigherValueProperty = DependencyProperty.Register( "HigherValue", typeof( double ), typeof( RangeSlider )
@@ -273,8 +261,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region IsDeferredUpdateValues
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// 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 )
@@ -315,8 +301,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between minimum/lower values . (Brush)
+    /// 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 ) );
@@ -337,8 +322,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Minimum/Lower values. (Style)
+    /// 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 )
@@ -360,9 +344,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the  LowerRange, within the entire min/max range.
+    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the LowerRange, within the entire min/max range.
     /// </summary>
     /// 
 
@@ -387,8 +369,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerThumbBackground
     /// <summary>
-    /// # TODODOC          
-    /// Get/Set the Brush for the LowerValue thumb back of the icons [active state]. (Brush)
+    /// 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 ) );
@@ -409,7 +390,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerValue
     /// <summary>
-    /// # TODODOC          
     /// LowerValue property represents the lower value within the selected range.
     /// </summary>
     public static readonly DependencyProperty LowerValueProperty = DependencyProperty.Register( "LowerValue", typeof( double ), typeof( RangeSlider )
@@ -463,7 +443,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region Maximum
     /// <summary>
-    /// # TODODOC          
     /// 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 )
@@ -499,7 +478,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region Minimum
     /// <summary>
-    /// //#TODODOC          
     /// 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 )
@@ -537,8 +515,7 @@ namespace Xceed.Wpf.Toolkit
     #region Orientation
 
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the RangeSlider orientation.
+    /// 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 ) );
@@ -572,8 +549,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between lower/higher values [active state]. (Brush)
+    /// 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 ) );
@@ -594,8 +570,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Lower/Higher values. (Style)
+    /// 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 )
@@ -617,8 +592,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// RangeWidth property is a readonly property, used to calculate the percentage of the range within the entire min/max range.
     /// </summary>
 
@@ -643,9 +616,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region Step
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// Step property is used to identify the RangeSlider's size of individual move, while clicking on the LowerRange, HigherRange, not while scrolling the thumbs.
+    /// 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 ) );
@@ -816,6 +787,7 @@ namespace Xceed.Wpf.Toolkit
       return this.LowerValue.ToString() + "-" + this.HigherValue.ToString();
     }
 
+
     #endregion Override
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
index 1ada0aae..f4890a1f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
@@ -22,547 +22,549 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
-   <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-    <!-- //#TODODOC
-         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>
-
-   <!--//##TODODOC-->
-   <!--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>
+  <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>
-   </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>
-            <!-- //#TODODOC 
-             Get Thumbs's height to set the good RangeSlider height.-->
-            <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 Height="{TemplateBinding RangeWidth}"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Background="{TemplateBinding RangeBackground}"
-                          Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                          SnapsToDevicePixels="True" />
-
-            <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" />
-
-            <!-- 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>
+      <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>
-      <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>
-                     <!-- //#TODODOC 
-                        Get Thumbs's width to set the good RangeSlider width.-->
-                     <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 Width="{TemplateBinding RangeWidth}"
-                                   Grid.Column="2"
-                                   Grid.Row="1"
-                                   Background="{TemplateBinding RangeBackground}"
-                                   Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                                   SnapsToDevicePixels="True" />
-
-                     <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" />
-
-                     <!-- 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>
+
+      <TickBar Name="RightTick"
+               Grid.Column="2"
+               SnapsToDevicePixels="True"
+               Fill="Black"
+               Placement="Right"
+               Width="4"
+               Visibility="Collapsed" />
+    </Grid>
+
+    <ControlTemplate.Triggers>
+      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
+                   Value="TopLeft">
+        <Setter TargetName="LeftTick"
+                Property="Visibility"
+                Value="Visible" />
+      </DataTrigger>
+      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
+                   Value="BottomRight">
+        <Setter TargetName="RightTick"
+                Property="Visibility"
+                Value="Visible" />
+      </DataTrigger>
+      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
+                   Value="Both">
+        <Setter TargetName="LeftTick"
+                Property="Visibility"
+                Value="Visible" />
+        <Setter TargetName="RightTick"
+                Property="Visibility"
+                Value="Visible" />
+      </DataTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <!-- ********************** -->
+  <!-- Vertical RangeSlider Template -->
+  <!-- ********************** -->
+  <ControlTemplate x:Key="VerticalRangeSlider"
+                   TargetType="{x:Type local:RangeSlider}">
+    <Border BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            Background="{TemplateBinding Background}">
+      <Grid HorizontalAlignment="Left"
+            VerticalAlignment="Top">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition x:Name="LeftColumn"
+                            Width="0" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition x:Name="RightColumn"
+                            Width="0" />
+        </Grid.ColumnDefinitions>
+        <!-- Get the Thumbs's height to set a good height for the RangeSlider.-->
+        <Grid.RowDefinitions>
+          <RowDefinition Height="11" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="11" />
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="1"
+                Grid.RowSpan="3"
+                Grid.Column="1"
+                BorderThickness="1"
+                BorderBrush="#FFD6D6D6"
+                Background="#FFE7EAEA"
+                VerticalAlignment="Stretch"
+                HorizontalAlignment="Center"
+                Width="4" />
+
+        <!-- Create a Hidden Slider to only display its Ticks -->
+        <Slider x:Name="TickSlider"
+                Orientation="Vertical"
+                Grid.RowSpan="5"
+                Grid.ColumnSpan="3"
+                Focusable="False"
+                Margin="0,5.5,0,5.5"
+                Template="{StaticResource VerticalTickSliderTemplate}"
+                Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
+                Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
+                TickFrequency="{TemplateBinding TickFrequency}">
+        </Slider>
+
+        <RepeatButton x:Name="PART_LowerRange"
+                      Height="{TemplateBinding LowerRangeWidth}"
+                      Grid.Row="3"
+                      Grid.Column="1"
+                      Background="{TemplateBinding LowerRangeBackground}"
+                      Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                      SnapsToDevicePixels="True" >
+        </RepeatButton>
+
+        <RepeatButton Height="{TemplateBinding RangeWidth}"
+                      Grid.Row="2"
+                      Grid.Column="1"
+                      Background="{TemplateBinding RangeBackground}"
+                      Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                      SnapsToDevicePixels="True" >
+        </RepeatButton>
+
+        <RepeatButton x:Name="PART_HigherRange"
+                      Height="{TemplateBinding HigherRangeWidth}"
+                      Grid.Row="1"
+                      Grid.Column="1"
+                      Background="{TemplateBinding HigherRangeBackground}"
+                      Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                      SnapsToDevicePixels="True" >
+        </RepeatButton>
+
+        <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb Height -->
+        <Slider x:Name="PART_LowerSlider"
+                Orientation="Vertical"
+                Grid.RowSpan="5"
+                Grid.Column="1"
+                Focusable="False"
+                Background="{TemplateBinding LowerThumbBackground}"
+                Template="{StaticResource SliderTemplate}"
+                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                TickFrequency="{TemplateBinding TickFrequency}"
+                HorizontalAlignment="Left"
+                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
+        </Slider>
+
+        <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
+        <Slider x:Name="PART_HigherSlider"
+                Grid.RowSpan="5"
+                Grid.Column="1"
+                Orientation="Vertical"
+                Focusable="False"
+                Background="{TemplateBinding HigherThumbBackground}"
+                Template="{StaticResource SliderTemplate}"
+                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                TickFrequency="{TemplateBinding TickFrequency}"
+                HorizontalAlignment="Left"
+                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
+        </Slider>
+      </Grid>
+    </Border>
+    <ControlTemplate.Triggers>
+      <Trigger Property="TickPlacement"
+               Value="TopLeft">
+        <Setter TargetName="LeftColumn"
+                Property="Width"
+                Value="4" />
+      </Trigger>
+      <Trigger Property="TickPlacement"
+               Value="BottomRight">
+        <Setter TargetName="RightColumn"
+                Property="Width"
+                Value="4" />
+      </Trigger>
+      <Trigger Property="TickPlacement"
+               Value="Both">
+        <Setter TargetName="LeftColumn"
+                Property="Width"
+                Value="4" />
+        <Setter TargetName="RightColumn"
+                Property="Width"
+                Value="4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <!-- ********************** -->
+  <!-- RangeSlider Style -->
+  <!-- ********************** -->
+  <Style TargetType="{x:Type local:RangeSlider}">
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:RangeSlider}">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Background="{TemplateBinding Background}">
+            <Grid HorizontalAlignment="Left"
+                  VerticalAlignment="Top">
+              <Grid.RowDefinitions>
+                <RowDefinition x:Name="TopRow"
+                               Height="0" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition x:Name="BottomRow"
+                               Height="0" />
+              </Grid.RowDefinitions>
+              <!-- Get the Thumbs's width to set a good width for the RangeSlider. -->
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="11" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="11" />
+              </Grid.ColumnDefinitions>
+
+              <Border Grid.Column="1"
+                      Grid.ColumnSpan="3"
+                      Grid.Row="1"
+                      BorderThickness="1"
+                      BorderBrush="#FFD6D6D6"
+                      Background="#FFE7EAEA"
+                      VerticalAlignment="Center"
+                      Height="4" />
+
+              <!-- Create a Hidden Slider to only display its Ticks -->
+              <Slider x:Name="TickSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.RowSpan="3"
+                      Focusable="False"
+                      Margin="5.5,0,5.5,0"
+                      Template="{StaticResource HorizontalTickSliderTemplate}"
+                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
+                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
+                      TickFrequency="{TemplateBinding TickFrequency}">
+              </Slider>
+
+              <RepeatButton x:Name="PART_LowerRange"
+                            Width="{TemplateBinding LowerRangeWidth}"
+                            Grid.Column="1"
+                            Grid.Row="1"
+                            Background="{TemplateBinding LowerRangeBackground}"
+                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True">
+              </RepeatButton>
+
+              <RepeatButton Width="{TemplateBinding RangeWidth}"
+                            Grid.Column="2"
+                            Grid.Row="1"
+                            Background="{TemplateBinding RangeBackground}"
+                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True">
+              </RepeatButton>
+
+              <RepeatButton x:Name="PART_HigherRange"
+                            Width="{TemplateBinding HigherRangeWidth}"
+                            Grid.Column="3"
+                            Grid.Row="1"
+                            Background="{TemplateBinding HigherRangeBackground}"
+                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True">
+              </RepeatButton>
+
+              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
+              <Slider x:Name="PART_LowerSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.Row="1"
+                      Focusable="False"
+                      Background="{TemplateBinding LowerThumbBackground}"
+                      Template="{StaticResource SliderTemplate}"
+                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                      TickFrequency="{TemplateBinding TickFrequency}"
+                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
+              </Slider>
+
+              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
+              <Slider x:Name="PART_HigherSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.Row="1"
+                      Focusable="False"
+                      Background="{TemplateBinding HigherThumbBackground}"
+                      Template="{StaticResource SliderTemplate}"
+                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                      TickFrequency="{TemplateBinding TickFrequency}"
+                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
+              </Slider>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="TickPlacement"
+                     Value="TopLeft">
+              <Setter TargetName="TopRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+            <Trigger Property="TickPlacement"
+                     Value="BottomRight">
+              <Setter TargetName="BottomRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+            <Trigger Property="TickPlacement"
+                     Value="Both">
+              <Setter TargetName="TopRow"
+                      Property="Height"
+                      Value="4" />
+              <Setter TargetName="BottomRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="Orientation"
+               Value="Vertical">
+        <Setter Property="Template"
+                Value="{StaticResource VerticalRangeSlider}" />
+      </Trigger>
+    </Style.Triggers>
+
+
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
index f5bb7177..95a47482 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
@@ -22,609 +22,615 @@
                     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>
-
-   <!-- //#TODODOC
-         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>
-
-   <!--//##TODODOC-->
-   <!--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"
+  <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>
+    <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>
 
-      <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>
+      <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>
 
-      <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>
-            <!-- //#TODODOC 
-             Get Thumbs's height to set the good RangeSlider height.-->
-            <Grid.RowDefinitions>
-               <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
+      <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 Height="{TemplateBinding RangeWidth}"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Background="{TemplateBinding RangeBackground}"
-                          Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                          SnapsToDevicePixels="True" />
-
-            <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" />
-
-            <!-- 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}"/>
-
-            <!-- 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}"/>
-         </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>
-                     <!-- //#TODODOC 
-                        Get Thumbs's width to set the good RangeSlider width.-->
-                  <Grid.ColumnDefinitions>
-                     <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
+          <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 Width="{TemplateBinding RangeWidth}"
-                                   Grid.Column="2"
-                                   Grid.Row="1"
-                                   Background="{TemplateBinding RangeBackground}"
-                                   Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                                   SnapsToDevicePixels="True" />
-
-                     <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" />
-
-                     <!-- 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}" />
-
-                     <!-- 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}"/>
-                  </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>
+                <ColumnDefinition Width="11" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="11" />
+              </Grid.ColumnDefinitions>
+
+              <Border Grid.Column="1"
+                      Grid.ColumnSpan="3"
+                      Grid.Row="1"
+                      BorderThickness="1"
+                      BorderBrush="{StaticResource SliderBorderBrush}"
+                      Background="#FFE7EAEA"
+                      VerticalAlignment="Center"
+                      Height="4" />
+
+              <!-- Create a Hidden Slider to only display its Ticks -->
+              <Slider x:Name="TickSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.RowSpan="3"
+                      Focusable="False"
+                      Margin="5.5,0,5.5,0"
+                      Template="{StaticResource HorizontalTickSliderTemplate}"
+                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
+                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
+                      TickFrequency="{TemplateBinding TickFrequency}">
+              </Slider>
+
+              <RepeatButton x:Name="PART_LowerRange"
+                            Width="{TemplateBinding LowerRangeWidth}"
+                            Grid.Column="1"
+                            Grid.Row="1"
+                            Background="{TemplateBinding LowerRangeBackground}"
+                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True" >
+              </RepeatButton>
+
+              <RepeatButton Width="{TemplateBinding RangeWidth}"
+                            Grid.Column="2"
+                            Grid.Row="1"
+                            Background="{TemplateBinding RangeBackground}"
+                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True" >
+              </RepeatButton>
+
+              <RepeatButton x:Name="PART_HigherRange"
+                            Width="{TemplateBinding HigherRangeWidth}"
+                            Grid.Column="3"
+                            Grid.Row="1"
+                            Background="{TemplateBinding HigherRangeBackground}"
+                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
+                            SnapsToDevicePixels="True" >
+              </RepeatButton>
+
+              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
+              <Slider x:Name="PART_LowerSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.Row="1"
+                      Focusable="False"
+                      Background="{TemplateBinding LowerThumbBackground}"
+                      Template="{StaticResource SliderTemplate}"
+                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                      TickFrequency="{TemplateBinding TickFrequency}"
+                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
+              </Slider>
+
+              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
+              <Slider x:Name="PART_HigherSlider"
+                      Grid.ColumnSpan="5"
+                      Grid.Row="1"
+                      Focusable="False"
+                      Background="{TemplateBinding HigherThumbBackground}"
+                      Template="{StaticResource SliderTemplate}"
+                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
+                      TickFrequency="{TemplateBinding TickFrequency}"
+                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
+                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
+              </Slider>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="TickPlacement"
+                     Value="TopLeft">
+              <Setter TargetName="TopRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+            <Trigger Property="TickPlacement"
+                     Value="BottomRight">
+              <Setter TargetName="BottomRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+            <Trigger Property="TickPlacement"
+                     Value="Both">
+              <Setter TargetName="TopRow"
+                      Property="Height"
+                      Value="4" />
+              <Setter TargetName="BottomRow"
+                      Property="Height"
+                      Value="4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="Orientation"
+               Value="Vertical">
+        <Setter Property="Template"
+                Value="{StaticResource VerticalRangeSlider}" />
+      </Trigger>
+    </Style.Triggers>
+
+
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index 3e42b028..0578ab59 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -109,7 +109,7 @@ namespace Xceed.Wpf.Toolkit
     protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
     {
       base.OnTextChanged( e );
-      UpdateTextFromDocument();
+      this.UpdateTextFromDocument();
     }
 
     private void UpdateTextFromDocument()
@@ -118,7 +118,11 @@ namespace Xceed.Wpf.Toolkit
         return;
 
       _preventDocumentUpdate = true;
-      Text = TextFormatter.GetText( Document );
+#if VS2008
+      Text = this.TextFormatter.GetText( this.Document );
+#else
+      this.SetCurrentValue( RichTextBox.TextProperty, this.TextFormatter.GetText( this.Document ) );
+#endif
       _preventDocumentUpdate = false;
     }
 
@@ -128,7 +132,7 @@ namespace Xceed.Wpf.Toolkit
         return;
 
       _preventTextUpdate = true;
-      TextFormatter.SetText( Document, Text );
+      this.TextFormatter.SetText( this.Document, Text );
       _preventTextUpdate = false;
     }
 
@@ -137,7 +141,7 @@ namespace Xceed.Wpf.Toolkit
     /// </summary>
     public void Clear()
     {
-      Document.Blocks.Clear();
+      this.Document.Blocks.Clear();
     }
 
     public override void BeginInit()
@@ -157,9 +161,13 @@ namespace Xceed.Wpf.Toolkit
       // the document AND the text at the same time 
       // in XAML. Text has priority.
       if( !string.IsNullOrEmpty( Text ) )
-        UpdateDocumentFromText();
+      {
+        this.UpdateDocumentFromText();
+      }
       else
-        UpdateTextFromDocument();
+      {
+        this.UpdateTextFromDocument();
+      }
     }
 
     #endregion //Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
index c710bbe6..5b3c37cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
@@ -14,10 +14,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -76,6 +73,13 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Constructors
 
+    #region Base Class Overrides
+
+
+
+
+    #endregion
+
     #region Event Hanlders
 
     private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
index 5f5cd3c1..8a6a8f75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
@@ -17,713 +17,735 @@
 <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" />
-                                        <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" />
-                                        <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}" />
-
-                <StackPanel Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <ComboBox x:Name="_cmbFontFamilies"
-                            IsEditable="True"
-                            Width="100"
-                            ToolTip="Font Family" />
-
-                        <ComboBox x:Name="_cmbFontSizes"
-                            IsEditable="True"
-                            Width="43"
-                            ToolTip="Font Size"/>
-
-                        <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" />
-                        </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" />
-                        </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" />
-                        </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" />
-                        </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" />
-                        </ToggleButton>
-
-                        <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" />
-                        </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" />
-                        </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" />
-                        </RadioButton>
-
-                        <Separator />
-
-                        <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                                     ToolTip="Text Highlight Color" />
-
-                        <local:ColorPicker x:Name="_cmbFontColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontColorButtonStyle}"
-                                     ToolTip="Font Color" />
-
-                    </StackPanel>
-
+                    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>
-            </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>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Opacity"
+                      TargetName="Content"
+                      Value="0.5" />
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="FontColorButtonStyle"
+         TargetType="{x:Type ToggleButton}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Height"
+            Value="22" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="ToolTipService.InitialShowDelay"
+            Value="900" />
+    <Setter Property="ToolTipService.ShowDuration"
+            Value="20000" />
+    <Setter Property="ToolTipService.BetweenShowDelay"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ToggleButton}">
+          <Grid SnapsToDevicePixels="True">
+            <Border x:Name="OuterBorder"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="0" />
+            <Border x:Name="MiddleBorder"
+                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="Transparent"
+                    CornerRadius="0">
+              <Border x:Name="InnerBorder"
+                      BorderBrush="Transparent"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Background="Transparent"
+                      CornerRadius="0"
+                      Padding="{TemplateBinding Padding}">
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+
+                  <Grid>
+                    <Image Source="../Images/FontColorPicker16.png"
+                           Width="16"
+                           Height="16">
+                    </Image>
+                    <Rectangle Grid.Row="1"
+                               Height="4"
+                               Margin="0,12,0,0"
+                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                  </Grid>
+
+                  <Path Grid.Column="1"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="#FF000000"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="FontBackgrounColorButtonStyle"
+         TargetType="{x:Type ToggleButton}">
+    <Setter Property="Background"
+            Value="White" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Height"
+            Value="22" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="ToolTipService.InitialShowDelay"
+            Value="900" />
+    <Setter Property="ToolTipService.ShowDuration"
+            Value="20000" />
+    <Setter Property="ToolTipService.BetweenShowDelay"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ToggleButton}">
+          <Grid SnapsToDevicePixels="True">
+            <Border x:Name="OuterBorder"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="0" />
+            <Border x:Name="MiddleBorder"
+                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="Transparent"
+                    CornerRadius="0">
+              <Border x:Name="InnerBorder"
+                      BorderBrush="Transparent"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Background="Transparent"
+                      CornerRadius="0"
+                      Padding="{TemplateBinding Padding}">
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+
+                  <Grid>
+                    <Image Source="../Images/TextHighlightColorPicker16.png"
+                           Width="16"
+                           Height="16">
+                    </Image>
+                    <Rectangle Grid.Row="1"
+                               Height="4"
+                               Margin="0,12,0,0"
+                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                  </Grid>
+
+                  <Path Grid.Column="1"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="#FF000000"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =================================================================== -->
+  <!-- Template                                                            -->
+  <!-- =================================================================== -->
+  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
+                   TargetType="{x:Type local:RichTextBoxFormatBar}">
+    <ControlTemplate.Resources>
+      <Style TargetType="{x:Type Separator}"
+             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
+    </ControlTemplate.Resources>
+    <Border CornerRadius="0"
+            BorderThickness="1"
+            BorderBrush="#FFADC7DE"
+            Background="#FFDAE8F9">
+      <Grid Margin="5,0,5,5">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Thumb x:Name="_dragWidget"
+               Height="10"
+               Template="{StaticResource ThumbControlTemplate}">
+        </Thumb>
+
+        <StackPanel Grid.Row="1">
+          <StackPanel Orientation="Horizontal">
+            <ComboBox x:Name="_cmbFontFamilies"
+                      IsEditable="True"
+                      Width="100"
+                      ToolTip="Font Family">
+            </ComboBox>
+
+            <ComboBox x:Name="_cmbFontSizes"
+                      IsEditable="True"
+                      Width="43"
+                      ToolTip="Font Size">
+            </ComboBox>
+
+            <Separator >
+            </Separator>
+
+            <ToggleButton x:Name="_btnBullets"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleBullets"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Bullets">
+              <Image Source="../Images/Bullets16.png">
+              </Image>
+            </ToggleButton>
+
+            <ToggleButton x:Name="_btnNumbers"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleNumbering"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Numbering">
+              <Image Source="../Images/Numbering16.png">
+              </Image>
+            </ToggleButton>
+
+          </StackPanel>
+
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,3,0,0">
+            <ToggleButton x:Name="_btnBold"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleBold"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Bold">
+              <Image Source="../Images/Bold16.png" >
+              </Image>
+            </ToggleButton>
+            <ToggleButton x:Name="_btnItalic"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="{x:Static EditingCommands.ToggleItalic}"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Italic">
+              <Image Source="../Images/Italic16.png" >
+              </Image>
+            </ToggleButton>
+            <ToggleButton x:Name="_btnUnderline"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="{x:Static EditingCommands.ToggleUnderline}"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Underline">
+              <Image Source="../Images/Underline16.png" >
+              </Image>
+            </ToggleButton>
+
+            <Separator>
+            </Separator>
+
+            <RadioButton x:Name="_btnAlignLeft"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignLeft}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Left">
+              <Image Source="../Images/LeftAlign16.png">
+              </Image>
+            </RadioButton>
+            <RadioButton x:Name="_btnAlignCenter"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignCenter}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Center">
+              <Image Source="../Images/CenterAlign16.png">
+              </Image>
+            </RadioButton>
+            <RadioButton x:Name="_btnAlignRight"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignRight}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Right">
+              <Image Source="../Images/RightAlign16.png">
+              </Image>
+            </RadioButton>
+
+            <Separator>
+            </Separator>
+
+            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
+                               BorderThickness="0"
+                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
+                               ToolTip="Text Highlight Color">
+            </local:ColorPicker>
+
+            <local:ColorPicker x:Name="_cmbFontColor"
+                               BorderThickness="0"
+                               ButtonStyle="{StaticResource FontColorButtonStyle}"
+                               ToolTip="Font Color">
+            </local:ColorPicker>
+
+          </StackPanel>
+
+        </StackPanel>
+      </Grid>
+    </Border>
+  </ControlTemplate>
+
+  <!-- =================================================================== -->
+  <!-- Style                                                               -->
+  <!-- =================================================================== -->
+  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
+    <Setter Property="IsTabStop"
+            Value="false" />
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template"
+            Value="{StaticResource richTextBoxFormatBarTemplate}" />
+    <Setter Property="Effect">
+      <Setter.Value>
+        <DropShadowEffect BlurRadius="5"
+                          Opacity=".25" />
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
index 1b83005c..1457bb50 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
@@ -17,716 +17,734 @@
 <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" />
-                              <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" />
-                              <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}" />
-
-            <StackPanel Grid.Row="1">
-               <StackPanel Orientation="Horizontal">
-                  <ComboBox x:Name="_cmbFontFamilies"
-                            IsEditable="True"
-                            Width="100"
-                            ToolTip="Font Family" />
-
-                  <ComboBox x:Name="_cmbFontSizes"
-                            IsEditable="True"
-                            Width="43"
-                            ToolTip="Font Size"/>
-
-                  <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" />
-                  </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" />
-                  </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" />
-                  </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" />
-                  </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" />
-                  </ToggleButton>
-
-                  <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" />
-                  </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" />
-                  </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" />
-                  </RadioButton>
-
-                  <Separator />
-
-                  <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                                     ToolTip="Text Highlight Color" />
-
-                  <local:ColorPicker x:Name="_cmbFontColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontColorButtonStyle}"
-                                     ToolTip="Font Color" />
-
-               </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>
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+  <ControlTemplate x:Key="ThumbControlTemplate"
+                   TargetType="{x:Type Thumb}">
+    <Border Background="Transparent"
+            Cursor="Hand"
+            ToolTip="Click to Drag">
+      <StackPanel VerticalAlignment="Center"
+                  Width="75">
+        <Line SnapsToDevicePixels="True"
+              Stretch="Fill"
+              StrokeDashArray="1,2"
+              StrokeThickness="1"
+              X1="0"
+              X2="1"
+              Margin=".5">
+          <Line.Stroke>
+            <SolidColorBrush Color="Gray" />
+          </Line.Stroke>
+        </Line>
+        <Line SnapsToDevicePixels="True"
+              Stretch="Fill"
+              StrokeDashArray="1,2"
+              StrokeThickness="1"
+              X1="0"
+              X2="1"
+              Margin=".5">
+          <Line.Stroke>
+            <SolidColorBrush Color="Gray" />
+          </Line.Stroke>
+        </Line>
+        <Line SnapsToDevicePixels="True"
+              Stretch="Fill"
+              StrokeDashArray="1,2"
+              StrokeThickness="1"
+              X1="0"
+              X2="1"
+              Margin=".5">
+          <Line.Stroke>
+            <SolidColorBrush Color="Gray" />
+          </Line.Stroke>
+        </Line>
+      </StackPanel>
+    </Border>
+  </ControlTemplate>
+
+  <SolidColorBrush x:Key="MouseOverBorderBrush"
+                   Color="#FFFFB700" />
+  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
+                       StartPoint="0,0"
+                       EndPoint="0,1">
+    <GradientStop Offset="0"
+                  Color="#FFFEFBF4" />
+    <GradientStop Offset="0.19"
+                  Color="#FFFDE7CE" />
+    <GradientStop Offset="0.39"
+                  Color="#FFFDDEB8" />
+    <GradientStop Offset="0.39"
+                  Color="#FFFFCE6B" />
+    <GradientStop Offset="0.79"
+                  Color="#FFFFDE9A" />
+    <GradientStop Offset="1"
+                  Color="#FFFFEBAA" />
+  </LinearGradientBrush>
+
+  <SolidColorBrush x:Key="CheckedBorderBrush"
+                   Color="#FFC29B29" />
+  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
+                       StartPoint="0,0"
+                       EndPoint="0,1">
+    <GradientStop Offset="0"
+                  Color="#FFFFDCA0" />
+    <GradientStop Offset="0.18"
+                  Color="#FFFFD692" />
+    <GradientStop Offset="0.39"
+                  Color="#FFFFC45D" />
+    <GradientStop Offset="1"
+                  Color="#FFFFD178" />
+  </LinearGradientBrush>
+
+  <SolidColorBrush x:Key="PressedBorderBrush"
+                   Color="#FFC29B29" />
+  <LinearGradientBrush x:Key="PressedBackgroundBrush"
+                       StartPoint="0,0"
+                       EndPoint="0,1">
+    <GradientStop Offset="0"
+                  Color="#FFE3C085" />
+    <GradientStop Offset="0.19"
+                  Color="#FFF4CC89" />
+    <GradientStop Offset="0.36"
+                  Color="#FFF5C777" />
+    <GradientStop Offset="0.36"
+                  Color="#FFF5BB56" />
+    <GradientStop Offset="0.79"
+                  Color="#FFF4CE9A" />
+    <GradientStop Offset="1"
+                  Color="#FFF3E28D" />
+  </LinearGradientBrush>
+
+  <Style x:Key="FormatBarToggleButtonStyle"
+         TargetType="{x:Type ToggleButton}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Height"
+            Value="22" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="ToolTipService.InitialShowDelay"
+            Value="900" />
+    <Setter Property="ToolTipService.ShowDuration"
+            Value="20000" />
+    <Setter Property="ToolTipService.BetweenShowDelay"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ToggleButton}">
+          <Grid SnapsToDevicePixels="True">
+            <Border x:Name="OuterBorder"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    CornerRadius="2" />
+            <Border x:Name="MiddleBorder"
+                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="Transparent"
+                    CornerRadius="2">
+              <Border x:Name="InnerBorder"
+                      BorderBrush="Transparent"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Background="Transparent"
+                      CornerRadius="2"
+                      Padding="{TemplateBinding Padding}">
+                <StackPanel x:Name="StackPanel"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                  <ContentPresenter x:Name="Content"
+                                    Content="{TemplateBinding Content}"
+                                    Margin="1"
+                                    RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                </StackPanel>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Opacity"
+                      TargetName="Content"
+                      Value="0.5" />
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="FontColorButtonStyle"
+         TargetType="{x:Type ToggleButton}">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Height"
+            Value="22" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="ToolTipService.InitialShowDelay"
+            Value="900" />
+    <Setter Property="ToolTipService.ShowDuration"
+            Value="20000" />
+    <Setter Property="ToolTipService.BetweenShowDelay"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ToggleButton}">
+          <Grid SnapsToDevicePixels="True">
+            <Border x:Name="OuterBorder"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="2" />
+            <Border x:Name="MiddleBorder"
+                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="Transparent"
+                    CornerRadius="2">
+              <Border x:Name="InnerBorder"
+                      BorderBrush="Transparent"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Background="Transparent"
+                      CornerRadius="2"
+                      Padding="{TemplateBinding Padding}">
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+
+                  <Grid>
+                    <Image Source="../Images/FontColorPicker16.png"
+                           Width="16"
+                           Height="16" >
+                    </Image>
+                    <Rectangle Grid.Row="1"
+                               Height="4"
+                               Margin="0,12,0,0"
+                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                  </Grid>
+
+                  <Path Grid.Column="1"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="#FF000000"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="FontBackgrounColorButtonStyle"
+         TargetType="{x:Type ToggleButton}">
+    <Setter Property="Background"
+            Value="White" />
+    <Setter Property="BorderBrush"
+            Value="Transparent" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="Height"
+            Value="22" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="ToolTipService.InitialShowDelay"
+            Value="900" />
+    <Setter Property="ToolTipService.ShowDuration"
+            Value="20000" />
+    <Setter Property="ToolTipService.BetweenShowDelay"
+            Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ToggleButton}">
+          <Grid SnapsToDevicePixels="True">
+            <Border x:Name="OuterBorder"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="2" />
+            <Border x:Name="MiddleBorder"
+                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="Transparent"
+                    CornerRadius="2">
+              <Border x:Name="InnerBorder"
+                      BorderBrush="Transparent"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Background="Transparent"
+                      CornerRadius="2"
+                      Padding="{TemplateBinding Padding}">
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+
+                  <Grid>
+                    <Image Source="../Images/TextHighlightColorPicker16.png"
+                           Width="16"
+                           Height="16" >
+                    </Image>
+                    <Rectangle Grid.Row="1"
+                               Height="4"
+                               Margin="0,12,0,0"
+                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                  </Grid>
+
+                  <Path Grid.Column="1"
+                        Width="9"
+                        Height="5"
+                        Data="{StaticResource DownArrowGeometry}"
+                        Fill="#FF000000"
+                        Margin="0,1,0,0" />
+                </Grid>
+              </Border>
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource MouseOverBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="#80FFFFFF" />
+            </Trigger>
+
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="OuterBorder"
+                      Value="#FF9E9E9E" />
+            </Trigger>
+
+            <Trigger Property="IsChecked"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource CheckedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#FFE7CBAD"
+                                  Offset="0" />
+                    <GradientStop Color="#FFF7D7B5"
+                                  Offset="0.1" />
+                    <GradientStop Color="#FFFFD38C"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFC75A"
+                                  Offset="0.36" />
+                    <GradientStop Color="#FFFFEFA5"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="Background"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBackgroundBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="OuterBorder"
+                      Value="{StaticResource PressedBorderBrush}" />
+              <Setter Property="BorderBrush"
+                      TargetName="InnerBorder"
+                      Value="Transparent" />
+            </Trigger>
+
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked"
+                           Value="True" />
+                <Condition Property="IsMouseOver"
+                           Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background"
+                      TargetName="MiddleBorder">
+                <Setter.Value>
+                  <LinearGradientBrush EndPoint="0,1"
+                                       StartPoint="0,0">
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0" />
+                    <GradientStop Color="#40FFFEFE"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.39" />
+                    <GradientStop Color="#20FFCE68"
+                                  Offset="0.69" />
+                    <GradientStop Color="#10FFFFFF"
+                                  Offset="1" />
+                  </LinearGradientBrush>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- =================================================================== -->
+  <!-- Template                                                            -->
+  <!-- =================================================================== -->
+  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
+                   TargetType="{x:Type local:RichTextBoxFormatBar}">
+    <ControlTemplate.Resources>
+      <Style TargetType="{x:Type Separator}"
+             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
+    </ControlTemplate.Resources>
+    <Border CornerRadius="3"
+            BorderThickness="1"
+            BorderBrush="Gray"
+            Background="WhiteSmoke">
+      <Grid Margin="5,0,5,5">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Thumb x:Name="_dragWidget"
+               Height="10"
+               Template="{StaticResource ThumbControlTemplate}" >
+        </Thumb>
+
+        <StackPanel Grid.Row="1">
+          <StackPanel Orientation="Horizontal">
+            <ComboBox x:Name="_cmbFontFamilies"
+                      IsEditable="True"
+                      Width="100"
+                      ToolTip="Font Family" >
+            </ComboBox>
+
+            <ComboBox x:Name="_cmbFontSizes"
+                      IsEditable="True"
+                      Width="43"
+                      ToolTip="Font Size" >
+            </ComboBox>
+
+            <Separator>
+            </Separator>
+
+            <ToggleButton x:Name="_btnBullets"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleBullets"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Bullets">
+              <Image Source="../Images/Bullets16.png" >
+              </Image>
+            </ToggleButton>
+
+            <ToggleButton x:Name="_btnNumbers"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleNumbering"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Numbering">
+              <Image Source="../Images/Numbering16.png" >
+              </Image>
+            </ToggleButton>
+
+          </StackPanel>
+
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,3,0,0">
+            <ToggleButton x:Name="_btnBold"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="EditingCommands.ToggleBold"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Bold">
+              <Image Source="../Images/Bold16.png" >
+              </Image>
+            </ToggleButton>
+            <ToggleButton x:Name="_btnItalic"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="{x:Static EditingCommands.ToggleItalic}"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Italic">
+              <Image Source="../Images/Italic16.png" >
+              </Image>
+            </ToggleButton>
+            <ToggleButton x:Name="_btnUnderline"
+                          Style="{StaticResource FormatBarToggleButtonStyle}"
+                          Command="{x:Static EditingCommands.ToggleUnderline}"
+                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                          ToolTip="Underline">
+              <Image Source="../Images/Underline16.png" >
+              </Image>
+            </ToggleButton>
+
+            <Separator>
+            </Separator>
+
+            <RadioButton x:Name="_btnAlignLeft"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignLeft}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Left">
+              <Image Source="../Images/LeftAlign16.png">
+              </Image>
+            </RadioButton>
+            <RadioButton x:Name="_btnAlignCenter"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignCenter}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Center">
+              <Image Source="../Images/CenterAlign16.png" >
+              </Image>
+            </RadioButton>
+            <RadioButton x:Name="_btnAlignRight"
+                         Style="{StaticResource FormatBarToggleButtonStyle}"
+                         Command="{x:Static EditingCommands.AlignRight}"
+                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
+                         ToolTip="Align Right">
+              <Image Source="../Images/RightAlign16.png" >
+              </Image>
+            </RadioButton>
+
+            <Separator>
+            </Separator>
+
+            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
+                               BorderThickness="0"
+                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
+                               ToolTip="Text Highlight Color" >
+            </local:ColorPicker>
+
+            <local:ColorPicker x:Name="_cmbFontColor"
+                               BorderThickness="0"
+                               ButtonStyle="{StaticResource FontColorButtonStyle}"
+                               ToolTip="Font Color" >
+            </local:ColorPicker>
+
+          </StackPanel>
+
+        </StackPanel>
+      </Grid>
+    </Border>
+  </ControlTemplate>
+
+  <!-- =================================================================== -->
+  <!-- Style                                                               -->
+  <!-- =================================================================== -->
+  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
+    <Setter Property="Template"
+            Value="{StaticResource richTextBoxFormatBarTemplate}" />
+    <Setter Property="Effect">
+      <Setter.Value>
+        <DropShadowEffect BlurRadius="5"
+                          Opacity=".25" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="IsTabStop"
+            Value="false" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
index e45d20ad..709437b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -41,6 +41,7 @@ namespace Xceed.Wpf.Toolkit
       Button = GetTemplateChild( PART_ActionButton ) as Button;
     }
 
-    #endregion //Base Class Overrides
+
+  #endregion //Base Class Overrides
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
index 83c2a675..e541166f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -21,148 +21,151 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
 
-   <!-- =============================================================================== -->
-   <!-- SplitButton                                                                     -->
-   <!-- =============================================================================== -->
-   <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter"/>
+  <!-- =============================================================================== -->
+  <!-- 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="Padding"
-              Value="3" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:SplitButton}">
-               <Grid x:Name="MainGrid"
-                     SnapsToDevicePixels="True">
-                  <chrome:ButtonChrome x:Name="ControlChrome"
-                                       Background="{TemplateBinding Background}"
-                                       RenderEnabled="{TemplateBinding IsEnabled}">
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Button x:Name="PART_ActionButton"
-                                Margin="0"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Padding="{TemplateBinding Padding}">
-                           <Button.Template>
-                              <ControlTemplate TargetType="Button">
-                                 <ContentPresenter />
-                              </ControlTemplate>
-                           </Button.Template>
-                           <Grid>
-                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                   Background="{TemplateBinding Background}"
-                                                   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>
+  <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="{StaticResource PanelBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+              <Setter TargetName="ActionButtonChrome"
+                      Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index b618d7cb..7791fcf0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -21,174 +21,177 @@
                     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="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}">
-                           <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="{StaticResource PopupBackgroundBrush}"
-                             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.MergedDictionaries>
+    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
+                       EndPoint="0.5,1"
+                       StartPoint="0.5,0">
+    <GradientStop Color="#FFA3AEB9"
+                  Offset="0" />
+    <GradientStop Color="#FF8399A9"
+                  Offset="0.375" />
+    <GradientStop Color="#FF718597"
+                  Offset="0.375" />
+    <GradientStop Color="#FF617584"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PopupBackgroundBrush"
+                       StartPoint="0,0"
+                       EndPoint="0,1">
+    <LinearGradientBrush.GradientStops>
+      <GradientStopCollection>
+        <GradientStop Offset="0"
+                      Color="#FFffffff" />
+        <GradientStop Offset="1"
+                      Color="#FFE8EBED" />
+      </GradientStopCollection>
+    </LinearGradientBrush.GradientStops>
+  </LinearGradientBrush>
+
+  <!-- =============================================================================== -->
+  <!-- SplitButton                                                                     -->
+  <!-- =============================================================================== -->
+  <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter" />
+
+  <Style TargetType="{x:Type local:SplitButton}">
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+    <Setter Property="DropDownContentBackground"
+            Value="{StaticResource PopupBackgroundBrush}" />
+    <Setter Property="Padding"
+            Value="3" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:SplitButton}">
+          <Grid x:Name="MainGrid"
+                SnapsToDevicePixels="True">
+            <chrome:ButtonChrome x:Name="ControlChrome"
+                                 Background="{TemplateBinding Background}"
+                                 RenderEnabled="{TemplateBinding IsEnabled}"
+                                 CornerRadius="2.75">
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Button x:Name="PART_ActionButton"
+                        Margin="0"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Padding="{TemplateBinding Padding}"
+                        Style="{x:Null}">
+                  <Button.Template>
+                    <ControlTemplate TargetType="Button">
+                      <ContentPresenter />
+                    </ControlTemplate>
+                  </Button.Template>
+                  <Grid>
+                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                         Background="{TemplateBinding Background}"
+                                         Foreground="{TemplateBinding Foreground}"
+                                         BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSideRemovalConverter}, ConverterParameter=2}"
+                                         BorderBrush="{TemplateBinding BorderBrush}"
+                                         CornerRadius="2.75, 0, 0, 2.75"
+                                         RenderEnabled="{TemplateBinding IsEnabled}"
+                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+                                         RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                      <ContentPresenter Name="ActionButtonContent"
+                                        Margin="{TemplateBinding Padding}"
+                                        Content="{TemplateBinding Content}"
+                                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        RecognizesAccessKey="true" />
+                    </chrome:ButtonChrome>
+                  </Grid>
+                </Button>
+                <ToggleButton x:Name="PART_ToggleButton"
+                              Grid.Column="1"
+                              IsTabStop="False"
+                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                  <ToggleButton.Template>
+                    <ControlTemplate TargetType="ToggleButton">
+                      <ContentPresenter />
+                    </ControlTemplate>
+                  </ToggleButton.Template>
+                  <Grid>
+                    <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                         Background="{TemplateBinding Background}"
+                                         BorderBrush="{TemplateBinding BorderBrush}"
+                                         BorderThickness="{TemplateBinding BorderThickness}"
+                                         Padding="1,0,1,0"
+                                         CornerRadius="0, 2.75, 2.75, 0"
+                                         RenderChecked="{TemplateBinding IsOpen}"
+                                         RenderEnabled="{TemplateBinding IsEnabled}"
+                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+                                         RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                      <Grid x:Name="arrowGlyph"
+                            IsHitTestVisible="False"
+                            Margin="4,3,4,3">
+                        <Path x:Name="Arrow"
+                              Width="9"
+                              Height="5"
+                              Data="{StaticResource DownArrowGeometry}"
+                              Fill="#FF000000"
+                              Margin="0,1,0,0" />
+                      </Grid>
+                    </chrome:ButtonChrome>
+                  </Grid>
+                </ToggleButton>
+              </Grid>
+            </chrome:ButtonChrome>
+
+            <Popup x:Name="PART_Popup"
+                   HorizontalOffset="1"
+                   VerticalOffset="1"
+                   AllowsTransparency="True"
+                   StaysOpen="False"
+                   Placement="{TemplateBinding DropDownPosition}"
+                   Focusable="False"
+                   IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+              <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+              <Border BorderThickness="1"
+                      Background="{TemplateBinding DropDownContentBackground}"
+                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
+                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                <ScrollViewer x:Name="DropDownScrollViewer"
+                              VerticalScrollBarVisibility="Auto">
+                  <ContentPresenter x:Name="PART_ContentPresenter"
+                                    Content="{TemplateBinding DropDownContent}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="#AFAFAF" />
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index b4e79e60..41532b30 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -413,8 +413,8 @@ namespace Xceed.Wpf.Toolkit
         time = StartTimeDefaultValue;
       }
 
-      //Limit the content of the list to the Minimum or Maximum
-      //if the date is set to the minimum or maximum.
+      // 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;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
index 116872da..cd7141c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -22,251 +22,284 @@
                     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>
+  <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" />
+  <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>
+  <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}">
+  <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>
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <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>
+                <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>
+  <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>
+      <!-- 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>
+      <!-- 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                                                                      -->
-    <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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}}" />
-                  <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}"/>
-                        </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>
+  <Style TargetType="{x:Type local:TimePicker}">
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1,1,0,1" />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Right" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="TextAlignment"
+            Value="Right" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:TimePicker}">
+          <Grid x:Name="root">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <local:ButtonSpinner x:Name="PART_Spinner"
+                                 IsTabStop="False"
+                                 Background="{TemplateBinding Background}"
+                                 BorderThickness="{TemplateBinding BorderThickness}"
+                                 HorizontalContentAlignment="Stretch"
+                                 VerticalContentAlignment="Stretch"
+                                 BorderBrush="{TemplateBinding BorderBrush}"
+                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                                 AllowSpin="{TemplateBinding AllowSpin}"
+                                 ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+              <local:WatermarkTextBox x:Name="PART_TextBox"
+                                      BorderThickness="0"
+                                      Background="Transparent"
+                                      FontFamily="{TemplateBinding FontFamily}"
+                                      FontSize="{TemplateBinding FontSize}"
+                                      FontStretch="{TemplateBinding FontStretch}"
+                                      FontStyle="{TemplateBinding FontStyle}"
+                                      FontWeight="{TemplateBinding FontWeight}"
+                                      Foreground="{TemplateBinding Foreground}"
+                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
+                                      IsTabStop="True"
+                                      MinWidth="20"
+                                      AcceptsReturn="False"
+                                      Padding="{TemplateBinding Padding}"
+                                      TextAlignment="{TemplateBinding TextAlignment}"
+                                      TextWrapping="NoWrap"
+                                      Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                      TabIndex="{TemplateBinding TabIndex}"
+                                      Watermark="{TemplateBinding Watermark}"
+                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+            </local:ButtonSpinner>
+            <ToggleButton x:Name="_timePickerToggleButton"
+                          Grid.Column="1"
+                          Background="White"
+                          Focusable="False"
+                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                          Style="{StaticResource TimePickerToggleButtonStyle}"
+                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
+            </ToggleButton>
+            <Popup x:Name="PART_Popup"
+                   IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                   AllowsTransparency="True"
+                   StaysOpen="False"
+                   ToolTip="{x:Static sys:String.Empty}">
+              <Popup.Resources>
+                <Style TargetType="ToolTip">
+                  <Style.Triggers>
+                    <Trigger Property="Content"
+                             Value="{x:Static sys:String.Empty}">
+                      <Setter Property="Visibility"
+                              Value="Collapsed" />
+                    </Trigger>
+                  </Style.Triggers>
+                </Style>
+              </Popup.Resources>
+              <Border BorderThickness="1"
+                      MinWidth="{Binding ActualWidth, ElementName=root}"
+                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                      Background="{StaticResource PanelBackgroundBrush}"
+                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                <Grid>
+                  <ListBox x:Name="PART_TimeListItems"
+                           BorderThickness="0"
+                           DisplayMemberPath="Display"
+                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
+                  </ListBox>
+                </Grid>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="PART_TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=PART_TextBox}" />
+            </Trigger>
+            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                           Value="True" />
+                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
+                           Value="DateTimePicker" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsHitTestVisible"
+                      Value="True"
+                      TargetName="_timePickerToggleButton" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
index d7695b47..63daafc1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -22,227 +22,262 @@
                     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" />
+  <!-- =============================================================================== -->
+  <!-- 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>
-                </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}}" />
-                  <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}" />
-                        </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>
+                  </Style.Triggers>
+                </Style>
+              </Popup.Resources>
+              <Border BorderThickness="1"
+                      MinWidth="{Binding ActualWidth, ElementName=root}"
+                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                      Background="{StaticResource PopupBackgroundBrush}"
+                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                <Grid>
+                  <ListBox x:Name="PART_TimeListItems"
+                           BorderThickness="0"
+                           DisplayMemberPath="Display"
+                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
+                  </ListBox>
+                </Grid>
+              </Border>
+            </Popup>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
+                           Value="False" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
+                         Value="True">
+              <Setter Property="IsReadOnly"
+                      Value="True"
+                      TargetName="PART_TextBox" />
+            </DataTrigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                           Value="True" />
+                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
+                           Value="DateTimePicker" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="IsHitTestVisible"
+                      Value="True"
+                      TargetName="_timePickerToggleButton" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
index 9e82d3a5..a2213ce0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
@@ -15,13 +15,9 @@
   ***********************************************************************************/
 
 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;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 
@@ -370,6 +366,7 @@ namespace Xceed.Wpf.Toolkit
       return (value1.Value > value2.Value);
     }
 
+
     #endregion
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index 2f8f99db..e8365ea6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -381,6 +381,7 @@ namespace Xceed.Wpf.Toolkit
       return renderSize;
     }
 
+
     #endregion //Base Class Overrides
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
index ed3fb920..d5e0a8aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
@@ -14,10 +14,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -71,5 +67,12 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #endregion //Constructors
+
+    #region Base Class Overrides
+
+
+
+
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
index e8ba0abc..f0f4b933 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
@@ -19,459 +19,459 @@
                     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>
+  <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">
+  <!-- =============================================================================== -->
+  <!-- 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>
-                           <ControlTemplate TargetType="{x:Type TextBox}">
-                              <ScrollViewer x:Name="PART_ContentHost"
-                                            Background="Transparent"
-                                            Focusable="False"
-                                            HorizontalScrollBarVisibility="Hidden"
-                                            VerticalScrollBarVisibility="Hidden" />
-                           </ControlTemplate>
+                          <LinearGradientBrush EndPoint="0,1"
+                                               StartPoint="0,0">
+                            <GradientStop Color="#FFDAECFC"
+                                          Offset="0" />
+                            <GradientStop Color="#FFC4E0FC"
+                                          Offset="1" />
+                          </LinearGradientBrush>
                         </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"
+                      </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>
+        </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                                                          -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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 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}" />
+  <Style TargetType="{x:Type local:WatermarkComboBox}"
+         BasedOn="{StaticResource WatermarkComboBox}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
index 28d9c0a0..f0f4b933 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
@@ -19,457 +19,459 @@
                     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>
+  <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="Template">
+  <!-- =============================================================================== -->
+  <!-- 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>
-                           <ControlTemplate TargetType="{x:Type TextBox}">
-                              <ScrollViewer x:Name="PART_ContentHost"
-                                            Background="Transparent"
-                                            Focusable="False"
-                                            HorizontalScrollBarVisibility="Hidden"
-                                            VerticalScrollBarVisibility="Hidden" />
-                           </ControlTemplate>
+                          <LinearGradientBrush EndPoint="0,1"
+                                               StartPoint="0,0">
+                            <GradientStop Color="#FFDAECFC"
+                                          Offset="0" />
+                            <GradientStop Color="#FFC4E0FC"
+                                          Offset="1" />
+                          </LinearGradientBrush>
                         </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"
+                      </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>
+        </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                                                          -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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 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}" />
+  <Style TargetType="{x:Type local:WatermarkComboBox}"
+         BasedOn="{StaticResource WatermarkComboBox}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
index 09b3773a..79249aad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
@@ -200,6 +200,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index 5cae21ae..8ef27cb9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -88,6 +85,13 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #endregion //Constructors
+
+    #region Base Class Overrides
+
+
+
+
+    #endregion
   }
 
 #pragma warning restore 0618
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
index 807d683c..a486bcc9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -20,95 +20,150 @@
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
 
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" />
-    </DataTemplate>
-
-   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#5794BF" Offset="0.05" />
-      <GradientStop Color="#B7D5EA" Offset="0.07" />
-      <GradientStop Color="#C7E2F1" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#3D7BAD" Offset="0.05" />
-      <GradientStop Color="#A4C9E3" Offset="0.07" />
-      <GradientStop Color="#B7D9ED" Offset="1" />
-   </LinearGradientBrush>
-
-
-    <!-- =============================================================================== -->
-    <!-- WatermarkTextBox                                                                -->
-    <!-- =============================================================================== -->
-
-    <Style x:Key="WatermarkTextBox" TargetType="{x:Type local:WatermarkTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="AllowDrop" Value="true" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-                    <Grid>
-
-                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="0" Background="{TemplateBinding Background}" >
-                           <Grid>
-                              <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                 <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}" />
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
+    <ContentControl Content="{Binding}"
+                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                    Focusable="False" />
+  </DataTemplate>
+
+  <LinearGradientBrush x:Key="TextBox_MouseOver"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#5794BF"
+                  Offset="0.05" />
+    <GradientStop Color="#B7D5EA"
+                  Offset="0.07" />
+    <GradientStop Color="#C7E2F1"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="TextBox_Focused"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#3D7BAD"
+                  Offset="0.05" />
+    <GradientStop Color="#A4C9E3"
+                  Offset="0.07" />
+    <GradientStop Color="#B7D9ED"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+
+  <!-- =============================================================================== -->
+  <!-- WatermarkTextBox                                                                -->
+  <!-- =============================================================================== -->
+
+  <Style x:Key="WatermarkTextBox"
+         TargetType="{x:Type local:WatermarkTextBox}">
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Padding"
+            Value="3" />
+    <Setter Property="AllowDrop"
+            Value="true" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="ScrollViewer.PanningMode"
+            Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled"
+            Value="False" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+          <Grid>
+
+            <Border x:Name="Border"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    CornerRadius="0"
+                    Background="{TemplateBinding Background}">
+              <Grid>
+                <ScrollViewer x:Name="PART_ContentHost"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                </ScrollViewer>
+                <ContentPresenter x:Name="PART_WatermarkHost"
+                                  Content="{TemplateBinding Watermark}"
+                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  IsHitTestVisible="False"
+                                  Margin="{TemplateBinding Padding}"
+                                  Visibility="Collapsed" />
+              </Grid>
+            </Border>
+            <Border x:Name="MouseOverVisual"
+                    Opacity="0"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{StaticResource TextBox_MouseOver}"
+                    CornerRadius="1" />
+            <Border x:Name="FocusVisual"
+                    Opacity="0"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{StaticResource TextBox_Focused}"
+                    CornerRadius="1" />
+
+          </Grid>
+          <ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="KeepWatermarkOnGotFocus"
+                           Value="False" />
+                <Condition Property="IsFocused"
+                           Value="False" />
+                <Condition Property="Text"
+                           Value="" />
+              </MultiTrigger.Conditions>
+              <MultiTrigger.Setters>
+                <Setter Property="Visibility"
+                        TargetName="PART_WatermarkHost"
+                        Value="Visible" />
+              </MultiTrigger.Setters>
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="KeepWatermarkOnGotFocus"
+                           Value="True" />
+                <Condition Property="Text"
+                           Value="" />
+              </MultiTrigger.Conditions>
+              <MultiTrigger.Setters>
+                <Setter Property="Visibility"
+                        TargetName="PART_WatermarkHost"
+                        Value="Visible" />
+              </MultiTrigger.Setters>
+            </MultiTrigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter TargetName="Border"
+                      Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="True">
+              <Setter TargetName="Border"
+                      Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type local:WatermarkTextBox}"
+         BasedOn="{StaticResource WatermarkTextBox}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
index a8c0450c..844f74f7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -18,108 +18,162 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-   <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-      <GradientStop Color="#ABADB3" Offset="0.05" />
-      <GradientStop Color="#E2E3EA" Offset="0.07" />
-      <GradientStop Color="#E3E9EF" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#5794BF" Offset="0.05" />
-      <GradientStop Color="#B7D5EA" Offset="0.07" />
-      <GradientStop Color="#C7E2F1" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#3D7BAD" Offset="0.05" />
-      <GradientStop Color="#A4C9E3" Offset="0.07" />
-      <GradientStop Color="#B7D9ED" Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
-   <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
-
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-   </DataTemplate>
-
-   <Style x:Key="WatermarkTextBox" TargetType="{x:Type local:WatermarkTextBox}">
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="AllowDrop" Value="true" />
-      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-      <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-               <Grid>
-
-                  <Border x:Name="Border"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          CornerRadius="1"
-                          Background="{TemplateBinding Background}">
-                     <Grid>
-                        <ScrollViewer x:Name="PART_ContentHost"
-                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <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}" />
+  <LinearGradientBrush x:Key="TextBoxBorder"
+                       EndPoint="0,20"
+                       MappingMode="Absolute"
+                       StartPoint="0,0">
+    <GradientStop Color="#ABADB3"
+                  Offset="0.05" />
+    <GradientStop Color="#E2E3EA"
+                  Offset="0.07" />
+    <GradientStop Color="#E3E9EF"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="TextBox_MouseOver"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#5794BF"
+                  Offset="0.05" />
+    <GradientStop Color="#B7D5EA"
+                  Offset="0.07" />
+    <GradientStop Color="#C7E2F1"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="TextBox_Focused"
+                       EndPoint="0,1"
+                       StartPoint="0,0">
+    <GradientStop Color="#3D7BAD"
+                  Offset="0.05" />
+    <GradientStop Color="#A4C9E3"
+                  Offset="0.07" />
+    <GradientStop Color="#B7D9ED"
+                  Offset="1" />
+  </LinearGradientBrush>
+
+  <SolidColorBrush x:Key="TextBox_DisabledBorder"
+                   Color="#ADB2B5" />
+  <SolidColorBrush x:Key="TextBox_DisabledBackground"
+                   Color="#F4F4F4" />
+
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
+    <ContentControl Content="{Binding}"
+                    Foreground="Gray"
+                    Focusable="False" />
+  </DataTemplate>
+
+  <Style x:Key="WatermarkTextBox"
+         TargetType="{x:Type local:WatermarkTextBox}">
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{StaticResource TextBoxBorder}" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="Padding"
+            Value="3" />
+    <Setter Property="AllowDrop"
+            Value="true" />
+    <Setter Property="FocusVisualStyle"
+            Value="{x:Null}" />
+    <Setter Property="ScrollViewer.PanningMode"
+            Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled"
+            Value="False" />
+    <Setter Property="WatermarkTemplate"
+            Value="{StaticResource DefaultWatermarkTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+          <Grid>
+
+            <Border x:Name="Border"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    CornerRadius="1"
+                    Background="{TemplateBinding Background}">
+              <Grid>
+                <ScrollViewer x:Name="PART_ContentHost"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" >
+                </ScrollViewer>
+                <ContentPresenter x:Name="PART_WatermarkHost"
+                                  Content="{TemplateBinding Watermark}"
+                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  IsHitTestVisible="False"
+                                  Margin="{TemplateBinding Padding}"
+                                  Visibility="Collapsed" />
+              </Grid>
+            </Border>
+            <Border x:Name="MouseOverVisual"
+                    Opacity="0"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{StaticResource TextBox_MouseOver}"
+                    CornerRadius="1" />
+            <Border x:Name="FocusVisual"
+                    Opacity="0"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{StaticResource TextBox_Focused}"
+                    CornerRadius="1" />
+
+          </Grid>
+          <ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="KeepWatermarkOnGotFocus"
+                           Value="False" />
+                <Condition Property="IsFocused"
+                           Value="False" />
+                <Condition Property="Text"
+                           Value="" />
+              </MultiTrigger.Conditions>
+              <MultiTrigger.Setters>
+                <Setter Property="Visibility"
+                        TargetName="PART_WatermarkHost"
+                        Value="Visible" />
+              </MultiTrigger.Setters>
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="KeepWatermarkOnGotFocus"
+                           Value="True" />
+                <Condition Property="Text"
+                           Value="" />
+              </MultiTrigger.Conditions>
+              <MultiTrigger.Setters>
+                <Setter Property="Visibility"
+                        TargetName="PART_WatermarkHost"
+                        Value="Visible" />
+              </MultiTrigger.Setters>
+            </MultiTrigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter TargetName="MouseOverVisual"
+                      Property="Opacity"
+                      Value="1" />
+            </Trigger>
+            <Trigger Property="IsFocused"
+                     Value="True">
+              <Setter TargetName="FocusVisual"
+                      Property="Opacity"
+                      Value="1" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="false">
+              <Setter Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type local:WatermarkTextBox}"
+         BasedOn="{StaticResource WatermarkTextBox}" />
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
index 26cd716a..6daa0ed2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -227,7 +227,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Collapsed ) );
     public Visibility FinishButtonVisibility
     {
       get
@@ -339,7 +339,7 @@ namespace Xceed.Wpf.Toolkit
       foreach( object o in this.Items )
       {
         if( !( o is WizardPage ) )
-          throw new NotSupportedException( "Wizard should only contains WizardPages." );
+          throw new NotSupportedException( "Wizard should only contain WizardPages." );
       }
 
       if( Items.Count > 0 && CurrentPage == null )
@@ -357,6 +357,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Commands
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index 3f43e080..635e683d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -316,6 +316,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion
 
     #region Events
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
index c9d0d4e0..dbfd0a11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -20,193 +20,284 @@
                     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="PART_HelpButton"
-                                      Grid.Column="0"
-                                      MinWidth="75" 
-                                      Command="local:WizardCommands.Help" 
-                                      Content="{TemplateBinding HelpButtonContent}">
-                                            <Button.Visibility>
-                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                                </MultiBinding>
-                                            </Button.Visibility>
-                                        </Button>
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                            <Button Name="PART_CancelButton"
-                                         Margin="0,0,7,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Cancel" 
-                                         Content="{TemplateBinding CancelButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_BackButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.PreviousPage" 
-                                         Content="{TemplateBinding BackButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_NextButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.NextPage"
-                                         Content="{TemplateBinding NextButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_FinishButton"
-                                         Margin="7,0,0,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Finish" 
-                                         Content="{TemplateBinding FinishButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Border>
-    </ControlTemplate>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid Background="{TemplateBinding Background}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-                </Grid>
-            </Border>
-            <Grid Column="1" Margin="14">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Grid>
-    </ControlTemplate>
+  <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
 
-    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
+  <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="*" />
-            </Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+
+              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
 
-            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+              <Border Grid.Row="1"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="0,1,0,0"
+                      Padding="7">
                 <StackPanel>
-                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+                  <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>
-                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+              </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>
 
-            <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>
+  <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>
-    </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>
+      </Border>
+      <Grid Column="1"
+            Margin="14">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0"
+                   TextWrapping="Wrap"
+                   Margin="0,0,0,14"
+                   FontSize="16"
+                   FontWeight="Bold"
+                   Text="{TemplateBinding Title}">
+        </TextBlock>
+        <TextBlock Grid.Row="1"
+                   TextWrapping="Wrap"
+                   Margin="0,0,0,14"
+                   Text="{TemplateBinding Description}">
+        </TextBlock>
+        <ContentPresenter Grid.Row="2"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+      </Grid>
+    </Grid>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="InteriorWizardPageTemplate"
+                   TargetType="{x:Type local:WizardPage}">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <Grid Background="{TemplateBinding HeaderBackground}"
+            MinHeight="56">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*" />
+          <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <StackPanel>
+          <TextBlock Margin="16,9,0,1"
+                     TextWrapping="Wrap"
+                     FontWeight="Bold"
+                     Text="{TemplateBinding Title}">
+          </TextBlock>
+          <TextBlock Margin="32,0,0,3"
+                     TextWrapping="Wrap"
+                     Text="{TemplateBinding Description}">
+          </TextBlock>
+        </StackPanel>
+        <Image Grid.Column="1"
+               Margin="4"
+               Source="{TemplateBinding HeaderImage}"
+               Stretch="None"
+               HorizontalAlignment="Center"
+               VerticalAlignment="Center">
+        </Image>
+      </Grid>
+
+      <Border Grid.Row="1"
+              SnapsToDevicePixels="true"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              BorderBrush="{TemplateBinding BorderBrush}">
+        <Grid Background="{TemplateBinding Background}">
+          <ContentPresenter Margin="14"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+        </Grid>
+      </Border>
+    </Grid>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:WizardPage}">
+    <Style.Triggers>
+      <Trigger Property="PageType"
+               Value="Blank">
+        <Setter Property="Background"
+                Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="Template"
+                Value="{StaticResource BlankWizardPageTemplate}" />
+      </Trigger>
+      <Trigger Property="PageType"
+               Value="Exterior">
+        <Setter Property="Background"
+                Value="White" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="ExteriorPanelBackground"
+                Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="Template"
+                Value="{StaticResource ExteriorWizardPageTemplate}" />
+      </Trigger>
+      <Trigger Property="PageType"
+               Value="Interior">
+        <Setter Property="Background"
+                Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{x:Static SystemColors.ActiveBorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="0,1,0,0" />
+        <Setter Property="HeaderBackground"
+                Value="White" />
+        <Setter Property="Template"
+                Value="{StaticResource InteriorWizardPageTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
index aaf5a14c..fa4a8fa6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -19,189 +19,280 @@
                     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="PART_HelpButton"
-                                      Grid.Column="0"
-                                      MinWidth="75" 
-                                      Command="local:WizardCommands.Help" 
-                                      Content="{TemplateBinding HelpButtonContent}">
-                                 <Button.Visibility>
-                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                    </MultiBinding>
-                                 </Button.Visibility>
-                              </Button>
-                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                 <Button Name="PART_CancelButton"
-                                         Margin="0,0,7,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Cancel" 
-                                         Content="{TemplateBinding CancelButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_BackButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.PreviousPage" 
-                                         Content="{TemplateBinding BackButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_NextButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.NextPage"
-                                         Content="{TemplateBinding NextButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_FinishButton"
-                                         Margin="7,0,0,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Finish" 
-                                         Content="{TemplateBinding FinishButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                              </StackPanel>
-                           </Grid>
-                        </StackPanel>
-                     </Border>
+  <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>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-         <Grid Background="{TemplateBinding Background}">
-            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-         </Grid>
-      </Border>
-   </ControlTemplate>
+                </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="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+  <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}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-            </Grid>
-         </Border>
-         <Grid Column="1" Margin="14">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-         </Grid>
+        <ContentPresenter Margin="14"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
       </Grid>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <StackPanel>
-               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
-            </StackPanel>
-            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
-         </Grid>
-
-         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-         </Border>
+    </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>
-   </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>
+
+      <Border Grid.Row="1"
+              SnapsToDevicePixels="true"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              BorderBrush="{TemplateBinding BorderBrush}">
+        <Grid Background="{TemplateBinding Background}">
+          <ContentPresenter Margin="14"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+        </Grid>
+      </Border>
+    </Grid>
+  </ControlTemplate>
+
+  <Style TargetType="{x:Type local:WizardPage}">
+    <Style.Triggers>
+      <Trigger Property="PageType"
+               Value="Blank">
+        <Setter Property="Background"
+                Value="#FFF0F0F0" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="Template"
+                Value="{StaticResource BlankWizardPageTemplate}" />
+      </Trigger>
+      <Trigger Property="PageType"
+               Value="Exterior">
+        <Setter Property="Background"
+                Value="#FFFFFF" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="ExteriorPanelBackground"
+                Value="#E3EFFF" />
+        <Setter Property="Template"
+                Value="{StaticResource ExteriorWizardPageTemplate}" />
+      </Trigger>
+      <Trigger Property="PageType"
+               Value="Interior">
+        <Setter Property="Background"
+                Value="#FFF0F0F0" />
+        <Setter Property="BorderBrush"
+                Value="{x:Static SystemColors.ActiveBorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="0,1,0,0" />
+        <Setter Property="HeaderBackground"
+                Value="#FFFFFF" />
+        <Setter Property="Template"
+                Value="{StaticResource InteriorWizardPageTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
index 924509db..3856f1c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -49,6 +49,7 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="UIAutomationProvider" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
index 2d183e87..5731a303 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
@@ -20,93 +20,93 @@
                     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" />
+  <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" />
+  <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="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>
+  <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 
+  <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
@@ -117,24 +117,24 @@
               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 
+        </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 
+        </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 
@@ -143,122 +143,122 @@
               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>
+        </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
+  <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 
+            <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 
+          <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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
@@ -266,102 +266,102 @@
               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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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 
+            <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>
+            <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 
+  <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 
+            <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>
+            <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 
+  <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 
@@ -371,452 +371,463 @@
               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>
+        </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}">
+  <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>
+            <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 x:Name="PART_HorizontalScrollBar"
-                             Grid.Row="1"
-                             Grid.Column="0"
-                             Orientation="Horizontal" 
-                             Visibility="Collapsed"/>
-                  <Border Grid.Row="1"
-                          Grid.Column="1"
-                          Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+            <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"
+            <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="10"
-                          CornerRadius="0">
-                     <Border.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform x:Name="LayoutScaleTransform"
-                                           ScaleX="0"
-                                           ScaleY="0" />
-                        </TransformGroup>
-                     </Border.RenderTransform>
-                     <Grid Margin="4">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="*" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <StackPanel Orientation="Horizontal"
-                                    Margin="0,0,0,3">
-                           <Button x:Name="BackButton"
-                                   Command="local:Zoombox.Back"
-                                   ToolTip="Go Back"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource PreviousGlyph}" />
-                           </Button>
-                           <Button x:Name="ForwardButton"
-                                   Command="local:Zoombox.Forward"
-                                   ToolTip="Go Forward"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource NextGlyph}" />
-                           </Button>
-                           <Button x:Name="HomeButton"
-                                   Command="local:Zoombox.Home"
-                                   ToolTip="Go Home"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource HomeGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FitButton"
-                                   Command="local:Zoombox.Fit"
-                                   ToolTip="Fit Content within Bounds"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FitContentGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FillButton"
-                                   Command="local:Zoombox.Fill"
-                                   ToolTip="Fill Bounds with Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FillToBoundsGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="CenterButton"
-                                   Command="local:Zoombox.Center"
-                                   ToolTip="Center Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource CenterGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="RefocusButton"
-                                   Command="local:Zoombox.Refocus"
-                                   Visibility="Collapsed"
-                                   ToolTip="Refocus View"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource RefocusGlyph}"
-                                     Margin="2" />
-                           </Button>
-                        </StackPanel>
-                        <ToggleButton x:Name="ToggleViewFinderButton"
-                                      ToolTip="Hide View Finder"
-                                      Height="13"
-                                      Width="13"
-                                      Margin="0,2,0,0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      Style="{StaticResource TransparentButton}"
-                                      Foreground="White"
-                                      IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                           <Image Source="{StaticResource CloseXDrawingImage}"
-                                  Margin="2" />
-                        </ToggleButton>
-                        <Border Grid.Row="1"
-                                BorderBrush="{StaticResource GlyphBrush}"
-                                BorderThickness="2"
-                                Background="#80FFFFFF" />
-                        <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                        Name="ViewFinderDisplay"
-                                                        ClipToBounds="True"
-                                                        Background="#C0FFFFFF"
-                                                        Margin="2"
-                                                        ShadowBrush="#80FFFFFF"
-                                                        ViewportBrush="Transparent"
-                                                        ViewportPen="{StaticResource ViewportPen}" />
-                     </Grid>
-                  </Border>
-                  <ToggleButton Name="ShowViewFinder"
-                                IsTabStop="False"
-                                ToolTip="Show View Finder"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Bottom"
-                                Margin="5"
-                                Height="22"
-                                Width="22"
-                                FocusVisualStyle="{x:Null}"
-                                Style="{StaticResource ViewFinderToggleButtonStyle}"
-                                Foreground="Transparent"
-                                Background="Transparent"
-                                IsChecked="{Binding Path=ViewFinderVisibility, 
+                          Margin="5"
+                          Height="22"
+                          Width="22"
+                          FocusVisualStyle="{x:Null}"
+                          Style="{StaticResource ViewFinderToggleButtonStyle}"
+                          Foreground="Transparent"
+                          Background="Transparent"
+                          IsChecked="{Binding Path=ViewFinderVisibility, 
                     Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
                     Converter={StaticResource TrueIfVisibleConverter}}">
-                     <Grid Name="ShowViewFinderGlyph"
-                           Opacity="0">
-                        <Image x:Name="ShowViewFinderGlyphImage"
-                               Source="{StaticResource ShowViewFinderGlyph}" />
-                     </Grid>
-                  </ToggleButton>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="EffectiveViewStackMode"
-                           Value="Manual">
-                     <Setter TargetName="RefocusButton"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="0"
-                                               To="1"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="1"
-                                               To="0"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.ExitActions>
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="False"
-                           SourceName="ShowViewFinder">
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="BackButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ForwardButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="HomeButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FitButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FillButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="CenterButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ToggleViewFinderButton" />
-                  </Trigger>
-                  <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!
+              <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 
+      <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>
+      <Trigger Property="IsDraggingContent"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="SizeAll" />
+      </Trigger>
+      <Trigger Property="IsSelectingRegion"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="Cross" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
index 5d219084..fa053728 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
@@ -20,93 +20,93 @@
                     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" />
+  <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" />
+  <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="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>
+  <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 
+  <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
@@ -117,24 +117,24 @@
               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 
+        </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 
+        </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 
@@ -143,122 +143,122 @@
               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>
+        </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
+  <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 
+            <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 
+          <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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
@@ -266,102 +266,102 @@
               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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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 
+            <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>
+            <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 
+  <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 
+            <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>
+            <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 
+  <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 
@@ -371,452 +371,463 @@
               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>
+        </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}">
+  <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>
+            <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 x:Name="PART_HorizontalScrollBar"
-                             Grid.Row="1"
-                             Grid.Column="0"
-                             Orientation="Horizontal"
-                             Visibility="Collapsed" />
-                  <Border Grid.Row="1"
-                          Grid.Column="1"
-                          Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+            <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"
+            <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="10"
-                          CornerRadius="4">
-                     <Border.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform x:Name="LayoutScaleTransform"
-                                           ScaleX="0"
-                                           ScaleY="0" />
-                        </TransformGroup>
-                     </Border.RenderTransform>
-                     <Grid Margin="4">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="*" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <StackPanel Orientation="Horizontal"
-                                    Margin="0,0,0,3">
-                           <Button x:Name="BackButton"
-                                   Command="local:Zoombox.Back"
-                                   ToolTip="Go Back"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource PreviousGlyph}" />
-                           </Button>
-                           <Button x:Name="ForwardButton"
-                                   Command="local:Zoombox.Forward"
-                                   ToolTip="Go Forward"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource NextGlyph}" />
-                           </Button>
-                           <Button x:Name="HomeButton"
-                                   Command="local:Zoombox.Home"
-                                   ToolTip="Go Home"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource HomeGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FitButton"
-                                   Command="local:Zoombox.Fit"
-                                   ToolTip="Fit Content within Bounds"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FitContentGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FillButton"
-                                   Command="local:Zoombox.Fill"
-                                   ToolTip="Fill Bounds with Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FillToBoundsGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="CenterButton"
-                                   Command="local:Zoombox.Center"
-                                   ToolTip="Center Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource CenterGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="RefocusButton"
-                                   Command="local:Zoombox.Refocus"
-                                   Visibility="Collapsed"
-                                   ToolTip="Refocus View"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource RefocusGlyph}"
-                                     Margin="2" />
-                           </Button>
-                        </StackPanel>
-                        <ToggleButton x:Name="ToggleViewFinderButton"
-                                      ToolTip="Hide View Finder"
-                                      Height="13"
-                                      Width="13"
-                                      Margin="0,2,0,0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      Style="{StaticResource TransparentButton}"
-                                      Foreground="White"
-                                      IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                           <Image Source="{StaticResource CloseXDrawingImage}"
-                                  Margin="2" />
-                        </ToggleButton>
-                        <Border Grid.Row="1"
-                                BorderBrush="{StaticResource GlyphBrush}"
-                                BorderThickness="2"
-                                Background="#80FFFFFF" />
-                        <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                        Name="ViewFinderDisplay"
-                                                        ClipToBounds="True"
-                                                        Background="#C0FFFFFF"
-                                                        Margin="2"
-                                                        ShadowBrush="#80FFFFFF"
-                                                        ViewportBrush="Transparent"
-                                                        ViewportPen="{StaticResource ViewportPen}" />
-                     </Grid>
-                  </Border>
-                  <ToggleButton Name="ShowViewFinder"
-                                IsTabStop="False"
-                                ToolTip="Show View Finder"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Bottom"
-                                Margin="5"
-                                Height="22"
-                                Width="22"
-                                FocusVisualStyle="{x:Null}"
-                                Style="{StaticResource ViewFinderToggleButtonStyle}"
-                                Foreground="Transparent"
-                                Background="Transparent"
-                                IsChecked="{Binding Path=ViewFinderVisibility, 
+                          Margin="5"
+                          Height="22"
+                          Width="22"
+                          FocusVisualStyle="{x:Null}"
+                          Style="{StaticResource ViewFinderToggleButtonStyle}"
+                          Foreground="Transparent"
+                          Background="Transparent"
+                          IsChecked="{Binding Path=ViewFinderVisibility, 
                     Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
                     Converter={StaticResource TrueIfVisibleConverter}}">
-                     <Grid Name="ShowViewFinderGlyph"
-                           Opacity="0">
-                        <Image x:Name="ShowViewFinderGlyphImage"
-                               Source="{StaticResource ShowViewFinderGlyph}" />
-                     </Grid>
-                  </ToggleButton>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="EffectiveViewStackMode"
-                           Value="Manual">
-                     <Setter TargetName="RefocusButton"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="0"
-                                               To="1"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="1"
-                                               To="0"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.ExitActions>
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="False"
-                           SourceName="ShowViewFinder">
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="BackButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ForwardButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="HomeButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FitButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FillButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="CenterButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ToggleViewFinderButton" />
-                  </Trigger>
-                  <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!
+              <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 
+      <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>
+      <Trigger Property="IsDraggingContent"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="SizeAll" />
+      </Trigger>
+      <Trigger Property="IsSelectingRegion"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="Cross" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
index 3e2bf0ca..d3804e7d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
@@ -295,6 +295,10 @@ namespace Xceed.Wpf.Toolkit.Zoombox
           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 );
@@ -333,6 +337,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox
           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;
@@ -2045,6 +2054,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnRender( drawingContext );
     }
 
+
+
+
     private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
       Zoombox zoombox = o as Zoombox;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..229ed573
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml
new file mode 100644
index 00000000..76dd12bb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..eafe318f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml
new file mode 100644
index 00000000..d8a35eb3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..44977772
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml
new file mode 100644
index 00000000..8fc33524
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..2fb66898
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml
new file mode 100644
index 00000000..0e51ab41
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..2716706a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml
new file mode 100644
index 00000000..8800717e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..08fadb68
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml
new file mode 100644
index 00000000..e9d716e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..a3b3bcec
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml
new file mode 100644
index 00000000..3c52f166
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..d322d032
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml
new file mode 100644
index 00000000..7b0660da
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml
new file mode 100644
index 00000000..b6b19e77
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
new file mode 100644
index 00000000..9d97a073
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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 44 "..\..\..\..\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 48 "..\..\..\..\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/Debug/CollectionControl/Implementation/CollectionControlDialog.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.i.cs
new file mode 100644
index 00000000..9d97a073
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.i.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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 44 "..\..\..\..\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 48 "..\..\..\..\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/Debug/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..af8e0206
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml
new file mode 100644
index 00000000..5ff00ae5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..e28321d1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml
new file mode 100644
index 00000000..d2ecac71
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..720b3d2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml
new file mode 100644
index 00000000..34ff710e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..31441c93
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml
new file mode 100644
index 00000000..6d903678
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..29bd3175
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml
new file mode 100644
index 00000000..921d5b95
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..df6e4b95
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml
new file mode 100644
index 00000000..d0dd99ad
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/GeneratedInternalTypeHelper.g.i.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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/Debug/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..dd250116
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml
new file mode 100644
index 00000000..dd250116
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml
new file mode 100644
index 00000000..aa9b2f26
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..42129966
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml
new file mode 100644
index 00000000..4e2dd03e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..3f98ba12
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml
new file mode 100644
index 00000000..5fbcd853
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..e6b3d19e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml
new file mode 100644
index 00000000..e7de9e1b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..894d1e46
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml
new file mode 100644
index 00000000..aa780b4b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml
new file mode 100644
index 00000000..67decf43
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml
new file mode 100644
index 00000000..d3a3f582
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml
new file mode 100644
index 00000000..814732c7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml
new file mode 100644
index 00000000..689332a9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..7b1363f1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml
new file mode 100644
index 00000000..87942ff0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..81c874ba
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml
new file mode 100644
index 00000000..e18d1003
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..4e3a6b65
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml
new file mode 100644
index 00000000..cdb55258
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..67486aab
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml
new file mode 100644
index 00000000..4d271b5a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml
new file mode 100644
index 00000000..373ed37e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml
new file mode 100644
index 00000000..98f3d262
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml
new file mode 100644
index 00000000..dfbe77e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..8d63aab7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml
new file mode 100644
index 00000000..16ca4f70
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml
new file mode 100644
index 00000000..63ab822c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml
new file mode 100644
index 00000000..f95c7846
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml
new file mode 100644
index 00000000..166dcea6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml
new file mode 100644
index 00000000..123f7f54
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml
new file mode 100644
index 00000000..802b3ab3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml
new file mode 100644
index 00000000..8efefeb8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml
new file mode 100644
index 00000000..825b99ba
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml
new file mode 100644
index 00000000..a76ec6d0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml
new file mode 100644
index 00000000..53cc7697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml
new file mode 100644
index 00000000..53cc7697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml
new file mode 100644
index 00000000..53cc7697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml
new file mode 100644
index 00000000..53cc7697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml
new file mode 100644
index 00000000..53cc7697
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..4b8e3304
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml
new file mode 100644
index 00000000..ca802661
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..495a80cb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml
new file mode 100644
index 00000000..1e419844
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..028b135d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml
new file mode 100644
index 00000000..028b135d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..3f40d3cb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml
new file mode 100644
index 00000000..a0a45a37
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..a9ff7e42
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml
new file mode 100644
index 00000000..df883f14
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
new file mode 100644
index 00000000..4f949211
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
new file mode 100644
index 00000000..cb345626
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
@@ -0,0 +1,94 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources
new file mode 100644
index 00000000..3a7989ba
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
new file mode 100644
index 00000000..4b88be44
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
@@ -0,0 +1,79 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..093a48aa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml
new file mode 100644
index 00000000..093a48aa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml differ
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
new file mode 100644
index 00000000..60ecd80c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..c22e3670
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml 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
new file mode 100644
index 00000000..da175362
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..7d19e208
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml 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
new file mode 100644
index 00000000..255465dc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..30f13b6d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml 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
new file mode 100644
index 00000000..148c9409
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..3d1e686e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..7edf2184
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..9dfe98f2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..2297fe39
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..4a4eab17
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..7fb1065b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..5da8c2c7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml 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
new file mode 100644
index 00000000..3143fe2e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..b0db4362
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml 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
new file mode 100644
index 00000000..06a8a587
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml 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
new file mode 100644
index 00000000..9d97a073
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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 44 "..\..\..\..\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 48 "..\..\..\..\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
new file mode 100644
index 00000000..9d97a073
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.i.cs
@@ -0,0 +1,113 @@
+#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.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 44 "..\..\..\..\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 48 "..\..\..\..\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
new file mode 100644
index 00000000..7bd08dff
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8296866f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml 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
new file mode 100644
index 00000000..c7734c2f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ff718d83
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml 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
new file mode 100644
index 00000000..33485220
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..4809c7bc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..d61ff396
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..db771e6e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..baa0d72f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..44c36ce5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..55f41f8d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..a2a3818f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..136dd1ba
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.i.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime 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
new file mode 100644
index 00000000..98674fb5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..98674fb5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..9f303df5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml 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
new file mode 100644
index 00000000..2eed4910
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..c4a0f1f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..6398a73e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..0bd0e9e9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml 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
new file mode 100644
index 00000000..fdf9c6aa
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..e4411da2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..8145880b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8145880b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml 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
new file mode 100644
index 00000000..9645e571
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml 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
new file mode 100644
index 00000000..4842c7b3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml 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
new file mode 100644
index 00000000..0985c44c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml 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
new file mode 100644
index 00000000..31f79d71
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml 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
new file mode 100644
index 00000000..0300a6da
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..0434d871
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml 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
new file mode 100644
index 00000000..c634fd48
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..034507cc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml 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
new file mode 100644
index 00000000..de674b16
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..4d13b078
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml 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
new file mode 100644
index 00000000..a82a7d13
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..de8fd4d7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..8d8f512c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml 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
new file mode 100644
index 00000000..30f22577
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml 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
new file mode 100644
index 00000000..0b9e19ab
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml 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
new file mode 100644
index 00000000..5b175593
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..38b51afb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml 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
new file mode 100644
index 00000000..70b6f709
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml 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
new file mode 100644
index 00000000..efcb001f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml 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
new file mode 100644
index 00000000..2dd29576
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml 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
new file mode 100644
index 00000000..1750af4d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml 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
new file mode 100644
index 00000000..6de30222
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml 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
new file mode 100644
index 00000000..1c4bb506
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml 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
new file mode 100644
index 00000000..d07d5db7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml 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
new file mode 100644
index 00000000..2dd29576
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml 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
new file mode 100644
index 00000000..db10e78f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml 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
new file mode 100644
index 00000000..db10e78f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml 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
new file mode 100644
index 00000000..db10e78f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml 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
new file mode 100644
index 00000000..db10e78f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml 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
new file mode 100644
index 00000000..db10e78f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml 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
new file mode 100644
index 00000000..ed16a4d6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..81513e6a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..ebd1800e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ef3e17c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..8c2ee464
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8c2ee464
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..d853b94a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..06f5f328
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..545bc3cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..0014ec6d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml 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
new file mode 100644
index 00000000..4f949211
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources 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
new file mode 100644
index 00000000..0e22432e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
@@ -0,0 +1,94 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csprojResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..e6182b6f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources 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
new file mode 100644
index 00000000..391bde7e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
@@ -0,0 +1,79 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.i.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..209b83b1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
@@ -0,0 +1,79 @@
+D:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
+FD:\Dev\ExtendedWPFToolkit\Release\3.3.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
new file mode 100644
index 00000000..a116f83c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..a116f83c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index 5187d3fa..73fd3191 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/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.2";
+  public const string BaseVersion = "3.3";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index 64d76344..5074c981 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -17,17 +17,12 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows;
-using System.Windows.Automation;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
   public class AutoSelectTextBox : TextBox
   {
-    static AutoSelectTextBox()
-    {
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( AutoSelectTextBox ), new UIPropertyMetadata( "AutoSelectTextBox" ) );
-    }
 
     #region AutoSelectBehavior PROPERTY
 
@@ -165,6 +160,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
     private bool CanMoveFocus( FocusNavigationDirection direction, bool reachedMax )
     {
       QueryMoveFocusEventArgs e = new QueryMoveFocusEventArgs( direction, reachedMax );
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index ac9088c8..a61532db 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -67,6 +67,7 @@ namespace Xceed.Wpf.Toolkit
       ChangeVisualState( false );
     }
 
+
     #endregion //Base Class Overrides
 
     #region Properties
@@ -257,7 +258,7 @@ namespace Xceed.Wpf.Toolkit
         new PropertyMetadata( null ) );
 
     /// <summary>
-    /// Gets or sets a Control that should get focus when the busy indicator disapears.
+    /// Gets or sets a Control that should get the focus when the busy indicator disapears.
     /// </summary>
     public Control FocusAfterBusy
     {
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
index d9b6413c..3515614b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -21,148 +21,195 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
+  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
 
-   <!-- =============================================================================== -->
-    <!-- BusyIndicator                                                                   -->
-    <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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>
+  <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>
+  <Style TargetType="{x:Type local:BusyIndicator}">
+    <Setter Property="Background"
+            Value="{StaticResource PanelBackgroundBrush}" />
+    <Setter Property="BusyContent"
+            Value="Please wait..." />
+    <Setter Property="IsTabStop"
+            Value="False" />
+    <Setter Property="Focusable"
+            Value="False" />
+    <Setter Property="OverlayStyle">
+      <Setter.Value>
+        <Style TargetType="Rectangle">
+          <Setter Property="Fill"
+                  Value="White" />
+          <Setter Property="Opacity"
+                  Value="0.5" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="ProgressBarStyle">
+      <Setter.Value>
+        <Style TargetType="ProgressBar">
+          <Setter Property="IsIndeterminate"
+                  Value="True" />
+          <Setter Property="Height"
+                  Value="15" />
+          <Setter Property="Margin"
+                  Value="8,0,8,8" />
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="DisplayAfter"
+            Value="00:00:00.1" />
+    <Setter Property="HorizontalAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalAlignment"
+            Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Stretch" />
+    <Setter Property="Template"
+            Value="{StaticResource BusyIndicatorTemplate}" />
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 795e1719..56e2a734 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -20,153 +20,207 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-   <!-- =============================================================================== -->
-   <!-- BusyIndicator                                                                   -->
-   <!-- =============================================================================== -->
-   <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
+  <!-- =============================================================================== -->
+  <!-- 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>
+  <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
index a6800826..8eb02cd3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -304,6 +304,7 @@ namespace Xceed.Wpf.Toolkit
       SetButtonUsage();
     }
 
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
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
index 2497238d..ed8ad412 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -19,91 +19,132 @@
                     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 x:Name="PART_DecreaseButton"
-                                   Grid.Row="1"
-                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                            </Grid>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <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.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
index 72c4f0c5..914e129c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -19,83 +19,119 @@
                     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 x:Name="PART_DecreaseButton"
-                                   Grid.Row="1"
-                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                     </Grid>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="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.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
index 4e21124f..ec48e247 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -270,6 +270,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
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
index 9edea9e0..6058039e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -20,247 +20,387 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-    </Style>
-
-    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Background" Value="Pink" />
-    </Style>
-
-    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Background" Value="#FFE8E8E8" />
-    </Style>
-
-
-    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-                <RowDefinition Height="3" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MC"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MR" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Back" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
-
-            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Cancel" 
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorClearButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Clear"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
-
-            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MS"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MAdd"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
-
-            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="MSub"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Negate"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Sqrt"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Seven"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Eight"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Nine"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Divide"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Percent"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Four"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Five"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Six"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Multiply"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Fraction"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="One"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Two"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Three"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Subtract"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
-					  local:Calculator.CalculatorButtonType="Equal"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Zero"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Decimal"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
-					  local:Calculator.CalculatorButtonType="Add"
-					  Command="local:CalculatorCommands.CalculatorButtonClick"
-					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:Calculator}">
-        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Calculator}">
-                    <Border Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       CornerRadius="0">
-                        <Grid Margin="10">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1">
-                                <StackPanel>
-                                    <Path Stretch="Fill"
-                                 Height="9"
-                                 Width="9"
-                                 Fill="DarkGray"
-                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Top"                                              
-                                 Margin="4,4,0,0"
-                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
-                                    <TextBlock FontSize="18"
-                                      HorizontalAlignment="Right"
-                                      Margin="0,0,4,0"
-                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1"
-                                            Template="{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.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
index 278d13ac..ad78aba3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -19,783 +19,812 @@
                     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}"
+  <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="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}"
+                          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="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 Grid.Column="2"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MR"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Back"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}"
-                 Grid.RowSpan="1" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Cancel"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorClearButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Clear"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorClearButtonStyle}"
-                 Grid.ColumnSpan="1"
-                 Grid.RowSpan="1" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MS"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MAdd"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}"
-                 Margin="0" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="0"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="MSub"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Negate"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="2"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Sqrt"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Seven"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Eight"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Nine"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Divide"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="4"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Percent"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Four"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Five"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Six"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Multiply"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="6"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Fraction"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="One"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="2"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Two"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Three"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="8"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Subtract"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="8"
-                 Grid.Row="8"
-                 Grid.RowSpan="3"
-                 MinWidth="28"
-                 MinHeight="55"
-                 local:Calculator.CalculatorButtonType="Equal"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-
-         <Button Grid.Column="0"
-                 Grid.Row="10"
-                 Grid.ColumnSpan="3"
-                 MinWidth="59"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Zero"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="4"
-                 Grid.Row="10"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Decimal"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-         <Button Grid.Column="6"
-                 Grid.Row="10"
-                 MinWidth="28"
-                 MinHeight="26"
-                 local:Calculator.CalculatorButtonType="Add"
-                 Command="local:CalculatorCommands.CalculatorButtonClick"
-                 Style="{StaticResource CalculatorOperatorButtonStyle}" />
-      </Grid>
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:Calculator}">
-      <Setter Property="Background">
-         <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}}" />
-                        </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>
+                          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/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
index 8c374919..0160991c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -22,167 +22,201 @@
                     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}}" />
-                        </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.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
index 2bed476b..3f3b0b28 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -22,173 +22,208 @@
                     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" />
+  <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>
-                </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}}" />
-                  <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>
+                  </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
index 442471ad..67944a0d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -18,10 +18,8 @@ using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Windows.Controls;
-using System.Collections;
 using System.Collections.Generic;
 using System.Windows.Controls.Primitives;
 
@@ -214,6 +212,7 @@ namespace Xceed.Wpf.Toolkit
         _popup.Opened += Popup_Opened;
     }
 
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
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
index bff06a32..d79a909d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -21,187 +21,189 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+  <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>
+  <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" />
-                     <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>
+              <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>
-                                 <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                                 KeyboardNavigation.DirectionalNavigation="Contained"
-                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                              </Grid>
-                           </ScrollViewer>
-                        </Border>
-                     </Grid>
-                  </Popup>
+  <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>
+                      <ItemsPresenter x:Name="PART_ItemsPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Contained"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </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}}" />
-               </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>
+            <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
index 262fa3cc..39279957 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -20,172 +20,180 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <SolidColorBrush x:Key="ButtonNormalBorder"
-                    Color="#FF707070" />
+  <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>
+  <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>
+  <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" />
-                     <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>
+              <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>
-                                 <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                                 KeyboardNavigation.DirectionalNavigation="Contained"
-                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                              </Grid>
-                           </ScrollViewer>
-                        </Border>
-                     </Grid>
-                  </Popup>
+  <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>
+                      <ItemsPresenter x:Name="PART_ItemsPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Contained"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                  </ScrollViewer>
+                </Border>
+              </Grid>
+            </Popup>
 
-                  <Border Background="{TemplateBinding Background}"
+            <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}"
-                          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}}" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                          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
index 3796b06d..6d214bd8 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -34,5 +34,10 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #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
index 082b2d6c..1c516f03 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -19,31 +19,43 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-    <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">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+  <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">
+              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index e73a1c93..1454e183 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -18,24 +18,30 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
-   <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">
-                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <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">
+              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </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
index c669c376..ad27f8ba 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -24,7 +24,6 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 using Xceed.Wpf.Toolkit.Primitives;
-using System.Diagnostics;
 using Xceed.Wpf.Toolkit.Core;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
@@ -531,6 +530,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
index 7d7732bc..9a8e72db 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
@@ -234,6 +234,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion
 
     #region Constructors
@@ -529,6 +532,9 @@ namespace Xceed.Wpf.Toolkit
 
         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 ];
         }
@@ -573,7 +579,11 @@ namespace Xceed.Wpf.Toolkit
         var constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
         if( constructor != null )
         {
-          collection = (IEnumerable)constructor.Invoke( null );
+          collection = ( IEnumerable )constructor.Invoke( null );
+        }
+        else if( ItemsSourceType.IsArray )
+        {
+          collection = Array.CreateInstance( ItemsSourceType.GetElementType(), Items.Count );
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
index e410e072..d7699fea 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
@@ -19,6 +19,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -64,7 +65,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
+        return ( IEnumerable )GetValue( ItemsSourceProperty );
       }
       set
       {
@@ -108,6 +109,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion  //NewItemTypes
 
+    #endregion
+
+    #region Base Class Overrides
+
+
     #endregion
 
     #region Methods
@@ -115,7 +121,8 @@ namespace Xceed.Wpf.Toolkit
     private void CollectionControlButton_Click( object sender, RoutedEventArgs e )
     {
       var collectionControlDialog = new CollectionControlDialog();
-      collectionControlDialog.ItemsSource = this.ItemsSource;
+      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;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
index 8acc4792..486b29db 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -24,6 +24,8 @@ 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;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -105,7 +107,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion //Properties
+    #endregion //Properties
 
 #region Constructors
 
@@ -134,7 +136,7 @@ namespace Xceed.Wpf.Toolkit
     {
       base.OnSourceInitialized( e );
 
-      //Backup data in case "Cancel" is clicked.
+      //Backup data if case "Cancel" is clicked.
       if( this.ItemsSource != null )
       {
         foreach( var item in this.ItemsSource )
@@ -184,8 +186,18 @@ namespace Xceed.Wpf.Toolkit
       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.
-      if( (this.ItemsSource is IDictionary)
+      else if( (this.ItemsSource is IDictionary)
         && sourceType.IsGenericType
         && typeof( KeyValuePair<,> ).IsAssignableFrom( sourceType.GetGenericTypeDefinition() ) )
       {
@@ -194,11 +206,23 @@ namespace Xceed.Wpf.Toolkit
       else
       {
         // Initialized a new object with default values
-        result = FormatterServices.GetUninitializedObject( sourceType );
+        try
+        {
+          result = FormatterServices.GetUninitializedObject( sourceType );
+        }
+        catch( Exception )
+        {
+        }
+
         var constructor = sourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor == null )
-          return null;
-        constructor.Invoke( result, null );
+        if( constructor != null )
+        {
+          constructor.Invoke( result, null );          
+        }
+        else
+        {
+          result = source;
+        }
       }
       Debug.Assert( result != null );
       if( result != null )
@@ -253,8 +277,16 @@ namespace Xceed.Wpf.Toolkit
             }
             else
             {
-              // copy regular object
-              propertyInfo.SetValue( result, propertyInfoValue, 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[] { propertyInfoValue } );
+              }
+              else
+              {
+                // copy regular object
+                propertyInfo.SetValue( result, propertyInfoValue, null );
+              }
             }
           }
         }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
index e255f357..d9dd11d3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
@@ -195,6 +195,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Constructors
 
+    #region Overrides
+
+
+#endregion
+
     #region Methods
 
     private void PersistChanges()
@@ -208,9 +213,17 @@ namespace Xceed.Wpf.Toolkit
       //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 )
       {
-        list.Add( item );
+        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
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
index cca43984..1ddc2617 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
@@ -23,238 +23,296 @@
                     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>
+  <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" />
+  <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 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>
-                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                                  Grid.Row="1"
-                                  Margin="0,0,0,3"
-                                  HorizontalAlignment="Stretch"
-                                  DisplayMemberPath="Name">
-                                    <ComboBox.ItemsSource>
-                                        <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
-                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
-                                        </MultiBinding>
-                                    </ComboBox.ItemsSource>
-                                </ComboBox>
-                                <Button Margin="3,0,0,3"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Padding="5,0"
-                                Content="Add" 
-                                Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
-                                 <ListBox x:Name="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" />
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                            <Grid Column="1" Margin="20,0,0,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Column="1" Text="Properties:" />
-                                <pg:PropertyGrid 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}}" />
-                            </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>
+  <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>
+    </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>
+                <TextBlock Margin="0,0,0,5"
+                           Text="Select type:">
+                </TextBlock>
+                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                          Grid.Row="1"
+                          Margin="0,0,0,3"
+                          HorizontalAlignment="Stretch"
+                          DisplayMemberPath="Name">
+                  <ComboBox.ItemsSource>
+                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="ItemsSourceType" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="NewItemTypes" />
+                    </MultiBinding>
+                  </ComboBox.ItemsSource>
+                </ComboBox>
+                <Button Margin="3,0,0,3"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Padding="5,0"
+                        Content="Add"
+                        Command="New"
+                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}">
+                </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>
+                </StackPanel>
+              </Grid>
+              <Grid Column="1"
+                    Margin="20,0,0,0">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Column="1"
+                           Text="Properties:">
+                </TextBlock>
+                <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}}" />
+              </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}"/>
+  <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.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>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
-   <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}" BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
+  <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>
+  <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>
+              <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>
+              <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>
+          </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}" />
+  <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
index b7af90c3..0e7d39a9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
@@ -22,286 +22,290 @@
                     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>
+  <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" />
+  <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 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>
-                        <TextBlock Margin="0,0,0,5"
-                                   Text="Select type:" />
-                        <ComboBox x:Name="PART_NewItemTypesComboBox"
-                                  Grid.Row="1"
-                                  Margin="0,0,0,3"
-                                  HorizontalAlignment="Stretch"
-                                  DisplayMemberPath="Name">
-                           <ComboBox.ItemsSource>
-                              <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                                 <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                          Path="ItemsSourceType" />
-                                 <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                                          Path="NewItemTypes" />
-                              </MultiBinding>
-                           </ComboBox.ItemsSource>
-                        </ComboBox>
-                        <Button Margin="3,0,0,3"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Padding="5,0"
-                                Content="Add"
-                                Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
-                        <ListBox x:Name="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" />
-                           </Button>
-                        </StackPanel>
-                     </Grid>
-                     <Grid Column="1"
-                           Margin="20,0,0,0">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <TextBlock Grid.Column="1"
-                                   Text="Properties:" />
-                        <pg:PropertyGrid 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}}" />
-                     </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 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>
+                <TextBlock Margin="0,0,0,5"
+                           Text="Select type:" >
+                </TextBlock>
+                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                          Grid.Row="1"
+                          Margin="0,0,0,3"
+                          HorizontalAlignment="Stretch"
+                          DisplayMemberPath="Name">
+                  <ComboBox.ItemsSource>
+                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="ItemsSourceType" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="NewItemTypes" />
+                    </MultiBinding>
+                  </ComboBox.ItemsSource>
+                </ComboBox>
+                <Button Margin="3,0,0,3"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Padding="5,0"
+                        Content="Add"
+                        Command="New"
+                        CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" >
+                </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>
+                </StackPanel>
+              </Grid>
+              <Grid Column="1"
+                    Margin="20,0,0,0">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Column="1"
+                           Text="Properties:" >
+                </TextBlock>
+                <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}}" />
+              </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 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 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>
+  <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>
+              <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>
+              <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>
+          </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}" />
+  <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
index 15419297..ac217077 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -16,7 +16,6 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -268,7 +267,13 @@ namespace Xceed.Wpf.Toolkit
       {
         if( !string.IsNullOrEmpty( retValue ) )
         {
-          ColorConverter.ConvertFromString( value );
+          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
@@ -387,6 +392,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
@@ -536,11 +544,11 @@ namespace Xceed.Wpf.Toolkit
 
       _currentColorPosition = null;
 
-      HsvColor hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
+      var hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
 
       if( _updateSpectrumSliderValue )
       {
-        _spectrumSlider.Value = hsv.H;
+        _spectrumSlider.Value = 360 - hsv.H;
       }
 
       Point p = new Point( hsv.S, 1 - hsv.V );
@@ -589,6 +597,12 @@ namespace Xceed.Wpf.Toolkit
         {
           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;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index fb0eb3d9..8d61bcbb 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -92,9 +92,9 @@ namespace Xceed.Wpf.Toolkit
       _pickerBrush.EndPoint = new Point( 0.5, 1 );
       _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
 
-      List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
+      var colorsList = ColorUtilities.GenerateHsvSpectrum();
 
-      double stopIncrement = ( double )1 / colorsList.Count;
+      double stopIncrement = ( double )1 / (colorsList.Count - 1);
 
       int i;
       for( i = 0; i < colorsList.Count; i++ )
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
index 16d60984..4047e312 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -20,328 +20,456 @@
                     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}">
+  <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>
-         <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>
-
-    <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}" />
-                        </Grid>
-                    </Border>
-
-                    <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
-                        <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
-                    </Border>
-                </Grid>
-
-                <Border 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="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Grid.Row="0"
-                                   Grid.Column="0"
-                                   Text="R"
-                                   VerticalAlignment="Center"/>
-                        <Slider x:Name="PART_RSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="0"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="0"
-                                    Grid.Column="2"
-                                    Text="{Binding Value, ElementName=PART_RSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="1"
-                                      Grid.Column="0"
-                                      Text="G"
-                                      VerticalAlignment="Center" />
-                        <Slider x:Name="PART_GSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="1"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="1"
-                                    Grid.Column="2"
-                                    Text="{Binding Value, ElementName=PART_GSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="2"
-                                      Grid.Column="0"
-                                      Text="B"
-                                      VerticalAlignment="Center" />
-                        <Slider x:Name="PART_BSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="2"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="2"
-                                    Grid.Column="3"
-                                    Text="{Binding Value, ElementName=PART_BSlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                        <TextBlock Grid.Row="3"
-                                      Grid.Column="0"
-                                      Text="A"
-                                      VerticalAlignment="Center"
-                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                        <Slider x:Name="PART_OpacitySlider"
-                                   Grid.Row="3"
-                                   Grid.Column="1"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   Margin="4,6,4,6"
-                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center"
-                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                        <TextBox Grid.Row="3"
-                                    Grid.Column="3"
-                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                    </Grid>
-                </Border>
+          <Grid.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>
-      <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>
+      </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
index fc4e1f29..2c9d81f4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -19,581 +19,598 @@
                     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"
+  <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"
-                             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}" />
-                        </Track.DecreaseRepeatButton>
-                        <Track.IncreaseRepeatButton>
-                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}"
-                                         Style="{StaticResource SliderRepeatButtonStyle}" />
-                        </Track.IncreaseRepeatButton>
-                        <Track.Thumb>
-                           <Thumb x:Name="Thumb"
-                                  Style="{StaticResource CustomThumbForSlider}" />
-                        </Track.Thumb>
-                     </Track>
+                             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>
-            </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}" />
-                           </Grid>
-                        </Border>
-
-                        <Border Grid.Column="1"
-                                Grid.RowSpan="2"
-                                Margin="4,-8,0,0"
-                                ClipToBounds="False">
-                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                                      VerticalAlignment="Stretch" />
-                        </Border>
-                     </Grid>
-
-                     <Border 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="Auto" />
-                           </Grid.ColumnDefinitions>
-
-                           <TextBlock Grid.Row="0"
-                                      Grid.Column="0"
-                                      Text="R"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_RSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="0"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="0"
+                </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"
-                                    Text="{Binding Value, ElementName=PART_RSlider, StringFormat=N0}"
+                                    Value="{Binding Value, ElementName=PART_RSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="1"
-                                      Grid.Column="0"
-                                      Text="G"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_GSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="1"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="1"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_GSlider, StringFormat=N0}"
+                                    Value="{Binding Value, ElementName=PART_GSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="2"
-                                      Grid.Column="0"
-                                      Text="B"
-                                      VerticalAlignment="Center" />
-                           <Slider x:Name="PART_BSlider"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   TickFrequency="1"
-                                   Grid.Row="2"
-                                   Grid.Column="1"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center" />
-                           <TextBox Grid.Row="2"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_BSlider, StringFormat=N0}"
+                                    Value="{Binding Value, ElementName=PART_BSlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
-
-                           <TextBlock Grid.Row="3"
-                                      Grid.Column="0"
-                                      Text="A"
-                                      VerticalAlignment="Center"
-                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                           <Slider x:Name="PART_OpacitySlider"
-                                   Grid.Row="3"
-                                   Grid.Column="1"
-                                   Maximum="255"
-                                   SmallChange="1"
-                                   LargeChange="10"
-                                   Margin="4,6,4,6"
-                                   Style="{StaticResource ColorCanvasSliderStyle}"
-                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                   VerticalAlignment="Center"
-                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                           <TextBox Grid.Row="3"
+                                    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"
-                                    Text="{Binding Value, ElementName=PART_OpacitySlider, StringFormat=N0}"
+                                    Value="{Binding Value, ElementName=PART_OpacitySlider}"
                                     VerticalAlignment="Center"
-                                    Style="{StaticResource ColorCanvasTextBoxStyle}"
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                        </Grid>
-                     </Border>
-                  </Grid>
-               </Border>
-               <ControlTemplate.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>
+                                    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/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index 91b87ed6..1cbe6c66 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -22,8 +22,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Windows.Controls.Primitives;
-using System.Linq;
-using System.Collections.Generic;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit
@@ -187,6 +185,23 @@ namespace Xceed.Wpf.Toolkit
 
     #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 ) );
@@ -581,7 +596,7 @@ namespace Xceed.Wpf.Toolkit
     {
       base.OnMouseUp( e );
 
-      // Close ColorPicker on MouseUp to prevent action of mouseUp on controls behind the ColorPicker.
+      // Close ColorPicker on MouseUp to prevent action of MouseUp on controls behind the ColorPicker.
       if( _selectionChanged )
       {
         CloseColorPicker( true );
@@ -589,7 +604,8 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Event Handlers
 
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
index 65c81a93..ca5926c0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -22,474 +22,481 @@
                     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}}" />
+  <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>
-                  <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 DisplayColorAndName, 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"/>
+                </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>
-                     </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" />
-                           </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" />
-                                       <ListBox x:Name="PART_AvailableColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-
-                                 <!-- Standard Colors-->
-                                 <Grid Grid.Row="2"
-                                       Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <Grid>
-                                       <Grid.RowDefinitions>
-                                          <RowDefinition Height="Auto" />
-                                          <RowDefinition Height="Auto" />
-                                       </Grid.RowDefinitions>
-                                       <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                                  Background="AliceBlue"
-                                                  Padding="2"
-                                                  Margin="0,1,0,1" />
-                                       <ListBox x:Name="PART_StandardColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-
-                                 <!-- Recent Colors-->
-                                 <Grid Grid.Row="3"
-                                       Margin="0,1,0,1"
-                                       Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <Grid>
-                                       <Grid.RowDefinitions>
-                                          <RowDefinition Height="Auto" />
-                                          <RowDefinition Height="22" />
-                                       </Grid.RowDefinitions>
-                                       <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                                  Background="AliceBlue"
-                                                  Padding="2"
-                                                  Margin="0,1,0,1" />
-                                       <ListBox x:Name="PART_RecentColors"
-                                                Grid.Row="1"
-                                                ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Style="{StaticResource ColorListStyle}" />
-                                    </Grid>
-                                 </Grid>
-                              </Grid>
-                           </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}" />
+                      </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
index 8a245d96..aa31e288 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -21,393 +21,501 @@
                     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" />
+  <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>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                  </Trigger>
-                  <DataTrigger Binding="{Binding DisplayColorAndName, 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" />
+                </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>
-                </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" />
-                           </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" />
-                                    <ListBox x:Name="PART_AvailableColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-
-                              <!-- Standard Colors-->
-                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                 <Grid>
-                                    <Grid.RowDefinitions>
-                                       <RowDefinition Height="Auto" />
-                                       <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
-                                    <ListBox x:Name="PART_StandardColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-
-                              <!-- Recent Colors-->
-                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                 <Grid>
-                                    <Grid.RowDefinitions>
-                                       <RowDefinition Height="Auto" />
-                                       <RowDefinition Height="22" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
-                                    <ListBox x:Name="PART_RecentColors"
-                                             Grid.Row="1"
-                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Style="{StaticResource ColorListStyle}" />
-                                 </Grid>
-                              </Grid>
-                           </Grid>
-                           </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>
+                  </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/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
index 4b484a13..b40f1574 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -37,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
       set
       {
         if( value < 0d || value > 1d )
-          throw new ArgumentException( "BlendedColorRatio must greater than or equal to 0 and lower than or equal to 1 " );
+          throw new ArgumentException( "BlendedColorRatio must be greater than or equal to 0 and lower than or equal to 1 " );
 
         _blendedColorRatio = value;
       }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index 7f9abf2e..c00f05bb 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -54,10 +54,10 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     /// Converts an RGB color to an HSV color.
     /// </summary>
     /// <param name="r"></param>
-    /// <param name="b"></param>
     /// <param name="g"></param>
+    /// <param name="b"></param>
     /// <returns></returns>
-    public static HsvColor ConvertRgbToHsv( int r, int b, int g )
+    public static HsvColor ConvertRgbToHsv( int r, int g, int b )
     {
       double delta, min;
       double h = 0, s, v;
@@ -190,11 +190,12 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     /// <returns></returns>
     public static List<Color> GenerateHsvSpectrum()
     {
-      List<Color> colorsList = new List<Color>( 8 );
+      var colorsList = new List<Color>();
+      int hStep = 60;
 
-      for( int i = 0; i < 29; i++ )
+      for( int h = 0; h < 360; h+= hStep )
       {
-        colorsList.Add( ColorUtilities.ConvertHsvToRgb( i * 12, 1, 1 ) );
+        colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) );
       }
 
       colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
index bc54a7c6..de0e4f27 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -19,7 +19,9 @@ 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
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index 21f21686..169a40a1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -275,6 +275,7 @@ namespace Xceed.Wpf.Toolkit
       {
         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 );
@@ -347,9 +348,9 @@ namespace Xceed.Wpf.Toolkit
     protected override void HandleKeyDown( object sender, KeyEventArgs e )
     {
       // The base call will handle the Ctrl+Down, Enter and Esc keys
-      // in order to open o r close the popup.
-      //Do not close the Calendar if the call is handled
-      //by the TimePicker inside the DateTimePicker template
+      // 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
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
index 64c9c5af..6334e716 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -15,7 +15,7 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
@@ -23,222 +23,253 @@
                     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}}" />
-                     </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>
-                  <!--Binding one-way when UpdateValueOnEnterKey is True-->
-                  <Trigger Property="UpdateValueOnEnterKey"
-                           Value="True">
-                     <Setter Property="Value"
-                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                             TargetName="PART_TimeUpDown"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <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
index 8d9ac671..d2e08202 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -15,7 +15,7 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
@@ -23,229 +23,261 @@
                     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}}"/>
-                     </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>
-                  <!--Binding one-way when UpdateValueOnEnterKey is True-->
-                  <Trigger Property="UpdateValueOnEnterKey"
-                           Value="True">
-                     <Setter Property="Value"
-                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                             TargetName="PART_TimeUpDown" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+  <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/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index aba78992..75627f79 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -15,16 +15,11 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 using System.Windows.Controls;
-using System.Linq;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -668,7 +663,8 @@ namespace Xceed.Wpf.Toolkit
       throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Methods
 
@@ -708,50 +704,13 @@ namespace Xceed.Wpf.Toolkit
 
     private void Increment( int step )
     {
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
+      if( this.Value.HasValue )
       {
-        _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.Value = this.UpdateDateTime( this.Value, step );
       }
       else
       {
-        if( this.Value.HasValue )
-        {
-          this.Value = this.UpdateDateTime( this.Value, step );
-        }
-        else
-        {
-          this.Value = this.DefaultValue ?? this.ContextNow;
-        }
+        this.Value = this.DefaultValue ?? this.ContextNow;
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index b889622b..11b77e7a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -55,8 +55,6 @@ namespace Xceed.Wpf.Toolkit
     {
       Keyboard.AddKeyDownHandler( this, OnKeyDown );
       Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-      //case 166525 : Do no inherit an implicit style of Button
-      this.InheritanceBehavior = InheritanceBehavior.SkipToThemeNow;
     }
 
     #endregion //Constructors
@@ -111,6 +109,23 @@ namespace Xceed.Wpf.Toolkit
 
     #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 )
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
index a92b0229..f7faa69a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -22,131 +22,133 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
 
-   <!-- =============================================================================== -->
-   <!-- DropDownButton                                                                  -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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="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>
+  <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="{StaticResource PanelBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter Property="Fill"
+                      TargetName="Arrow"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+              <Setter TargetName="ToggleButtonChrome"
+                      Property="Foreground"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index c4cc825d..a54bfbf6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -22,151 +22,153 @@
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-   </ResourceDictionary.MergedDictionaries>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <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="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>
+  <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="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>
+  <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="{StaticResource PopupBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </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/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index 3553c7ad..7e1f8d78 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -81,6 +81,16 @@ namespace Xceed.Wpf.Toolkit
 
     #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 ) ) );
@@ -275,7 +285,16 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion // Base Class Overrides
 
-    #region Methods
+    #region Public Methods
+
+    public void Freeze( bool freeze )
+    {
+      this.IsFrozen = freeze;
+    }
+
+    #endregion
+
+    #region Private Methods
 
     private void UpdateViewBox()
     {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index 305b67a1..b0ef685c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -57,6 +57,9 @@ namespace Xceed.Wpf.Toolkit
       if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) )
         return;
 
+      if( _magnifier.IsFrozen )
+        return;
+
       _currentMousePosition = pt;
       _currentZoomFactor = _magnifier.ZoomFactor;
       UpdateViewBox();
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index 6c66bac1..88856103 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -59,6 +59,10 @@ namespace Xceed.Wpf.Toolkit
 
     private void Element_MouseLeave( object sender, MouseEventArgs e )
     {
+      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
+      if( ( magnifier != null ) && magnifier.IsFrozen )
+        return;
+
       HideAdorner();
     }
 
@@ -94,16 +98,16 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion //Event Handlers
+    #endregion //Event Handlers
 
-#region Methods
+    #region Methods
 
     private void AttachToMagnifier( UIElement element, Magnifier magnifier )
     {
       _element = element;
-      _element.MouseEnter += Element_MouseEnter;
-      _element.MouseLeave += Element_MouseLeave;
-      _element.MouseWheel += Element_MouseWheel;
+      _element.MouseEnter += this.Element_MouseEnter;
+      _element.MouseLeave += this.Element_MouseLeave;
+      _element.MouseWheel += this.Element_MouseWheel;
 
       magnifier.Target = _element;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index 0aff1207..f9c7932a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -168,8 +168,6 @@ namespace Xceed.Wpf.Toolkit
         new FrameworkPropertyMetadata(
         null,
         new CoerceValueCallback( MaskedTextBox.TextCoerceValueCallback ) ) );
-
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( MaskedTextBox ), new UIPropertyMetadata( "MaskedTextBox" ) );
     }
 
     public MaskedTextBox()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
index f7a9dc5d..80fdf126 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
@@ -27,6 +27,7 @@ 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
 {
@@ -69,6 +70,7 @@ namespace Xceed.Wpf.Toolkit
     /// Tracks the owner of the MessageBox
     /// </summary>
     private Window _owner;
+    private IntPtr _ownerHandle;
 
     private WindowControl _windowControl;
 
@@ -382,12 +384,16 @@ namespace Xceed.Wpf.Toolkit
     }
 
 
+
+
     #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.
@@ -448,7 +454,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( null, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -459,7 +465,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -479,7 +485,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, icon, MessageBoxResult.None, 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 )
@@ -489,7 +495,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
     }
 
 
@@ -509,7 +515,7 @@ namespace Xceed.Wpf.Toolkit
     /// <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, messageText, caption, button, icon, defaultResult, 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 )
@@ -520,9 +526,60 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
     {
-      return ShowCore( owner, messageText, caption, button, icon, defaultResult, 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
@@ -611,17 +668,21 @@ namespace Xceed.Wpf.Toolkit
     /// <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>
-    protected void InitializeMessageBox( Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
+    /// <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 );
     }
 
@@ -740,7 +801,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
     {
-      this.InitializeMessageBox( null, messageText, caption, button, icon, defaultResult );
+      this.InitializeMessageBox( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult );
       this.ShowMessageBox();
     }
 
@@ -760,15 +821,20 @@ namespace Xceed.Wpf.Toolkit
     /// <param name="icon">The icon.</param>
     /// <param name="defaultResult">The default result.</param>
     /// <returns></returns>
-    private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    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." );
       }
 
-      MessageBox msgBox = new MessageBox();
-      msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
+      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 )
@@ -790,18 +856,21 @@ namespace Xceed.Wpf.Toolkit
     {
       Window result = null;
 
-      if( Application.Current.Dispatcher.CheckAccess() )
-      {
-        result = ComputeOwnerWindowCore();
-      }
-      else
+      if( Application.Current != null )
       {
-        Application.Current.Dispatcher.BeginInvoke( new Action( () =>
+        if( Application.Current.Dispatcher.CheckAccess() )
+        {
+          result = ComputeOwnerWindowCore();
+        }
+        else
+        {
+          Application.Current.Dispatcher.BeginInvoke( new Action( () =>
           {
             result = ComputeOwnerWindowCore();
           }
-        ) );
-      }
+          ) );
+        }
+      }     
 
       return result;
     }
@@ -876,12 +945,20 @@ namespace Xceed.Wpf.Toolkit
       newWindow.AllowsTransparency = true;
       newWindow.Background = Brushes.Transparent;
       newWindow.Content = this;
-      newWindow.Owner = _owner ?? ComputeOwnerWindow();
 
-      if( newWindow.Owner != null )
+      if( _ownerHandle != IntPtr.Zero )
+      {
+        var windowHelper = new WindowInteropHelper( newWindow ) { Owner = _ownerHandle };
         newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
+      }
       else
-        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+      {
+        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;
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
index 03f6cccb..5f514cef 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
@@ -19,175 +19,220 @@
                     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}" />
-
-                            <!-- 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.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
index e8e41c2f..5c3d3796 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
@@ -19,177 +19,220 @@
                     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}" />
-
-                                <!-- 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.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/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 4ceab8b8..39780891 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -230,6 +230,9 @@ namespace Xceed.Wpf.Toolkit
       _toggleButton = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
     }
 
+
+
+
     #endregion //Bass Class Overrides
 
     #region Event Handlers
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
index 98c9c85e..2fbc03ae 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -22,194 +22,196 @@
                     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"/>
+  <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>
-                     </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}" />
-                  <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" />
-                           <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>
+                      </ControlTemplate>
+                    </Thumb.Template>
+                  </Thumb>
+                </Grid>
+              </Border>
+            </Popup>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+      </Trigger>
+      <Trigger Property="IsKeyboardFocusWithin"
+               Value="True">
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 713b206a..378ade61 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -21,169 +21,216 @@
                     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" />
+  <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>
-                </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}" />
-                  <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" />
-                           <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>
+                  </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>
-                     </Border>
-                  </Popup>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                      </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/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 6687c89b..5af9e296 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -19,6 +19,7 @@ using System.Globalization;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
 
+
 namespace Xceed.Wpf.Toolkit
 {
   public abstract class NumericUpDown<T> : UpDownBase<T>
@@ -146,6 +147,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Properties
 
+    #region Overrides
+
+
+    #endregion
+
     #region Methods
 
     protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
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
index 8255aa58..ffc3cfd2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -21,181 +21,193 @@
                     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}}" />
-               </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}" />
+  <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}}">
+            </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
index 62372059..a9f0662c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -21,151 +21,181 @@
                     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}}" />
-               </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}" />
+  <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}}" >
+            </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/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index 38dd9add..dcc130ef 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -21,7 +21,6 @@ using System.Collections.Specialized;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Media.Animation;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -1364,6 +1363,7 @@ namespace Xceed.Wpf.Toolkit.Panels
       }
     }
 
+
     protected new void RemoveVisualChild( Visual child )
     {
       if( _switchParent == null )
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
index c7e74b92..eaf040a4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
@@ -21,292 +21,375 @@
                     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}">
+  <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>
-            <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"/>
-                    </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>
+          <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>
+
 
-            <!-- 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>
-
-            <!-- #TODODOC-->
-            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
-            <Trigger Property="Text" Value="" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <!-- 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 
+      </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>
+    <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/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
index a0007416..cb7bd023 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
@@ -21,255 +21,366 @@
                     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}" />
-                        </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"/>
-                        </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>
+  <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>
 
-            <!-- 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>
-
-            <!-- #TODODOC-->
-            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
-            <Trigger Property="Text" Value="" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
-               <Setter Property="Margin" Value="0" TargetName="TitleText" />
-            </Trigger>
-
-            <!-- 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 
+          </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>
+    <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/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
index 07babce9..46cb091b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
@@ -51,8 +51,6 @@ namespace Xceed.Wpf.Toolkit.Primitives
       ValueRangeTextBox.AcceptsTabProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
         new FrameworkPropertyMetadata(
         false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsTabCoerceValueCallback ) ) );
-
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( ValueRangeTextBox ), new UIPropertyMetadata( "ValueRangeTextBox" ) );
     }
 
     public ValueRangeTextBox()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index 481ed834..e2c7d4b1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@ using System.Windows.Markup;
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2016" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 [assembly: AssemblyCulture( "" )]
 
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index 5b5de379..466b306f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -49,12 +49,13 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Constructor
 
-
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, bool isPropertyGridCategorized )
-      : base( isPropertyGridCategorized )
+    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, IPropertyContainer propertyContainer )
+       : base( propertyContainer.IsCategorized
+             )
     {
       this.Init( propertyDescriptor, selectedObject );
     }
+
     #endregion
 
     #region Custom Properties
@@ -120,8 +121,16 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     protected override bool ComputeCanResetValue()
     {
-      return PropertyDescriptor.CanResetValue( SelectedObject )
-        && !PropertyDescriptor.IsReadOnly;
+      if( !PropertyDescriptor.IsReadOnly )
+      {
+        var defaultValue = this.ComputeDefaultValueAttribute();
+        if( defaultValue != null )
+          return true;
+
+        return PropertyDescriptor.CanResetValue( SelectedObject );
+      }
+
+      return false;
     }
 
     protected override object ComputeAdvancedOptionsTooltip()
@@ -188,10 +197,22 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       var editorAttribute = GetAttribute<EditorAttribute>();
       if( editorAttribute != null )
       {
+        Type type = null;
 #if VS2008
-        var type = Type.GetType( editorAttribute.EditorTypeName );
+        type = Type.GetType( editorAttribute.EditorTypeName );
 #else
-        var type = Type.GetType( editorAttribute.EditorTypeName, ( name ) => { return AppDomain.CurrentDomain.GetAssemblies().Where( l => l.FullName == name.FullName ).FirstOrDefault(); }, null, true );
+        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.
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
index f3870f77..4bde0880 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -60,7 +60,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Initialization
 
-    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized )
+
+    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized
+                                             )
     {
       this.IsPropertyGridCategorized = isPropertyGridCategorized;
     }
@@ -212,15 +214,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal void UpdateAdvanceOptions()
     {
-      // Only set the Tooltip. the Icon will be added in XAML based on the Tooltip.
+      // 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.ExpandableAttribute
-        && this.ComputeIsExpandable();
+      this.IsExpandable = this.ComputeIsExpandable() 
+                          && ( this.ExpandableAttribute
+                             );
     }
 
     internal void UpdateValueFromSource()
@@ -576,6 +578,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
+
     internal bool IsPropertyGridCategorized
     {
       get;
@@ -583,6 +586,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     }
 
 
+
     #region Value Property (DP)
 
     public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null, OnValueChanged ) );
@@ -624,7 +628,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       _displayName = ComputeDisplayName();
       _defaultValue = ComputeDefaultValueAttribute();
       _displayOrder = ComputeDisplayOrder( this.IsPropertyGridCategorized );
-
       _expandableAttribute = ComputeExpandableAttribute();
 
 
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
index c0a86948..2b1a4545 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
@@ -30,6 +30,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       ValueProperty = CollectionControlButton.ItemsSourceProperty;
     }
 
+    protected override CollectionControlButton CreateEditor()
+    {
+      return new PropertyGridEditorCollectionControl();
+    }
+
 
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
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
index 29bacc5a..374858f2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
@@ -18,6 +18,8 @@ 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
 {
@@ -35,6 +37,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       set;
     }
 
+    protected override MaskedTextBox CreateEditor()
+    {
+      return new PropertyGridEditorMaskedTextBox();
+    }
+
     protected override void SetControlProperties( PropertyItem propertyItem )
     {
       Editor.BorderThickness = new System.Windows.Thickness( 0 );
@@ -47,4 +54,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       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
index 6a98f3b8..bd1097df 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -31,6 +31,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty;
     }
 
+    protected override PrimitiveTypeCollectionControl CreateEditor()
+    {
+      return new PropertyGridEditorPrimitiveTypeCollectionControl();
+    }
+
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
       var type = propertyItem.PropertyType;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index 5aaca022..78fad1d7 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -34,6 +34,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     protected override void SetControlProperties( PropertyItem propertyItem )
     {
       Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
+      Editor.TextTrimming = TextTrimming.CharacterEllipsis;
     }
   }
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
index 80d2cf90..8ba7a517 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
@@ -52,5 +52,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     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
index d135fd96..4c516e31 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -120,10 +120,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
     {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property,
-                                                                                  SelectedObject, 
-                                                                                  this.PropertyContainer.IsCategorized
-                                                                                 );
+      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
       definition.InitProperties();
 
       this.InitializeDescriptorDefinition( definition, propertyDef );
@@ -131,6 +128,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       Debug.Assert( SelectedObject != null );
       propertyItem.Instance = SelectedObject;
       propertyItem.CategoryOrder = this.GetCategoryOrder( definition.CategoryValue );
+
       propertyItem.WillRefreshPropertyGrid = this.GetWillRefreshPropertyGrid( property );
       return propertyItem;
     }
@@ -165,5 +163,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
index 352ab366..52a29bf2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -188,10 +188,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private void UpdateFilter()
     {
-      FilterInfo filterInfo = PropertyContainer.FilterInfo;
+      FilterInfo filterInfo = this.PropertyContainer.FilterInfo;
 
-      PropertyItems.FilterPredicate = filterInfo.Predicate
-        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString );
+      this.PropertyItems.FilterPredicate = filterInfo.Predicate
+        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString, this.PropertyItems, this.PropertyContainer );
     }
 
     private void UpdateCategorization( bool updateSubPropertiesCategorization )
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index b7346fde..ef4be577 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -693,6 +693,23 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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 ) );
@@ -867,7 +884,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
-    #endregion //Base Class Overrides
+
+#endregion //Base Class Overrides
 
     #region Event Handlers
 
@@ -916,8 +934,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       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 )
@@ -1215,6 +1237,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #endregion
 
+
+
+
+
+
     #region PreparePropertyItemEvent Attached Routed Event
 
     /// <summary>
@@ -1396,6 +1423,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return null;
     }
 
+
+
+
     #endregion
 
 
@@ -1452,15 +1482,13 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
   }
   #endregion
 
-  #region isPropertyBrowsableEvent Handler/Args
+  #region IsPropertyArgs class
 
-  public delegate void IsPropertyBrowsableHandler( object sender, IsPropertyBrowsableArgs e );
-
-  public class IsPropertyBrowsableArgs : RoutedEventArgs
+  public class PropertyArgs : RoutedEventArgs
   {
     #region Constructors
 
-    public IsPropertyBrowsableArgs( PropertyDescriptor pd )
+    public PropertyArgs( PropertyDescriptor pd )
     {
       this.PropertyDescriptor = pd;
     }
@@ -1469,22 +1497,44 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Properties
 
-    #region IsBrowsable Property
+    #region PropertyDescriptor Property
 
-    public bool? IsBrowsable
+    public PropertyDescriptor PropertyDescriptor
     {
       get;
-      set;
+      private set;
     }
 
     #endregion
 
-    #region PropertyDescriptor Property
+    #endregion
+  }
 
-    public PropertyDescriptor PropertyDescriptor
+  #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;
-      private set;
+      set;
     }
 
     #endregion
@@ -1494,4 +1544,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
   #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
index 6554807c..828c86db 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
@@ -205,20 +205,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       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();
-        }
-      }
-    }
-
     private void SetValueFontWeight()
     {
       if( this.ValueContainer == null )
@@ -234,6 +220,20 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
                                         : FontWeights.Normal;
     }
 
+    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
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
index 8476dae5..5d80bac9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
@@ -16,9 +16,7 @@
 
 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;
@@ -26,7 +24,6 @@ using System.Windows.Media;
 using System.Windows.Data;
 using System.Collections;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Reflection;
 using System.Linq.Expressions;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
@@ -130,6 +127,24 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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 ) );
@@ -429,6 +444,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       e.Handled = true;
     }
 
+
     private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
     { 
       IsSelected = true;
@@ -578,7 +594,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return null;
     }
 
-    #endregion
+
+
+#endregion
 
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
index 55066424..5f54fd2b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -25,6 +25,7 @@ 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
@@ -80,7 +81,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public void Filter( string text )
     {
-      Predicate<object> filter = PropertyItemCollection.CreateFilter( text );
+      Predicate<object> filter = PropertyItemCollection.CreateFilter( text, this.Items, null );
       GetDefaultView().Filter = filter;
     }
 
@@ -151,7 +152,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       GetDefaultView().Refresh();
     }
 
-    internal static Predicate<object> CreateFilter( string text )
+    internal static Predicate<object> CreateFilter( string text, IList<PropertyItem> PropertyItems, IPropertyContainer propertyContainer )
     {
       Predicate<object> filter = null;
 
@@ -171,8 +172,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
                 return false;
             }
 #endif
-
-            return property.DisplayName.ToLower().Contains( text.ToLower() );
+            property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
+            return (property.HighlightedText != null);
           }
 
           return false;
@@ -181,5 +182,30 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
       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
index 4926b2a7..2839de49 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
@@ -104,5 +104,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       this.RaiseClearPropertyItemEvent( ( PropertyItemBase )element, item );
       base.ClearContainerForItemOverride( element, item );
     }
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
index 9677c4f3..d0fbbd9b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
@@ -20,6 +20,8 @@ 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
 {
@@ -65,6 +67,89 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #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)
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
index 90c389ae..7baed15b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
@@ -21,6 +21,7 @@
                     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"
@@ -54,8 +55,13 @@
             Member="sys:String.Empty" />
 
   <!-- PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
+  <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>
@@ -73,7 +79,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -91,7 +97,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -109,7 +115,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -127,7 +133,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -145,7 +151,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -163,7 +169,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -273,6 +279,11 @@
             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}">
@@ -311,13 +322,13 @@
   <!-- 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).                                               -->
+  <!-- available in code-behind (not xaml).                                              -->
   <!-- (ex. Office2007 theme)                                                            -->
   <!-- ===============================================================================   -->
 
   <!-- Internal PropertyGrid numeric Editors -->
   <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -335,7 +346,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -353,7 +364,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -371,7 +382,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -854,15 +865,18 @@
                                   Template="{StaticResource ExpanderToggleButton}"
                                   OverridesDefaultStyle="True"
                                   IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                  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}}" />
+                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                      </pg:TrimmedTextBlock>
                   </Grid>
 
                   <Grid Grid.Column="1"
@@ -872,10 +886,12 @@
                         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}}" />
+                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
+                    </Image>
                   </Grid>
                 </Grid>
               </Border>
@@ -1085,12 +1101,14 @@
                   <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
                     <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
                                          TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" />
+                                         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" />
+                                         TextTrimming="CharacterEllipsis">
+                    </pg:TrimmedTextBlock>
                   </Grid>
                 </StackPanel>
               </StackPanel>
@@ -1114,7 +1132,8 @@
                                  ToolTip="Categorized">
                       <Image Source="./../Images/Categorize16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                     <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                  VerticalAlignment="Center"
@@ -1122,7 +1141,8 @@
                                  ToolTip="Alphabetical">
                       <Image Source="./../Images/SortAscending16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                   </StackPanel>
                 </Grid>
@@ -1166,7 +1186,8 @@
                             HorizontalAlignment="Left">
                       <Image Source="./../Images/ClearFilter16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </Button>
                   </Grid>
                 </Border>
@@ -1201,13 +1222,22 @@
                               BorderBrush="{TemplateBinding BorderBrush}"
                               Background="{TemplateBinding Background}"
                               SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
+                        <ScrollViewer x:Name="ScrollBar"
+                                      Padding="{TemplateBinding Padding}"
                                       Focusable="False"
                                       VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="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>
 
@@ -1230,16 +1260,19 @@
               <GridSplitter Height="3"
                             Grid.Row="3"
                             HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            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}}" />
+                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}">
+                </TextBlock>
                 <TextBlock Padding="5 2 2 0"
                            TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}">
+                </TextBlock>
               </StackPanel>
             </Grid>
           </Border>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
index 36d5610c..caad45e6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
@@ -20,6 +20,7 @@
                     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"
@@ -52,8 +53,13 @@
             Member="sys:String.Empty" />
 
   <!-- PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
+  <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>
@@ -71,7 +77,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -89,7 +95,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -107,7 +113,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -125,7 +131,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -143,7 +149,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -161,7 +167,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -279,6 +285,11 @@
             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}}">
@@ -317,13 +328,13 @@
   <!-- 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).                                               -->
+  <!-- available in code-behind (not xaml).                                              -->
   <!-- (ex. Office2007 theme)                                                            -->
   <!-- ===============================================================================   -->
 
   <!-- Internal PropertyGrid numeric Editors -->
   <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -341,7 +352,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -359,7 +370,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -377,7 +388,7 @@
   </Style>
 
   <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource NumericUpDown}">
+         BasedOn="{StaticResource PropertyGridNumericUpDown}">
     <Style.Triggers>
       <MultiTrigger>
         <MultiTrigger.Conditions>
@@ -970,15 +981,18 @@
                                   Template="{StaticResource ExpanderToggleButton}"
                                   OverridesDefaultStyle="True"
                                   IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                  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}}" />
+                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                    </pg:TrimmedTextBlock>
                   </Grid>
 
                   <Grid Grid.Column="1"
@@ -988,10 +1002,12 @@
                         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}}" />
+                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
+                    </Image>
                   </Grid>
                 </Grid>
               </Border>
@@ -1204,12 +1220,14 @@
                   <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
                     <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
                                          TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" />
+                                         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" />
+                                         TextTrimming="CharacterEllipsis" >
+                    </pg:TrimmedTextBlock>
                   </Grid>
                 </StackPanel>
               </StackPanel>
@@ -1233,7 +1251,8 @@
                                  ToolTip="Categorized">
                       <Image Source="./../Images/Categorize16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                     <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                  VerticalAlignment="Center"
@@ -1241,7 +1260,8 @@
                                  ToolTip="Alphabetical">
                       <Image Source="./../Images/SortAscending16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </RadioButton>
                   </StackPanel>
                 </Grid>
@@ -1285,7 +1305,8 @@
                             HorizontalAlignment="Left">
                       <Image Source="./../Images/ClearFilter16.png"
                              Width="16"
-                             Height="16" />
+                             Height="16" >
+                      </Image>
                     </Button>
                   </Grid>
                 </Border>
@@ -1320,13 +1341,22 @@
                               BorderBrush="{TemplateBinding BorderBrush}"
                               Background="{TemplateBinding Background}"
                               SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
+                        <ScrollViewer x:Name="ScrollBar"
+                                      Padding="{TemplateBinding Padding}"
                                       Focusable="False"
                                       VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="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>
 
@@ -1349,16 +1379,19 @@
               <GridSplitter Height="3"
                             Grid.Row="3"
                             HorizontalAlignment="Stretch"
-                            Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-              <StackPanel Grid.Row="4"
+                            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}}" />
+                           Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" >
+                </TextBlock>
                 <TextBlock Padding="5 2 2 0"
                            TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" >
+                </TextBlock>
               </StackPanel>
             </Grid>
           </Border>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
index 3e58a8dc..40528354 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
@@ -15,14 +15,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using System.ComponentModel;
-using System.Windows.Input;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit
@@ -123,8 +118,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between higher/maximum values. (Brush)
+    /// 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 ) );
@@ -145,8 +139,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Higher/Maximum values. (Style)
+    /// 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 )
@@ -168,9 +161,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherRangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the  HigherRange within the entire min/max range.
+    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the HigherRange within the entire min/max range.
     /// </summary>
     /// 
 
@@ -196,8 +187,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherThumbBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the HigherValue thumb back of the icons [active state]. (Brush)
+    /// 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 ) );
@@ -218,8 +208,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region HigherValue
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// HigherValue property represents the higher value within the selected range.
     /// </summary>
     public static readonly DependencyProperty HigherValueProperty = DependencyProperty.Register( "HigherValue", typeof( double ), typeof( RangeSlider )
@@ -273,8 +261,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region IsDeferredUpdateValues
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// 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 )
@@ -315,8 +301,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between minimum/lower values . (Brush)
+    /// 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 ) );
@@ -337,8 +322,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Minimum/Lower values. (Style)
+    /// 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 )
@@ -360,9 +344,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerRangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the  LowerRange, within the entire min/max range.
+    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the LowerRange, within the entire min/max range.
     /// </summary>
     /// 
 
@@ -387,8 +369,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerThumbBackground
     /// <summary>
-    /// # TODODOC          
-    /// Get/Set the Brush for the LowerValue thumb back of the icons [active state]. (Brush)
+    /// 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 ) );
@@ -409,7 +390,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region LowerValue
     /// <summary>
-    /// # TODODOC          
     /// LowerValue property represents the lower value within the selected range.
     /// </summary>
     public static readonly DependencyProperty LowerValueProperty = DependencyProperty.Register( "LowerValue", typeof( double ), typeof( RangeSlider )
@@ -463,7 +443,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region Maximum
     /// <summary>
-    /// # TODODOC          
     /// 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 )
@@ -499,7 +478,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region Minimum
     /// <summary>
-    /// //#TODODOC          
     /// 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 )
@@ -537,8 +515,7 @@ namespace Xceed.Wpf.Toolkit
     #region Orientation
 
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the RangeSlider orientation.
+    /// 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 ) );
@@ -572,8 +549,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeBackground
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Brush for the Range between lower/higher values [active state]. (Brush)
+    /// 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 ) );
@@ -594,8 +570,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeStyle
     /// <summary>
-    /// # TODODOC
-    /// Get/Set the Style for the Range between Lower/Higher values. (Style)
+    /// 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 )
@@ -617,8 +592,6 @@ namespace Xceed.Wpf.Toolkit
 
     #region RangeWidth
     /// <summary>
-    /// # TODODOC          
-    /// 
     /// RangeWidth property is a readonly property, used to calculate the percentage of the range within the entire min/max range.
     /// </summary>
 
@@ -643,9 +616,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region Step
     /// <summary>
-    /// # TODODOC          
-    /// 
-    /// Step property is used to identify the RangeSlider's size of individual move, while clicking on the LowerRange, HigherRange, not while scrolling the thumbs.
+    /// 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 ) );
@@ -816,6 +787,7 @@ namespace Xceed.Wpf.Toolkit
       return this.LowerValue.ToString() + "-" + this.HigherValue.ToString();
     }
 
+
     #endregion Override
 
     #region Methods
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
index 1ada0aae..f4890a1f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
@@ -22,547 +22,549 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
-   <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-    <!-- //#TODODOC
-         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>
-
-   <!--//##TODODOC-->
-   <!--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>
+  <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>
-   </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>
-            <!-- //#TODODOC 
-             Get Thumbs's height to set the good RangeSlider height.-->
-            <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 Height="{TemplateBinding RangeWidth}"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Background="{TemplateBinding RangeBackground}"
-                          Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                          SnapsToDevicePixels="True" />
-
-            <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" />
-
-            <!-- 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>
+      <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>
-      <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>
-                     <!-- //#TODODOC 
-                        Get Thumbs's width to set the good RangeSlider width.-->
-                     <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 Width="{TemplateBinding RangeWidth}"
-                                   Grid.Column="2"
-                                   Grid.Row="1"
-                                   Background="{TemplateBinding RangeBackground}"
-                                   Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                                   SnapsToDevicePixels="True" />
-
-                     <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" />
-
-                     <!-- 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>
+
+      <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
index f5bb7177..95a47482 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
@@ -22,609 +22,615 @@
                     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>
-
-   <!-- //#TODODOC
-         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>
-
-   <!--//##TODODOC-->
-   <!--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"
+  <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>
+    <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>
 
-      <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>
+      <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>
 
-      <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>
-            <!-- //#TODODOC 
-             Get Thumbs's height to set the good RangeSlider height.-->
-            <Grid.RowDefinitions>
-               <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
+      <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 Height="{TemplateBinding RangeWidth}"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Background="{TemplateBinding RangeBackground}"
-                          Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                          SnapsToDevicePixels="True" />
-
-            <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" />
-
-            <!-- 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}"/>
-
-            <!-- 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}"/>
-         </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>
-                     <!-- //#TODODOC 
-                        Get Thumbs's width to set the good RangeSlider width.-->
-                  <Grid.ColumnDefinitions>
-                     <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
+          <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 Width="{TemplateBinding RangeWidth}"
-                                   Grid.Column="2"
-                                   Grid.Row="1"
-                                   Background="{TemplateBinding RangeBackground}"
-                                   Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                                   SnapsToDevicePixels="True" />
-
-                     <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" />
-
-                     <!-- 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}" />
-
-                     <!-- 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}"/>
-                  </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>
+                <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/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index 3e42b028..0578ab59 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -109,7 +109,7 @@ namespace Xceed.Wpf.Toolkit
     protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
     {
       base.OnTextChanged( e );
-      UpdateTextFromDocument();
+      this.UpdateTextFromDocument();
     }
 
     private void UpdateTextFromDocument()
@@ -118,7 +118,11 @@ namespace Xceed.Wpf.Toolkit
         return;
 
       _preventDocumentUpdate = true;
-      Text = TextFormatter.GetText( Document );
+#if VS2008
+      Text = this.TextFormatter.GetText( this.Document );
+#else
+      this.SetCurrentValue( RichTextBox.TextProperty, this.TextFormatter.GetText( this.Document ) );
+#endif
       _preventDocumentUpdate = false;
     }
 
@@ -128,7 +132,7 @@ namespace Xceed.Wpf.Toolkit
         return;
 
       _preventTextUpdate = true;
-      TextFormatter.SetText( Document, Text );
+      this.TextFormatter.SetText( this.Document, Text );
       _preventTextUpdate = false;
     }
 
@@ -137,7 +141,7 @@ namespace Xceed.Wpf.Toolkit
     /// </summary>
     public void Clear()
     {
-      Document.Blocks.Clear();
+      this.Document.Blocks.Clear();
     }
 
     public override void BeginInit()
@@ -157,9 +161,13 @@ namespace Xceed.Wpf.Toolkit
       // the document AND the text at the same time 
       // in XAML. Text has priority.
       if( !string.IsNullOrEmpty( Text ) )
-        UpdateDocumentFromText();
+      {
+        this.UpdateDocumentFromText();
+      }
       else
-        UpdateTextFromDocument();
+      {
+        this.UpdateTextFromDocument();
+      }
     }
 
     #endregion //Methods
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
index c710bbe6..5b3c37cb 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
@@ -14,10 +14,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -76,6 +73,13 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Constructors
 
+    #region Base Class Overrides
+
+
+
+
+    #endregion
+
     #region Event Hanlders
 
     private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
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
index 5f5cd3c1..8a6a8f75 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
@@ -17,713 +17,735 @@
 <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" />
-                                        <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" />
-                                        <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}" />
-
-                <StackPanel Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <ComboBox x:Name="_cmbFontFamilies"
-                            IsEditable="True"
-                            Width="100"
-                            ToolTip="Font Family" />
-
-                        <ComboBox x:Name="_cmbFontSizes"
-                            IsEditable="True"
-                            Width="43"
-                            ToolTip="Font Size"/>
-
-                        <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" />
-                        </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" />
-                        </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" />
-                        </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" />
-                        </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" />
-                        </ToggleButton>
-
-                        <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" />
-                        </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" />
-                        </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" />
-                        </RadioButton>
-
-                        <Separator />
-
-                        <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                                     ToolTip="Text Highlight Color" />
-
-                        <local:ColorPicker x:Name="_cmbFontColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontColorButtonStyle}"
-                                     ToolTip="Font Color" />
-
-                    </StackPanel>
-
+                    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>
-            </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>
+              </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
index 1b83005c..1457bb50 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
@@ -17,716 +17,734 @@
 <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" />
-                              <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" />
-                              <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}" />
-
-            <StackPanel Grid.Row="1">
-               <StackPanel Orientation="Horizontal">
-                  <ComboBox x:Name="_cmbFontFamilies"
-                            IsEditable="True"
-                            Width="100"
-                            ToolTip="Font Family" />
-
-                  <ComboBox x:Name="_cmbFontSizes"
-                            IsEditable="True"
-                            Width="43"
-                            ToolTip="Font Size"/>
-
-                  <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" />
-                  </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" />
-                  </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" />
-                  </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" />
-                  </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" />
-                  </ToggleButton>
-
-                  <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" />
-                  </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" />
-                  </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" />
-                  </RadioButton>
-
-                  <Separator />
-
-                  <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                                     ToolTip="Text Highlight Color" />
-
-                  <local:ColorPicker x:Name="_cmbFontColor"
-                                     BorderThickness="0"
-                                     ButtonStyle="{StaticResource FontColorButtonStyle}"
-                                     ToolTip="Font Color" />
-
-               </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>
+                    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
index e45d20ad..709437b9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -41,6 +41,7 @@ namespace Xceed.Wpf.Toolkit
       Button = GetTemplateChild( PART_ActionButton ) as Button;
     }
 
-    #endregion //Base Class Overrides
+
+  #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
index 83c2a675..e541166f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -21,148 +21,151 @@
                     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>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
 
-   <!-- =============================================================================== -->
-   <!-- SplitButton                                                                     -->
-   <!-- =============================================================================== -->
-   <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter"/>
+  <!-- =============================================================================== -->
+  <!-- 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="Padding"
-              Value="3" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:SplitButton}">
-               <Grid x:Name="MainGrid"
-                     SnapsToDevicePixels="True">
-                  <chrome:ButtonChrome x:Name="ControlChrome"
-                                       Background="{TemplateBinding Background}"
-                                       RenderEnabled="{TemplateBinding IsEnabled}">
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Button x:Name="PART_ActionButton"
-                                Margin="0"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Padding="{TemplateBinding Padding}">
-                           <Button.Template>
-                              <ControlTemplate TargetType="Button">
-                                 <ContentPresenter />
-                              </ControlTemplate>
-                           </Button.Template>
-                           <Grid>
-                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                   Background="{TemplateBinding Background}"
-                                                   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>
+  <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="{StaticResource PanelBackgroundBrush}"
-                             BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                             MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <ScrollViewer x:Name="DropDownScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                           <ContentPresenter x:Name="PART_ContentPresenter"
-                                             Content="{TemplateBinding DropDownContent}" />
-                        </ScrollViewer>
-                     </Border>
-                  </Popup>
+            <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>
+          </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
index b618d7cb..7791fcf0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -21,174 +21,177 @@
                     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="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}">
-                           <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="{StaticResource PopupBackgroundBrush}"
-                             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.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/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index b4e79e60..41532b30 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -413,8 +413,8 @@ namespace Xceed.Wpf.Toolkit
         time = StartTimeDefaultValue;
       }
 
-      //Limit the content of the list to the Minimum or Maximum
-      //if the date is set to the minimum or maximum.
+      // 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;
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
index 116872da..cd7141c6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -22,251 +22,284 @@
                     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>
+  <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" />
+  <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>
+  <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}">
+  <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>
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <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>
+                <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>
+  <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>
+      <!-- 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>
+      <!-- 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                                                                      -->
-    <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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}}" />
-                  <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}"/>
-                        </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>
+  <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
index d7695b47..63daafc1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -22,227 +22,262 @@
                     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" />
+  <!-- =============================================================================== -->
+  <!-- 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>
-                </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}}" />
-                  <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}" />
-                        </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>
+                  </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
index 9e82d3a5..a2213ce0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
@@ -15,13 +15,9 @@
   ***********************************************************************************/
 
 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;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 
@@ -370,6 +366,7 @@ namespace Xceed.Wpf.Toolkit
       return (value1.Value > value2.Value);
     }
 
+
     #endregion
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index 2f8f99db..e8365ea6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -381,6 +381,7 @@ namespace Xceed.Wpf.Toolkit
       return renderSize;
     }
 
+
     #endregion //Base Class Overrides
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
index ed3fb920..d5e0a8aa 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
@@ -14,10 +14,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -71,5 +67,12 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #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
index e8ba0abc..f0f4b933 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
@@ -19,459 +19,459 @@
                     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>
+  <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">
+  <!-- =============================================================================== -->
+  <!-- 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>
-                           <ControlTemplate TargetType="{x:Type TextBox}">
-                              <ScrollViewer x:Name="PART_ContentHost"
-                                            Background="Transparent"
-                                            Focusable="False"
-                                            HorizontalScrollBarVisibility="Hidden"
-                                            VerticalScrollBarVisibility="Hidden" />
-                           </ControlTemplate>
+                          <LinearGradientBrush EndPoint="0,1"
+                                               StartPoint="0,0">
+                            <GradientStop Color="#FFDAECFC"
+                                          Offset="0" />
+                            <GradientStop Color="#FFC4E0FC"
+                                          Offset="1" />
+                          </LinearGradientBrush>
                         </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"
+                      </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>
+        </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                                                          -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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 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}" />
+  <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
index 28d9c0a0..f0f4b933 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
@@ -19,457 +19,459 @@
                     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>
+  <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="Template">
+  <!-- =============================================================================== -->
+  <!-- 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>
-                           <ControlTemplate TargetType="{x:Type TextBox}">
-                              <ScrollViewer x:Name="PART_ContentHost"
-                                            Background="Transparent"
-                                            Focusable="False"
-                                            HorizontalScrollBarVisibility="Hidden"
-                                            VerticalScrollBarVisibility="Hidden" />
-                           </ControlTemplate>
+                          <LinearGradientBrush EndPoint="0,1"
+                                               StartPoint="0,0">
+                            <GradientStop Color="#FFDAECFC"
+                                          Offset="0" />
+                            <GradientStop Color="#FFC4E0FC"
+                                          Offset="1" />
+                          </LinearGradientBrush>
                         </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"
+                      </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>
+        </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                                                          -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- 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 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}" />
+  <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
index 09b3773a..79249aad 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
@@ -200,6 +200,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Event
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index 5cae21ae..8ef27cb9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -15,9 +15,6 @@
   ***********************************************************************************/
 
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -88,6 +85,13 @@ namespace Xceed.Wpf.Toolkit
     }
 
     #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
index 96b42fd2..700d3c07 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -20,94 +20,148 @@
                     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}" />
-                                 <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}" />
+  <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
index 8dac05a3..2e0c4f29 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -18,107 +18,160 @@
                     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}" />
-                        <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}" />
+  <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
index 26cd716a..6daa0ed2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -227,7 +227,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Collapsed ) );
     public Visibility FinishButtonVisibility
     {
       get
@@ -339,7 +339,7 @@ namespace Xceed.Wpf.Toolkit
       foreach( object o in this.Items )
       {
         if( !( o is WizardPage ) )
-          throw new NotSupportedException( "Wizard should only contains WizardPages." );
+          throw new NotSupportedException( "Wizard should only contain WizardPages." );
       }
 
       if( Items.Count > 0 && CurrentPage == null )
@@ -357,6 +357,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion //Base Class Overrides
 
     #region Commands
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index 3f43e080..635e683d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -316,6 +316,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
+
+
     #endregion
 
     #region Events
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
index c9d0d4e0..dbfd0a11 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -20,193 +20,284 @@
                     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="PART_HelpButton"
-                                      Grid.Column="0"
-                                      MinWidth="75" 
-                                      Command="local:WizardCommands.Help" 
-                                      Content="{TemplateBinding HelpButtonContent}">
-                                            <Button.Visibility>
-                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                                </MultiBinding>
-                                            </Button.Visibility>
-                                        </Button>
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                            <Button Name="PART_CancelButton"
-                                         Margin="0,0,7,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Cancel" 
-                                         Content="{TemplateBinding CancelButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_BackButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.PreviousPage" 
-                                         Content="{TemplateBinding BackButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_NextButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.NextPage"
-                                         Content="{TemplateBinding NextButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_FinishButton"
-                                         Margin="7,0,0,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Finish" 
-                                         Content="{TemplateBinding FinishButtonContent}">
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Border>
-    </ControlTemplate>
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid Background="{TemplateBinding Background}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-                </Grid>
-            </Border>
-            <Grid Column="1" Margin="14">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Grid>
-    </ControlTemplate>
+  <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
 
-    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
+  <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="*" />
-            </Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+
+              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
 
-            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+              <Border Grid.Row="1"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="0,1,0,0"
+                      Padding="7">
                 <StackPanel>
-                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+                  <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>
-                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+              </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>
 
-            <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>
+  <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>
-    </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>
+      </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
index aaf5a14c..fa4a8fa6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -19,189 +19,280 @@
                     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="PART_HelpButton"
-                                      Grid.Column="0"
-                                      MinWidth="75" 
-                                      Command="local:WizardCommands.Help" 
-                                      Content="{TemplateBinding HelpButtonContent}">
-                                 <Button.Visibility>
-                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                    </MultiBinding>
-                                 </Button.Visibility>
-                              </Button>
-                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                 <Button Name="PART_CancelButton"
-                                         Margin="0,0,7,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Cancel" 
-                                         Content="{TemplateBinding CancelButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_BackButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.PreviousPage" 
-                                         Content="{TemplateBinding BackButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_NextButton"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.NextPage"
-                                         Content="{TemplateBinding NextButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                                 <Button Name="PART_FinishButton"
-                                         Margin="7,0,0,0"
-                                         MinWidth="75" 
-                                         Command="local:WizardCommands.Finish" 
-                                         Content="{TemplateBinding FinishButtonContent}">
-                                    <Button.Visibility>
-                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                       </MultiBinding>
-                                    </Button.Visibility>
-                                 </Button>
-                              </StackPanel>
-                           </Grid>
-                        </StackPanel>
-                     </Border>
+  <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>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-         <Grid Background="{TemplateBinding Background}">
-            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-         </Grid>
-      </Border>
-   </ControlTemplate>
+                </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="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+  <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}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
-               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-            </Grid>
-         </Border>
-         <Grid Column="1" Margin="14">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-         </Grid>
+        <ContentPresenter Margin="14"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
       </Grid>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <StackPanel>
-               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
-            </StackPanel>
-            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
-         </Grid>
-
-         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-         </Border>
+    </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>
-   </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>
+
+      <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
index 8f186366..10570590 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -47,12 +47,15 @@
     <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>..\..\..\3.4.0\dlls\WPFToolkit.dll</HintPath>
+      <HintPath>..\..\..\..\WPFToolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
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
index 2d183e87..5731a303 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
@@ -20,93 +20,93 @@
                     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" />
+  <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" />
+  <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="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>
+  <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 
+  <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
@@ -117,24 +117,24 @@
               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 
+        </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 
+        </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 
@@ -143,122 +143,122 @@
               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>
+        </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
+  <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 
+            <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 
+          <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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
@@ -266,102 +266,102 @@
               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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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 
+            <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>
+            <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 
+  <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 
+            <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>
+            <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 
+  <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 
@@ -371,452 +371,463 @@
               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>
+        </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}">
+  <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>
+            <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 x:Name="PART_HorizontalScrollBar"
-                             Grid.Row="1"
-                             Grid.Column="0"
-                             Orientation="Horizontal" 
-                             Visibility="Collapsed"/>
-                  <Border Grid.Row="1"
-                          Grid.Column="1"
-                          Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+            <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"
+            <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="10"
-                          CornerRadius="0">
-                     <Border.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform x:Name="LayoutScaleTransform"
-                                           ScaleX="0"
-                                           ScaleY="0" />
-                        </TransformGroup>
-                     </Border.RenderTransform>
-                     <Grid Margin="4">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="*" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <StackPanel Orientation="Horizontal"
-                                    Margin="0,0,0,3">
-                           <Button x:Name="BackButton"
-                                   Command="local:Zoombox.Back"
-                                   ToolTip="Go Back"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource PreviousGlyph}" />
-                           </Button>
-                           <Button x:Name="ForwardButton"
-                                   Command="local:Zoombox.Forward"
-                                   ToolTip="Go Forward"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource NextGlyph}" />
-                           </Button>
-                           <Button x:Name="HomeButton"
-                                   Command="local:Zoombox.Home"
-                                   ToolTip="Go Home"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource HomeGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FitButton"
-                                   Command="local:Zoombox.Fit"
-                                   ToolTip="Fit Content within Bounds"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FitContentGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FillButton"
-                                   Command="local:Zoombox.Fill"
-                                   ToolTip="Fill Bounds with Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FillToBoundsGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="CenterButton"
-                                   Command="local:Zoombox.Center"
-                                   ToolTip="Center Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource CenterGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="RefocusButton"
-                                   Command="local:Zoombox.Refocus"
-                                   Visibility="Collapsed"
-                                   ToolTip="Refocus View"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource RefocusGlyph}"
-                                     Margin="2" />
-                           </Button>
-                        </StackPanel>
-                        <ToggleButton x:Name="ToggleViewFinderButton"
-                                      ToolTip="Hide View Finder"
-                                      Height="13"
-                                      Width="13"
-                                      Margin="0,2,0,0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      Style="{StaticResource TransparentButton}"
-                                      Foreground="White"
-                                      IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                           <Image Source="{StaticResource CloseXDrawingImage}"
-                                  Margin="2" />
-                        </ToggleButton>
-                        <Border Grid.Row="1"
-                                BorderBrush="{StaticResource GlyphBrush}"
-                                BorderThickness="2"
-                                Background="#80FFFFFF" />
-                        <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                        Name="ViewFinderDisplay"
-                                                        ClipToBounds="True"
-                                                        Background="#C0FFFFFF"
-                                                        Margin="2"
-                                                        ShadowBrush="#80FFFFFF"
-                                                        ViewportBrush="Transparent"
-                                                        ViewportPen="{StaticResource ViewportPen}" />
-                     </Grid>
-                  </Border>
-                  <ToggleButton Name="ShowViewFinder"
-                                IsTabStop="False"
-                                ToolTip="Show View Finder"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Bottom"
-                                Margin="5"
-                                Height="22"
-                                Width="22"
-                                FocusVisualStyle="{x:Null}"
-                                Style="{StaticResource ViewFinderToggleButtonStyle}"
-                                Foreground="Transparent"
-                                Background="Transparent"
-                                IsChecked="{Binding Path=ViewFinderVisibility, 
+                          Margin="5"
+                          Height="22"
+                          Width="22"
+                          FocusVisualStyle="{x:Null}"
+                          Style="{StaticResource ViewFinderToggleButtonStyle}"
+                          Foreground="Transparent"
+                          Background="Transparent"
+                          IsChecked="{Binding Path=ViewFinderVisibility, 
                     Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
                     Converter={StaticResource TrueIfVisibleConverter}}">
-                     <Grid Name="ShowViewFinderGlyph"
-                           Opacity="0">
-                        <Image x:Name="ShowViewFinderGlyphImage"
-                               Source="{StaticResource ShowViewFinderGlyph}" />
-                     </Grid>
-                  </ToggleButton>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="EffectiveViewStackMode"
-                           Value="Manual">
-                     <Setter TargetName="RefocusButton"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="0"
-                                               To="1"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="1"
-                                               To="0"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.ExitActions>
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="False"
-                           SourceName="ShowViewFinder">
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="BackButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ForwardButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="HomeButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FitButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FillButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="CenterButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ToggleViewFinderButton" />
-                  </Trigger>
-                  <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!
+              <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 
+      <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>
+      <Trigger Property="IsDraggingContent"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="SizeAll" />
+      </Trigger>
+      <Trigger Property="IsSelectingRegion"
+               Value="True">
+        <Setter Property="Cursor"
+                Value="Cross" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
index 5d219084..fa053728 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
@@ -20,93 +20,93 @@
                     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" />
+  <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" />
+  <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="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>
+  <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 
+  <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
@@ -117,24 +117,24 @@
               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 
+        </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 
+        </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 
@@ -143,122 +143,122 @@
               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>
+        </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
+  <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 
+            <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 
+          <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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 
+          <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 
+          <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 
+          <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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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
@@ -266,102 +266,102 @@
               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>
+        </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 
+  <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 
+            <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>
+        </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 
+  <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 
+            <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>
+            <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 
+  <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 
+            <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>
+            <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 
+  <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 
@@ -371,452 +371,463 @@
               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>
+        </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}">
+  <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>
+            <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 x:Name="PART_HorizontalScrollBar"
-                             Grid.Row="1"
-                             Grid.Column="0"
-                             Orientation="Horizontal"
-                             Visibility="Collapsed" />
-                  <Border Grid.Row="1"
-                          Grid.Column="1"
-                          Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+            <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"
+            <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="10"
-                          CornerRadius="4">
-                     <Border.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform x:Name="LayoutScaleTransform"
-                                           ScaleX="0"
-                                           ScaleY="0" />
-                        </TransformGroup>
-                     </Border.RenderTransform>
-                     <Grid Margin="4">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="*" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <StackPanel Orientation="Horizontal"
-                                    Margin="0,0,0,3">
-                           <Button x:Name="BackButton"
-                                   Command="local:Zoombox.Back"
-                                   ToolTip="Go Back"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource PreviousGlyph}" />
-                           </Button>
-                           <Button x:Name="ForwardButton"
-                                   Command="local:Zoombox.Forward"
-                                   ToolTip="Go Forward"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource NextGlyph}" />
-                           </Button>
-                           <Button x:Name="HomeButton"
-                                   Command="local:Zoombox.Home"
-                                   ToolTip="Go Home"
-                                   Width="20px"
-                                   Height="20px"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource HomeGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FitButton"
-                                   Command="local:Zoombox.Fit"
-                                   ToolTip="Fit Content within Bounds"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FitContentGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="FillButton"
-                                   Command="local:Zoombox.Fill"
-                                   ToolTip="Fill Bounds with Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource FillToBoundsGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="CenterButton"
-                                   Command="local:Zoombox.Center"
-                                   ToolTip="Center Content"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource CenterGlyph}"
-                                     Margin="2" />
-                           </Button>
-                           <Button x:Name="RefocusButton"
-                                   Command="local:Zoombox.Refocus"
-                                   Visibility="Collapsed"
-                                   ToolTip="Refocus View"
-                                   Width="20px"
-                                   Height="20px"
-                                   Margin="2,0"
-                                   Style="{StaticResource TransparentButton}">
-                              <Image Source="{StaticResource RefocusGlyph}"
-                                     Margin="2" />
-                           </Button>
-                        </StackPanel>
-                        <ToggleButton x:Name="ToggleViewFinderButton"
-                                      ToolTip="Hide View Finder"
-                                      Height="13"
-                                      Width="13"
-                                      Margin="0,2,0,0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      Style="{StaticResource TransparentButton}"
-                                      Foreground="White"
-                                      IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}">
-                           <Image Source="{StaticResource CloseXDrawingImage}"
-                                  Margin="2" />
-                        </ToggleButton>
-                        <Border Grid.Row="1"
-                                BorderBrush="{StaticResource GlyphBrush}"
-                                BorderThickness="2"
-                                Background="#80FFFFFF" />
-                        <local:ZoomboxViewFinderDisplay Grid.Row="1"
-                                                        Name="ViewFinderDisplay"
-                                                        ClipToBounds="True"
-                                                        Background="#C0FFFFFF"
-                                                        Margin="2"
-                                                        ShadowBrush="#80FFFFFF"
-                                                        ViewportBrush="Transparent"
-                                                        ViewportPen="{StaticResource ViewportPen}" />
-                     </Grid>
-                  </Border>
-                  <ToggleButton Name="ShowViewFinder"
-                                IsTabStop="False"
-                                ToolTip="Show View Finder"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Bottom"
-                                Margin="5"
-                                Height="22"
-                                Width="22"
-                                FocusVisualStyle="{x:Null}"
-                                Style="{StaticResource ViewFinderToggleButtonStyle}"
-                                Foreground="Transparent"
-                                Background="Transparent"
-                                IsChecked="{Binding Path=ViewFinderVisibility, 
+                          Margin="5"
+                          Height="22"
+                          Width="22"
+                          FocusVisualStyle="{x:Null}"
+                          Style="{StaticResource ViewFinderToggleButtonStyle}"
+                          Foreground="Transparent"
+                          Background="Transparent"
+                          IsChecked="{Binding Path=ViewFinderVisibility, 
                     Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
                     Converter={StaticResource TrueIfVisibleConverter}}">
-                     <Grid Name="ShowViewFinderGlyph"
-                           Opacity="0">
-                        <Image x:Name="ShowViewFinderGlyphImage"
-                               Source="{StaticResource ShowViewFinderGlyph}" />
-                     </Grid>
-                  </ToggleButton>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="EffectiveViewStackMode"
-                           Value="Manual">
-                     <Setter TargetName="RefocusButton"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="0"
-                                               To="1"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
-                                               Storyboard.TargetProperty="Opacity"
-                                               DecelerationRatio="1"
-                                               Duration="0:0:0.3"
-                                               From="1"
-                                               To="0"
-                                               FillBehavior="HoldEnd" />
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </Trigger.ExitActions>
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="False"
-                           SourceName="ShowViewFinder">
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="BackButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ForwardButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="HomeButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FitButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="FillButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="CenterButton" />
-                     <Setter Property="Focusable"
-                             Value="False"
-                             TargetName="ToggleViewFinderButton" />
-                  </Trigger>
-                  <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!
+              <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 
+      <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>
+      <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
index 3e2bf0ca..d3804e7d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
@@ -295,6 +295,10 @@ namespace Xceed.Wpf.Toolkit.Zoombox
           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 );
@@ -333,6 +337,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox
           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;
@@ -2045,6 +2054,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnRender( drawingContext );
     }
 
+
+
+
     private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
       Zoombox zoombox = o as Zoombox;
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
index 53913158..db7db3c0 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml 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
index 5b514da6..e4646b9b 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml 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
index b8d1a408..b510a72b 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml 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
index 28298aa0..7daeb613 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml 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
index d5f3e01d..71de474d 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml 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
index b88985ee..5c0d780e 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml 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
index e9d4daa8..46fbcd2b 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml 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
index dda913a2..e4f09e5e 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml 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
index 6b072131..5422ff38 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml 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
index 5b288225..7333e9e9 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml 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
index c31f8223..78860477 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml 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
index ac92ac56..36f955dc 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml 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
index 52c508ff..dff850aa 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml 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
index 1abf6257..2e1cb643 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml 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
index cebcaf48..3b1f8721 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml 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
index 7ba5a79c..71a9d4c2 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml 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
index a410ec9a..ea349280 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml differ
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
index fae0e7cd..70887618 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml 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
index dfbcb8f4..81853f9f 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml 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
index e6f9cf32..d5496919 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml 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
index d4247261..801d34e4 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml 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
index cb67fe73..65f10c4e 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml 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
index 8f002dc8..3cf123a4 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml 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
index 5a1a4282..605368cc 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml 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
index 6cff207f..3fa711da 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml 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
index 50e2ad10..e9cd77bc 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml 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
index 9e60289e..c4b37f16 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml 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
index 66c8aa53..12c6f8ca 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml 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
index 02165a7c..839b9bd9 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml differ
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
index 97beeb7b..4d588794 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml 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
index 97beeb7b..4d588794 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml 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
index 18977d07..c01e99ac 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml 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
index 0271d079..33fa18e1 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml 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
index 804bbd9c..b3878878 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml 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
index 85d31d43..6d941b00 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml 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
index 0416d35e..885eba35 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml 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
index df1e0433..94c02d27 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml 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
index eebc1150..c35e5974 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml 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
index 1bc5b5aa..f3612943 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml 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
index aace64ce..c3627cbb 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml 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
index 003d455e..30ef3789 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml 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
index 5039d17b..c265ec25 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml 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
index a2c50122..ed5451cc 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml 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
index 2e35c058..cf7cf14c 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml 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
index f7e5f2cf..1490c27e 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml 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
index cce696da..71cb5286 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml 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
index d4be6ebc..dd10ec54 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml 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
index c64957ab..1a96e302 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml 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
index 9ad29679..8308e520 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml 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
index c548c999..ca856d9b 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml 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
index 74c59e67..0e89774c 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml 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
index 773ca49a..ed4a5f84 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml 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
index 5cbc9e8f..cca222cd 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml 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
index d3cb0c4c..a9b638c7 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml 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
index dd6d1627..e76d8a03 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml 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
index 7dd410f3..adbbb86f 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml 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
index 1fb4df52..37d6036f 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml 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
index d8b9f202..3c9597d3 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml 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
index 7ce9b117..f9ffff6a 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml 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
index 9d91a503..07a26251 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml 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
index 150f0e6c..6715ef68 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml 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
index ebd8adbe..01dd0642 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml 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
index be2f2b90..3f35f2c0 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml 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
index b348f7ad..77c98bbc 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml 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
index f6a544ea..6c27f484 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml 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
index ee39d961..e8ba7bae 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml 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
index 074c382c..193455e3 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml 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
index 5a53598f..922359c4 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml 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
index de04898f..c831808a 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml 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
index 843187a9..c831808a 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml 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
index 206e26fe..f1a84a3c 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml 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
index 5aed1ff8..891a3112 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml 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
index 1d453b96..0f6e8a01 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml 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
index eecf4104..c8391325 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml 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
index 252d05da..59b2fce3 100644
--- 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
@@ -1,95 +1,95 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\WPFToolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\WPFToolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.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
index c91f7b56..afc500d3 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources 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
index f865300f..45e28970 100644
--- 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
@@ -1,78 +1,78 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
 
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.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
index a1c10b38..fd1f8223 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml 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
index 93902865..fd1f8223 100644
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml 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
new file mode 100644
index 00000000..1ed54301
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..04f7560e
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml 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
new file mode 100644
index 00000000..455c9036
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ee324890
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml 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
new file mode 100644
index 00000000..608cba52
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..b39b5424
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml 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
new file mode 100644
index 00000000..280bb22a
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..3c8f506c
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..39917614
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..b0aadd10
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..7e958560
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ee2c62d4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..f38ad968
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ed0bd57f
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml 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
new file mode 100644
index 00000000..57532c2c
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..5b72ecfb
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml 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
new file mode 100644
index 00000000..6ce809bf
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml 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
new file mode 100644
index 00000000..5d455104
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
@@ -0,0 +1,111 @@
+#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192"
+//------------------------------------------------------------------------------
+// <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 44 "..\..\..\..\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 48 "..\..\..\..\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
new file mode 100644
index 00000000..ef54b08f
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..2d5b8194
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml 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
new file mode 100644
index 00000000..c2553572
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..74f62506
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml 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
new file mode 100644
index 00000000..1eaebd07
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..bde47d5d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..0d3665a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..64f737c6
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..04a3cd79
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..d4757af7
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..02afd99a
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..803c9e42
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..4a59f27e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <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/Release/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml
new file mode 100644
index 00000000..ea746e34
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..ea746e34
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..16eab2f0
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml 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
new file mode 100644
index 00000000..fa91f7a7
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..04cff434
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..77099644
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..0bf0cf85
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml 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
new file mode 100644
index 00000000..b35544ae
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..3e124e12
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..823f7224
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..823f7224
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml 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
new file mode 100644
index 00000000..54320ae7
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml 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
new file mode 100644
index 00000000..a7292408
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml 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
new file mode 100644
index 00000000..dc21fdd6
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml 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
new file mode 100644
index 00000000..83f46919
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml 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
new file mode 100644
index 00000000..5dc9c9ea
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..a3b39aff
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml 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
new file mode 100644
index 00000000..8754541d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..6b14d7f4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml 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
new file mode 100644
index 00000000..2c98f49b
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8ceaa329
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml 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
new file mode 100644
index 00000000..bb5e61d4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..2b3e9983
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml 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
new file mode 100644
index 00000000..41f807eb
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml 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
new file mode 100644
index 00000000..1b088c5d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml 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
new file mode 100644
index 00000000..67c3f3e0
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml 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
new file mode 100644
index 00000000..0b4639b6
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8e61bb11
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml 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
new file mode 100644
index 00000000..e3b7884e
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml 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
new file mode 100644
index 00000000..c25103cf
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml 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
new file mode 100644
index 00000000..07768b73
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml 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
new file mode 100644
index 00000000..bdc8a33d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml 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
new file mode 100644
index 00000000..ab8dcc2e
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml 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
new file mode 100644
index 00000000..b9903a6f
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml 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
new file mode 100644
index 00000000..902c4838
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml 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
new file mode 100644
index 00000000..07768b73
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml 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
new file mode 100644
index 00000000..6c0ac4c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml 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
new file mode 100644
index 00000000..6c0ac4c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml 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
new file mode 100644
index 00000000..6c0ac4c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml 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
new file mode 100644
index 00000000..6c0ac4c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml 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
new file mode 100644
index 00000000..6c0ac4c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml 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
new file mode 100644
index 00000000..e4b11d1f
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..c5367697
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml 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
new file mode 100644
index 00000000..9b6caa90
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..a1aa3e9a
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml 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
new file mode 100644
index 00000000..e2e384bc
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..e2e384bc
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..c8464d51
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..a998a120
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml 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
new file mode 100644
index 00000000..10fca110
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..0086df93
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml 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
new file mode 100644
index 00000000..67ef7128
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources 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
new file mode 100644
index 00000000..7fb609c6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
@@ -0,0 +1,95 @@
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ResolveAssemblyReference.cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\WPFToolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.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
new file mode 100644
index 00000000..da9b9507
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources 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
new file mode 100644
index 00000000..a1a95160
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
@@ -0,0 +1,78 @@
+D:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
+
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
+FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.3.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
new file mode 100644
index 00000000..8f3f1983
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml 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
new file mode 100644
index 00000000..8f3f1983
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml differ